TLORA_T3_S3

src/main.cpp

@@ -242,7 +242,6 @@ void setup()
     digitalWrite(PIN_3V3_EN, 1);
 #endif
 
-
     // Currently only the tbeam has a PMU
     // PMU initialization needs to be placed before scanI2Cdevice
     power = new Power();
@@ -462,17 +461,6 @@ if((config.lora.region == Config_LoRaConfig_RegionCode_LORA_24) && (!rIf->wideLo
     }
 }
 
-if((config.lora.region != Config_LoRaConfig_RegionCode_LORA_24) && (rIf->wideLora())){
-    DEBUG_MSG("Warning: Radio chip only supports 2.4GHz LoRa. Adjusting Region.\n");
-    config.lora.region = Config_LoRaConfig_RegionCode_LORA_24;
-    nodeDB.saveToDisk(SEGMENT_CONFIG);
-    if(!rIf->reconfigure()) {
-        DEBUG_MSG("Reconfigure failed, rebooting\n");
-        screen->startRebootScreen();
-        rebootAtMsec = millis() + 5000;
-    }
-}
-
 #if HAS_WIFI || HAS_ETHERNET
     mqttInit();
 #endif

src/mesh/SX128xInterface.cpp

@@ -1,5 +1,6 @@
 #include "configuration.h"
 #include "SX128xInterface.h"
+#include "mesh/NodeDB.h"
 #include "error.h"
 
 // Particular boards might define a different max power based on what their hardware can do
@@ -50,6 +51,20 @@ bool SX128xInterface<T>::init()
     // \todo Display actual typename of the adapter, not just `SX128x`
     DEBUG_MSG("SX128x init result %d\n", res);
 
+    if((config.lora.region != Config_LoRaConfig_RegionCode_LORA_24) && (res == RADIOLIB_ERR_INVALID_FREQUENCY)) {
+        DEBUG_MSG("Warning: Radio chip only supports 2.4GHz LoRa. Adjusting Region and rebooting.\n");
+        config.lora.region = Config_LoRaConfig_RegionCode_LORA_24;
+        nodeDB.saveToDisk(SEGMENT_CONFIG);
+        delay(2000);
+#if defined(ARCH_ESP32)
+        ESP.restart();
+#elif defined(ARCH_NRF52)
+        NVIC_SystemReset();
+#else
+        DEBUG_MSG("FIXME implement reboot for this platform. Skipping for now.\n");
+#endif
+    }
+
     DEBUG_MSG("Frequency set to %f\n", getFreq());    
     DEBUG_MSG("Bandwidth set to %f\n", bw);    
     DEBUG_MSG("Power output set to %d\n", power);    

src/mesh/generated/mesh.pb.h

@@ -54,6 +54,8 @@ typedef enum _HardwareModel {
     HardwareModel_NANO_G1 = 14,
     /* TODO: REPLACE */
     HardwareModel_TLORA_V2_1_1P8 = 15,
+    /* TODO: REPLACE */
+    HardwareModel_TLORA_T3_S3 = 16,
     /* B&Q Consulting Station Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:station */
     HardwareModel_STATION_G1 = 25,
     /* Less common/prototype boards listed here (needs one more byte over the air) */

src/platform/esp32/architecture.h

@@ -88,6 +88,8 @@
     #define HW_VENDOR HardwareModel_HELTEC_V3
 #elif defined(HELTEC_WSL_V3)
     #define HW_VENDOR HardwareModel_HELTEC_WSL_V3
+#elif defined(TLORA_T3S3_V1)
+    #define HW_VENDOR HardwareModel_TLORA_T3_S3
 #endif
 
 //