johannes/Sicherheitssystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added short distance warning + increased priority of heavy warning

Browse Source
This commit is contained in:
JPaehr
2023-08-12 17:22:12 +02:00
parent 42135c6482
commit 833ecfd1f2
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platformio.ini
View File

@@ -14,8 +14,8 @@ board = esp32dev
framework = arduino framework = arduino
monitor_speed = 115200 monitor_speed = 115200
#; upload_port = COM[6] #; upload_port = COM[6]
#upload_protocol = espota ; upload_protocol = espota
upload_port = 192.168.2.92 upload_port = 192.168.2.136
;board_build.partitions = huge_app.csv ;board_build.partitions = huge_app.csv
board_build.partitions = min_spiffs.csv board_build.partitions = min_spiffs.csv

32
src/main.cpp
View File

@@ -56,6 +56,7 @@ class MyServerCallbacks : public BLEServerCallbacks {
uint8_t alarmFired_1km = 0; uint8_t alarmFired_1km = 0;
uint8_t alarmFired_500m = 0; uint8_t alarmFired_500m = 0;
uint8_t alarmFired_300m = 0; uint8_t alarmFired_300m = 0;
uint8_t alarmFired_100m = 0;
int state = 0; int state = 0;
class MyAlarmCallback : public BLECharacteristicCallbacks { class MyAlarmCallback : public BLECharacteristicCallbacks {
void onWrite(BLECharacteristic * pCharacteristic) { void onWrite(BLECharacteristic * pCharacteristic) {
@@ -76,6 +77,11 @@ class MyAlarmCallback : public BLECharacteristicCallbacks {
alarmFired_300m = 1; alarmFired_300m = 1;
state = 0; state = 0;
} }
else if (value.compare("XXXX") == 0) {
Serial.println("found XXXX");
alarmFired_100m = 1;
state = 0;
}
else if (value.compare("U") == 0) { else if (value.compare("U") == 0) {
// reboot in WifiMode // reboot in WifiMode
Serial.println("Found U"); Serial.println("Found U");
@@ -252,8 +258,14 @@ void loop() {
} }
state++; state++;
#else #else
if (alarmFired_1km) { if (alarmFired_100m) {
if (state % 4 == 0) { // if (state % 2 == 0) {
stateLED = togglePin(ALARM_LED, stateLED);
// }
state++;
}
else if (alarmFired_300m) {
if (state % 2 == 0) {
stateLED = togglePin(ALARM_LED, stateLED); stateLED = togglePin(ALARM_LED, stateLED);
} }
state++; state++;
@@ -264,12 +276,13 @@ void loop() {
} }
state++; state++;
} }
else if (alarmFired_300m) { else if (alarmFired_1km) {
if (state % 2 == 0) { if (state % 4 == 0) {
stateLED = togglePin(ALARM_LED, stateLED); stateLED = togglePin(ALARM_LED, stateLED);
} }
state++; state++;
} }
#endif #endif
if (state == 50) { if (state == 50) {
state = 0; state = 0;
@@ -281,6 +294,7 @@ void loop() {
alarmFired_1km = 0; alarmFired_1km = 0;
alarmFired_500m = 0; alarmFired_500m = 0;
alarmFired_300m = 0; alarmFired_300m = 0;
alarmFired_100m = 0;
} }
} }
@@ -291,6 +305,7 @@ void loop() {
// value++; // value++;
delay(10); // bluetooth stack will go into congestion, if too many packets are sent, in delay(10); // bluetooth stack will go into congestion, if too many packets are sent, in
// 6 hours test i was able to go as low as 3ms // 6 hours test i was able to go as low as 3ms
} }
// disconnecting // disconnecting
if (!deviceConnected && oldDeviceConnected) { if (!deviceConnected && oldDeviceConnected) {
@@ -304,6 +319,15 @@ void loop() {
if (deviceConnected && !oldDeviceConnected) { if (deviceConnected && !oldDeviceConnected) {
// do stuff here on connecting // do stuff here on connecting
oldDeviceConnected = deviceConnected; oldDeviceConnected = deviceConnected;
digitalWrite(ALARM_LED, HIGH);
delay(200);
digitalWrite(ALARM_LED, LOW);
delay(200);
digitalWrite(ALARM_LED, HIGH);
delay(200);
digitalWrite(ALARM_LED, LOW);
} }
// delay(500); // delay(500);