Merge pull request #164 from thorrak/devel

v1.0.1 Release
thorrak · Feb 17, 2021 · 30e6d5f · 30e6d5f
2 parents 9956410 + a905604
commit 30e6d5f
Show file tree

Hide file tree

Showing 21 changed files with 469 additions and 1,222 deletions.
diff --git a/bin/d32_pro_tft_firmware.bin b/bin/d32_pro_tft_firmware.bin
diff --git a/bin/d32_pro_tft_spiffs.bin b/bin/d32_pro_tft_spiffs.bin
diff --git a/bin/lcd_ssd1306_firmware.bin b/bin/lcd_ssd1306_firmware.bin
diff --git a/bin/lcd_ssd1306_spiffs.bin b/bin/lcd_ssd1306_spiffs.bin
diff --git a/bin/tft_espi_firmware.bin b/bin/tft_espi_firmware.bin
diff --git a/bin/tft_espi_spiffs.bin b/bin/tft_espi_spiffs.bin
diff --git a/data/settings.js b/data/settings.js
@@ -140,14 +140,14 @@ function populateConfig(callback = null) { // Get configuration settings, popula
                 // Google Sheets Tab
                 $('input[name="scriptsURL"]').val(config.scriptsURL);
                 $('input[name="scriptsEmail"]').val(config.scriptsEmail);
-                $('input[name="sheetName_red"]').val(config.sheetName_red);
-                $('input[name="sheetName_green"]').val(config.sheetName_green);
-                $('input[name="sheetName_black"]').val(config.sheetName_black);
-                $('input[name="sheetName_purple"]').val(config.sheetName_purple);
-                $('input[name="sheetName_orange"]').val(config.sheetName_orange);
-                $('input[name="sheetName_blue"]').val(config.sheetName_blue);
-                $('input[name="sheetName_yellow"]').val(config.sheetName_yellow);
-                $('input[name="sheetName_pink"]').val(config.sheetName_pink);
+                $('input[name="sheetName_red"]').val(config.Red.name);
+                $('input[name="sheetName_green"]').val(config.Green.name);
+                $('input[name="sheetName_black"]').val(config.Black.name);
+                $('input[name="sheetName_purple"]').val(config.Purple.name);
+                $('input[name="sheetName_orange"]').val(config.Orange.name);
+                $('input[name="sheetName_blue"]').val(config.Blue.name);
+                $('input[name="sheetName_yellow"]').val(config.Yellow.name);
+                $('input[name="sheetName_pink"]').val(config.Pink.name);
 
                 // Brewer's Friend Tab
                 $('input[name="brewersFriendKey"]').val(config.brewersFriendKey);

diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -2,6 +2,15 @@ Changelog
 #########
 
 
+v1.0.1 - Feb 16, 2021 - Bugfixes & Configuration Tweaks
+-------------------------------------------------------
+
+- Rewrite code for storing/loading Google Sheets configuration
+- Fix issue that can cause Google Sheets posts to periodically fail
+- Corrected delay timers for Google Sheets, Brewer's Friend, and BrewFather
+- Other behind-the-scenes cleanup
+
+
 v1.0.0 - Feb 12, 2021 - UI Overhaul, Scanner Overhaul, and loads more
 ---------------------------------------------------------------------
 

diff --git a/platformio.ini b/platformio.ini
@@ -35,16 +35,17 @@ monitor_rts = 1
 ; -D_GLIBCXX_USE_C99 is to fix an issue with the xtensa toolchain that precludes the use of std::to_string
 ; See: https://github.com/espressif/esp-idf/issues/1445
 build_flags =                           ; Do not use spaces around the "=" here, will give you a builder not found error
-    -D_GLIBCXX_USE_C99=1                ; See above
+    ;-D_GLIBCXX_USE_C99=1                ; See above
     !python tools/git_rev.py            ; Pick up git information for version (disabled), branch, and commit (in version.cpp)
-    -D PIO_SRC_TAG=1.0.0                ; Increment versions shown in about.htm page (from version.cpp)
+    -D PIO_SRC_TAG=1.0.1                ; Increment versions shown in about.htm page (from version.cpp)
     ; Async TCP Settings:
     -D CONFIG_ASYNC_TCP_RUNNING_CORE=1  ; per: https://github.com/me-no-dev/ESPAsyncWebServer/issues/731#issuecomment-628163515
     -D CONFIG_ASYNC_TCP_USE_WDT=1
     ; BLE Settings:
-    -D CONFIG_SW_COEXIST_ENABLE=1
     -D CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=1
-    -D CONFIG_SW_COEXIST_PREFERENCE_BALANCED=1
+    ;-D CONFIG_SW_COEXIST_PREFERENCE_BALANCED=1
+    -D CONFIG_BT_NIMBLE_ROLE_PERIPHERAL_DISABLED=1   ; Disable NimBLE Server
+    -D CONFIG_BT_NIMBLE_ROLE_BROADCASTER_DISABLED=1  ; Disable NimBLE Broadcaster
     ; Debug logging
     -D PRINT_GRAV_UPDATES=0             ; Turn on and off gravity printing to serial log
     -D CORE_DEBUG_LEVEL=0               ; Set core Arduino log level (5 = high)
@@ -54,10 +55,10 @@ build_flags =                           ; Do not use spaces around the "=" here,
     -D BAUD=${common.monitor_speed}     ; Serial monitor baud setting
     -D FILESYSTEM=SPIFFS                ; Define filesystem in use
     -D DISABLE_OTA_UPDATES=1
-    ;-D DOTELNET=0                       ; Allow Telnet serial logging
+    ;-D DOTELNET=1                       ; Allow Telnet serial logging
     ;-D TELNETPORT=23
     -D WEBPORT=80
-    ; -D FSEDIT=0                         ; Use a filesystem editor
+    ; -D FSEDIT=1                         ; Use a filesystem editor
 extra_scripts = tools/get_port.py       ; Pick up port information based on OS
 lib_deps =
     bblanchon/ArduinoJson @ 6.17.2
@@ -69,7 +70,6 @@ lib_deps =
     256dpi/MQTT @ 2.4.8
     https://github.com/tzapu/WiFiManager.git
     https://github.com/lbussy/LCBUrl.git#devel
-    https://github.com/bblanchon/ArduinoStreamUtils.git ; This is used to allow stream processing, can be turned off later.
 build_type = release ; debug
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -139,13 +139,14 @@ build_flags =
     -D LOAD_GFXFF=1
     -D GFXFF=1
     -D TOUCH_CS=1
+    ;-D CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL=1 ; Use PSRAM for NimBLE
 lib_deps =
     ${common.lib_deps}
     bodmer/TFT_eSPI @ 2.3.59 ; https://github.com/Bodmer/TFT_eSPI.git
 build_type = ${common.build_type}
 
 
-[env:tft_espi]  ; TTGO
+[env:tft_espi]  ; TTGO TFT (USB-C) Board
 ; This is configured for a TTGO T-Display using the tft_espi drivers
 ; it should work for other tft_espi compatible displays, if you tweak
 ; the defines appropriately. See the documentation for TFT_eSPI at

diff --git a/src/bridge_lcd.cpp b/src/bridge_lcd.cpp
@@ -299,7 +299,7 @@ void bridge_lcd::print_line(const char *left_text, const char *middle_text, cons
 }
 
 void bridge_lcd::check_screen() {
-    if (! onResetScreen && next_screen_at < millis()) {
+    if (!onResetScreen && next_screen_at < millis()) {
         next_screen_at = display_next() * 1000 + millis();
     }
 }
@@ -431,15 +431,15 @@ void bridge_lcd::print_tilt_to_line(tiltHydrometer *tilt, uint8_t line) {
     sprintf(temp, "%s %s", tilt->converted_temp(false).c_str(), tilt->is_celsius() ? "C" : "F");
 
 #ifdef LCD_TFT_ESPI
-    tft->setTextColor(tilt->text_color());
+    tft->setTextColor(tilt_text_colors[tilt->m_color]);
 #endif
 
     // Print line with gutter for the color block for TFT screens
-    print_line(tilt->color_name().c_str(), temp, gravity, line, true);
+    print_line(tilt_color_names[tilt->m_color], temp, gravity, line, true);
 
 #ifdef LCD_TFT
     uint16_t fHeight = tft->fontHeight(GFXFF);
-    if (tilt->text_color() == 0xFFFF) { // White outline, black square
+    if (tilt_text_colors[tilt->m_color] == 0xFFFF) { // White outline, black square
         tft->fillRect( // White square
             0,
             fHeight * (line - 1) + 2,
@@ -459,7 +459,7 @@ void bridge_lcd::print_tilt_to_line(tiltHydrometer *tilt, uint8_t line) {
             fHeight * (line - 1) + 2,
             15,
             fHeight - 8,
-            tilt->text_color());
+            tilt_text_colors[tilt->m_color]);
     }
 #elif defined(LCD_TFT_ESPI)
     tft->setTextColor(TFT_WHITE);