Merge pull request #237 from thorrak/devel

v1.2.1 - Bugfixes
thorrak · Jun 4, 2023 · e067467 · e067467
2 parents ff39018 + 65409d5
commit e067467
Show file tree

Hide file tree

Showing 13 changed files with 121 additions and 161 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -16,26 +16,18 @@
 
 [common]
 platform = espressif32
-; platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#1.0.6
 framework = arduino
-; As the framework has grown, min_spiffs no longer has enough space. We're now
-; requiring 16MB of flash space for most builds (which comes standard with the
-; recommended D32 Pro)
 board_build.partitions = 4mb_inc_ota.csv
 upload_speed = 460800
 monitor_speed = 115200
-monitor_filters =
+monitor_filters = 
     esp32_exception_decoder
-    ; log2file
-; This can/will be set in tools/get_port.py
-; upload_port =
-; monitor_port =
 monitor_dtr = 1
 monitor_rts = 1
 
 build_flags =                           ; Do not use spaces around the "=" here, will give you a builder not found error
     !python tools/git_rev.py            ; Pick up git information for version (disabled), branch, and commit (in version.cpp)
-    -D PIO_SRC_TAG=1.1.3               ; Increment versions shown in about.htm page (from version.cpp)
+    -D PIO_SRC_TAG=1.2.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
@@ -61,19 +53,18 @@ build_flags =                           ; Do not use spaces around the "=" here,
     ;-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  ; 6.18.5
+    bblanchon/ArduinoJson @ 6.21.2  ; https://github.com/bblanchon/ArduinoJson
     ; thijse/ArduinoLog @ 1.1.1 ; https://github.com/thijse/Arduino-Log.git
     https://github.com/thorrak/Arduino-Log.git ; // Need this until ArduinoLog merges https://github.com/thijse/Arduino-Log/pull/23 
     https://github.com/lbussy/esptelnet.git
     https://github.com/me-no-dev/ESPAsyncWebServer.git
     https://github.com/thorrak/WiFiManager.git#feature_asyncwebserver
-    h2zero/NimBLE-Arduino @ 1.3.4  ; https://github.com/h2zero/NimBLE-Arduino.git
-    256dpi/MQTT @ 2.4.8
+    h2zero/NimBLE-Arduino @ 1.4.1  ; https://github.com/h2zero/NimBLE-Arduino
+    256dpi/MQTT @ 2.5.1 ; https://github.com/256dpi/arduino-mqtt
     lbussy/LCBUrl @ ^1.1.7
-    ;https://github.com/DJMarlow/Parse-SDK-Arduino.git
     https://github.com/lbussy/Parse-SDK-Arduino.git#fix_warnings
-
-
+espi_lib_deps = 
+    bodmer/TFT_eSPI @ 2.4.79 ; https://github.com/Bodmer/TFT_eSPI.git
 build_type = release ; debug
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -83,24 +74,18 @@ build_type = release ; debug
 [env:lcd_ssd1306]   ; Small OLED Board
 board = lolin_d32
 platform = ${common.platform}
-; platform_packages = ${common.platform_packages}
 framework = ${common.framework}
-; For the "OLED" variant, we can't guarantee we have more than 4MB of flash. Use
-; huge_app to get us the space - but at the cost of being able to update OTA.
 board_build.partitions = ${common.board_build.partitions}
 upload_speed = ${common.upload_speed}
 monitor_speed = ${common.monitor_speed}
 monitor_filters = ${common.monitor_filters}
-; This can/will be set in tools/get_port.py
-; upload_port = ${common.upload_port}
-; monitor_port = ${common.monitor_port}
 monitor_dtr = ${common.monitor_dtr}
 monitor_rts = ${common.monitor_rts}
-build_flags =
+build_flags = 
     ${common.build_flags}
     -DLCD_SSD1306
     -DDISABLE_OTA_UPDATES
-lib_deps =
+lib_deps = 
     ${common.lib_deps}
     https://github.com/ThingPulse/esp8266-oled-ssd1306.git#4.3.0
 build_type = ${common.build_type}
@@ -109,48 +94,30 @@ build_type = ${common.build_type}
 [env:d32_pro_tft]   ; Lolin ESP32 + ILI TFT
 board = lolin_d32_pro
 platform = ${common.platform}
-; platform_packages = ${common.platform_packages}
 framework = ${common.framework}
-; There's issues with the way that BrewFlasher flashes the bootloader with the latest esptool, meaning we can't use
-; the 16MB boards unless we define a new devicefamily. I really don't want to do that, so we'll go back to 4MB.
-; board_build.partitions = large_spiffs_16MB.csv
 board_build.partitions = 4mb_no_ota.csv
-; board_build.partitions = ${common.board_build.partitions}
 upload_speed = ${common.upload_speed}
 monitor_speed = ${common.monitor_speed}
 monitor_filters = ${common.monitor_filters}
