Merge t-echo display support (currently non-scaled)

master
jacob.eva 5 months ago
parent 2be8fa407d
commit afce928149
No known key found for this signature in database
GPG Key ID: B92E083BBCCAA1E
  1. 17
      Boards.h
  2. 3
      Device.h
  3. 770
      Display.h
  4. 2776
      Graphics.h
  5. BIN
      Graphics/Bitmaps/banner_boot.bmp
  6. BIN
      Graphics/Bitmaps/banner_checks.bmp
  7. BIN
      Graphics/Bitmaps/banner_console.bmp
  8. BIN
      Graphics/Bitmaps/banner_fw_corrupt.bmp
  9. BIN
      Graphics/Bitmaps/banner_fw_update.bmp
  10. BIN
      Graphics/Bitmaps/banner_hwfail.bmp
  11. BIN
      Graphics/Bitmaps/banner_hwok.bmp
  12. BIN
      Graphics/Bitmaps/banner_nfr.bmp
  13. BIN
      Graphics/Bitmaps/banner_no_radio.bmp
  14. BIN
      Graphics/Bitmaps/banner_online.bmp
  15. BIN
      Graphics/Bitmaps/banner_pairing.bmp
  16. BIN
      Graphics/Bitmaps/banner_version.bmp
  17. BIN
      Graphics/Bitmaps/bm_pairing.bmp
  18. BIN
      Graphics/Bitmaps/bm_update.bmp
  19. BIN
      Graphics/Bitmaps/bt_icons.bmp
  20. BIN
      Graphics/Bitmaps/cable_icons.bmp
  21. BIN
      Graphics/Bitmaps/console_icon.bmp
  22. BIN
      Graphics/Bitmaps/default_fb.bmp
  23. BIN
      Graphics/Bitmaps/default_fb_alt.bmp
  24. BIN
      Graphics/Bitmaps/default_fb_lc.bmp
  25. BIN
      Graphics/Bitmaps/frame.bmp
  26. BIN
      Graphics/Bitmaps/hourglass_high.png
  27. BIN
      Graphics/Bitmaps/hourglass_low.png
  28. BIN
      Graphics/Bitmaps/numbers_upheaval.bmp
  29. BIN
      Graphics/Bitmaps/plug.bmp
  30. BIN
      Graphics/Bitmaps/rf_icons.bmp
  31. BIN
      Graphics/Bitmaps/sideband_fb.bmp
  32. BIN
      Graphics/Design/Bluetooth.kra
  33. BIN
      Graphics/Design/Text.xcf
  34. BIN
      Graphics/Design/banners.kra
  35. BIN
      Graphics/Design/cable_icons.kra
  36. BIN
      Graphics/Design/console_icon.kra
  37. BIN
      Graphics/Design/cs.kra
  38. BIN
      Graphics/Design/default_fb.kra
  39. BIN
      Graphics/Design/default_fb_alt.kra
  40. BIN
      Graphics/Design/firware_update_icon.kra
  41. BIN
      Graphics/Design/frame.kra
  42. BIN
      Graphics/Design/icons.kra
  43. BIN
      Graphics/Design/numbers_silkscreen.kra
  44. BIN
      Graphics/Design/numbers_upheaval.kra
  45. BIN
      Graphics/Design/plug.kra
  46. BIN
      Graphics/Design/r_icon.kra
  47. BIN
      Graphics/Design/rf_icons.kra
  48. BIN
      Graphics/Design/sideband_fb.kra
  49. 10
      Makefile
  50. 4
      RNode_Firmware_CE.ino

