diff --git a/lib/device-ui b/lib/device-ui index f4da01478..a3e502d3b 160000 --- a/lib/device-ui +++ b/lib/device-ui @@ -1 +1 @@ -Subproject commit f4da01478825545aea53a6eb6442010037b78cae +Subproject commit a3e502d3bd0e31ddd05d49f922e5cb9d78165827 diff --git a/variants/seeed-sensecap-indicator/platformio.ini b/variants/seeed-sensecap-indicator/platformio.ini index 5b8d0ad45..c5b364042 100644 --- a/variants/seeed-sensecap-indicator/platformio.ini +++ b/variants/seeed-sensecap-indicator/platformio.ini @@ -8,15 +8,23 @@ platform_packages = board = seeed-sensecap-indicator board_check = true upload_protocol = esptool -build_type = debug -build_flags = ${esp32_base.build_flags} -Og +build_flags = ${esp32_base.build_flags} -Ivariants/seeed-sensecap-indicator -DSENSECAP_INDICATOR + -DCONFIG_ARDUHAL_LOG_COLORS + -DRADIOLIB_DEBUG_SPI=0 + -DRADIOLIB_DEBUG_PROTOCOL=0 + -DRADIOLIB_DEBUG_BASIC=0 + -DRADIOLIB_VERBOSE_ASSERT=0 + -DRADIOLIB_SPI_PARANOID=0 -DIO_EXPANDER=0x40 + -DIO_EXPANDER_IRQ=42 + ;-DIO_EXPANDER_DEBUG + -DUSE_ARDUINO_HAL_GPIO lib_deps = ${esp32s3_base.lib_deps} - lovyan03/LovyanGFX@^1.1.16 + https://github.com/mverch67/LovyanGFX#develop earlephilhower/ESP8266Audio@^1.9.7 earlephilhower/ESP8266SAM@^1.0.1 @@ -24,13 +32,11 @@ lib_deps = ${esp32s3_base.lib_deps} [env:seeed-sensecap-indicator-tft] extends = esp32s3_base platform_packages = -; platformio/framework-arduinoespressif32 @ symlink:///home/manuel/Documents/PlatformIO/Projects/arduino-esp32-fork - platformio/framework-arduinoespressif32 @ https://github.com/mverch67/arduino-esp32.git#add_tca9535 ; based on 2.0.16 + platformio/framework-arduinoespressif32 @ symlink:///home/manuel/Documents/PlatformIO/Projects/arduino-esp32 +; platformio/framework-arduinoespressif32 @ https://github.com/mverch67/arduino-esp32.git#add_tca9535 ; based on 2.0.16 board = seeed-sensecap-indicator -;board_build.partitions = default_16MB.csv board_check = true upload_protocol = esptool -build_type = debug build_flags = ${esp32_base.build_flags} -D SENSECAP_INDICATOR -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1 @@ -38,7 +44,16 @@ build_flags = ${esp32_base.build_flags} -D MESHTASTIC_EXCLUDE_BLUETOOTH=1 -D MESHTASTIC_EXCLUDE_SCREEN=1 -D MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1 + -D CONFIG_ARDUHAL_LOG_COLORS + -D RADIOLIB_DEBUG_SPI=0 + -D RADIOLIB_DEBUG_PROTOCOL=0 + -D RADIOLIB_DEBUG_BASIC=0 + -D RADIOLIB_VERBOSE_ASSERT=0 + -D RADIOLIB_SPI_PARANOID=0 -D IO_EXPANDER=0x40 + -D IO_EXPANDER_IRQ=42 + ;-D IO_EXPANDER_DEBUG + -D USE_ARDUINO_HAL_GPIO -D MAX_NUM_NODES=250 -D HAS_SCREEN=0 -D HAS_TFT=1 @@ -54,7 +69,7 @@ build_flags = ${esp32_base.build_flags} -D LV_USE_LOG=0 -D USE_LOG_DEBUG -D LOG_DEBUG_INC=\"DebugConfiguration.h\" -; -D CALIBRATE_TOUCH=0 + -D CALIBRATE_TOUCH=0 -D LGFX_DRIVER=LGFX_INDICATOR -D VIEW_320x240 ; -D USE_DOUBLE_BUFFER @@ -67,6 +82,7 @@ build_src_filter = ${esp32_base.build_src_filter} +<../lib/device-ui/locale> +<../lib/device-ui/source> lib_deps = ${esp32s3_base.lib_deps} - lovyan03/LovyanGFX@^1.1.16 + https://github.com/mverch67/LovyanGFX#develop +; file:///home/manuel/Documents/PlatformIO/Projects/LovyanGFX earlephilhower/ESP8266Audio@^1.9.7 earlephilhower/ESP8266SAM@^1.0.1 diff --git a/variants/seeed-sensecap-indicator/variant.h b/variants/seeed-sensecap-indicator/variant.h index 6662f940e..fe07c34b4 100644 --- a/variants/seeed-sensecap-indicator/variant.h +++ b/variants/seeed-sensecap-indicator/variant.h @@ -19,21 +19,20 @@ #define ST7701_BL 45 #define ST7701_SPI_HOST SPI2_HOST #define ST7701_BACKLIGHT_EN 45 -#define SPI_FREQUENCY 20000000 -#define SPI_READ_FREQUENCY 16000000 +#define SPI_FREQUENCY 12000000 #define TFT_HEIGHT 480 #define TFT_WIDTH 480 #define TFT_OFFSET_X 0 #define TFT_OFFSET_Y 0 -#define TFT_OFFSET_ROTATION 1 +#define TFT_OFFSET_ROTATION 0 #define TFT_BL 45 #define SCREEN_ROTATE #define SCREEN_TRANSITION_FRAMERATE 5 // fps -#define HAS_TOUCHSCREEN 3 +#define HAS_TOUCHSCREEN 1 #define SCREEN_TOUCH_INT (6 | IO_EXPANDER) #define SCREEN_TOUCH_RST (7 | IO_EXPANDER) -#define TOUCH_I2C_PORT 1 +#define TOUCH_I2C_PORT 0 #define TOUCH_SLAVE_ADDRESS 0x48 // Buzzer @@ -43,10 +42,8 @@ #undef GPS_RX_PIN #undef GPS_TX_PIN -// disabled until IO_EXPANDER interrupts supported -#define HAS_RADIO 0 -// #define USE_SX1262 -// #define USE_SX1268 +#define USE_SX1262 +#define USE_SX1268 #define LORA_SCK 41 #define LORA_MISO 47 @@ -64,4 +61,3 @@ #define SX126X_BUSY LORA_DIO2 #define SX126X_RESET LORA_RESET #define SX126X_DIO2_AS_RF_SWITCH -// #define SX126X_DIO3_TCXO_VOLTAGE 1.8