Skip to content

Commit

Permalink
Fix warnings & upgrade NimBLE-arduino
Browse files Browse the repository at this point in the history
  • Loading branch information
thorrak committed Aug 23, 2024
1 parent f90a071 commit 9859193
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ platform = espressif32
platform_packages =
framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.4
platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1
board_build.partitions = 4mb_inc_ota.csv
board_build.partitions = 4mb_no_ota.csv
upload_speed = 460800
monitor_speed = 115200
monitor_filters =
Expand Down Expand Up @@ -55,7 +55,7 @@ lib_deps =
; 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/tzapu/WiFiManager.git#0d84861270c3cd64f72a4eaf34443ee580d2547e ; Anchor to latest commit as of 8/7/24
h2zero/NimBLE-Arduino @ ^1.4.1 ; https://github.com/h2zero/NimBLE-Arduino
h2zero/NimBLE-Arduino @ ^1.4.2 ; https://github.com/h2zero/NimBLE-Arduino
256dpi/MQTT @ 2.5.2 ; https://github.com/256dpi/arduino-mqtt
; lbussy/LCBUrl @ ^1.1.9
https://github.com/thorrak/LCBUrl.git#arduino_v3
Expand Down
2 changes: 2 additions & 0 deletions src/bridge_lcd.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
#elif defined(LCD_TFT) || defined(LCD_TFT_ESPI)

// For the LCD_TFT displays, we're connecting via SPI
#define DISABLE_ALL_LIBRARY_WARNINGS
#include <TFT_eSPI.h>
#undef DISABLE_ALL_LIBRARY_WARNINGS
#include <SPI.h>

#define FF_NORMAL &FreeSans9pt7b
Expand Down
2 changes: 2 additions & 0 deletions src/watchButtons.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@

// We use these for LCD_TFT_ESPI or LCD_SSD1306
#define BOARD_RESET_BUTTON_GPIO 35 // (Soft) Reset button
#ifndef WIFI_RESET_BUTTON_GPIO
#define WIFI_RESET_BUTTON_GPIO 0 // Boot button
#endif
#define WIFIRESET_DEBOUNCE 100
#define BOARDRESET_DEBOUNCE 100

Expand Down

0 comments on commit 9859193

Please sign in to comment.