From f6dc5efab33ee0a09bd87c5fb291813c19ced559 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Tue, 14 Aug 2018 15:50:17 +0200 Subject: [PATCH 1/4] espressif 1.3.0 --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 98296872..498ffd27 100644 --- a/platformio.ini +++ b/platformio.ini @@ -28,7 +28,7 @@ env_default = generic description = Paxcounter is a proof-of-concept ESP32 device for metering passenger flows in realtime. It counts how many mobile devices are around. [common_env_data] -platform_espressif32 = espressif32@1.2.0 +platform_espressif32 = espressif32@1.3.0 ;platform_espressif32 = https://github.com/platformio/platform-espressif32.git#feature/stage board_build.partitions = no_ota.csv lib_deps_all = From 758918bf7e6c2acaebcbb6456bcf3d4e5e914826 Mon Sep 17 00:00:00 2001 From: cyberman54 Date: Tue, 14 Aug 2018 22:41:21 +0200 Subject: [PATCH 2/4] espressif32 v1.3.0 --- README.md | 4 ++-- platformio.ini | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6d5b64d5..8c6400aa 100644 --- a/README.md +++ b/README.md @@ -140,8 +140,8 @@ Hereafter described is the default *plain* format, which uses MSB bit numbering. byte 1-2: Battery or USB Voltage [mV], 0 if no battery probe byte 3-10: Uptime [seconds] - bytes 11-14: CPU temperature [°C] - bytes 15-18: Free RAM [bytes] + byte 11: CPU temperature [°C] + bytes 12-15: Free RAM [bytes] **Port #3:** Device configuration query result diff --git a/platformio.ini b/platformio.ini index 98296872..6f198ad0 100644 --- a/platformio.ini +++ b/platformio.ini @@ -28,7 +28,7 @@ env_default = generic description = Paxcounter is a proof-of-concept ESP32 device for metering passenger flows in realtime. It counts how many mobile devices are around. [common_env_data] -platform_espressif32 = espressif32@1.2.0 +platform_espressif32 = espressif32@1.3.0 ;platform_espressif32 = https://github.com/platformio/platform-espressif32.git#feature/stage board_build.partitions = no_ota.csv lib_deps_all = @@ -48,9 +48,9 @@ build_flags = ; Error ; -DCORE_DEBUG_LEVEL=1 ; Warn - -DCORE_DEBUG_LEVEL=2 +; -DCORE_DEBUG_LEVEL=2 ; Info -; -DCORE_DEBUG_LEVEL=3 + -DCORE_DEBUG_LEVEL=3 ; Debug ; -DCORE_DEBUG_LEVEL=4 ; Verbose From 4883497a6bbd981e07e36c4af40acdcae4948639 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Wed, 15 Aug 2018 21:02:15 +0200 Subject: [PATCH 3/4] rcommand.cpp: code sanitization --- src/rcommand.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rcommand.cpp b/src/rcommand.cpp index 0335877e..76f7ba9b 100644 --- a/src/rcommand.cpp +++ b/src/rcommand.cpp @@ -269,10 +269,10 @@ void rcommand(uint8_t cmd[], uint8_t cmdlength) { table[i].opcode); break; // command found -> exit table lookup loop } // end of command validation - } // end of command table lookup loop - if (i < 0) // command not found -> exit parser + } // end of table lookup loop + if (i < 0) // command not found -> exit parser loop break; - } // command parsing loop + } // end of command parsing loop if (storeflag) saveConfig(); From 051272063553be51efcdf6e87416b71da27486a3 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Wed, 15 Aug 2018 21:04:48 +0200 Subject: [PATCH 4/4] upgrade u8g2 in platformio.ini --- platformio.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platformio.ini b/platformio.ini index 498ffd27..bb895931 100644 --- a/platformio.ini +++ b/platformio.ini @@ -33,7 +33,7 @@ platform_espressif32 = espressif32@1.3.0 board_build.partitions = no_ota.csv lib_deps_all = lib_deps_display = - U8g2@>=2.23.12 + U8g2@>=2.23.16 lib_deps_rgbled = SmartLeds@>=1.1.3 lib_deps_gps = @@ -44,11 +44,11 @@ build_flags = ; otherwise device may leak RAM ; ; None -; -DCORE_DEBUG_LEVEL=0 + -DCORE_DEBUG_LEVEL=0 ; Error ; -DCORE_DEBUG_LEVEL=1 ; Warn - -DCORE_DEBUG_LEVEL=2 +; -DCORE_DEBUG_LEVEL=2 ; Info ; -DCORE_DEBUG_LEVEL=3 ; Debug