From 6ec85c20c4d7641d9f082bdaf85a53ec5a9eb92f Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Tue, 16 Jun 2020 18:01:05 +0200 Subject: [PATCH 1/9] removed unused var macs_total --- include/globals.h | 2 +- src/main.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/globals.h b/include/globals.h index 2d6988be..14ca8221 100644 --- a/include/globals.h +++ b/include/globals.h @@ -124,7 +124,7 @@ extern configData_t cfg; // current device configuration extern char lmic_event_msg[LMIC_EVENTMSG_LEN]; // display buffer extern uint8_t volatile channel; // wifi channel rotation counter extern uint8_t batt_level; // display value -extern uint16_t volatile macs_total, macs_wifi, macs_ble; // display values +extern uint16_t volatile macs_wifi, macs_ble; // display values extern bool volatile TimePulseTick; // 1sec pps flag set by GPS or RTC extern timesource_t timeSource; extern hw_timer_t *displayIRQ, *matrixDisplayIRQ, *ppsIRQ; diff --git a/src/main.cpp b/src/main.cpp index 17a8fa04..ed0bd9ee 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -81,8 +81,7 @@ configData_t cfg; // struct holds current device configuration char lmic_event_msg[LMIC_EVENTMSG_LEN]; // display buffer for LMIC event message uint8_t volatile channel = 0; // channel rotation counter uint8_t batt_level = 0; // display value -uint16_t volatile macs_total = 0, macs_wifi = 0, - macs_ble = 0; // globals for display +uint16_t volatile macs_wifi = 0, macs_ble = 0; // globals for display hw_timer_t *ppsIRQ = NULL, *displayIRQ = NULL, *matrixDisplayIRQ = NULL; From 55315b7301706f3a9acb21bc8be8e0548e16ac0f Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Tue, 16 Jun 2020 18:04:56 +0200 Subject: [PATCH 2/9] m5fire.h note added --- src/hal/m5fire.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/hal/m5fire.h b/src/hal/m5fire.h index 9572f6bf..a35bbb93 100644 --- a/src/hal/m5fire.h +++ b/src/hal/m5fire.h @@ -2,6 +2,9 @@ // upload_speed 921600 // board m5stack-fire +// note use of GPIO16/17 +// https://www.bjoerns-techblog.de/2019/03/m5stack-fire-eine-uebersicht/ + #ifndef _M5FIRE_H #define _M5FIRE_H From d5556568527bfb90fcef637cbab1515922a61551 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Tue, 16 Jun 2020 20:29:49 +0200 Subject: [PATCH 3/9] MQTT client enhanced (experimental) --- include/irqhandler.h | 4 ++- include/mqttclient.h | 11 ++++--- src/cyclic.cpp | 2 -- src/irqhandler.cpp | 49 +++++++++++------------------- src/mqttclient.cpp | 72 +++++++++++++++++++++++++++----------------- 5 files changed, 72 insertions(+), 66 deletions(-) diff --git a/include/irqhandler.h b/include/irqhandler.h index 04e62d93..712e5e41 100644 --- a/include/irqhandler.h +++ b/include/irqhandler.h @@ -11,6 +11,7 @@ #define BME_IRQ 0x080 #define MATRIX_DISPLAY_IRQ 0x100 #define PMU_IRQ 0x200 +#define MQTT_IRQ 0x400 #include "globals.h" #include "button.h" @@ -20,10 +21,12 @@ #include "bmesensor.h" #include "power.h" #include "ledmatrixdisplay.h" +#include "mqttclient.h" void irqHandler(void *pvParameters); void mask_user_IRQ(); void unmask_user_IRQ(); +void doIRQ(int irq); #ifdef HAS_DISPLAY void IRAM_ATTR DisplayIRQ(); @@ -41,5 +44,4 @@ void IRAM_ATTR ButtonIRQ(); void IRAM_ATTR PMUIRQ(); #endif - #endif \ No newline at end of file diff --git a/include/mqttclient.h b/include/mqttclient.h index 9bb90364..cf04543a 100644 --- a/include/mqttclient.h +++ b/include/mqttclient.h @@ -6,17 +6,20 @@ #include #include -#define MQTT_INTOPIC "paxcounter_in/" -#define MQTT_OUTTOPIC "paxcounter_out/" +#define MQTT_INTOPIC "paxcounter/in" +#define MQTT_OUTTOPIC "paxcounter/out" #define MQTT_PORT 1883 #define MQTT_SERVER "broker.hivemq.com" -#define MQTT_RETRYSEC 10 // retry reconnect every 10 seconds +//#define MQTT_SERVER "test.mosquitto.org" +#define MQTT_RETRYSEC 20 // retry reconnect every 20 seconds +#define MQTT_KEEPALIVE 10 // seconds to keep alive server connections extern TaskHandle_t mqttTask; -extern PubSubClient mqttClient; void mqtt_enqueuedata(MessageBuffer_t *message); void mqtt_queuereset(void); +void mqtt_irq(void); +void mqtt_loop(void); void mqtt_client_task(void *param); int mqtt_connect(const char *my_host, const uint16_t my_port); void mqtt_callback(char *topic, byte *payload, unsigned int length); diff --git a/src/cyclic.cpp b/src/cyclic.cpp index 77e7439d..96521a61 100644 --- a/src/cyclic.cpp +++ b/src/cyclic.cpp @@ -55,7 +55,6 @@ void doHousekeeping() { #ifdef HAS_MQTT ESP_LOGD(TAG, "MQTTloop %d bytes left | Taskstate = %d", uxTaskGetStackHighWaterMark(mqttTask), eTaskGetState(mqttTask)); - mqttClient.loop(); #endif #if (defined HAS_DCF77 || defined HAS_IF482) @@ -152,7 +151,6 @@ uint32_t getFreeRAM() { void reset_counters() { #if ((WIFICOUNTER) || (BLECOUNTER)) macs.clear(); // clear all macs container - macs_total = 0; // reset all counters macs_wifi = 0; macs_ble = 0; #ifdef HAS_DISPLAY diff --git a/src/irqhandler.cpp b/src/irqhandler.cpp index 196debed..528a8187 100644 --- a/src/irqhandler.cpp +++ b/src/irqhandler.cpp @@ -69,6 +69,14 @@ void irqHandler(void *pvParameters) { } #endif +// MQTT loop due? +#if (HAS_MQTT) + if (InterruptStatus & MQTT_IRQ) { + mqtt_loop(); + InterruptStatus &= ~MQTT_IRQ; + } +#endif + // are cyclic tasks due? if (InterruptStatus & CYCLIC_IRQ) { doHousekeeping(); @@ -91,53 +99,30 @@ void irqHandler(void *pvParameters) { } // for } // irqHandler() -// esp32 hardware timer triggered interrupt service routines +// timer triggered interrupt service routines // they notify the irq handler task -#ifdef HAS_DISPLAY -void IRAM_ATTR DisplayIRQ() { +void IRAM_ATTR doIRQ(int irq) { BaseType_t xHigherPriorityTaskWoken = pdFALSE; - - xTaskNotifyFromISR(irqHandlerTask, DISPLAY_IRQ, eSetBits, - &xHigherPriorityTaskWoken); + xTaskNotifyFromISR(irqHandlerTask, irq, eSetBits, &xHigherPriorityTaskWoken); if (xHigherPriorityTaskWoken) portYIELD_FROM_ISR(); } + +#ifdef HAS_DISPLAY +void IRAM_ATTR DisplayIRQ() { doIRQ(DISPLAY_IRQ); } #endif #ifdef HAS_MATRIX_DISPLAY -void IRAM_ATTR MatrixDisplayIRQ() { - BaseType_t xHigherPriorityTaskWoken = pdFALSE; - - xTaskNotifyFromISR(irqHandlerTask, MATRIX_DISPLAY_IRQ, eSetBits, - &xHigherPriorityTaskWoken); - if (xHigherPriorityTaskWoken) - portYIELD_FROM_ISR(); -} +void IRAM_ATTR MatrixDisplayIRQ() { doIRQ(MATRIX_DISPLAY_IRQ); } #endif #ifdef HAS_BUTTON -void IRAM_ATTR ButtonIRQ() { - BaseType_t xHigherPriorityTaskWoken = pdFALSE; - - xTaskNotifyFromISR(irqHandlerTask, BUTTON_IRQ, eSetBits, - &xHigherPriorityTaskWoken); - - if (xHigherPriorityTaskWoken) - portYIELD_FROM_ISR(); -} +void IRAM_ATTR ButtonIRQ() { doIRQ(BUTTON_IRQ); } #endif #ifdef HAS_PMU -void IRAM_ATTR PMUIRQ() { - BaseType_t xHigherPriorityTaskWoken = pdFALSE; - - xTaskNotifyFromISR(irqHandlerTask, PMU_IRQ, eSetBits, - &xHigherPriorityTaskWoken); - - if (xHigherPriorityTaskWoken) - portYIELD_FROM_ISR(); -} +void IRAM_ATTR PMUIRQ() { doIRQ(PMU_IRQ); } #endif void mask_user_IRQ() { xTaskNotify(irqHandlerTask, MASK_IRQ, eSetBits); } diff --git a/src/mqttclient.cpp b/src/mqttclient.cpp index bfd11319..deb6ce0b 100644 --- a/src/mqttclient.cpp +++ b/src/mqttclient.cpp @@ -7,8 +7,10 @@ static const char TAG[] = __FILE__; QueueHandle_t MQTTSendQueue; TaskHandle_t mqttTask; -WiFiClient EthClient; -PubSubClient mqttClient(EthClient); +Ticker mqttTimer; + +WiFiClient NetClient; +PubSubClient mqttClient(NetClient); void NetworkEvent(WiFiEvent_t event) { switch (event) { @@ -16,22 +18,26 @@ void NetworkEvent(WiFiEvent_t event) { ESP_LOGI(TAG, "Ethernet link layer started"); ETH.setHostname(ETH.macAddress().c_str()); break; + case SYSTEM_EVENT_ETH_STOP: + ESP_LOGI(TAG, "Ethernet link layer stopped"); + break; case SYSTEM_EVENT_ETH_CONNECTED: + case SYSTEM_EVENT_STA_CONNECTED: ESP_LOGI(TAG, "Network link connected"); break; + case SYSTEM_EVENT_ETH_DISCONNECTED: + case SYSTEM_EVENT_STA_DISCONNECTED: + ESP_LOGI(TAG, "Network link disconnected"); + break; case SYSTEM_EVENT_ETH_GOT_IP: ESP_LOGI(TAG, "ETH MAC: %s", ETH.macAddress().c_str()); ESP_LOGI(TAG, "IPv4: %s", ETH.localIP().toString().c_str()); ESP_LOGI(TAG, "Link Speed: %d Mbps %s", ETH.linkSpeed(), ETH.fullDuplex() ? "full duplex" : "half duplex"); + case SYSTEM_EVENT_STA_GOT_IP: mqtt_connect(MQTT_SERVER, MQTT_PORT); break; - case SYSTEM_EVENT_ETH_DISCONNECTED: - ESP_LOGI(TAG, "Network link disconnected"); - break; - case SYSTEM_EVENT_ETH_STOP: - ESP_LOGI(TAG, "Ethernet link layer stopped"); - break; + default: break; } @@ -40,10 +46,12 @@ void NetworkEvent(WiFiEvent_t event) { int mqtt_connect(const char *my_host, const uint16_t my_port) { IPAddress mqtt_server_ip; - static String clientId = "paxcounter-" + ETH.macAddress(); + // static String clientId = "paxcounter-" + ETH.macAddress(); + static String clientId = "paxcounter-" + String(random(0xffff), HEX); + ESP_LOGI(TAG, "MQTT name is %s", clientId.c_str()); - // resolve server + // resolve server host name if (WiFi.hostByName(my_host, mqtt_server_ip)) { ESP_LOGI(TAG, "Attempting to connect to %s [%s]", my_host, mqtt_server_ip.toString().c_str()); @@ -53,9 +61,10 @@ int mqtt_connect(const char *my_host, const uint16_t my_port) { } // attempt to connect to MQTT server - if (EthClient.connect(mqtt_server_ip, my_port, HOMECYCLE * 2 * 1000)) { + if (NetClient.connect(mqtt_server_ip, my_port, HOMECYCLE * 2 * 1000)) { + NetClient.setTimeout(MQTT_KEEPALIVE); // seconds mqttClient.setServer(mqtt_server_ip, my_port); - mqttClient.setKeepAlive(HOMECYCLE * 2); + mqttClient.setKeepAlive(MQTT_KEEPALIVE); mqttClient.setCallback(mqtt_callback); if (mqttClient.connect(clientId.c_str())) { @@ -92,23 +101,30 @@ void mqtt_client_task(void *param) { mqttClient.write('/'); mqttClient.write(msg.Message, msg.MessageSize); if (mqttClient.endPublish()) { - ESP_LOGI(TAG, "%d byte(s) sent to MQTT", msg.MessageSize + 2); - continue; // while(1) - } else - goto reconnect; + ESP_LOGI(TAG, "%d byte(s) sent to MQTT server", msg.MessageSize + 2); + continue; + } else { + mqtt_enqueuedata(&msg); // postpone the undelivered message + ESP_LOGD(TAG, + "Couldn't sent message to MQTT server, message postponed"); + } } else { - // attempt to reconnect to MQTT server - reconnect: + ESP_LOGD(TAG, "MQTT client reconnecting..."); mqtt_enqueuedata(&msg); // postpone the undelivered message delay(MQTT_RETRYSEC * 1000); mqtt_connect(MQTT_SERVER, MQTT_PORT); } + } // while(1) } esp_err_t mqtt_init(void) { + + WiFi.onEvent(NetworkEvent); + ETH.begin(); + assert(SEND_QUEUE_SIZE); MQTTSendQueue = xQueueCreate(SEND_QUEUE_SIZE, sizeof(MessageBuffer_t)); if (MQTTSendQueue == 0) { @@ -119,10 +135,8 @@ esp_err_t mqtt_init(void) { SEND_QUEUE_SIZE * PAYLOAD_BUFFER_SIZE); ESP_LOGI(TAG, "Starting MQTTloop..."); - xTaskCreate(mqtt_client_task, "mqttloop", 4096, (void *)NULL, 2, &mqttTask); - - WiFi.onEvent(NetworkEvent); - ETH.begin(); + mqttTimer.attach(MQTT_KEEPALIVE, mqtt_irq); + xTaskCreate(mqtt_client_task, "mqttloop", 4096, (void *)NULL, 1, &mqttTask); return ESP_OK; } @@ -151,13 +165,17 @@ void mqtt_enqueuedata(MessageBuffer_t *message) { } void mqtt_callback(char *topic, byte *payload, unsigned int length) { - String s = ""; - for (int i = 0; i < length; i++) - s += (char)payload[i]; - ESP_LOGD(TAG, "MQTT: Received %u byte(s) of payload [%s]", length, s); - // rcommand(payload, length); + + char buffer[11]; + snprintf(buffer, 10, "%X02 %X02 %X02 %X02 %X02 %X02 %X02 %X02 %X02 %X02", + payload); + ESP_LOGI(TAG, "MQTT: Received %u byte(s) of payload [%s]", length, buffer); + + rcommand(payload, length); } void mqtt_queuereset(void) { xQueueReset(MQTTSendQueue); } +void mqtt_irq(void) { xTaskNotify(irqHandlerTask, MQTT_IRQ, eSetBits); } +void mqtt_loop(void) { mqttClient.loop(); } #endif // HAS_MQTT \ No newline at end of file From 8f46feaf33da6944ebaf521c66ea14cf8e91934c Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Fri, 19 Jun 2020 14:10:40 +0200 Subject: [PATCH 4/9] ttgobeamv10.h edited --- src/hal/ttgobeam10.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hal/ttgobeam10.h b/src/hal/ttgobeam10.h index 080b5a5d..96238c71 100644 --- a/src/hal/ttgobeam10.h +++ b/src/hal/ttgobeam10.h @@ -9,7 +9,7 @@ /* Hardware related definitions for TTGO T-Beam board -for T-Beam versions T22_V10 + T22_V11 +for T-Beam version T22_V10 + T22_V11 pinouts taken from https://github.com/lewisxhe/TTGO-T-Beam /// Button functions: /// @@ -61,7 +61,7 @@ Reset -> reset device /* -// T-Beam V10 has on board power management by AXP192 PMU chip: +// T-Beam V10/V11 has on board power management by AXP192 PMU chip: // // DCDC1 0.7-3.5V @ 1200mA -> OLED // DCDC3 0.7-3.5V @ 700mA -> ESP32 (keep this on!) From c51a45cfd06682de3c7a500672f4e17ac715b181 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Fri, 19 Jun 2020 21:44:15 +0200 Subject: [PATCH 5/9] typo --- src/loraconf.sample.h | 2 +- src/loraconf_abp.cpp | 2 +- src/lorawan.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/loraconf.sample.h b/src/loraconf.sample.h index 826a39f9..a088cdc2 100644 --- a/src/loraconf.sample.h +++ b/src/loraconf.sample.h @@ -80,7 +80,7 @@ static const u4_t DEVADDR = 0x00000000; // <-- Change this address for every node! // set additional ABP parameters in loraconf_abp.cpp -void setABPParamaters(); +void setABPParameters(); #endif diff --git a/src/loraconf_abp.cpp b/src/loraconf_abp.cpp index 4a4971bf..76de2f73 100644 --- a/src/loraconf_abp.cpp +++ b/src/loraconf_abp.cpp @@ -13,7 +13,7 @@ * *********************************************************************/ -void setABPParamaters() { +void setABPParameters() { /** ************************************************************** * ************************************************************* */ diff --git a/src/lorawan.cpp b/src/lorawan.cpp index ac3dd1f2..0d39ded8 100644 --- a/src/lorawan.cpp +++ b/src/lorawan.cpp @@ -1,4 +1,5 @@ // Basic Config + #if (HAS_LORA) #include "lorawan.h" @@ -319,7 +320,7 @@ esp_err_t lora_stack_init(bool do_join) { memcpy_P(nwkskey, NWKSKEY, sizeof(NWKSKEY)); LMIC_setSession(NETID, DEVADDR, nwkskey, appskey); // These parameters are defined as macro in loraconf.h - setABPParamaters(); + setABPParameters(); #else // Start join procedure if not already joined, // lora_setupForNetwork(true) is called by eventhandler when joined From 6b785fedd73369d70f2edea0d7d6e426041aef7b Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Sat, 20 Jun 2020 15:04:03 +0200 Subject: [PATCH 6/9] mqtt lib changed (experimental) --- include/mqttclient.h | 18 +++-- platformio.ini | 16 ++-- src/hal/olimexpoeiso.h | 2 +- src/mqttclient.cpp | 169 +++++++++++++++++++++-------------------- src/timekeeper.cpp | 2 - 5 files changed, 110 insertions(+), 97 deletions(-) diff --git a/include/mqttclient.h b/include/mqttclient.h index cf04543a..d1bef44e 100644 --- a/include/mqttclient.h +++ b/include/mqttclient.h @@ -4,15 +4,22 @@ #include "globals.h" #include "rcommand.h" #include -#include +#include #define MQTT_INTOPIC "paxcounter/in" #define MQTT_OUTTOPIC "paxcounter/out" #define MQTT_PORT 1883 -#define MQTT_SERVER "broker.hivemq.com" -//#define MQTT_SERVER "test.mosquitto.org" +#define MQTT_SERVER "broker.shiftr.io" +//#define MQTT_CLIENTNAME "arduino" +#define MQTT_USER "try" +#define MQTT_PASSWD "try" #define MQTT_RETRYSEC 20 // retry reconnect every 20 seconds -#define MQTT_KEEPALIVE 10 // seconds to keep alive server connections +#define MQTT_KEEPALIVE 10 // keep alive interval in seconds +#define MQTT_TIMEOUT 1000 // timeout for all mqtt commands in milliseconds + +#ifndef MQTT_CLIENTNAME +#define MQTT_CLIENTNAME clientId.c_str() +#endif extern TaskHandle_t mqttTask; @@ -22,7 +29,8 @@ void mqtt_irq(void); void mqtt_loop(void); void mqtt_client_task(void *param); int mqtt_connect(const char *my_host, const uint16_t my_port); -void mqtt_callback(char *topic, byte *payload, unsigned int length); +void mqtt_callback(MQTTClient *client, char topic[], char payload[], + int length); void NetworkEvent(WiFiEvent_t event); esp_err_t mqtt_init(void); diff --git a/platformio.ini b/platformio.ini index 7030b54f..533a6e5b 100644 --- a/platformio.ini +++ b/platformio.ini @@ -7,7 +7,7 @@ ; ---> SELECT THE TARGET PLATFORM HERE! <--- [board] -halfile = generic.h +;halfile = generic.h ;halfile = ebox.h ;halfile = eboxtube.h ;halfile = ecopower.h @@ -33,15 +33,15 @@ halfile = generic.h ;halfile = tinypicomatrix.h ;halfile = m5core.h ;halfile = m5fire.h -;halfile = olimexpoeiso.h +halfile = olimexpoeiso.h [platformio] ; upload firmware to board with usb cable -default_envs = usb +;default_envs = usb ; upload firmware to a jfrog bintray repository ;default_envs = ota ; use latest versions of libraries -;default_envs = dev +default_envs = dev description = Paxcounter is a device for metering passenger flows in realtime. It counts how many mobile devices are around. [common] @@ -49,12 +49,12 @@ description = Paxcounter is a device for metering passenger flows in realtime. I release_version = 1.9.996 ; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running! ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose -debug_level = 3 +debug_level = 4 extra_scripts = pre:build.py otakeyfile = ota.conf lorakeyfile = loraconf.h lmicconfigfile = lmic_config.h -platform_espressif32 = espressif32@1.12.2 +platform_espressif32 = espressif32@1.12.4 monitor_speed = 115200 upload_speed = 115200 ; set by build.py and taken from hal file display_library = ; set by build.py and taken from hal file @@ -79,13 +79,13 @@ lib_deps_sensors = BSEC Software Library@1.5.1474 https://github.com/ricki-z/SDS011.git lib_deps_basic = - ArduinoJson@^5.13.1 + ArduinoJson@<6 76@>=1.2.4 ; #76 Timezone by Jack Christensen 274@>=2.3.4 ; #274 RTC by Michael Miller SimpleButton AXP202X_Library@>=1.1.1 ; AXP202 PMU lib by Lewis He esp32-micro-sdcard - PubSubClient@>=2.8.0 + MQTT@>=2.4.7 ; MQTT client maintained by Joel Gaehwiler lib_deps_all = ${common.lib_deps_basic} ${common.lib_deps_lora} diff --git a/src/hal/olimexpoeiso.h b/src/hal/olimexpoeiso.h index 70856336..4fcbdd6b 100644 --- a/src/hal/olimexpoeiso.h +++ b/src/hal/olimexpoeiso.h @@ -8,7 +8,7 @@ #include // enable only if you want to store a local paxcount table on the device -//#define HAS_SDCARD 2 // this board has a SDMMC card-reader/writer +#define HAS_SDCARD 2 // this board has a SDMMC card-reader/writer // enable only if you want to send paxcount via ethernet port to mqtt server #define HAS_MQTT 1 // use MQTT on ethernet interface diff --git a/src/mqttclient.cpp b/src/mqttclient.cpp index deb6ce0b..a36dff54 100644 --- a/src/mqttclient.cpp +++ b/src/mqttclient.cpp @@ -8,39 +8,35 @@ QueueHandle_t MQTTSendQueue; TaskHandle_t mqttTask; Ticker mqttTimer; +WiFiClient netClient; +MQTTClient mqttClient; -WiFiClient NetClient; -PubSubClient mqttClient(NetClient); +esp_err_t mqtt_init(void) { -void NetworkEvent(WiFiEvent_t event) { - switch (event) { - case SYSTEM_EVENT_ETH_START: - ESP_LOGI(TAG, "Ethernet link layer started"); - ETH.setHostname(ETH.macAddress().c_str()); - break; - case SYSTEM_EVENT_ETH_STOP: - ESP_LOGI(TAG, "Ethernet link layer stopped"); - break; - case SYSTEM_EVENT_ETH_CONNECTED: - case SYSTEM_EVENT_STA_CONNECTED: - ESP_LOGI(TAG, "Network link connected"); - break; - case SYSTEM_EVENT_ETH_DISCONNECTED: - case SYSTEM_EVENT_STA_DISCONNECTED: - ESP_LOGI(TAG, "Network link disconnected"); - break; - case SYSTEM_EVENT_ETH_GOT_IP: - ESP_LOGI(TAG, "ETH MAC: %s", ETH.macAddress().c_str()); - ESP_LOGI(TAG, "IPv4: %s", ETH.localIP().toString().c_str()); - ESP_LOGI(TAG, "Link Speed: %d Mbps %s", ETH.linkSpeed(), - ETH.fullDuplex() ? "full duplex" : "half duplex"); - case SYSTEM_EVENT_STA_GOT_IP: - mqtt_connect(MQTT_SERVER, MQTT_PORT); - break; + // setup network connection + WiFi.onEvent(NetworkEvent); + ETH.begin(); + // WiFi.mode(WIFI_STA); + // WiFi.begin("SSID", "PW"); - default: - break; + // setup mqtt client + mqttClient.begin(MQTT_SERVER, MQTT_PORT, netClient); + mqttClient.onMessageAdvanced(mqtt_callback); + + assert(SEND_QUEUE_SIZE); + MQTTSendQueue = xQueueCreate(SEND_QUEUE_SIZE, sizeof(MessageBuffer_t)); + if (MQTTSendQueue == 0) { + ESP_LOGE(TAG, "Could not create MQTT send queue. Aborting."); + return ESP_FAIL; } + ESP_LOGI(TAG, "MQTT send queue created, size %d Bytes", + SEND_QUEUE_SIZE * PAYLOAD_BUFFER_SIZE); + + ESP_LOGI(TAG, "Starting MQTTloop..."); + mqttTimer.attach(MQTT_KEEPALIVE, mqtt_irq); + xTaskCreate(mqtt_client_task, "mqttloop", 4096, (void *)NULL, 1, &mqttTask); + + return ESP_OK; } int mqtt_connect(const char *my_host, const uint16_t my_port) { @@ -49,7 +45,7 @@ int mqtt_connect(const char *my_host, const uint16_t my_port) { // static String clientId = "paxcounter-" + ETH.macAddress(); static String clientId = "paxcounter-" + String(random(0xffff), HEX); - ESP_LOGI(TAG, "MQTT name is %s", clientId.c_str()); + ESP_LOGI(TAG, "MQTT name is %s", MQTT_CLIENTNAME); // resolve server host name if (WiFi.hostByName(my_host, mqtt_server_ip)) { @@ -60,28 +56,56 @@ int mqtt_connect(const char *my_host, const uint16_t my_port) { return -1; } - // attempt to connect to MQTT server - if (NetClient.connect(mqtt_server_ip, my_port, HOMECYCLE * 2 * 1000)) { - NetClient.setTimeout(MQTT_KEEPALIVE); // seconds - mqttClient.setServer(mqtt_server_ip, my_port); - mqttClient.setKeepAlive(MQTT_KEEPALIVE); - mqttClient.setCallback(mqtt_callback); - - if (mqttClient.connect(clientId.c_str())) { - ESP_LOGI(TAG, "MQTT server connected, subscribing..."); - mqttClient.publish(MQTT_OUTTOPIC, clientId.c_str()); - mqttClient.subscribe(MQTT_INTOPIC); - ESP_LOGI(TAG, "MQTT topic subscribed"); - } else { - ESP_LOGW(TAG, "MQTT server not responding, retrying later"); - return -1; - } + if (mqttClient.connect(MQTT_CLIENTNAME, MQTT_USER, MQTT_PASSWD)) { + ESP_LOGI(TAG, "MQTT server connected, subscribing..."); + mqttClient.publish(MQTT_OUTTOPIC, MQTT_CLIENTNAME); + // Clear retained messages that may have been published earlier on topic + mqttClient.publish(MQTT_INTOPIC, "", true, 1); + mqttClient.subscribe(MQTT_INTOPIC); + ESP_LOGI(TAG, "MQTT topic subscribed"); } else { - ESP_LOGW(TAG, "MQTT server not connected, retrying later"); + ESP_LOGD(TAG, "MQTT last_error = %d / rc = %d", mqttClient.lastError(), + mqttClient.returnCode()); + ESP_LOGW(TAG, "MQTT server not responding, retrying later"); return -1; } } +void NetworkEvent(WiFiEvent_t event) { + switch (event) { + case SYSTEM_EVENT_ETH_START: + case SYSTEM_EVENT_STA_START: + ESP_LOGI(TAG, "Network link layer started"); + // ETH.setHostname(ETH.macAddress().c_str()); + break; + case SYSTEM_EVENT_ETH_STOP: + case SYSTEM_EVENT_STA_STOP: + ESP_LOGI(TAG, "Network link layer stopped"); + break; + case SYSTEM_EVENT_ETH_CONNECTED: + case SYSTEM_EVENT_STA_CONNECTED: + ESP_LOGI(TAG, "Network link connected"); + break; + case SYSTEM_EVENT_ETH_DISCONNECTED: + case SYSTEM_EVENT_STA_DISCONNECTED: + ESP_LOGI(TAG, "Network link disconnected"); + break; + case SYSTEM_EVENT_ETH_GOT_IP: + ESP_LOGI(TAG, "IP: %s", ETH.localIP().toString().c_str()); + ESP_LOGI(TAG, "Link Speed: %d Mbps %s", ETH.linkSpeed(), + ETH.fullDuplex() ? "full duplex" : "half duplex"); + mqtt_connect(MQTT_SERVER, MQTT_PORT); + break; + case SYSTEM_EVENT_STA_GOT_IP: + ESP_LOGI(TAG, "IP: %s", WiFi.localIP().toString().c_str()); + mqtt_connect(MQTT_SERVER, MQTT_PORT); + break; + + default: + break; + } +} + void mqtt_client_task(void *param) { MessageBuffer_t msg; @@ -96,11 +120,12 @@ void mqtt_client_task(void *param) { // send data to mqtt server, if we are connected if (mqttClient.connected()) { - mqttClient.beginPublish(MQTT_OUTTOPIC, msg.MessageSize + 2, false); - mqttClient.write(msg.MessagePort); - mqttClient.write('/'); - mqttClient.write(msg.Message, msg.MessageSize); - if (mqttClient.endPublish()) { + + char buffer[PAYLOAD_BUFFER_SIZE + 3]; + snprintf(buffer, msg.MessageSize + 3, "%s/%s", msg.MessagePort, + msg.Message); + + if (mqttClient.publish(MQTT_OUTTOPIC, buffer)) { ESP_LOGI(TAG, "%d byte(s) sent to MQTT server", msg.MessageSize + 2); continue; } else { @@ -112,6 +137,8 @@ void mqtt_client_task(void *param) { } else { // attempt to reconnect to MQTT server ESP_LOGD(TAG, "MQTT client reconnecting..."); + ESP_LOGD(TAG, "MQTT last_error = %d / rc = %d", mqttClient.lastError(), + mqttClient.returnCode()); mqtt_enqueuedata(&msg); // postpone the undelivered message delay(MQTT_RETRYSEC * 1000); mqtt_connect(MQTT_SERVER, MQTT_PORT); @@ -120,27 +147,6 @@ void mqtt_client_task(void *param) { } // while(1) } -esp_err_t mqtt_init(void) { - - WiFi.onEvent(NetworkEvent); - ETH.begin(); - - assert(SEND_QUEUE_SIZE); - MQTTSendQueue = xQueueCreate(SEND_QUEUE_SIZE, sizeof(MessageBuffer_t)); - if (MQTTSendQueue == 0) { - ESP_LOGE(TAG, "Could not create MQTT send queue. Aborting."); - return ESP_FAIL; - } - ESP_LOGI(TAG, "MQTT send queue created, size %d Bytes", - SEND_QUEUE_SIZE * PAYLOAD_BUFFER_SIZE); - - ESP_LOGI(TAG, "Starting MQTTloop..."); - mqttTimer.attach(MQTT_KEEPALIVE, mqtt_irq); - xTaskCreate(mqtt_client_task, "mqttloop", 4096, (void *)NULL, 1, &mqttTask); - - return ESP_OK; -} - void mqtt_enqueuedata(MessageBuffer_t *message) { // enqueue message in MQTT send queue BaseType_t ret; @@ -164,18 +170,19 @@ void mqtt_enqueuedata(MessageBuffer_t *message) { ESP_LOGW(TAG, "MQTT sendqueue is full"); } -void mqtt_callback(char *topic, byte *payload, unsigned int length) { +void mqtt_callback(MQTTClient *client, char topic[], char payload[], + int length) { + if (topic == MQTT_INTOPIC) + rcommand((const uint8_t *)payload, (const uint8_t)length); +} - char buffer[11]; - snprintf(buffer, 10, "%X02 %X02 %X02 %X02 %X02 %X02 %X02 %X02 %X02 %X02", - payload); - ESP_LOGI(TAG, "MQTT: Received %u byte(s) of payload [%s]", length, buffer); - - rcommand(payload, length); +void mqtt_loop(void) { + if (!mqttClient.loop()) + ESP_LOGD(TAG, "MQTT last_error = %d / rc = %d", mqttClient.lastError(), + mqttClient.returnCode()); } void mqtt_queuereset(void) { xQueueReset(MQTTSendQueue); } void mqtt_irq(void) { xTaskNotify(irqHandlerTask, MQTT_IRQ, eSetBits); } -void mqtt_loop(void) { mqttClient.loop(); } #endif // HAS_MQTT \ No newline at end of file diff --git a/src/timekeeper.cpp b/src/timekeeper.cpp index 87ef0ad0..6d8439ec 100644 --- a/src/timekeeper.cpp +++ b/src/timekeeper.cpp @@ -1,6 +1,5 @@ #include "timekeeper.h" -/* #if !(HAS_LORA) #if (TIME_SYNC_LORASERVER) #error TIME_SYNC_LORASERVER defined, but device has no LORA configured @@ -8,7 +7,6 @@ #error TIME_SYNC_LORAWAN defined, but device has no LORA configured #endif #endif -*/ // Local logging tag static const char TAG[] = __FILE__; From 48cdb06c2c0c4c7743730b83a21906d281fb2a52 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Sun, 19 Jul 2020 16:03:15 +0200 Subject: [PATCH 7/9] small cleanups --- include/mqttclient.h | 7 ++++--- platformio.ini | 9 ++++----- src/lorawan.cpp | 1 + src/mqttclient.cpp | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/include/mqttclient.h b/include/mqttclient.h index d1bef44e..5f942aa3 100644 --- a/include/mqttclient.h +++ b/include/mqttclient.h @@ -3,11 +3,12 @@ #include "globals.h" #include "rcommand.h" -#include #include +#include -#define MQTT_INTOPIC "paxcounter/in" -#define MQTT_OUTTOPIC "paxcounter/out" +#define MQTT_ETHERNET 0 // set to 0 to run on Wifi +#define MQTT_INTOPIC "paxin" +#define MQTT_OUTTOPIC "paxout" #define MQTT_PORT 1883 #define MQTT_SERVER "broker.shiftr.io" //#define MQTT_CLIENTNAME "arduino" diff --git a/platformio.ini b/platformio.ini index 533a6e5b..5449c8bc 100644 --- a/platformio.ini +++ b/platformio.ini @@ -19,7 +19,7 @@ ;halfile = ttgov21new.h ;halfile = ttgofox.h ;halfile = ttgobeam.h -;halfile = ttgobeam10.h +halfile = ttgobeam10.h ;halfile = fipy.h ;halfile = lopy.h ;halfile = lopy4.h @@ -33,7 +33,7 @@ ;halfile = tinypicomatrix.h ;halfile = m5core.h ;halfile = m5fire.h -halfile = olimexpoeiso.h +;halfile = olimexpoeiso.h [platformio] ; upload firmware to board with usb cable @@ -61,8 +61,7 @@ display_library = ; set by build.py and taken from hal file lib_deps_lora = MCCI LoRaWAN LMIC library@3.2.0 ; MCCI LMIC by Terrill Moore lib_deps_display = - ;OneBitDisplay@>1.4.0 - https://github.com/bitbank2/OneBitDisplay.git + OneBitDisplay@1.5.0 QRCode@0.0.1 BitBang_I2C@2.1.1 TFT_eSPI@>=2.2.8 @@ -73,7 +72,7 @@ lib_deps_rgbled = lib_deps_gps = 1655@>=1.0.2 ; #1655 TinyGPSPlus by Mikal Hart lib_deps_sensors = - Adafruit Unified Sensor@>=1.1.3 + Adafruit Unified Sensor@>=1.1.4 Adafruit BME280 Library@>=2.0.2 Adafruit BMP085 Library@>=1.1.0 BSEC Software Library@1.5.1474 diff --git a/src/lorawan.cpp b/src/lorawan.cpp index 0d39ded8..8ed6aa14 100644 --- a/src/lorawan.cpp +++ b/src/lorawan.cpp @@ -582,6 +582,7 @@ const char *getCrName(rps_t rps) { #if (VERBOSE) // decode LORAWAN MAC message +// see https://github.com/mcci-catena/arduino-lmic/blob/master/doc/LoRaWAN-at-a-glance.pdf void mac_decode(const uint8_t cmd[], const uint8_t cmdlen, bool is_down) { if (!cmdlen) diff --git a/src/mqttclient.cpp b/src/mqttclient.cpp index a36dff54..e9333c8a 100644 --- a/src/mqttclient.cpp +++ b/src/mqttclient.cpp @@ -16,8 +16,8 @@ esp_err_t mqtt_init(void) { // setup network connection WiFi.onEvent(NetworkEvent); ETH.begin(); - // WiFi.mode(WIFI_STA); - // WiFi.begin("SSID", "PW"); + //WiFi.mode(WIFI_STA); + //WiFi.begin("SSID", "PASSWORD"); // setup mqtt client mqttClient.begin(MQTT_SERVER, MQTT_PORT, netClient); From ae74b097d48472b0d4a97ac10c126579992c65e3 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Wed, 29 Jul 2020 10:50:40 +0200 Subject: [PATCH 8/9] RTC lib update --- platformio.ini | 6 +++--- src/rtctime.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platformio.ini b/platformio.ini index 5449c8bc..ed0aa1bf 100644 --- a/platformio.ini +++ b/platformio.ini @@ -17,9 +17,9 @@ ;halfile = ttgov2.h ;halfile = ttgov21old.h ;halfile = ttgov21new.h -;halfile = ttgofox.h +halfile = ttgofox.h ;halfile = ttgobeam.h -halfile = ttgobeam10.h +;halfile = ttgobeam10.h ;halfile = fipy.h ;halfile = lopy.h ;halfile = lopy4.h @@ -80,7 +80,7 @@ lib_deps_sensors = lib_deps_basic = ArduinoJson@<6 76@>=1.2.4 ; #76 Timezone by Jack Christensen - 274@>=2.3.4 ; #274 RTC by Michael Miller + 274@>=2.3.5 ; #274 RTC by Michael Miller SimpleButton AXP202X_Library@>=1.1.1 ; AXP202 PMU lib by Lewis He esp32-micro-sdcard diff --git a/src/rtctime.cpp b/src/rtctime.cpp index a3fc2a31..29ad18c6 100644 --- a/src/rtctime.cpp +++ b/src/rtctime.cpp @@ -13,7 +13,7 @@ uint8_t rtc_init(void) { if (I2C_MUTEX_LOCK()) { // block i2c bus access Wire.begin(HAS_RTC); - Rtc.Begin(); + Rtc.Begin(MY_DISPLAY_SDA, MY_DISPLAY_SCL); // configure RTC chip Rtc.Enable32kHzPin(false); From 316cd8d98c150845fb86e7b058820fb461b30880 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Wed, 29 Jul 2020 10:52:48 +0200 Subject: [PATCH 9/9] AXP202 lib update --- platformio.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platformio.ini b/platformio.ini index ed0aa1bf..246d5734 100644 --- a/platformio.ini +++ b/platformio.ini @@ -7,7 +7,7 @@ ; ---> SELECT THE TARGET PLATFORM HERE! <--- [board] -;halfile = generic.h +halfile = generic.h ;halfile = ebox.h ;halfile = eboxtube.h ;halfile = ecopower.h @@ -17,7 +17,7 @@ ;halfile = ttgov2.h ;halfile = ttgov21old.h ;halfile = ttgov21new.h -halfile = ttgofox.h +;halfile = ttgofox.h ;halfile = ttgobeam.h ;halfile = ttgobeam10.h ;halfile = fipy.h @@ -82,7 +82,7 @@ lib_deps_basic = 76@>=1.2.4 ; #76 Timezone by Jack Christensen 274@>=2.3.5 ; #274 RTC by Michael Miller SimpleButton - AXP202X_Library@>=1.1.1 ; AXP202 PMU lib by Lewis He + AXP202X_Library@>=1.1.2 ; AXP202 PMU lib by Lewis He esp32-micro-sdcard MQTT@>=2.4.7 ; MQTT client maintained by Joel Gaehwiler lib_deps_all =