@ -672,6 +672,7 @@
#elif MCU_VARIANT == MCU_NRF52 #elif MCU_VARIANT == MCU_NRF52
#if BOARD_MODEL == BOARD_TECHO #if BOARD_MODEL == BOARD_TECHO
#define VALIDATE_FIRMWARE false #define VALIDATE_FIRMWARE false
#define HAS_INPUT true
//#define GPS_BAUD_RATE 115200 //#define GPS_BAUD_RATE 115200
//#define PIN_GPS_TX 41 //#define PIN_GPS_TX 41
//#define PIN_GPS_RX 40 //#define PIN_GPS_RX 40
@ -679,17 +680,18 @@
#define EEPROM_OFFSET EEPROM_SIZE-EEPROM_RESERVED #define EEPROM_OFFSET EEPROM_SIZE-EEPROM_RESERVED
//#define HAS_EEPROM true //#define HAS_EEPROM true
//#define HAS_SD true //#define HAS_SD true
//#define HAS_DISPLAY true #define HAS_DISPLAY true
#define DISPLAY EINK_BW
#define DISPLAY_MODEL GxEPD2_154_D67
//#define HAS_CONSOLE true //#define HAS_CONSOLE true
//#define HAS_TXCO true //#define HAS_TXCO true
//#define DISPLAY EINK_BW
//#define HAS_BLE true //#define HAS_BLE true
//#define HAS_PMU true //#define HAS_PMU true
#define CONFIG_UART_BUFFER_SIZE 40000 #define CONFIG_UART_BUFFER_SIZE 40000
#define CONFIG_QUEUE_0_SIZE 6144 #define CONFIG_QUEUE_0_SIZE 6144
#define CONFIG_QUEUE_MAX_LENGTH 200 #define CONFIG_QUEUE_MAX_LENGTH 200
#define BLE_MANUFACTURER "LilyGO" //#define BLE_MANUFACTURER "LilyGO"
#define BLE_MODEL "T-Echo" //#define BLE_MODEL "T-Echo"
#define INTERFACE_COUNT 1 #define INTERFACE_COUNT 1
//#define I2C_SDA 26 //#define I2C_SDA 26
//#define I2C_SCL 27 //#define I2C_SCL 27
@ -726,6 +728,13 @@
const int pin_disp_reset = 2; const int pin_disp_reset = 2;
const int pin_disp_busy = 3; const int pin_disp_busy = 3;
const int pin_disp_en = 43; const int pin_disp_en = 43;
const int pin_disp_sck = 31;
const int pin_disp_mosi = 29;
const int pin_disp_miso = -1;
#define HAS_BACKLIGHT true
const int pin_btn_usr1 = 42;
const int pin_backlight = 43;
const int pin_led_rx = LED_BLUE; const int pin_led_rx = LED_BLUE;
const int pin_led_tx = LED_RED; const int pin_led_tx = LED_RED;

@ -324,7 +324,8 @@ bool device_init() {
} }
#else #else
// Skip hash comparison and checking BT // Skip hash comparison and checking BT
return true; device_init_done = true;
return device_init_done;
#endif #endif
} }
#endif #endif

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 509 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 513 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 418 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -89,9 +89,6 @@ firmware-t3s3_sx1280_pa:
firmware-e22_esp32: firmware-e22_esp32:
arduino-cli compile --fqbn esp32:esp32:esp32 $(COMMON_BUILD_FLAGS) --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x44\" \"-DEXTERNAL_LEDS=true\"" arduino-cli compile --fqbn esp32:esp32:esp32 $(COMMON_BUILD_FLAGS) --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x44\" \"-DEXTERNAL_LEDS=true\""
firmware-e22_esp32:
arduino-cli compile --fqbn esp32:esp32:esp32 -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x44\" \"-DEXTERNAL_LEDS=true\""
firmware-lora32_v10: firmware-lora32_v10:
arduino-cli compile --fqbn esp32:esp32:ttgo-lora32 $(COMMON_BUILD_FLAGS) --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x39\"" arduino-cli compile --fqbn esp32:esp32:ttgo-lora32 $(COMMON_BUILD_FLAGS) --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x39\""
@ -214,13 +211,6 @@ upload-t3s3:
@sleep 1 @sleep 1
rnodeconf $(or $(port), /dev/ttyACM0) --firmware-hash $$(./partition_hashes ./build/esp32.esp32.esp32s3/RNode_Firmware_CE.ino.bin) rnodeconf $(or $(port), /dev/ttyACM0) --firmware-hash $$(./partition_hashes ./build/esp32.esp32.esp32s3/RNode_Firmware_CE.ino.bin)
upload-e22_esp32:
arduino-cli upload -p $(or $(port), /dev/ttyUSB0) --fqbn esp32:esp32:esp32
@sleep 1
rnodeconf $(or $(port), /dev/ttyUSB0) --firmware-hash $$(./partition_hashes ./build/esp32.esp32.esp32/RNode_Firmware_CE.ino.bin)
@sleep 3
python3 ./Release/esptool/esptool.py --chip esp32 --port $(or $(port), /dev/ttyUSB0) --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin
upload-featheresp32: upload-featheresp32:
arduino-cli upload -p $(or $(port), /dev/ttyUSB0) --fqbn esp32:esp32:featheresp32 arduino-cli upload -p $(or $(port), /dev/ttyUSB0) --fqbn esp32:esp32:featheresp32
@sleep 1 @sleep 1

@ -109,9 +109,9 @@ void setup() {
Serial.begin(serial_baudrate); Serial.begin(serial_baudrate);
#if BOARD_MODEL != BOARD_RAK4631 && BOARD_MODEL != BOARD_T3S3 #if BOARD_MODEL != BOARD_RAK4631 && BOARD_MODEL != BOARD_T3S3 && BOARD_MODEL != BOARD_TECHO
// Some boards need to wait until the hardware UART is set up before booting // Some boards need to wait until the hardware UART is set up before booting
// the full firmware. In the case of the RAK4631, the line below will wait // the full firmware. In the case of the RAK4631/TECHO, the line below will wait
// until a serial connection is actually established with a master. Thus, it // until a serial connection is actually established with a master. Thus, it
// is disabled on this platform. // is disabled on this platform.
while (!Serial); while (!Serial);

Loading…
Cancel
Save