-; This can/will be set in tools/get_port.py
-; upload_port = {common.upload_port}
-; monitor_port = ${common.monitor_port}
 monitor_dtr = ${common.monitor_dtr}
 monitor_rts = ${common.monitor_rts}
-build_flags =
+
+build_flags = 
     ${common.build_flags}
     -D LCD_TFT=1
     -D USER_SETUP_LOADED=1
     -D ILI9341_DRIVER=1
     -D TFT_WIDTH=240
     -D TFT_HEIGHT=320
     -D CGRAM_OFFSET=1
-    ; -DTFT_MISO=19                 ; in TFT_eSPI_ESP32.h
-    ; -DTFT_MOSI=23                 ; in TFT_eSPI_ESP32.h
-    ; -DTFT_SCLK=18                 ; in TFT_eSPI_ESP32.h
-    ; -DTFT_CS=14                   ; in pins_arduino.h
-    ; -DTFT_DC=27                   ; in pins_arduino.h
-    ; -DTFT_RST=33                  ; in pins_arduino.h
-    ; -DSPI_FREQUENCY=40000000      ; in TFTe_SPI.h
-    ; -DSPI_READ_FREQUENCY=20000000 ; in TFTe_SPI.h
-    ; -DSPI_TOUCH_FREQUENCY=2500000 ; in TFTe_SPI.h
     -D TFT_BL=32
     -D SMOOTH_FONT=1
     -D TFT_BACKLIGHT_ON=1
     -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 =
+    -D TOUCH_CS=12
+lib_deps = 
     ${common.lib_deps}
-    bodmer/TFT_eSPI @ 2.4.72 ; https://github.com/Bodmer/TFT_eSPI.git
+    ${common.espi_lib_deps}
 build_type = ${common.build_type}
 
 
@@ -161,20 +128,14 @@ build_type = ${common.build_type}
 ; https://github.com/Bodmer/TFT_eSPI
 board = esp32dev
 platform = ${common.platform}
-; platform_packages = ${common.platform_packages}
 framework = ${common.framework}
-; The T-Display has 4MB of flash. Use huge_app to get us the space - but
-; at the cost of being able to update OTA.
 board_build.partitions = ${common.board_build.partitions}
 upload_speed = ${common.upload_speed}
 monitor_speed = ${common.monitor_speed}
 monitor_filters = ${common.monitor_filters}
-; This can/will be set in tools/get_port.py
-; upload_port = -DUSBC
-; monitor_port = -DUSBC
 monitor_dtr = ${common.monitor_dtr}
 monitor_rts = ${common.monitor_rts}
-build_flags =
+build_flags = 
     ${common.build_flags}
     -DLCD_TFT_ESPI=1
     -DDISABLE_OTA_UPDATES=1
@@ -191,36 +152,29 @@ build_flags =
     -DTFT_RST=23
     -DTFT_BL=4
     -DLOAD_GFXFF=1
-lib_deps =
+lib_deps = 
     ${common.lib_deps}
-    bodmer/TFT_eSPI @ 2.4.72 ; https://github.com/Bodmer/TFT_eSPI.git
+    ${common.espi_lib_deps}
 build_type = ${common.build_type}
 
-
 [env:m5stickc_plus]
 board = esp32dev
 platform = ${common.platform}
-; platform_packages = ${common.platform_packages}
 framework = ${common.framework}
-; The M5StickC Plus has 4MB of flash. Use the custom 4MB partition to allow enough space
-; for both OTA and SPIFFS.
 board_build.partitions = ${common.board_build.partitions}
 upload_speed = 1500000
 monitor_speed = ${common.monitor_speed}
 monitor_filters = ${common.monitor_filters}
 monitor_dtr = ${common.monitor_dtr}
 monitor_rts = ${common.monitor_rts}
-build_flags =
+build_flags = 
     ${common.build_flags}
-    ; -DM5STICKC_PLUS
     -DLCD_TFT_M5STICKC=1
     -DLCD_TFT_ESPI=1
     -DDISABLE_OTA_UPDATES
-;    -DBUTTON_NO_PULLUP=1
     -DBUTTON_INVERT
     -DLCD_TFT_ESPI=1
     -DAXP192=1
-    ; -DDISABLE_OTA_UPDATES=1
     -DUSER_SETUP_LOADED=1
     -DST7789_DRIVER=1
     -DTFT_WIDTH=135
@@ -235,10 +189,9 @@ build_flags =
     -DLOAD_GFXFF=1
     -DWIFI_RESET_BUTTON_GPIO=37
     -DDISABLE_OTA_UPDATES
-;    -DBOARD_RESET_BUTTON_GPIO=39
-lib_deps =
+lib_deps = 
     ${common.lib_deps}
-    bodmer/TFT_eSPI @ 2.4.79 ; https://github.com/Bodmer/TFT_eSPI.git
+    ${common.espi_lib_deps}
     tanakamasayuki/I2C AXP192 Power management@^1.0.4
 build_type = ${common.build_type}
 check_skip_packages = yes