SkyView: misc. update for revision 2.8 of TTGO T5S ESP32 e-Paper dev.…

… board [skip ci]
lyusupov · Jul 4, 2020 · 669bf10 · 669bf10
1 parent 0c444c5
commit 669bf10
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 11 deletions.
diff --git a/software/firmware/source/SkyView/BatteryHelper.cpp b/software/firmware/source/SkyView/BatteryHelper.cpp
@@ -52,8 +52,8 @@ void Battery_setup()
 
 void Battery_loop()
 {
- if (hw_info.model == SOFTRF_MODEL_SKYVIEW &&
- hw_info.revision == HW_REV_T5S_1_9) {
+ if ( hw_info.model == SOFTRF_MODEL_SKYVIEW &&
+ (hw_info.revision == HW_REV_T5S_1_9 || hw_info.revision == HW_REV_T5S_2_8)) {
  if (isTimeToBattery()) {
  float voltage = Battery_voltage();
 

diff --git a/software/firmware/source/SkyView/EPDHelper.cpp b/software/firmware/source/SkyView/EPDHelper.cpp
@@ -120,7 +120,7 @@ byte EPD_setup(bool splash_screen)
  display->setCursor(x, y);
  display->print(EPD_SkyView_text4);
 
- if (hw_info.revision == HW_REV_T5S_1_9) {
+ if (hw_info.revision == HW_REV_T5S_1_9 || hw_info.revision == HW_REV_T5S_2_8) {
  display->getTextBounds(EPD_SkyView_text5, 0, 0, &tbx5, &tby5, &tbw5, &tbh5);
  x = (display->width() - tbw5) / 2;
  y += tbh4;

diff --git a/software/firmware/source/SkyView/Platform_ESP32.cpp b/software/firmware/source/SkyView/Platform_ESP32.cpp
@@ -225,13 +225,18 @@ static void ESP32_setup()
  uint32_t flash_id = ESP32_getFlashId();
 
  /*
- * Board | Module | Flash memory IC
- * -----------------+------------+--------------------
- * DoIt ESP32 | WROOM | GIGADEVICE_GD25Q32
- * TTGO LoRa32 V2.0 | PICO-D4 IC | GIGADEVICE_GD25Q32
- * TTGO T-Beam V06 | | WINBOND_NEX_W25Q32_V
- * TTGO T8 V1.8 | WROVER | GIGADEVICE_GD25LQ32
- * TTGO T5S V1.9 | | WINBOND_NEX_W25Q32_V
+ * Board | Module | Flash memory IC
+ * ----------------+------------+--------------------
+ * DoIt ESP32 | WROOM | GIGADEVICE_GD25Q32
+ * TTGO T3 V2.0 | PICO-D4 IC | GIGADEVICE_GD25Q32
+ * TTGO T3 V2.1.6 | PICO-D4 IC | GIGADEVICE_GD25Q32
+ * TTGO T22 V06 | | WINBOND_NEX_W25Q32_V
+ * TTGO T22 V08 | | WINBOND_NEX_W25Q32_V
+ * TTGO T22 V11 | | BOYA_BY25Q32AL
+ * TTGO T8 V1.8 | WROVER | GIGADEVICE_GD25LQ32
+ * TTGO T5S V1.9 | | WINBOND_NEX_W25Q32_V
+ * TTGO T5S V2.8 | | BOYA_BY25Q32AL
+ * TTGO T-Watch | | WINBOND_NEX_W25Q128_V
  */
 
  if (psramFound()) {
@@ -254,6 +259,9 @@ static void ESP32_setup()
  case MakeFlashId(WINBOND_NEX_ID, WINBOND_NEX_W25Q32_V):
  hw_info.revision = HW_REV_T5S_1_9;
  break;
+ case MakeFlashId(BOYA_ID, BOYA_BY25Q32AL):
+ hw_info.revision = HW_REV_T5S_2_8;
+ break;
  default:
  hw_info.revision = HW_REV_UNKNOWN;
  break;

diff --git a/software/firmware/source/SkyView/Platform_ESP32.h b/software/firmware/source/SkyView/Platform_ESP32.h
@@ -70,6 +70,10 @@
 /* TTGO T5S green LED mapping */
 #define SOC_GPIO_PIN_LED_T5S 22
 
+/* Boya Microelectronics Inc. */
+#define BOYA_ID 0x68
+#define BOYA_BY25Q32AL 0x4016
+
 #define MakeFlashId(v,d) ((v << 16) | d)
 #define CCCC(c1, c2, c3, c4) ((c4 << 24) | (c3 << 16) | (c2 << 8) | c1)
 

diff --git a/software/firmware/source/SkyView/SkyView.h b/software/firmware/source/SkyView/SkyView.h
@@ -66,6 +66,7 @@ enum
  HW_REV_UNKNOWN,
  HW_REV_DEVKIT,
  HW_REV_T5S_1_9,
+ HW_REV_T5S_2_8,
  HW_REV_T8_1_8
 };
 

diff --git a/software/firmware/source/SoftRF/Platform_ESP32.cpp b/software/firmware/source/SoftRF/Platform_ESP32.cpp
@@ -174,6 +174,7 @@ static void ESP32_setup()
  * TTGO T22 V11 | | BOYA_BY25Q32AL
  * TTGO T8 V1.8 | WROVER | GIGADEVICE_GD25LQ32
  * TTGO T5S V1.9 | | WINBOND_NEX_W25Q32_V
+ * TTGO T5S V2.8 | | BOYA_BY25Q32AL
  * TTGO T-Watch | | WINBOND_NEX_W25Q128_V
  */
 
@@ -1067,7 +1068,7 @@ static bool ESP32_Baro_setup()
  }
 
 #if DEBUG
- Serial.println(F("INFO: RESET pin of SX1276 radio is not connected to MCU."));
+ Serial.println(F("INFO: RESET pin of SX12xx radio is not connected to MCU."));
 #endif
 
  /* Pre-init 1st ESP32 I2C bus to stick on these pins */