From 688d0993afe514c59bd33310679d31b9fcd62529 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Tue, 17 Apr 2018 18:08:47 +0200 Subject: [PATCH 01/17] state machine (part 1) --- src/globals.h | 2 +- src/lorawan.cpp | 3 - src/main.cpp | 361 ++++++++++++++++++++++++++--------------------- src/rcommand.cpp | 4 +- 4 files changed, 204 insertions(+), 166 deletions(-) diff --git a/src/globals.h b/src/globals.h index 72598669..a484a192 100644 --- a/src/globals.h +++ b/src/globals.h @@ -44,7 +44,7 @@ typedef struct { extern configData_t cfg; extern uint8_t mydata[]; -extern uint64_t uptimecounter; +extern uint64_t currentMillis ; extern osjob_t sendjob; extern char display_lora[], display_lmic[]; extern int countermode, screensaver, adrmode, lorasf, txpower, rlim; diff --git a/src/lorawan.cpp b/src/lorawan.cpp index fd8693e3..86e4fff8 100644 --- a/src/lorawan.cpp +++ b/src/lorawan.cpp @@ -13,9 +13,6 @@ // Local logging Tag static const char *TAG = "lorawan"; -// function defined in main.cpp -void set_onboard_led(int state); - // functions defined in rcommand.cpp void rcommand(int cmd, int arg); void switch_lora(int sf, int tx); diff --git a/src/main.cpp b/src/main.cpp index 2bfadabd..ec3fa91b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -47,8 +47,10 @@ osjob_t sendjob, initjob; // LMIC char display_lora[16], display_lmic[16]; uint8_t channel = 0; int macnum = 0; -uint64_t uptimecounter = 0; +uint64_t currentMillis = 0, previousLEDmillis = 0, previousDisplaymillis = 0; bool joinstate = false; +uint8_t DisplayState, LEDState; +uint16_t LEDBlinkduration = 500, LEDInterval = 1000, color = COLOR_NONE; std::set macs; // associative container holds total of unique MAC adress hashes (Wifi + BLE) std::set wifis; // associative container holds unique Wifi MAC adress hashes @@ -77,10 +79,6 @@ void eraseConfig(void); void saveConfig(void); void loadConfig(void); -#ifdef HAS_LED - void set_onboard_led(int st); -#endif - /* begin LMIC specific parts ------------------------------------------------------------ */ // defined in lorawan.cpp @@ -151,48 +149,37 @@ static void lora_init (osjob_t* j) { void lorawan_loop(void * pvParameters) { configASSERT( ( ( uint32_t ) pvParameters ) == 1 ); // FreeRTOS check - static bool led_state; - bool new_led_state; - while(1) { - uint16_t color; + os_runloop_once(); - // All follow is Led management - // Let join at the begining of if sequence, - // is prior to send because joining state send data + // LED management for viusalizing LoRaWAN state if ( LMIC.opmode & (OP_JOINING | OP_REJOIN) ) { - color = COLOR_YELLOW; // quick blink 20ms on each 1/5 second - new_led_state = ((millis() % 200) < 20) ? HIGH : LOW; - + color = COLOR_YELLOW; + LEDBlinkduration = 20; + LEDInterval = 200; + LEDState = 1; // TX data pending } else if (LMIC.opmode & (OP_TXDATA | OP_TXRXPEND)) { - color = COLOR_BLUE; // small blink 10ms on each 1/2sec (not when joining) - new_led_state = ((millis() % 500) < 20) ? HIGH : LOW; - + color = COLOR_BLUE; + LEDBlinkduration = 10; + LEDInterval = 500; + LEDState =1; // This should not happen so indicate a problem } else if ( LMIC.opmode & (OP_TXDATA | OP_TXRXPEND | OP_JOINING | OP_REJOIN) == 0 ) { - color = COLOR_RED; // heartbeat long blink 200ms on each 2 seconds - new_led_state = ((millis() % 2000) < 200) ? HIGH : LOW; + color = COLOR_RED; + LEDBlinkduration = 200; + LEDInterval = 2000; + LEDState = 1; } else { // led off - rgb_set_color(COLOR_NONE); + color = COLOR_NONE; + LEDState = 0; } - // led need to change state? avoid digitalWrite() for nothing - if (led_state != new_led_state) { - if (new_led_state == HIGH) { - set_onboard_led(1); - rgb_set_color(color); - } else { - set_onboard_led(0); - rgb_set_color(COLOR_NONE); - } - led_state = new_led_state; - } - + vTaskDelay(10/portTICK_PERIOD_MS); yield(); } @@ -218,21 +205,6 @@ void lorawan_loop(void * pvParameters) { bool btstop = btStop(); #endif -void set_onboard_led(int st){ -#ifdef HAS_LED - switch (st) { - #ifdef LED_ACTIVE_LOW - case 1: digitalWrite(HAS_LED, LOW); break; - case 0: digitalWrite(HAS_LED, HIGH); break; - #else - case 1: digitalWrite(HAS_LED, HIGH); break; - case 0: digitalWrite(HAS_LED, LOW); break; - #endif - } -#endif -}; - - #ifdef HAS_BUTTON // Button Handling, board dependent -> perhaps to be moved to hal/<$board.h> // IRAM_ATTR necessary here, see https://github.com/espressif/arduino-esp32/issues/855 @@ -303,15 +275,6 @@ void sniffer_loop(void * pvParameters) { yield(); } sprintf(display_lora, " "); // clear LoRa wait message fromd display - - /* - // TBD: need to check if long 2000ms pause causes stack problems while scanning continues - if (cfg.screenon && cfg.screensaver) { - vTaskDelay(2000/portTICK_PERIOD_MS); // pause for displaying results - yield(); - u8x8.setPowerSave(1 && cfg.screensaver); // set display off if screensaver is enabled - } - */ } // end of send data cycle @@ -330,68 +293,165 @@ uint64_t uptime() { } #ifdef HAS_DISPLAY -// Print a key on display -void DisplayKey(const uint8_t * key, uint8_t len, bool lsb) { - uint8_t start=lsb?len:0; - uint8_t end = lsb?0:len; - const uint8_t * p ; - for (uint8_t i=0; i= ( 1 / DISPLAYFPS * (1000/portTICK_PERIOD_MS))) { + refreshDisplay(); + previousDisplaymillis += ( 1 / DISPLAYFPS * (1000/portTICK_PERIOD_MS)); + } + // set display on/off according to current device configuration + if (DisplayState != cfg.screenon) { + DisplayState = cfg.screenon; + u8x8.setPowerSave(!cfg.screenon); + } + } // updateDisplay() - // Display chip information - #ifdef VERBOSE - esp_chip_info_t chip_info; - esp_chip_info(&chip_info); - u8x8.printf("ESP32 %d cores\nWiFi%s%s\n", - chip_info.cores, - (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "", - (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : ""); - u8x8.printf("ESP Rev.%d\n", chip_info.revision); - u8x8.printf("%dMB %s Flash\n", spi_flash_get_chip_size() / (1024 * 1024), - (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "int." : "ext."); - #endif // VERBOSE - u8x8.print(Productname); - u8x8.print(" v"); - u8x8.println(PROGVERSION); - u8x8.println("DEVEUI:"); - os_getDevEui((u1_t*) buf); - DisplayKey(buf, 8, true); - delay(5000); - u8x8.clear(); -} #endif // HAS_DISPLAY +#ifdef HAS_BUTTON + void readButton() { + if (ButtonTriggered) { + ButtonTriggered = false; + ESP_LOGI(TAG, "Button pressed, resetting device to factory defaults"); + eraseConfig(); + esp_restart(); + } + } +#endif + +#ifdef HAS_LED + void updateLEDstatus() { + + if (LEDState == LOW) { + if (currentMillis - previousLEDmillis >= LEDInterval) { + LEDState = HIGH; + previousLEDmillis += LEDInterval; + } + } + else { + if (currentMillis - previousLEDmillis >= LEDBlinkduration) { + LEDState = LOW; + previousLEDmillis += LEDBlinkduration; + } + } + + }; // updateLEDstatus() + + void refreshLED() { + static bool previousLEDState; + // led need to change state? avoid digitalWrite() for nothing + if (LEDState != previousLEDState) { + #ifdef LED_ACTIVE_LOW + digitalWrite(HAS_LED, LEDState); + #else + digitalWrite(HAS_LED, !LEDState); + #endif + + #ifdef HAS_RGB_LED + rgb_set_color(color); + #endif + previousLEDState = LEDState; + } + }; // refreshLED() +#endif + + /* begin Aruino SETUP ------------------------------------------------------------ */ void setup() { @@ -436,8 +496,17 @@ void setup() { // initialize led if needed #ifdef HAS_LED + LEDState = 0; + color = COLOR_NONE; pinMode(HAS_LED, OUTPUT); - digitalWrite(HAS_LED, LOW); + #ifdef LED_ACTIVE_LOW + digitalWrite(HAS_LED, LEDState); + #else + digitalWrite(HAS_LED, !LEDState); + #endif + #ifdef HAS_RBG_LED + rgb_set_color (color); + #endif #endif // initialize button handling if needed @@ -460,7 +529,8 @@ void setup() { #ifdef HAS_DISPLAY // initialize display - init_display(PROGNAME, PROGVERSION); + init_display(PROGNAME, PROGVERSION); + DisplayState = cfg.screenon; u8x8.setPowerSave(!cfg.screenon); // set display off if disabled u8x8.draw2x2String(0, 0, "PAX:0"); u8x8.setCursor(0,4); @@ -513,55 +583,26 @@ do_send(&sendjob); // https://techtutorialsx.com/2017/05/09/esp32-get-task-execution-core/ void loop() { - uptimecounter = uptime() / 1000; // count uptime seconds + // state machine for central control of all timimg based features + + currentMillis = uptime() / 1000; // count uptime seconds - #ifdef HAS_BUTTON // ...then check if pressed - if (ButtonTriggered) { - ButtonTriggered = false; - ESP_LOGI(TAG, "Button pressed, resetting device to factory defaults"); - eraseConfig(); - esp_restart(); - } - #endif - - #ifdef HAS_DISPLAY // ...then update mask - - // set display on/off according to current device configuration - u8x8.setPowerSave(!cfg.screenon); - - // update counter display (lines 0-4) - char buff[16]; - snprintf(buff, sizeof(buff), "PAX:%-4d", (int) macs.size()); // convert 16-bit MAC counter to decimal counter value - u8x8.draw2x2String(0, 0, buff); // display number on unique macs total Wifi + BLE - u8x8.setCursor(0,4); - u8x8.printf("WIFI: %-4d", (int) wifis.size()); - #ifdef BLECOUNTER - u8x8.setCursor(0,3); - if (cfg.blescan) - u8x8.printf("BLTH: %-4d", (int) bles.size()); - else - u8x8.printf("%-16s", "BLTH: off"); - #endif - - // update wifi channel display (line 4) - u8x8.setCursor(11,4); - u8x8.printf("ch:%02i", channel); - - // update RSSI limiter status display (line 5) - u8x8.setCursor(0,5); - u8x8.printf(!cfg.rssilimit ? "RLIM: off" : "RLIM: %-4d", cfg.rssilimit); - - // update LoRa status display (line 6) - u8x8.setCursor(0,6); - u8x8.printf("%-16s", display_lora); - - // update LMiC event display (line 7) - u8x8.setCursor(0,7); - u8x8.printf("%-16s", display_lmic); - + #ifdef HAS_BUTTON + readButton(); #endif - vTaskDelay(1000/DISPLAYFPS/portTICK_PERIOD_MS); + #ifdef HAS_DISPLAY + updateDisplay(); + #endif + + #ifdef HAS_LED + updateLEDstatus(); + refreshLED(); + #endif + + //sendPayload(); + + } diff --git a/src/rcommand.cpp b/src/rcommand.cpp index 29ed2f1c..4119b0b0 100644 --- a/src/rcommand.cpp +++ b/src/rcommand.cpp @@ -210,9 +210,9 @@ void get_config (int val) { void get_uptime (int val) { ESP_LOGI(TAG, "Remote command: get uptime"); - int size = sizeof(uptimecounter); + int size = sizeof(currentMillis ); unsigned char *sendData = new unsigned char[size]; - memcpy(sendData, (unsigned char*)&uptimecounter, size); + memcpy(sendData, (unsigned char*)¤tMillis , size); LMIC_setTxData2(RCMDPORT, sendData, size-1, 0); // send data unconfirmed on RCMD Port delete sendData; // free memory ESP_LOGI(TAG, "%i bytes queued in send queue", size-1); From eefac5903082888230d1f46f869d34f7421d9cbd Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Tue, 17 Apr 2018 18:46:01 +0200 Subject: [PATCH 02/17] state machine (part 2) --- platformio.ini | 8 ++++---- src/main.cpp | 46 +++++++++++++++++++++------------------------- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/platformio.ini b/platformio.ini index fff50de0..2d11dae3 100644 --- a/platformio.ini +++ b/platformio.ini @@ -11,9 +11,9 @@ ; ---> SELECT TARGET PLATFORM HERE! <--- [platformio] -env_default = heltec_wifi_lora_32 +;env_default = heltec_wifi_lora_32 ;env_default = ttgov1 -;env_default = ttgov2 +env_default = ttgov2 ;env_default = lopy ;env_default = lopy4 ;env_default = lolin32lite_lora @@ -31,8 +31,8 @@ build_flags = ; ---> NOTE: For production run set DEBUG_LEVEL level to NONE! <--- ; otherwise device may crash in dense environments due to serial buffer overflow ; - -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_NONE -; -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_INFO +; -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_NONE + -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_INFO ; -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE ; -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG ; diff --git a/src/main.cpp b/src/main.cpp index ec3fa91b..05324c57 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -44,13 +44,13 @@ configData_t cfg; // struct holds current device configuration osjob_t sendjob, initjob; // LMIC // Initialize global variables -char display_lora[16], display_lmic[16]; -uint8_t channel = 0; -int macnum = 0; +#define DISPLAYREFRESH_MS (1 / DISPLAYFPS * (1000/portTICK_PERIOD_MS)) // calculate ms from fps +char display_lora[16], display_lmic[16]; // display buffers uint64_t currentMillis = 0, previousLEDmillis = 0, previousDisplaymillis = 0; -bool joinstate = false; uint8_t DisplayState, LEDState; uint16_t LEDBlinkduration = 500, LEDInterval = 1000, color = COLOR_NONE; +uint8_t channel = 0; // wifi channel counter +bool joinstate = false; std::set macs; // associative container holds total of unique MAC adress hashes (Wifi + BLE) std::set wifis; // associative container holds unique Wifi MAC adress hashes @@ -86,7 +86,6 @@ void gen_lora_deveui(uint8_t * pdeveui); void RevBytes(unsigned char* b, size_t c); void get_hard_deveui(uint8_t *pdeveui); - #ifdef VERBOSE void printKeys(void); #endif // VERBOSE @@ -145,6 +144,13 @@ static void lora_init (osjob_t* j) { LMIC_startJoining(); } +void set_LED (uint16_t set_color, uint16_t set_blinkduration, uint16_t set_interval, uint8_t set_state) { + color = set_color; + LEDBlinkduration = set_blinkduration; + LEDInterval = set_interval; + LEDState = set_state; +} + // LMIC FreeRTos Task void lorawan_loop(void * pvParameters) { configASSERT( ( ( uint32_t ) pvParameters ) == 1 ); // FreeRTOS check @@ -153,31 +159,21 @@ void lorawan_loop(void * pvParameters) { os_runloop_once(); - // LED management for viusalizing LoRaWAN state + // LED indicators for viusalizing LoRaWAN state if ( LMIC.opmode & (OP_JOINING | OP_REJOIN) ) { // quick blink 20ms on each 1/5 second - color = COLOR_YELLOW; - LEDBlinkduration = 20; - LEDInterval = 200; - LEDState = 1; + set_LED(COLOR_YELLOW, 20, 200, 1); // TX data pending } else if (LMIC.opmode & (OP_TXDATA | OP_TXRXPEND)) { // small blink 10ms on each 1/2sec (not when joining) - color = COLOR_BLUE; - LEDBlinkduration = 10; - LEDInterval = 500; - LEDState =1; + set_LED(COLOR_BLUE, 10, 500, 1); // This should not happen so indicate a problem } else if ( LMIC.opmode & (OP_TXDATA | OP_TXRXPEND | OP_JOINING | OP_REJOIN) == 0 ) { // heartbeat long blink 200ms on each 2 seconds - color = COLOR_RED; - LEDBlinkduration = 200; - LEDInterval = 2000; - LEDState = 1; + set_LED(COLOR_RED, 200, 2000, 1); } else { // led off - color = COLOR_NONE; - LEDState = 0; + set_LED(COLOR_NONE, 0, 0, 0); } vTaskDelay(10/portTICK_PERIOD_MS); @@ -390,9 +386,9 @@ uint64_t uptime() { void updateDisplay() { // timed display refresh according to frames per second setting - if (currentMillis - previousDisplaymillis >= ( 1 / DISPLAYFPS * (1000/portTICK_PERIOD_MS))) { + if (currentMillis - previousDisplaymillis >= DISPLAYREFRESH_MS) { refreshDisplay(); - previousDisplaymillis += ( 1 / DISPLAYFPS * (1000/portTICK_PERIOD_MS)); + previousDisplaymillis += DISPLAYREFRESH_MS; } // set display on/off according to current device configuration if (DisplayState != cfg.screenon) { @@ -418,15 +414,15 @@ uint64_t uptime() { #ifdef HAS_LED void updateLEDstatus() { - if (LEDState == LOW) { + if (LEDState == 0) { if (currentMillis - previousLEDmillis >= LEDInterval) { - LEDState = HIGH; + LEDState = 1; previousLEDmillis += LEDInterval; } } else { if (currentMillis - previousLEDmillis >= LEDBlinkduration) { - LEDState = LOW; + LEDState = 0; previousLEDmillis += LEDBlinkduration; } } From cbca740792580ce6c838d3c6e580957af036d1e2 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Tue, 17 Apr 2018 19:20:54 +0200 Subject: [PATCH 03/17] state machine (part 3) --- src/globals.h | 3 ++- src/main.cpp | 8 +++++--- src/main.h | 4 ++-- src/rcommand.cpp | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/globals.h b/src/globals.h index a484a192..c695a388 100644 --- a/src/globals.h +++ b/src/globals.h @@ -44,7 +44,8 @@ typedef struct { extern configData_t cfg; extern uint8_t mydata[]; -extern uint64_t currentMillis ; +extern uint64_t uptimecounter; +extern uint32_t currentMillis ; extern osjob_t sendjob; extern char display_lora[], display_lmic[]; extern int countermode, screensaver, adrmode, lorasf, txpower, rlim; diff --git a/src/main.cpp b/src/main.cpp index 05324c57..788ee74b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -44,9 +44,9 @@ configData_t cfg; // struct holds current device configuration osjob_t sendjob, initjob; // LMIC // Initialize global variables -#define DISPLAYREFRESH_MS (1 / DISPLAYFPS * (1000/portTICK_PERIOD_MS)) // calculate ms from fps char display_lora[16], display_lmic[16]; // display buffers -uint64_t currentMillis = 0, previousLEDmillis = 0, previousDisplaymillis = 0; +uint64_t uptimecounter = 0; +uint32_t currentMillis = 0, previousLEDmillis = 0, previousDisplaymillis = 0; uint8_t DisplayState, LEDState; uint16_t LEDBlinkduration = 500, LEDInterval = 1000, color = COLOR_NONE; uint8_t channel = 0; // wifi channel counter @@ -579,9 +579,11 @@ do_send(&sendjob); // https://techtutorialsx.com/2017/05/09/esp32-get-task-execution-core/ void loop() { + uptimecounter = uptime() / 1000; // counts uptime in seconds (64bit) + // state machine for central control of all timimg based features - currentMillis = uptime() / 1000; // count uptime seconds + currentMillis = millis(); // timebase for state machine in milliseconds (32bit) #ifdef HAS_BUTTON readButton(); diff --git a/src/main.h b/src/main.h index 490fea31..f077f9e0 100644 --- a/src/main.h +++ b/src/main.h @@ -1,7 +1,7 @@ #pragma once // program version - note: increment version after modifications to configData_t struct!! -#define PROGVERSION "1.3.01" // use max 10 chars here! +#define PROGVERSION "1.3.1" // use max 10 chars here! #define PROGNAME "PAXCNT" // Verbose enables serial output @@ -47,7 +47,7 @@ #define RGBLUMINOSITY 30 // 30% // OLED Display refresh cycle (in Milliseconds) -#define DISPLAYFPS 5 // [fps] -> 5 Frames per second ps = 200ms refreseh cycle +#define DISPLAYREFRESH_MS 40 // e.g. 40ms -> 1000/40 = 25 frames per second // LMIC settings // define hardware independent LMIC settings here, settings of standard library in /lmic/config.h will be ignored diff --git a/src/rcommand.cpp b/src/rcommand.cpp index 4119b0b0..0ef9f2ef 100644 --- a/src/rcommand.cpp +++ b/src/rcommand.cpp @@ -210,9 +210,9 @@ void get_config (int val) { void get_uptime (int val) { ESP_LOGI(TAG, "Remote command: get uptime"); - int size = sizeof(currentMillis ); + int size = sizeof(uptimecounter); unsigned char *sendData = new unsigned char[size]; - memcpy(sendData, (unsigned char*)¤tMillis , size); + memcpy(sendData, (unsigned char*)&uptimecounter , size); LMIC_setTxData2(RCMDPORT, sendData, size-1, 0); // send data unconfirmed on RCMD Port delete sendData; // free memory ESP_LOGI(TAG, "%i bytes queued in send queue", size-1); From f6864b19731e240e83c8532323293e46f5e1a1e6 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Tue, 17 Apr 2018 19:28:58 +0200 Subject: [PATCH 04/17] state machine (part 4) --- src/main.cpp | 11 ++++------- src/main.h | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 788ee74b..1da702c7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -385,7 +385,7 @@ uint64_t uptime() { } void updateDisplay() { - // timed display refresh according to frames per second setting + // timed display refresh according to refresh cycle setting if (currentMillis - previousDisplaymillis >= DISPLAYREFRESH_MS) { refreshDisplay(); previousDisplaymillis += DISPLAYREFRESH_MS; @@ -580,10 +580,9 @@ do_send(&sendjob); void loop() { uptimecounter = uptime() / 1000; // counts uptime in seconds (64bit) - - // state machine for central control of all timimg based features - currentMillis = millis(); // timebase for state machine in milliseconds (32bit) + + // simple state machine for controlling display, LED, button, etc. #ifdef HAS_BUTTON readButton(); @@ -598,9 +597,7 @@ void loop() { refreshLED(); #endif - //sendPayload(); - - + //sendPayload(); } diff --git a/src/main.h b/src/main.h index f077f9e0..cd606adb 100644 --- a/src/main.h +++ b/src/main.h @@ -35,8 +35,8 @@ #define WIFI_CHANNEL_SWITCH_INTERVAL 50 // [seconds/100] -> 0,5 sec. // LoRa payload send cycle -#define SEND_SECS 120 // [seconds/2] -> 240 sec. -//#define SEND_SECS 30 // [seconds/2] -> 60 sec. +//#define SEND_SECS 120 // [seconds/2] -> 240 sec. +#define SEND_SECS 30 // [seconds/2] -> 60 sec. // Default LoRa Spreadfactor #define LORASFDEFAULT 9 // 7 ... 12 SF, according to LoRaWAN specs From 758a960371cfdca76580d9985cedfeee958fc3a9 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Tue, 17 Apr 2018 22:42:06 +0200 Subject: [PATCH 05/17] new led management (part 1) --- platformio.ini | 4 +-- src/lorawan.cpp | 14 ++++---- src/macsniff.cpp | 12 +++---- src/main.cpp | 84 +++++++++++++++++++----------------------------- 4 files changed, 47 insertions(+), 67 deletions(-) diff --git a/platformio.ini b/platformio.ini index 2d11dae3..8be3a272 100644 --- a/platformio.ini +++ b/platformio.ini @@ -11,9 +11,9 @@ ; ---> SELECT TARGET PLATFORM HERE! <--- [platformio] -;env_default = heltec_wifi_lora_32 +env_default = heltec_wifi_lora_32 ;env_default = ttgov1 -env_default = ttgov2 +;env_default = ttgov2 ;env_default = lopy ;env_default = lopy4 ;env_default = lolin32lite_lora diff --git a/src/lorawan.cpp b/src/lorawan.cpp index 86e4fff8..1832d2f5 100644 --- a/src/lorawan.cpp +++ b/src/lorawan.cpp @@ -116,13 +116,13 @@ void do_send(osjob_t* j){ mydata[1] = data & 0xff; #ifdef BLECOUNTER - // Sum of unique BLE MACs seen - data = (uint16_t) bles.size(); - mydata[2] = (data & 0xff00) >> 8; - mydata[3] = data & 0xff; + // Sum of unique BLE MACs seen + data = (uint16_t) bles.size(); + mydata[2] = (data & 0xff00) >> 8; + mydata[3] = data & 0xff; #else - mydata[2] = 0; - mydata[3] = 0; + mydata[2] = 0; + mydata[3] = 0; #endif // Total BLE+WIFI unique MACs seen @@ -164,7 +164,7 @@ void onEvent (ev_t ev) { case EV_JOINED: strcpy_P(buff, PSTR("JOINED")); - sprintf(display_lora, " "); // erase "Join Wait" message from display + sprintf(display_lora, ""); // erase "Join Wait" message from display // Disable link check validation (automatically enabled // during join, but not supported by TTN at this time). LMIC_setLinkCheckMode(0); diff --git a/src/macsniff.cpp b/src/macsniff.cpp index 6084d6be..e57526b1 100644 --- a/src/macsniff.cpp +++ b/src/macsniff.cpp @@ -11,6 +11,9 @@ // Local logging tag static const char *TAG = "macsniff"; +// defined in main.cpp +void set_LED (uint16_t set_color, uint16_t set_blinkduration, uint16_t set_interval, uint8_t set_count); + static wifi_country_t wifi_country = {.cc=WIFI_MY_COUNTRY, .schan=WIFI_CHANNEL_MIN, .nchan=WIFI_CHANNEL_MAX, .policy=WIFI_COUNTRY_POLICY_MANUAL}; uint16_t salt; @@ -49,21 +52,16 @@ bool mac_add(uint8_t *paddr, int8_t rssi, bool sniff_type) { // Insert only if it was not found on global count if (added) { - if (sniff_type == MAC_SNIFF_WIFI ) { - rgb_set_color(COLOR_GREEN); + set_LED(COLOR_GREEN, 20, 0, 1); wifis.insert(hashedmac); // add hashed MAC to wifi container } #ifdef BLECOUNTER else if (sniff_type == MAC_SNIFF_BLE ) { - rgb_set_color(COLOR_MAGENTA); + set_LED(COLOR_MAGENTA, 20, 0, 1); bles.insert(hashedmac); // add hashed MAC to BLE container } #endif - - // Not sure user will have time to see the LED - // TBD do light off further in the code - rgb_set_color(COLOR_NONE); } ESP_LOGI(TAG, "%s RSSI %ddBi -> MAC %s -> Hash %04X -> WiFi:%d BLTH:%d %s", diff --git a/src/main.cpp b/src/main.cpp index 1da702c7..5c0e608b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -46,9 +46,9 @@ osjob_t sendjob, initjob; // LMIC // Initialize global variables char display_lora[16], display_lmic[16]; // display buffers uint64_t uptimecounter = 0; -uint32_t currentMillis = 0, previousLEDmillis = 0, previousDisplaymillis = 0; -uint8_t DisplayState, LEDState; -uint16_t LEDBlinkduration = 500, LEDInterval = 1000, color = COLOR_NONE; +uint32_t currentMillis = 0, previousDisplaymillis = 0; +uint8_t DisplayState, LEDState = 0, LEDcount = 0; +uint16_t LEDBlinkduration = 0, LEDInterval = 0, color=COLOR_NONE; uint8_t channel = 0; // wifi channel counter bool joinstate = false; @@ -79,6 +79,14 @@ void eraseConfig(void); void saveConfig(void); void loadConfig(void); +void set_LED (uint16_t set_color, uint16_t set_blinkduration, uint16_t set_interval, uint8_t set_count) { + color = set_color; // set color for RGB LED + LEDBlinkduration = set_blinkduration; // duration on + LEDInterval = set_interval; // duration off - on - off + LEDcount = set_count * 2; // number of blinks before LED off + LEDState = set_count ? 1 : 0; // sets LED to off if 0 blinks +} + /* begin LMIC specific parts ------------------------------------------------------------ */ // defined in lorawan.cpp @@ -144,13 +152,6 @@ static void lora_init (osjob_t* j) { LMIC_startJoining(); } -void set_LED (uint16_t set_color, uint16_t set_blinkduration, uint16_t set_interval, uint8_t set_state) { - color = set_color; - LEDBlinkduration = set_blinkduration; - LEDInterval = set_interval; - LEDState = set_state; -} - // LMIC FreeRTos Task void lorawan_loop(void * pvParameters) { configASSERT( ( ( uint32_t ) pvParameters ) == 1 ); // FreeRTOS check @@ -161,16 +162,16 @@ void lorawan_loop(void * pvParameters) { // LED indicators for viusalizing LoRaWAN state if ( LMIC.opmode & (OP_JOINING | OP_REJOIN) ) { - // quick blink 20ms on each 1/5 second - set_LED(COLOR_YELLOW, 20, 200, 1); + // 5 quick blinks 20ms on each 1/5 second while joining + set_LED(COLOR_YELLOW, 20, 200, 5); // TX data pending } else if (LMIC.opmode & (OP_TXDATA | OP_TXRXPEND)) { - // small blink 10ms on each 1/2sec (not when joining) - set_LED(COLOR_BLUE, 10, 500, 1); + // 3 small blink 10ms on each 1/2sec (not when joining) + set_LED(COLOR_BLUE, 10, 500, 3); // This should not happen so indicate a problem } else if ( LMIC.opmode & (OP_TXDATA | OP_TXRXPEND | OP_JOINING | OP_REJOIN) == 0 ) { - // heartbeat long blink 200ms on each 2 seconds - set_LED(COLOR_RED, 200, 2000, 1); + // 5 heartbeat long blink 200ms on each 2 seconds + set_LED(COLOR_RED, 200, 2000, 5); } else { // led off set_LED(COLOR_NONE, 0, 0, 0); @@ -270,7 +271,7 @@ void sniffer_loop(void * pvParameters) { vTaskDelay(1000/portTICK_PERIOD_MS); yield(); } - sprintf(display_lora, " "); // clear LoRa wait message fromd display + sprintf(display_lora, ""); // clear LoRa wait message fromd display } // end of send data cycle @@ -412,39 +413,30 @@ uint64_t uptime() { #endif #ifdef HAS_LED - void updateLEDstatus() { - - if (LEDState == 0) { - if (currentMillis - previousLEDmillis >= LEDInterval) { - LEDState = 1; - previousLEDmillis += LEDInterval; - } - } - else { - if (currentMillis - previousLEDmillis >= LEDBlinkduration) { - LEDState = 0; - previousLEDmillis += LEDBlinkduration; - } - } - - }; // updateLEDstatus() - - void refreshLED() { + void switchLED() { static bool previousLEDState; // led need to change state? avoid digitalWrite() for nothing if (LEDState != previousLEDState) { #ifdef LED_ACTIVE_LOW - digitalWrite(HAS_LED, LEDState); - #else digitalWrite(HAS_LED, !LEDState); + #else + digitalWrite(HAS_LED, LEDState); #endif #ifdef HAS_RGB_LED rgb_set_color(color); #endif previousLEDState = LEDState; + LEDcount--; // decrement blink counter } - }; // refreshLED() + }; // switchLED() + + void switchLEDstate() { + if (!LEDcount) // no more blinks? -> switch off LED + LEDState = 0; + else if (LEDInterval) // blinks left? -> toggle LED and decrement blinks + LEDState = ((currentMillis % LEDInterval) < LEDBlinkduration) ? 1 : 0; + } // switchLEDstate() #endif @@ -469,7 +461,6 @@ void setup() { #endif ESP_LOGI(TAG, "Starting %s %s", PROGNAME, PROGVERSION); - rgb_set_color(COLOR_NONE); // initialize system event handler for wifi task, needed for wifi_sniffer_init() esp_event_loop_init(NULL, NULL); @@ -492,17 +483,8 @@ void setup() { // initialize led if needed #ifdef HAS_LED - LEDState = 0; - color = COLOR_NONE; pinMode(HAS_LED, OUTPUT); - #ifdef LED_ACTIVE_LOW - digitalWrite(HAS_LED, LEDState); - #else - digitalWrite(HAS_LED, !LEDState); - #endif - #ifdef HAS_RBG_LED - rgb_set_color (color); - #endif + set_LED(COLOR_NONE, 0, 0, 0); // LED off #endif // initialize button handling if needed @@ -593,8 +575,8 @@ void loop() { #endif #ifdef HAS_LED - updateLEDstatus(); - refreshLED(); + switchLEDstate(); + switchLED(); #endif //sendPayload(); From bf6a21f44f79f4803549c72dcdcff833178db679 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Tue, 17 Apr 2018 23:05:12 +0200 Subject: [PATCH 06/17] new led management (part 2) --- platformio.ini | 4 ++-- src/macsniff.cpp | 4 ++-- src/main.cpp | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/platformio.ini b/platformio.ini index 8be3a272..e3217138 100644 --- a/platformio.ini +++ b/platformio.ini @@ -11,10 +11,10 @@ ; ---> SELECT TARGET PLATFORM HERE! <--- [platformio] -env_default = heltec_wifi_lora_32 +;env_default = heltec_wifi_lora_32 ;env_default = ttgov1 ;env_default = ttgov2 -;env_default = lopy +env_default = lopy ;env_default = lopy4 ;env_default = lolin32lite_lora ;env_default = lolin32_lora diff --git a/src/macsniff.cpp b/src/macsniff.cpp index e57526b1..6762d662 100644 --- a/src/macsniff.cpp +++ b/src/macsniff.cpp @@ -53,12 +53,12 @@ bool mac_add(uint8_t *paddr, int8_t rssi, bool sniff_type) { // Insert only if it was not found on global count if (added) { if (sniff_type == MAC_SNIFF_WIFI ) { - set_LED(COLOR_GREEN, 20, 0, 1); + set_LED(COLOR_GREEN, 50, 0, 1); wifis.insert(hashedmac); // add hashed MAC to wifi container } #ifdef BLECOUNTER else if (sniff_type == MAC_SNIFF_BLE ) { - set_LED(COLOR_MAGENTA, 20, 0, 1); + set_LED(COLOR_MAGENTA, 50, 0, 1); bles.insert(hashedmac); // add hashed MAC to BLE container } #endif diff --git a/src/main.cpp b/src/main.cpp index 5c0e608b..f45403e9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -424,7 +424,10 @@ uint64_t uptime() { #endif #ifdef HAS_RGB_LED - rgb_set_color(color); + if (LEDState) + rgb_set_color(color); // LED on + else + rgb_set_color(COLOR_NONE); // LED off #endif previousLEDState = LEDState; LEDcount--; // decrement blink counter From e41aaa45a0b797c2337c3ebcf70782b5cd61cc53 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Tue, 17 Apr 2018 23:14:01 +0200 Subject: [PATCH 07/17] cleanups --- platformio.ini | 4 ++-- src/main.cpp | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/platformio.ini b/platformio.ini index e3217138..8be3a272 100644 --- a/platformio.ini +++ b/platformio.ini @@ -11,10 +11,10 @@ ; ---> SELECT TARGET PLATFORM HERE! <--- [platformio] -;env_default = heltec_wifi_lora_32 +env_default = heltec_wifi_lora_32 ;env_default = ttgov1 ;env_default = ttgov2 -env_default = lopy +;env_default = lopy ;env_default = lopy4 ;env_default = lolin32lite_lora ;env_default = lolin32_lora diff --git a/src/main.cpp b/src/main.cpp index f45403e9..73b6b343 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -424,11 +424,9 @@ uint64_t uptime() { #endif #ifdef HAS_RGB_LED - if (LEDState) - rgb_set_color(color); // LED on - else - rgb_set_color(COLOR_NONE); // LED off + rgb_set_color(LEDState ? color : COLOR_NONE); #endif + previousLEDState = LEDState; LEDcount--; // decrement blink counter } From 7f7dfaeec8815036543e9be8b340cde448285f1b Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Thu, 19 Apr 2018 10:55:59 +0200 Subject: [PATCH 08/17] removed 2 of 3 set arrays to save RAM --- src/globals.h | 11 +++-------- src/lorawan.cpp | 14 ++++++------- src/macsniff.cpp | 13 ++++-------- src/main.cpp | 51 ++++++++++++++++++++++++------------------------ src/rcommand.cpp | 13 +++++------- 5 files changed, 43 insertions(+), 59 deletions(-) diff --git a/src/globals.h b/src/globals.h index c695a388..ae9440f9 100644 --- a/src/globals.h +++ b/src/globals.h @@ -3,8 +3,8 @@ // std::set for unified array functions #include -#include -#include +//#include +//#include #ifdef HAS_DISPLAY // OLED Display @@ -49,15 +49,10 @@ extern uint32_t currentMillis ; extern osjob_t sendjob; extern char display_lora[], display_lmic[]; extern int countermode, screensaver, adrmode, lorasf, txpower, rlim; +extern uint16_t macs_total, macs_wifi, macs_ble; // MAC counters extern bool joinstate; -extern std::set wifis; extern std::set macs; #ifdef HAS_DISPLAY extern HAS_DISPLAY u8x8; #endif - -#ifdef BLECOUNTER - extern int scanTime; - extern std::set bles; -#endif diff --git a/src/lorawan.cpp b/src/lorawan.cpp index 1832d2f5..395c77e8 100644 --- a/src/lorawan.cpp +++ b/src/lorawan.cpp @@ -111,15 +111,13 @@ void do_send(osjob_t* j){ uint8_t mydata[4]; uint16_t data; // Sum of unique WIFI MACs seen - data = (uint16_t) wifis.size(); - mydata[0] = (data & 0xff00) >> 8; - mydata[1] = data & 0xff; + mydata[0] = (macs_wifi & 0xff00) >> 8; + mydata[1] = macs_wifi & 0xff; #ifdef BLECOUNTER // Sum of unique BLE MACs seen - data = (uint16_t) bles.size(); - mydata[2] = (data & 0xff00) >> 8; - mydata[3] = data & 0xff; + mydata[2] = (macs_ble & 0xff00) >> 8; + mydata[3] = macs_ble & 0xff; #else mydata[2] = 0; mydata[3] = 0; @@ -128,8 +126,8 @@ void do_send(osjob_t* j){ // Total BLE+WIFI unique MACs seen // TBD ? //data = (uint16_t) macs.size(); - //mydata[4] = (data & 0xff00) >> 8; - //mydata[5] = data & 0xff; + //mydata[4] = (macs_total & 0xff00) >> 8; + //mydata[5] = macs_total & 0xff; // Check if there is not a current TX/RX job running if (LMIC.opmode & OP_TXRXPEND) { diff --git a/src/macsniff.cpp b/src/macsniff.cpp index 6762d662..6fb5e9a8 100644 --- a/src/macsniff.cpp +++ b/src/macsniff.cpp @@ -53,26 +53,21 @@ bool mac_add(uint8_t *paddr, int8_t rssi, bool sniff_type) { // Insert only if it was not found on global count if (added) { if (sniff_type == MAC_SNIFF_WIFI ) { + macs_wifi++; // increment Wifi MACs counter set_LED(COLOR_GREEN, 50, 0, 1); - wifis.insert(hashedmac); // add hashed MAC to wifi container } #ifdef BLECOUNTER else if (sniff_type == MAC_SNIFF_BLE ) { + macs_ble++; // increment BLE Macs counter set_LED(COLOR_MAGENTA, 50, 0, 1); - bles.insert(hashedmac); // add hashed MAC to BLE container } #endif } ESP_LOGI(TAG, "%s RSSI %ddBi -> MAC %s -> Hash %04X -> WiFi:%d BLTH:%d %s", sniff_type==MAC_SNIFF_WIFI ? "WiFi":"BLTH", - rssi, buff, hashedmac, - (int) wifis.size(), - #ifdef BLECOUNTER - (int) bles.size(), - #else - 0, - #endif + rssi, buff, hashedmac, + macs_wifi, added ? "new" : "known"); #ifdef VENDORFILTER diff --git a/src/main.cpp b/src/main.cpp index 73b6b343..11a59ec6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -24,9 +24,6 @@ Refer to LICENSE.txt file in repository for more details. // Basic Config #include "globals.h" -// std::set for unified array functions -#include - // Does nothing and avoid any compilation error with I2C #include @@ -43,22 +40,23 @@ Refer to LICENSE.txt file in repository for more details. configData_t cfg; // struct holds current device configuration osjob_t sendjob, initjob; // LMIC +enum states { + LED_ON, + LED_OFF +}; + // Initialize global variables char display_lora[16], display_lmic[16]; // display buffers -uint64_t uptimecounter = 0; -uint32_t currentMillis = 0, previousDisplaymillis = 0; -uint8_t DisplayState, LEDState = 0, LEDcount = 0; -uint16_t LEDBlinkduration = 0, LEDInterval = 0, color=COLOR_NONE; -uint8_t channel = 0; // wifi channel counter -bool joinstate = false; +uint64_t uptimecounter = 0; // timer global for uptime counter +uint32_t currentMillis = 0; // timer global for state machine +uint8_t DisplayState, LEDcount = 0; // globals for state machine +uint16_t LEDBlinkduration = 0, LEDInterval = 0, color=COLOR_NONE; // state machine variables +uint16_t macs_total = 0, macs_wifi = 0, macs_ble = 0; // MAC counters globals for display +uint8_t channel = 0; // wifi channel rotation counter global for display +enum states LEDState = LED_OFF; // LED state global for state machine +bool joinstate = false; // LoRa network joined? global flag std::set macs; // associative container holds total of unique MAC adress hashes (Wifi + BLE) -std::set wifis; // associative container holds unique Wifi MAC adress hashes - -#ifdef BLECOUNTER - std::set bles; // associative container holds unique BLE MAC adresses hashes - int scanTime; -#endif // this variable will be changed in the ISR, and read in main loop static volatile bool ButtonTriggered = false; @@ -83,8 +81,8 @@ void set_LED (uint16_t set_color, uint16_t set_blinkduration, uint16_t set_inter color = set_color; // set color for RGB LED LEDBlinkduration = set_blinkduration; // duration on LEDInterval = set_interval; // duration off - on - off - LEDcount = set_count * 2; // number of blinks before LED off - LEDState = set_count ? 1 : 0; // sets LED to off if 0 blinks + LEDcount = set_count * 2; // number of on/off cycles before LED off + LEDState = set_count ? LED_ON : LED_OFF; // sets LED to off if 0 blinks } /* begin LMIC specific parts ------------------------------------------------------------ */ @@ -250,10 +248,9 @@ void sniffer_loop(void * pvParameters) { // clear counter if not in cumulative counter mode if (cfg.countermode != 1) { macs.clear(); // clear all macs container - wifis.clear(); // clear Wifi macs couner - #ifdef BLECOUNTER - bles.clear(); // clear BLE macs counter - #endif + macs_total = 0; // reset all counters + macs_wifi = 0; + macs_ble = 0; salt_reset(); // get new salt for salting hashes } @@ -358,12 +355,12 @@ uint64_t uptime() { snprintf(buff, sizeof(buff), "PAX:%-4d", (int) macs.size()); // convert 16-bit MAC counter to decimal counter value u8x8.draw2x2String(0, 0, buff); // display number on unique macs total Wifi + BLE u8x8.setCursor(0,4); - u8x8.printf("WIFI: %-4d", (int) wifis.size()); + u8x8.printf("WIFI: %-4d", macs_wifi); #ifdef BLECOUNTER u8x8.setCursor(0,3); if (cfg.blescan) - u8x8.printf("BLTH: %-4d", (int) bles.size()); + u8x8.printf("BLTH: %-4d", macs_ble); else u8x8.printf("%-16s", "BLTH: off"); #endif @@ -387,6 +384,8 @@ uint64_t uptime() { void updateDisplay() { // timed display refresh according to refresh cycle setting + uint32_t previousDisplaymillis = currentMillis; + if (currentMillis - previousDisplaymillis >= DISPLAYREFRESH_MS) { refreshDisplay(); previousDisplaymillis += DISPLAYREFRESH_MS; @@ -414,7 +413,7 @@ uint64_t uptime() { #ifdef HAS_LED void switchLED() { - static bool previousLEDState; + enum states previousLEDState; // led need to change state? avoid digitalWrite() for nothing if (LEDState != previousLEDState) { #ifdef LED_ACTIVE_LOW @@ -434,9 +433,9 @@ uint64_t uptime() { void switchLEDstate() { if (!LEDcount) // no more blinks? -> switch off LED - LEDState = 0; + LEDState = LED_OFF; else if (LEDInterval) // blinks left? -> toggle LED and decrement blinks - LEDState = ((currentMillis % LEDInterval) < LEDBlinkduration) ? 1 : 0; + LEDState = ((currentMillis % LEDInterval) < LEDBlinkduration) ? LED_ON : LED_OFF; } // switchLEDstate() #endif diff --git a/src/rcommand.cpp b/src/rcommand.cpp index 0ef9f2ef..6875ad8e 100644 --- a/src/rcommand.cpp +++ b/src/rcommand.cpp @@ -65,10 +65,9 @@ void set_reset(int val) { case 1: // reset MAC counter ESP_LOGI(TAG, "Remote command: reset MAC counter"); macs.clear(); // clear all macs container - wifis.clear(); // clear Wifi macs container - #ifdef BLECOUNTER - bles.clear(); // clear BLE macs container - #endif + macs_total = 0; // reset all counters + macs_wifi = 0; + macs_ble = 0; salt_reset(); // get new 16bit salt sprintf(display_lora, "Reset counter"); break; @@ -151,10 +150,8 @@ void set_blescan(int val) { ESP_LOGI(TAG, "Remote command: set BLE scan mode to %s", val ? "on" : "off"); switch (val) { case 0: - cfg.blescan = 0; - #ifdef BLECOUNTER - bles.clear(); // clear BLE macs container - #endif + cfg.blescan = 0; + macs_ble = 0; // clear BLE counter break; default: cfg.blescan = 1; From f922b90242c01ca4a83e59f2e348eb2088eb69a1 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Thu, 19 Apr 2018 11:07:18 +0200 Subject: [PATCH 09/17] main.cpp: code sanitization --- src/main.cpp | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 11a59ec6..8468872d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -72,11 +72,32 @@ int redirect_log(const char * fmt, va_list args) { } #endif +//--- Prototypes --- + +// LMIC functions, defined in this main.cpp +void onEvent(ev_t ev); +void do_send(osjob_t* j); + // defined in configmanager.cpp void eraseConfig(void); void saveConfig(void); void loadConfig(void); +// defined in lorawan.cpp +void gen_lora_deveui(uint8_t * pdeveui); +void RevBytes(unsigned char* b, size_t c); +void get_hard_deveui(uint8_t *pdeveui); + +// defined in wifisniffer.cpp +void wifi_sniffer_init(void); +void wifi_sniffer_set_channel(uint8_t channel); +void wifi_sniffer_packet_handler(void *buff, wifi_promiscuous_pkt_type_t type); + +// defined in blescan.cpp +void bt_loop(void *ignore); + +//--- + void set_LED (uint16_t set_color, uint16_t set_blinkduration, uint16_t set_interval, uint8_t set_count) { color = set_color; // set color for RGB LED LEDBlinkduration = set_blinkduration; // duration on @@ -87,10 +108,6 @@ void set_LED (uint16_t set_color, uint16_t set_blinkduration, uint16_t set_inter /* begin LMIC specific parts ------------------------------------------------------------ */ -// defined in lorawan.cpp -void gen_lora_deveui(uint8_t * pdeveui); -void RevBytes(unsigned char* b, size_t c); -void get_hard_deveui(uint8_t *pdeveui); #ifdef VERBOSE void printKeys(void); @@ -136,10 +153,6 @@ const lmic_pinmap lmic_pins = { .dio = {DIO0, DIO1, DIO2} }; -// LMIC functions -void onEvent(ev_t ev); -void do_send(osjob_t* j); - // LoRaWAN Initjob static void lora_init (osjob_t* j) { // reset MAC state @@ -212,14 +225,6 @@ void lorawan_loop(void * pvParameters) { /* begin wifi specific parts ---------------------------------------------------------- */ -// defined in wifisniffer.cpp -void wifi_sniffer_init(void); -void wifi_sniffer_set_channel(uint8_t channel); -void wifi_sniffer_packet_handler(void *buff, wifi_promiscuous_pkt_type_t type); - -// defined in blescan.cpp -void bt_loop(void *ignore); - // Sniffer Task void sniffer_loop(void * pvParameters) { From 54945f173ecc5fa68f63a235ae393e5896eb43fa Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Thu, 19 Apr 2018 11:09:17 +0200 Subject: [PATCH 10/17] main.cpp: code sanitization --- src/main.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 8468872d..2d8374b1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -74,16 +74,14 @@ int redirect_log(const char * fmt, va_list args) { //--- Prototypes --- -// LMIC functions, defined in this main.cpp -void onEvent(ev_t ev); -void do_send(osjob_t* j); - // defined in configmanager.cpp void eraseConfig(void); void saveConfig(void); void loadConfig(void); // defined in lorawan.cpp +void onEvent(ev_t ev); +void do_send(osjob_t* j); void gen_lora_deveui(uint8_t * pdeveui); void RevBytes(unsigned char* b, size_t c); void get_hard_deveui(uint8_t *pdeveui); From fab0e4f0ddca1a58ea1f7db27a0cacc9a7a9330d Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Thu, 19 Apr 2018 15:17:23 +0200 Subject: [PATCH 11/17] code sanitization --- platformio.ini | 2 +- src/blecsan.cpp | 4 +- src/configmanager.cpp | 2 +- src/globals.h | 1 + src/macsniff.cpp | 36 +++++------ src/macsniff.h | 2 +- src/main.cpp | 74 ++++++++------------- src/main.h | 146 ++++++++---------------------------------- src/paxcounter.conf | 129 +++++++++++++++++++++++++++++++++++++ src/rcommand.cpp | 11 +--- 10 files changed, 210 insertions(+), 197 deletions(-) create mode 100644 src/paxcounter.conf diff --git a/platformio.ini b/platformio.ini index 8be3a272..f780a017 100644 --- a/platformio.ini +++ b/platformio.ini @@ -38,7 +38,7 @@ build_flags = ; ; override lora settings from LMiC library in lmic/config.h and use main.h instead -D_lmic_config_h_ - -include "src/main.h" + -include "src/paxcounter.conf" [env:heltec_wifi_lora_32] platform = espressif32 diff --git a/src/blecsan.cpp b/src/blecsan.cpp index 4e028aaf..1471f5f6 100644 --- a/src/blecsan.cpp +++ b/src/blecsan.cpp @@ -233,8 +233,10 @@ esp_err_t register_ble_functionality(void) // Main start code running in its own Xtask -void bt_loop(void *ignore) +void bt_loop(void * pvParameters) { + configASSERT( ( ( uint32_t ) pvParameters ) == 1 ); // FreeRTOS check + esp_err_t status; // Initialize BT controller to allocate task and other resource. diff --git a/src/configmanager.cpp b/src/configmanager.cpp index 49341163..fecd37a1 100644 --- a/src/configmanager.cpp +++ b/src/configmanager.cpp @@ -18,7 +18,7 @@ esp_err_t err; // populate cfg vars with factory settings void defaultConfig() { - cfg.lorasf = LORASFDEFAULT; // 7-12, initial lora spreadfactor defined in main.h + cfg.lorasf = LORASFDEFAULT; // 7-12, initial lora spreadfactor defined in paxcounter.conf cfg.txpower = 15; // 2-15, lora tx power cfg.adrmode = 1; // 0=disabled, 1=enabled cfg.screensaver = 0; // 0=disabled, 1=enabled diff --git a/src/globals.h b/src/globals.h index ae9440f9..eb238842 100644 --- a/src/globals.h +++ b/src/globals.h @@ -22,6 +22,7 @@ #include "rgb_led.h" #include "macsniff.h" +#include "main.h" // Struct holding devices's runtime configuration typedef struct { diff --git a/src/macsniff.cpp b/src/macsniff.cpp index 6fb5e9a8..30ada2b5 100644 --- a/src/macsniff.cpp +++ b/src/macsniff.cpp @@ -11,46 +11,44 @@ // Local logging tag static const char *TAG = "macsniff"; -// defined in main.cpp -void set_LED (uint16_t set_color, uint16_t set_blinkduration, uint16_t set_interval, uint8_t set_count); - static wifi_country_t wifi_country = {.cc=WIFI_MY_COUNTRY, .schan=WIFI_CHANNEL_MIN, .nchan=WIFI_CHANNEL_MAX, .policy=WIFI_COUNTRY_POLICY_MANUAL}; +// globals uint16_t salt; -uint16_t salt_reset(void) { - salt = random(65536); // get new 16bit random for salting hashes +uint16_t reset_salt(void) { + salt = random(65536); // get new 16bit random for salting hashes and set global salt var return salt; } bool mac_add(uint8_t *paddr, int8_t rssi, bool sniff_type) { - char buff[16]; // temporary buffer for printf + char buff[16]; // temporary buffer for printf bool added = false; - uint32_t addr2int; - uint32_t vendor2int; - uint16_t hashedmac; + uint32_t addr2int, vendor2int; // temporary buffer for MAC and Vendor OUI + uint16_t hashedmac; // temporary buffer for generated hash value - // only last 3 MAC Address bytes are used for MAC Address Anonymization + // only last 3 MAC Address bytes are used for MAC address anonymization // but since it's uint32 we take 4 bytes to avoid 1st value to be 0 addr2int = ( (uint32_t)paddr[2] ) | ( (uint32_t)paddr[3] << 8 ) | ( (uint32_t)paddr[4] << 16 ) | ( (uint32_t)paddr[5] << 24 ); #ifdef VENDORFILTER vendor2int = ( (uint32_t)paddr[2] ) | ( (uint32_t)paddr[1] << 8 ) | ( (uint32_t)paddr[0] << 16 ); // use OUI vendor filter list only on Wifi, not on BLE - if ( (sniff_type==MAC_SNIFF_BLE) || std::find(vendors.begin(), vendors.end(), vendor2int) != vendors.end() ) { + if ( (sniff_type==MAC_SNIFF_BLE) || std::find(vendors.begin(), vendors.end(), vendor2int) != vendors.end() ) + { #endif // salt and hash MAC, and if new unique one, store identifier in container and increment counter on display // https://en.wikipedia.org/wiki/MAC_Address_Anonymization - addr2int += (uint32_t) salt; // add 16-bit salt to pseudo MAC + addr2int += (uint32_t)salt; // add 16-bit salt to pseudo MAC snprintf(buff, sizeof(buff), "%08X", addr2int); // convert unsigned 32-bit salted MAC to 8 digit hex string hashedmac = rokkit(&buff[3], 5); // hash MAC last string value, use 5 chars to fit hash in uint16_t container auto newmac = macs.insert(hashedmac); // add hashed MAC to total container if new unique added = newmac.second ? true:false; // true if hashed MAC is unique in container - // Insert only if it was not found on global count + // Count only if MAC was not yet seen if (added) { if (sniff_type == MAC_SNIFF_WIFI ) { macs_wifi++; // increment Wifi MACs counter @@ -63,12 +61,12 @@ bool mac_add(uint8_t *paddr, int8_t rssi, bool sniff_type) { } #endif } - - ESP_LOGI(TAG, "%s RSSI %ddBi -> MAC %s -> Hash %04X -> WiFi:%d BLTH:%d %s", - sniff_type==MAC_SNIFF_WIFI ? "WiFi":"BLTH", - rssi, buff, hashedmac, - macs_wifi, - added ? "new" : "known"); + + // Log scan result + ESP_LOGI(TAG, "%s RSSI %ddBi -> MAC %s -> Hash %04X -> WiFi:%d BLTH:%d %s", + sniff_type==MAC_SNIFF_WIFI ? "WiFi":"BLTH", + rssi, buff, hashedmac, macs_wifi, + added ? "new" : "known"); #ifdef VENDORFILTER } else { diff --git a/src/macsniff.h b/src/macsniff.h index 441ab157..a92046df 100644 --- a/src/macsniff.h +++ b/src/macsniff.h @@ -19,7 +19,7 @@ typedef struct { uint8_t payload[0]; /* network data ended with 4 bytes csum (CRC32) */ } wifi_ieee80211_packet_t; -uint16_t salt_reset(void); +uint16_t reset_salt(void); void wifi_sniffer_init(void); void wifi_sniffer_set_channel(uint8_t channel); void wifi_sniffer_packet_handler(void *buff, wifi_promiscuous_pkt_type_t type); diff --git a/src/main.cpp b/src/main.cpp index 2d8374b1..4f4c0d31 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -32,18 +32,13 @@ Refer to LICENSE.txt file in repository for more details. #include #include -// ESP32 Functions -#include // needed for Wifi event handler -#include // needed for reading ESP32 chip attributes -#include // needed for ESP_LOGx on arduino framework +// ESP32 lib Functions +#include // needed for Wifi event handler +#include // needed for reading ESP32 chip attributes +#include // needed for ESP_LOGx on arduino framework -configData_t cfg; // struct holds current device configuration -osjob_t sendjob, initjob; // LMIC - -enum states { - LED_ON, - LED_OFF -}; +configData_t cfg; // struct holds current device configuration +osjob_t sendjob, initjob; // LMIC jobs // Initialize global variables char display_lora[16], display_lmic[16]; // display buffers @@ -65,6 +60,7 @@ static volatile bool ButtonTriggered = false; static const char *TAG = "paxcnt"; // Note: Log level control seems not working during runtime, // so we need to switch loglevel by compiler build option in platformio.ini + #ifndef VERBOSE int redirect_log(const char * fmt, va_list args) { //do nothing @@ -72,30 +68,6 @@ int redirect_log(const char * fmt, va_list args) { } #endif -//--- Prototypes --- - -// defined in configmanager.cpp -void eraseConfig(void); -void saveConfig(void); -void loadConfig(void); - -// defined in lorawan.cpp -void onEvent(ev_t ev); -void do_send(osjob_t* j); -void gen_lora_deveui(uint8_t * pdeveui); -void RevBytes(unsigned char* b, size_t c); -void get_hard_deveui(uint8_t *pdeveui); - -// defined in wifisniffer.cpp -void wifi_sniffer_init(void); -void wifi_sniffer_set_channel(uint8_t channel); -void wifi_sniffer_packet_handler(void *buff, wifi_promiscuous_pkt_type_t type); - -// defined in blescan.cpp -void bt_loop(void *ignore); - -//--- - void set_LED (uint16_t set_color, uint16_t set_blinkduration, uint16_t set_interval, uint8_t set_count) { color = set_color; // set color for RGB LED LEDBlinkduration = set_blinkduration; // duration on @@ -104,6 +76,13 @@ void set_LED (uint16_t set_color, uint16_t set_blinkduration, uint16_t set_inter LEDState = set_count ? LED_ON : LED_OFF; // sets LED to off if 0 blinks } +void reset_counters() { + macs.clear(); // clear all macs container + macs_total = 0; // reset all counters + macs_wifi = 0; + macs_ble = 0; +} + /* begin LMIC specific parts ------------------------------------------------------------ */ @@ -163,6 +142,7 @@ static void lora_init (osjob_t* j) { // LMIC FreeRTos Task void lorawan_loop(void * pvParameters) { + configASSERT( ( ( uint32_t ) pvParameters ) == 1 ); // FreeRTOS check while(1) { @@ -227,34 +207,31 @@ void lorawan_loop(void * pvParameters) { void sniffer_loop(void * pvParameters) { configASSERT( ( ( uint32_t ) pvParameters ) == 1 ); // FreeRTOS check - channel=0; + char buff[16]; int nloop=0, lorawait=0; - while (true) { + while (1) { nloop++; // actual number of wifi loops, controls cycle when data is sent - vTaskDelay(cfg.wifichancycle*10 / portTICK_PERIOD_MS); - yield(); channel = (channel % WIFI_CHANNEL_MAX) + 1; // rotates variable channel 1..WIFI_CHANNEL_MAX wifi_sniffer_set_channel(channel); ESP_LOGD(TAG, "Wifi set channel %d", channel); // duration of one wifi scan loop reached? then send data and begin new scan cycle if ( nloop >= ( (100 / cfg.wifichancycle) * (cfg.wifiscancycle * 2)) +1 ) { + nloop=0; channel=0; // reset wifi scan + channel loop counter do_send(&sendjob); // Prepare and execute LoRaWAN data upload - vTaskDelay(500/portTICK_PERIOD_MS); - yield(); + + //vTaskDelay(500/portTICK_PERIOD_MS); // tbd - is this delay really needed here? + //yield(); // clear counter if not in cumulative counter mode if (cfg.countermode != 1) { - macs.clear(); // clear all macs container - macs_total = 0; // reset all counters - macs_wifi = 0; - macs_ble = 0; - salt_reset(); // get new salt for salting hashes + reset_counters(); // clear macs container and reset all counters + reset_salt(); // get new salt for salting hashes } // check if payload is sent @@ -275,6 +252,9 @@ void sniffer_loop(void * pvParameters) { } // end of send data cycle + vTaskDelay(cfg.wifichancycle*10 / portTICK_PERIOD_MS); + yield(); + } // end of infinite wifi channel rotation loop } @@ -536,7 +516,7 @@ wifi_sniffer_init(); // setup wifi in monitor mode and start MAC counting // initialize salt value using esp_random() called by random() in arduino-esp32 core // note: do this *after* wifi has started, since gets it's seed from RF noise -salt_reset(); // get new 16bit for salting hashes +reset_salt(); // get new 16bit for salting hashes // run wifi task on core 0 and lora task on core 1 and bt task on core 0 ESP_LOGI(TAG, "Starting Lora task on core 1"); diff --git a/src/main.h b/src/main.h index cd606adb..919550a2 100644 --- a/src/main.h +++ b/src/main.h @@ -1,131 +1,41 @@ #pragma once // program version - note: increment version after modifications to configData_t struct!! -#define PROGVERSION "1.3.1" // use max 10 chars here! +#define PROGVERSION "1.3.2" // use max 10 chars here! #define PROGNAME "PAXCNT" -// Verbose enables serial output -#define VERBOSE 1 // comment out to silence the device, for mute use build option +//--- Declarations --- -// set this to include BLE counting and vendor filter functions -#define VENDORFILTER 1 // comment out if you want to count things, not people -#define BLECOUNTER 1 // comment out if you don't want BLE count +enum states { + LED_ON, + LED_OFF +}; -// BLE scan parameters -#define BLESCANTIME 11 // [seconds] scan duration, see note below -#define BLESCANWINDOW 10 // [milliseconds] scan window, see below, 3 .. 10240, default 10 -#define BLESCANINTERVAL 10 // [milliseconds] how long to wait between scans, 3 .. 10240, default 10 +//--- Prototypes --- -/* Note: guide for setting bluetooth parameters -* -* |< Scan Window > |< Scan Window > |< Scan Window > | -* |< Scan Interval >|< Scan Interval >|< Scan Interval >| -* |< Scan duration >| -* -* Scan duration sets how long scanning should be going on, interrupting a wifi scan cycle. -* Scan window sets how much of the interval should be occupied by scanning. -* Scan interval is how long scanning should be done on each channel. BLE uses 3 channels for advertising. -* -> Adjust these values with power consumption in mind if power is limited. -*/ +// defined in main.cpp +void set_LED (uint16_t set_color, uint16_t set_blinkduration, uint16_t set_interval, uint8_t set_count); +void reset_counters(); -// WiFi scan parameters -#define WIFI_CHANNEL_MIN 1 // start channel number where scan begings -#define WIFI_CHANNEL_MAX 13 // total channel number to scan -#define WIFI_MY_COUNTRY "EU" // select locale for Wifi RF settings -#define WIFI_CHANNEL_SWITCH_INTERVAL 50 // [seconds/100] -> 0,5 sec. +// defined in configmanager.cpp +void eraseConfig(void); +void saveConfig(void); +void loadConfig(void); -// LoRa payload send cycle -//#define SEND_SECS 120 // [seconds/2] -> 240 sec. -#define SEND_SECS 30 // [seconds/2] -> 60 sec. +// defined in lorawan.cpp +void onEvent(ev_t ev); +void do_send(osjob_t* j); +void gen_lora_deveui(uint8_t * pdeveui); +void RevBytes(unsigned char* b, size_t c); +void get_hard_deveui(uint8_t *pdeveui); -// Default LoRa Spreadfactor -#define LORASFDEFAULT 9 // 7 ... 12 SF, according to LoRaWAN specs -#define MAXLORARETRY 500 // maximum count of TX retries if LoRa busy -#define RCMDPORT 2 // LoRaWAN Port on which device listenes for remote commands +// defined in wifisniffer.cpp +void wifi_sniffer_init(void); +void wifi_sniffer_set_channel(uint8_t channel); +void wifi_sniffer_packet_handler(void *buff, wifi_promiscuous_pkt_type_t type); -// Default RGB LED luminosity (in %) -#define RGBLUMINOSITY 30 // 30% +// defined in blescan.cpp +void bt_loop(void *ignore); -// OLED Display refresh cycle (in Milliseconds) -#define DISPLAYREFRESH_MS 40 // e.g. 40ms -> 1000/40 = 25 frames per second - -// LMIC settings -// define hardware independent LMIC settings here, settings of standard library in /lmic/config.h will be ignored -// define hardware specifics settings in platformio.ini as build_flag for hardware environment - -// Select frequency band here according to national regulations -#define CFG_eu868 1 -//#define CFG_us915 1 - -// This is the SX1272/SX1273 radio, which is also used on the HopeRF -// RFM92 boards. -//#define CFG_sx1272_radio 1 -// This is the SX1276/SX1277/SX1278/SX1279 radio, which is also used on -// the HopeRF RFM95 boards. -//#define CFG_sx1276_radio 1 - -// 16 μs per tick -// LMIC requires ticks to be 15.5μs - 100 μs long -#define US_PER_OSTICK_EXPONENT 4 -#define US_PER_OSTICK (1 << US_PER_OSTICK_EXPONENT) -#define OSTICKS_PER_SEC (1000000 / US_PER_OSTICK) - -// Set this to 1 to enable some basic debug output (using printf) about -// RF settings used during transmission and reception. Set to 2 to -// enable more verbose output. Make sure that printf is actually -// configured (e.g. on AVR it is not by default), otherwise using it can -// cause crashing. -//#define LMIC_DEBUG_LEVEL 1 - -// Enable this to allow using printf() to print to the given serial port -// (or any other Print object). This can be easy for debugging. The -// current implementation only works on AVR, though. -//#define LMIC_PRINTF_TO Serial - -// Any runtime assertion failures are printed to this serial port (or -// any other Print object). If this is unset, any failures just silently -// halt execution. -#define LMIC_FAILURE_TO Serial - -// Uncomment this to disable all code related to joining -//#define DISABLE_JOIN -// Uncomment this to disable all code related to ping -#define DISABLE_PING -// Uncomment this to disable all code related to beacon tracking. -// Requires ping to be disabled too -#define DISABLE_BEACONS - -// Uncomment these to disable the corresponding MAC commands. -// Class A -//#define DISABLE_MCMD_DCAP_REQ // duty cycle cap -//#define DISABLE_MCMD_DN2P_SET // 2nd DN window param -//#define DISABLE_MCMD_SNCH_REQ // set new channel -// Class B -//#define DISABLE_MCMD_PING_SET // set ping freq, automatically disabled by DISABLE_PING -//#define DISABLE_MCMD_BCNI_ANS // next beacon start, automatical disabled by DISABLE_BEACON - -// In LoRaWAN, a gateway applies I/Q inversion on TX, and nodes do the -// same on RX. This ensures that gateways can talk to nodes and vice -// versa, but gateways will not hear other gateways and nodes will not -// hear other nodes. By uncommenting this macro, this inversion is -// disabled and this node can hear other nodes. If two nodes both have -// this macro set, they can talk to each other (but they can no longer -// hear gateways). This should probably only be used when debugging -// and/or when talking to the radio directly (e.g. like in the "raw" -// example). -//#define DISABLE_INVERT_IQ_ON_RX - -// This allows choosing between multiple included AES implementations. -// Make sure exactly one of these is uncommented. -// -// This selects the original AES implementation included LMIC. This -// implementation is optimized for speed on 32-bit processors using -// fairly big lookup tables, but it takes up big amounts of flash on the -// AVR architecture. -#define USE_ORIGINAL_AES -// -// This selects the AES implementation written by Ideetroon for their -// own LoRaWAN library. It also uses lookup tables, but smaller -// byte-oriented ones, making it use a lot less flash space (but it is -// also about twice as slow as the original). -// #define USE_IDEETRON_AES +// defined in main.cpp +void reset_counters(void); \ No newline at end of file diff --git a/src/paxcounter.conf b/src/paxcounter.conf new file mode 100644 index 00000000..bfae6146 --- /dev/null +++ b/src/paxcounter.conf @@ -0,0 +1,129 @@ +// ----- Paxcounter user config file ------ +// +// --> adapt to your needs and use case <-- + +// Verbose enables serial output +#define VERBOSE 1 // comment out to silence the device, for mute use build option + +// set this to include BLE counting and vendor filter functions +#define VENDORFILTER 1 // comment out if you want to count things, not people +#define BLECOUNTER 1 // comment out if you don't want BLE count + +// BLE scan parameters +#define BLESCANTIME 11 // [seconds] scan duration, see note below +#define BLESCANWINDOW 10 // [milliseconds] scan window, see below, 3 .. 10240, default 10 +#define BLESCANINTERVAL 10 // [milliseconds] how long to wait between scans, 3 .. 10240, default 10 + +/* Note: guide for setting bluetooth parameters +* +* |< Scan Window > |< Scan Window > |< Scan Window > | +* |< Scan Interval >|< Scan Interval >|< Scan Interval >| +* |< Scan duration >| +* +* Scan duration sets how long scanning should be going on, interrupting a wifi scan cycle. +* Scan window sets how much of the interval should be occupied by scanning. +* Scan interval is how long scanning should be done on each channel. BLE uses 3 channels for advertising. +* -> Adjust these values with power consumption in mind if power is limited. +*/ + +// WiFi scan parameters +#define WIFI_CHANNEL_MIN 1 // start channel number where scan begings +#define WIFI_CHANNEL_MAX 13 // total channel number to scan +#define WIFI_MY_COUNTRY "EU" // select locale for Wifi RF settings +#define WIFI_CHANNEL_SWITCH_INTERVAL 50 // [seconds/100] -> 0,5 sec. + +// LoRa payload send cycle +//#define SEND_SECS 120 // [seconds/2] -> 240 sec. +#define SEND_SECS 30 // [seconds/2] -> 60 sec. + +// Default LoRa Spreadfactor +#define LORASFDEFAULT 9 // 7 ... 12 SF, according to LoRaWAN specs +#define MAXLORARETRY 500 // maximum count of TX retries if LoRa busy +#define RCMDPORT 2 // LoRaWAN Port on which device listenes for remote commands + +// Default RGB LED luminosity (in %) +#define RGBLUMINOSITY 30 // 30% + +// OLED Display refresh cycle (in Milliseconds) +#define DISPLAYREFRESH_MS 40 // e.g. 40ms -> 1000/40 = 25 frames per second + +// LMIC settings +// define hardware independent LMIC settings here, settings of standard library in /lmic/config.h will be ignored +// define hardware specifics settings in platformio.ini as build_flag for hardware environment + +// Select frequency band here according to national regulations +#define CFG_eu868 1 +//#define CFG_us915 1 + +// This is the SX1272/SX1273 radio, which is also used on the HopeRF +// RFM92 boards. +//#define CFG_sx1272_radio 1 +// This is the SX1276/SX1277/SX1278/SX1279 radio, which is also used on +// the HopeRF RFM95 boards. +//#define CFG_sx1276_radio 1 + +// 16 μs per tick +// LMIC requires ticks to be 15.5μs - 100 μs long +#define US_PER_OSTICK_EXPONENT 4 +#define US_PER_OSTICK (1 << US_PER_OSTICK_EXPONENT) +#define OSTICKS_PER_SEC (1000000 / US_PER_OSTICK) + +// Set this to 1 to enable some basic debug output (using printf) about +// RF settings used during transmission and reception. Set to 2 to +// enable more verbose output. Make sure that printf is actually +// configured (e.g. on AVR it is not by default), otherwise using it can +// cause crashing. +//#define LMIC_DEBUG_LEVEL 1 + +// Enable this to allow using printf() to print to the given serial port +// (or any other Print object). This can be easy for debugging. The +// current implementation only works on AVR, though. +//#define LMIC_PRINTF_TO Serial + +// Any runtime assertion failures are printed to this serial port (or +// any other Print object). If this is unset, any failures just silently +// halt execution. +#define LMIC_FAILURE_TO Serial + +// Uncomment this to disable all code related to joining +//#define DISABLE_JOIN +// Uncomment this to disable all code related to ping +#define DISABLE_PING +// Uncomment this to disable all code related to beacon tracking. +// Requires ping to be disabled too +#define DISABLE_BEACONS + +// Uncomment these to disable the corresponding MAC commands. +// Class A +//#define DISABLE_MCMD_DCAP_REQ // duty cycle cap +//#define DISABLE_MCMD_DN2P_SET // 2nd DN window param +//#define DISABLE_MCMD_SNCH_REQ // set new channel +// Class B +//#define DISABLE_MCMD_PING_SET // set ping freq, automatically disabled by DISABLE_PING +//#define DISABLE_MCMD_BCNI_ANS // next beacon start, automatical disabled by DISABLE_BEACON + +// In LoRaWAN, a gateway applies I/Q inversion on TX, and nodes do the +// same on RX. This ensures that gateways can talk to nodes and vice +// versa, but gateways will not hear other gateways and nodes will not +// hear other nodes. By uncommenting this macro, this inversion is +// disabled and this node can hear other nodes. If two nodes both have +// this macro set, they can talk to each other (but they can no longer +// hear gateways). This should probably only be used when debugging +// and/or when talking to the radio directly (e.g. like in the "raw" +// example). +//#define DISABLE_INVERT_IQ_ON_RX + +// This allows choosing between multiple included AES implementations. +// Make sure exactly one of these is uncommented. +// +// This selects the original AES implementation included LMIC. This +// implementation is optimized for speed on 32-bit processors using +// fairly big lookup tables, but it takes up big amounts of flash on the +// AVR architecture. +#define USE_ORIGINAL_AES +// +// This selects the AES implementation written by Ideetroon for their +// own LoRaWAN library. It also uses lookup tables, but smaller +// byte-oriented ones, making it use a lot less flash space (but it is +// also about twice as slow as the original). +// #define USE_IDEETRON_AES diff --git a/src/rcommand.cpp b/src/rcommand.cpp index 6875ad8e..fe73c8aa 100644 --- a/src/rcommand.cpp +++ b/src/rcommand.cpp @@ -19,10 +19,6 @@ typedef struct { const bool store; } cmd_t; -// functions defined in configmanager.cpp -void eraseConfig(void); -void saveConfig(void); - // function defined in antenna.cpp #ifdef HAS_ANTENNA_SWITCH void antenna_select(const int8_t _ant); @@ -64,11 +60,8 @@ void set_reset(int val) { break; case 1: // reset MAC counter ESP_LOGI(TAG, "Remote command: reset MAC counter"); - macs.clear(); // clear all macs container - macs_total = 0; // reset all counters - macs_wifi = 0; - macs_ble = 0; - salt_reset(); // get new 16bit salt + reset_counters(); // clear macs + reset_salt(); // get new salt sprintf(display_lora, "Reset counter"); break; case 2: // reset device to factory settings From face65421aa46201115186e1c32de91565be21c6 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Thu, 19 Apr 2018 15:28:27 +0200 Subject: [PATCH 12/17] code sanitization --- src/main.cpp | 5 ++--- src/main.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 4f4c0d31..91ffc5de 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -37,17 +37,16 @@ Refer to LICENSE.txt file in repository for more details. #include // needed for reading ESP32 chip attributes #include // needed for ESP_LOGx on arduino framework +// Initialize global variables configData_t cfg; // struct holds current device configuration osjob_t sendjob, initjob; // LMIC jobs - -// Initialize global variables -char display_lora[16], display_lmic[16]; // display buffers uint64_t uptimecounter = 0; // timer global for uptime counter uint32_t currentMillis = 0; // timer global for state machine uint8_t DisplayState, LEDcount = 0; // globals for state machine uint16_t LEDBlinkduration = 0, LEDInterval = 0, color=COLOR_NONE; // state machine variables uint16_t macs_total = 0, macs_wifi = 0, macs_ble = 0; // MAC counters globals for display uint8_t channel = 0; // wifi channel rotation counter global for display +char display_lora[16], display_lmic[16]; // display buffers enum states LEDState = LED_OFF; // LED state global for state machine bool joinstate = false; // LoRa network joined? global flag diff --git a/src/main.h b/src/main.h index 919550a2..26baff29 100644 --- a/src/main.h +++ b/src/main.h @@ -1,4 +1,3 @@ -#pragma once // program version - note: increment version after modifications to configData_t struct!! #define PROGVERSION "1.3.2" // use max 10 chars here! From f07cc7dcb2c18f27cabb3d357201953274462e26 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Thu, 19 Apr 2018 15:36:01 +0200 Subject: [PATCH 13/17] code sanitization --- src/main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 91ffc5de..caeca29a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -519,9 +519,11 @@ reset_salt(); // get new 16bit for salting hashes // run wifi task on core 0 and lora task on core 1 and bt task on core 0 ESP_LOGI(TAG, "Starting Lora task on core 1"); -xTaskCreatePinnedToCore(lorawan_loop, "loratask", 2048, ( void * ) 1, ( 5 | portPRIVILEGE_BIT ), NULL, 1); +xTaskCreatePinnedToCore(lorawan_loop, "loratask", 2048, ( void * ) 1, ( 5 | portPRIVILEGE_BIT ), NULL, 1); + ESP_LOGI(TAG, "Starting Wifi task on core 0"); xTaskCreatePinnedToCore(sniffer_loop, "wifisniffer", 16384, ( void * ) 1, 1, NULL, 0); + #ifdef BLECOUNTER if (cfg.blescan) { // start BLE task only if BLE function is enabled in NVRAM configuration ESP_LOGI(TAG, "Starting Bluetooth task on core 0"); From c6191f9a24c085e09d9272d3df6ff70dba808a83 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Thu, 19 Apr 2018 19:16:32 +0200 Subject: [PATCH 14/17] bugfixes --- platformio.ini | 4 ++-- src/macsniff.cpp | 2 +- src/main.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platformio.ini b/platformio.ini index f780a017..5f249bba 100644 --- a/platformio.ini +++ b/platformio.ini @@ -11,9 +11,9 @@ ; ---> SELECT TARGET PLATFORM HERE! <--- [platformio] -env_default = heltec_wifi_lora_32 +;env_default = heltec_wifi_lora_32 ;env_default = ttgov1 -;env_default = ttgov2 +env_default = ttgov2 ;env_default = lopy ;env_default = lopy4 ;env_default = lolin32lite_lora diff --git a/src/macsniff.cpp b/src/macsniff.cpp index 30ada2b5..b73264c1 100644 --- a/src/macsniff.cpp +++ b/src/macsniff.cpp @@ -65,7 +65,7 @@ bool mac_add(uint8_t *paddr, int8_t rssi, bool sniff_type) { // Log scan result ESP_LOGI(TAG, "%s RSSI %ddBi -> MAC %s -> Hash %04X -> WiFi:%d BLTH:%d %s", sniff_type==MAC_SNIFF_WIFI ? "WiFi":"BLTH", - rssi, buff, hashedmac, macs_wifi, + rssi, buff, hashedmac, macs_wifi, macs_ble, added ? "new" : "known"); #ifdef VENDORFILTER diff --git a/src/main.cpp b/src/main.cpp index caeca29a..31d2d1cc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -366,7 +366,7 @@ uint64_t uptime() { void updateDisplay() { // timed display refresh according to refresh cycle setting - uint32_t previousDisplaymillis = currentMillis; + uint32_t previousDisplaymillis; if (currentMillis - previousDisplaymillis >= DISPLAYREFRESH_MS) { refreshDisplay(); @@ -527,7 +527,7 @@ xTaskCreatePinnedToCore(sniffer_loop, "wifisniffer", 16384, ( void * ) 1, 1, NUL #ifdef BLECOUNTER if (cfg.blescan) { // start BLE task only if BLE function is enabled in NVRAM configuration ESP_LOGI(TAG, "Starting Bluetooth task on core 0"); - xTaskCreatePinnedToCore(bt_loop, "btscan", 16384, NULL, 5, NULL, 0); + xTaskCreatePinnedToCore(bt_loop, "btscan", 16384, ( void * ) 1, 1, NULL, 0); } #endif From de2aaf9e6ab39eeb83e6c26032418cbe2c12890a Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Thu, 19 Apr 2018 21:02:42 +0200 Subject: [PATCH 15/17] cleanup --- README.md | 12 +++++++++--- platformio.ini | 4 ++-- src/main.cpp | 12 ++++-------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 372fc03f..0fa85e7a 100644 --- a/README.md +++ b/README.md @@ -48,11 +48,13 @@ Hardware dependent settings (pinout etc.) are stored in board files in /hal dire These results where metered with software version 1.2.97 while continuously scanning wifi and ble, no LoRa TX’ing, OLED display (if present) on, 5V USB powered. -# Building +# Preparing -Use PlatformIO with your preferred IDE for development and building this code. +Before compiling the code, -Before compiling the code, **create file loraconf.h in your local /src directory** using the template [loraconf.sample.h](https://github.com/cyberman54/ESP32-Paxcounter/blob/master/src/loraconf.sample.h) and populate it with your personal APPEUI und APPKEY for the LoRaWAN network. If you're using popular TheThingsNetwork you can copy&paste the keys from TTN console or output of ttnctl. +- **edit paxcounter.conf** and taylor settings in this file according to your needs and use case. Please take care of the duty cycle regulations of the LoRaWAN network you're going to use. + +- **create file loraconf.h in your local /src directory** using the template [loraconf.sample.h](https://github.com/cyberman54/ESP32-Paxcounter/blob/master/src/loraconf.sample.h) and populate it with your personal APPEUI und APPKEY for the LoRaWAN network. If you're using popular TheThingsNetwork you can copy&paste the keys from TTN console or output of ttnctl. To join the network only method OTAA is supported, not ABP. The DEVEUI for OTAA will be derived from the device's MAC adress during device startup and is shown as well on the device's display (if it has one) as on the serial console for copying it to your LoRaWAN network server settings. @@ -60,6 +62,10 @@ If your device has a fixed DEVEUI enter this in your local loraconf.h file. Duri If your device has silicon **Unique ID** which is stored in serial EEPROM Microchip 24AA02E64 you don't need to change anything. The Unique ID will be read during startup and DEVEUI will be generated from it, overriding settings in loraconf.h. +# Building + +Use PlatformIO with your preferred IDE for development and building this code. + # Uploading To upload the code to your ESP32 board this needs to be switched from run to bootloader mode. Boards with USB bridge like Heltec and TTGO usually have an onboard logic which allows soft switching by the upload tool. In PlatformIO this happenes automatically.

diff --git a/platformio.ini b/platformio.ini index 5f249bba..f780a017 100644 --- a/platformio.ini +++ b/platformio.ini @@ -11,9 +11,9 @@ ; ---> SELECT TARGET PLATFORM HERE! <--- [platformio] -;env_default = heltec_wifi_lora_32 +env_default = heltec_wifi_lora_32 ;env_default = ttgov1 -env_default = ttgov2 +;env_default = ttgov2 ;env_default = lopy ;env_default = lopy4 ;env_default = lolin32lite_lora diff --git a/src/main.cpp b/src/main.cpp index 31d2d1cc..e65ce176 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -41,12 +41,12 @@ Refer to LICENSE.txt file in repository for more details. configData_t cfg; // struct holds current device configuration osjob_t sendjob, initjob; // LMIC jobs uint64_t uptimecounter = 0; // timer global for uptime counter -uint32_t currentMillis = 0; // timer global for state machine +uint32_t currentMillis = 0, previousDisplaymillis = 0 // timer globals for state machine uint8_t DisplayState, LEDcount = 0; // globals for state machine uint16_t LEDBlinkduration = 0, LEDInterval = 0, color=COLOR_NONE; // state machine variables -uint16_t macs_total = 0, macs_wifi = 0, macs_ble = 0; // MAC counters globals for display +uint16_t macs_total = 0, macs_wifi = 0, macs_ble = 0; // MAC counters globals for display uint8_t channel = 0; // wifi channel rotation counter global for display -char display_lora[16], display_lmic[16]; // display buffers +char display_lora[16], display_lmic[16]; // display buffers enum states LEDState = LED_OFF; // LED state global for state machine bool joinstate = false; // LoRa network joined? global flag @@ -224,9 +224,6 @@ void sniffer_loop(void * pvParameters) { nloop=0; channel=0; // reset wifi scan + channel loop counter do_send(&sendjob); // Prepare and execute LoRaWAN data upload - //vTaskDelay(500/portTICK_PERIOD_MS); // tbd - is this delay really needed here? - //yield(); - // clear counter if not in cumulative counter mode if (cfg.countermode != 1) { reset_counters(); // clear macs container and reset all counters @@ -366,8 +363,7 @@ uint64_t uptime() { void updateDisplay() { // timed display refresh according to refresh cycle setting - uint32_t previousDisplaymillis; - + if (currentMillis - previousDisplaymillis >= DISPLAYREFRESH_MS) { refreshDisplay(); previousDisplaymillis += DISPLAYREFRESH_MS; From 14e68260e6ea55d1d87f463ad2adedc0dc00cd57 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Fri, 20 Apr 2018 10:27:13 +0200 Subject: [PATCH 16/17] bugfixes in LED blink routine --- src/macsniff.cpp | 6 ++-- src/main.cpp | 85 +++++++++++++++++++++++++----------------------- src/main.h | 6 ++-- 3 files changed, 52 insertions(+), 45 deletions(-) diff --git a/src/macsniff.cpp b/src/macsniff.cpp index b73264c1..3e5db96b 100644 --- a/src/macsniff.cpp +++ b/src/macsniff.cpp @@ -52,12 +52,14 @@ bool mac_add(uint8_t *paddr, int8_t rssi, bool sniff_type) { if (added) { if (sniff_type == MAC_SNIFF_WIFI ) { macs_wifi++; // increment Wifi MACs counter - set_LED(COLOR_GREEN, 50, 0, 1); + if (joinstate) + blink_LED(COLOR_GREEN, 50, 0); } #ifdef BLECOUNTER else if (sniff_type == MAC_SNIFF_BLE ) { macs_ble++; // increment BLE Macs counter - set_LED(COLOR_MAGENTA, 50, 0, 1); + if (joinstate) + blink_LED(COLOR_MAGENTA, 50, 0); } #endif } diff --git a/src/main.cpp b/src/main.cpp index e65ce176..61a1f2da 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -41,13 +41,14 @@ Refer to LICENSE.txt file in repository for more details. configData_t cfg; // struct holds current device configuration osjob_t sendjob, initjob; // LMIC jobs uint64_t uptimecounter = 0; // timer global for uptime counter -uint32_t currentMillis = 0, previousDisplaymillis = 0 // timer globals for state machine -uint8_t DisplayState, LEDcount = 0; // globals for state machine -uint16_t LEDBlinkduration = 0, LEDInterval = 0, color=COLOR_NONE; // state machine variables +uint32_t currentMillis = millis(); // timer global for state machine +uint32_t previousDisplaymillis = currentMillis; // Display refresh for state machine +uint8_t DisplayState = 0; // globals for state machine +uint16_t LEDBlinkduration = 0, LEDInterval = 0, color = COLOR_NONE; // state machine variables uint16_t macs_total = 0, macs_wifi = 0, macs_ble = 0; // MAC counters globals for display uint8_t channel = 0; // wifi channel rotation counter global for display char display_lora[16], display_lmic[16]; // display buffers -enum states LEDState = LED_OFF; // LED state global for state machine +enum states LEDState = LED_OFF, previousLEDState = LED_OFF; // LED state global for state machine bool joinstate = false; // LoRa network joined? global flag std::set macs; // associative container holds total of unique MAC adress hashes (Wifi + BLE) @@ -67,12 +68,11 @@ int redirect_log(const char * fmt, va_list args) { } #endif -void set_LED (uint16_t set_color, uint16_t set_blinkduration, uint16_t set_interval, uint8_t set_count) { +void blink_LED (uint16_t set_color, uint16_t set_blinkduration, uint16_t set_interval) { color = set_color; // set color for RGB LED LEDBlinkduration = set_blinkduration; // duration on LEDInterval = set_interval; // duration off - on - off - LEDcount = set_count * 2; // number of on/off cycles before LED off - LEDState = set_count ? LED_ON : LED_OFF; // sets LED to off if 0 blinks + LEDState = LED_ON; // start blink } void reset_counters() { @@ -151,18 +151,18 @@ void lorawan_loop(void * pvParameters) { // LED indicators for viusalizing LoRaWAN state if ( LMIC.opmode & (OP_JOINING | OP_REJOIN) ) { // 5 quick blinks 20ms on each 1/5 second while joining - set_LED(COLOR_YELLOW, 20, 200, 5); + blink_LED(COLOR_YELLOW, 20, 200); // TX data pending } else if (LMIC.opmode & (OP_TXDATA | OP_TXRXPEND)) { // 3 small blink 10ms on each 1/2sec (not when joining) - set_LED(COLOR_BLUE, 10, 500, 3); + blink_LED(COLOR_BLUE, 10, 500); // This should not happen so indicate a problem } else if ( LMIC.opmode & (OP_TXDATA | OP_TXRXPEND | OP_JOINING | OP_REJOIN) == 0 ) { // 5 heartbeat long blink 200ms on each 2 seconds - set_LED(COLOR_RED, 200, 2000, 5); + blink_LED(COLOR_RED, 200, 2000); } else { // led off - set_LED(COLOR_NONE, 0, 0, 0); + blink_LED(COLOR_NONE, 0, 0); } vTaskDelay(10/portTICK_PERIOD_MS); @@ -334,23 +334,21 @@ uint64_t uptime() { snprintf(buff, sizeof(buff), "PAX:%-4d", (int) macs.size()); // convert 16-bit MAC counter to decimal counter value u8x8.draw2x2String(0, 0, buff); // display number on unique macs total Wifi + BLE u8x8.setCursor(0,4); - u8x8.printf("WIFI: %-4d", macs_wifi); + u8x8.printf("WIFI:%-4d", macs_wifi); #ifdef BLECOUNTER u8x8.setCursor(0,3); if (cfg.blescan) - u8x8.printf("BLTH: %-4d", macs_ble); + u8x8.printf("BLTH:%-4d", macs_ble); else - u8x8.printf("%-16s", "BLTH: off"); + u8x8.printf("%-16s", "BLTH:off"); #endif - // update wifi channel display (line 4) - u8x8.setCursor(11,4); - u8x8.printf("ch:%02i", channel); - - // update RSSI limiter status display (line 5) + // update RSSI limiter status & wifi channel display (line 5) u8x8.setCursor(0,5); - u8x8.printf(!cfg.rssilimit ? "RLIM: off" : "RLIM: %-4d", cfg.rssilimit); + u8x8.printf(!cfg.rssilimit ? "RLIM:off " : "RLIM:%-4d", cfg.rssilimit); + u8x8.setCursor(11,5); + u8x8.printf("ch:%02i", channel); // update LoRa status display (line 6) u8x8.setCursor(0,6); @@ -391,7 +389,7 @@ uint64_t uptime() { #ifdef HAS_LED void switchLED() { - enum states previousLEDState; + // led need to change state? avoid digitalWrite() for nothing if (LEDState != previousLEDState) { #ifdef LED_ACTIVE_LOW @@ -404,16 +402,25 @@ uint64_t uptime() { rgb_set_color(LEDState ? color : COLOR_NONE); #endif + ESP_LOGI(TAG, "switched LED: %d -> %d", previousLEDState, LEDState); + previousLEDState = LEDState; - LEDcount--; // decrement blink counter } + }; // switchLED() void switchLEDstate() { - if (!LEDcount) // no more blinks? -> switch off LED - LEDState = LED_OFF; - else if (LEDInterval) // blinks left? -> toggle LED and decrement blinks + + // LEDInterval != 0 -> LED is currently blinking -> toggle if interval cycle time elapsed + // LEDInterval = 0 -> do one blink then turn off LED + + if (LEDInterval) // LED is blinking, wait until time elapsed, then toggle LEDState = ((currentMillis % LEDInterval) < LEDBlinkduration) ? LED_ON : LED_OFF; + else // only one blink + LEDState = (currentMillis < LEDBlinkduration) ? LED_ON : LED_OFF; + + ESP_LOGI(TAG, "current LEDState %d", LEDState); + } // switchLEDstate() #endif @@ -462,7 +469,7 @@ void setup() { // initialize led if needed #ifdef HAS_LED pinMode(HAS_LED, OUTPUT); - set_LED(COLOR_NONE, 0, 0, 0); // LED off + blink_LED(COLOR_NONE, 0, 0); // LED off #endif // initialize button handling if needed @@ -490,13 +497,13 @@ void setup() { u8x8.setPowerSave(!cfg.screenon); // set display off if disabled u8x8.draw2x2String(0, 0, "PAX:0"); u8x8.setCursor(0,4); - u8x8.printf("WIFI: 0"); + u8x8.printf("WIFI:0"); #ifdef BLECOUNTER u8x8.setCursor(0,3); - u8x8.printf("BLTH: 0"); + u8x8.printf("BLTH:0"); #endif u8x8.setCursor(0,5); - u8x8.printf(!cfg.rssilimit ? "RLIM: off" : "RLIM: %d", cfg.rssilimit); + u8x8.printf(!cfg.rssilimit ? "RLIM:off " : "RLIM:%d", cfg.rssilimit); sprintf(display_lora, "Join wait"); #endif @@ -541,11 +548,16 @@ do_send(&sendjob); // https://techtutorialsx.com/2017/05/09/esp32-get-task-execution-core/ void loop() { - uptimecounter = uptime() / 1000; // counts uptime in seconds (64bit) - currentMillis = millis(); // timebase for state machine in milliseconds (32bit) - // simple state machine for controlling display, LED, button, etc. + uptimecounter = uptime() / 1000; // counts uptime in seconds (64bit) + currentMillis = millis(); // timebase for state machine in milliseconds (32bit) + + #ifdef HAS_LED + switchLEDstate(); + switchLED(); + #endif + #ifdef HAS_BUTTON readButton(); #endif @@ -554,13 +566,6 @@ void loop() { updateDisplay(); #endif - #ifdef HAS_LED - switchLEDstate(); - switchLED(); - #endif - - //sendPayload(); - -} + } /* end Aruino LOOP ------------------------------------------------------------ */ diff --git a/src/main.h b/src/main.h index 26baff29..d92ed7a2 100644 --- a/src/main.h +++ b/src/main.h @@ -6,14 +6,14 @@ //--- Declarations --- enum states { - LED_ON, - LED_OFF + LED_OFF, + LED_ON }; //--- Prototypes --- // defined in main.cpp -void set_LED (uint16_t set_color, uint16_t set_blinkduration, uint16_t set_interval, uint8_t set_count); +void blink_LED (uint16_t set_color, uint16_t set_blinkduration, uint16_t set_interval); void reset_counters(); // defined in configmanager.cpp From 7f4782914005299b1395c748c11241d8a544475a Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Fri, 20 Apr 2018 11:52:58 +0200 Subject: [PATCH 17/17] v1.3.2 --- src/main.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 61a1f2da..4cd60af2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -402,8 +402,6 @@ uint64_t uptime() { rgb_set_color(LEDState ? color : COLOR_NONE); #endif - ESP_LOGI(TAG, "switched LED: %d -> %d", previousLEDState, LEDState); - previousLEDState = LEDState; } @@ -419,8 +417,6 @@ uint64_t uptime() { else // only one blink LEDState = (currentMillis < LEDBlinkduration) ? LED_ON : LED_OFF; - ESP_LOGI(TAG, "current LEDState %d", LEDState); - } // switchLEDstate() #endif