Ham: update of TWR 2.x version detect logic [skip ci]

lyusupov · Feb 29, 2024 · bcba878 · bcba878
1 parent eeea008
commit bcba878
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/software/firmware/source/SoftRF/src/platform/ESP32.cpp b/software/firmware/source/SoftRF/src/platform/ESP32.cpp
@@ -1474,7 +1474,7 @@ static void ESP32_setup()
 #endif /* EXCLUDE_IMU */
   } else if (esp32_board == ESP32_LILYGO_T_TWR_V2_0) {
 
-    /* turn SA868 power off  to make sure that SQL is inactive */
+    /* turn SA868 digital power off to make sure that SQL is inactive */
     digitalWrite(SOC_GPIO_PIN_TWR2_RADIO_PD, LOW);
     pinMode(SOC_GPIO_PIN_TWR2_RADIO_PD, OUTPUT);
 
@@ -1486,9 +1486,23 @@ static void ESP32_setup()
 
     if (gpio2_voltage > 1900) {
 #else
+
+    bool probe_1 = false;
+    bool probe_2 = false;
+
     pinMode(SOC_GPIO_PIN_TWR2_RADIO_SQL, INPUT_PULLDOWN);
+    delay(20);
+
+    probe_1 = digitalRead(SOC_GPIO_PIN_TWR2_RADIO_SQL);
+
+    /* turn SA868 digital power on */
+    digitalWrite(SOC_GPIO_PIN_TWR2_RADIO_PD, HIGH);
+
+    delay(200);
+
+    probe_2 = digitalRead(SOC_GPIO_PIN_TWR2_RADIO_SQL);
 
-    if (digitalRead(SOC_GPIO_PIN_TWR2_RADIO_SQL) == HIGH) {
+    if (probe_1 == LOW && probe_2 == HIGH) {
 #endif
       esp32_board = ESP32_LILYGO_T_TWR_V2_1;
       hw_info.revision = 21;
@@ -1498,13 +1512,6 @@ static void ESP32_setup()
       axp_2xxx.setALDO3Voltage(3300); // V2.1 - Amp. OE Ctrl
 
 #if defined(USE_SA8X8)
-#if 0
-      if (gpio2_voltage > 2400) {
-        controller.setBand(Band::VHF);
-      } else {
-        controller.setBand(Band::UHF);
-      }
-#else
       Wire.begin(SOC_GPIO_PIN_TWR2_SDA , SOC_GPIO_PIN_TWR2_SCL);
       Wire.beginTransmission(SSD1306_OLED_I2C_ADDR);
       if (Wire.endTransmission() == 0) {
@@ -1514,7 +1521,6 @@ static void ESP32_setup()
       if (Wire.endTransmission() == 0) {
         controller.setBand(Band::UHF);
       }
-#endif
 #endif /* USE_SA8X8 */
     } else {
       axp_2xxx.setDC3Voltage  (3400); // V2.0 - SA868, NeoPixel
@@ -1524,6 +1530,8 @@ static void ESP32_setup()
       digitalWrite(SOC_GPIO_PIN_TWR2_RADIO_HL, LOW);
     }
 
+    pinMode(SOC_GPIO_PIN_TWR2_RADIO_SQL, INPUT);
+
     digitalWrite(SOC_GPIO_PIN_TWR2_RADIO_PTT, HIGH);
     pinMode(SOC_GPIO_PIN_TWR2_RADIO_PTT,  INPUT_PULLUP);
     pinMode(SOC_GPIO_PIN_TWR2_MIC_CH_SEL, INPUT_PULLUP);

diff --git a/software/firmware/source/SoftRF/src/platform/bluetooth/ArduinoBLE.h b/software/firmware/source/SoftRF/src/platform/bluetooth/ArduinoBLE.h
@@ -1,6 +1,6 @@
 /*
  * ArduinoBLE.h
- * Copyright (C) 2018-2024 Linar Yusupov
+ * Copyright (C) 2024 Linar Yusupov
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by