Merge branch 'ripplebiz:dev' into dev

examples/companion_radio/main.cpp

@@ -120,11 +120,11 @@ static uint32_t _atoi(const char* sp) {
 #define FIRMWARE_VER_CODE    2
 
 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "3 Mar 2025"
+  #define FIRMWARE_BUILD_DATE   "7 Mar 2025"
 #endif
 
 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.0.0"
+  #define FIRMWARE_VERSION   "v1.2.1"
 #endif
 
 #define CMD_APP_START              1
@@ -156,6 +156,7 @@ static uint32_t _atoi(const char* sp) {
 #define CMD_SEND_STATUS_REQ       27
 #define CMD_HAS_CONNECTION        28
 #define CMD_LOGOUT                29   // 'Disconnect'
+#define CMD_GET_CONTACT_BY_KEY    30
 
 #define RESP_CODE_OK                0
 #define RESP_CODE_ERR               1
@@ -955,6 +956,14 @@ public:
       } else {
         writeErrFrame();  // not found, or unable to send
       }
+    } else if (cmd_frame[0] == CMD_GET_CONTACT_BY_KEY) {
+      uint8_t* pub_key = &cmd_frame[1];
+      ContactInfo* contact = lookupContactByPubKey(pub_key, PUB_KEY_SIZE);
+      if (contact) {
+        writeContactRespFrame(RESP_CODE_CONTACT, *contact);
+      } else {
+        writeErrFrame();  // not found
+      }
     } else if (cmd_frame[0] == CMD_EXPORT_CONTACT) {
       if (len < 1 + PUB_KEY_SIZE) {
         // export SELF
@@ -1230,10 +1239,6 @@ void setup() {
   float tcxo = 1.6f;
 #endif
 
-#ifdef DISPLAY_CLASS
-  display.begin();
-#endif
-
 #if defined(NRF52_PLATFORM)
   SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI);
   SPI.begin();
@@ -1294,6 +1299,7 @@ void setup() {
 #endif
 
 #ifdef DISPLAY_CLASS
+  display.begin();
   ui_task.begin(the_mesh.getNodeName(), FIRMWARE_BUILD_DATE, the_mesh.getBLEPin());
 #endif
 }

examples/simple_repeater/main.cpp

@@ -22,11 +22,11 @@
 /* ------------------------------ Config -------------------------------- */
 
 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "3 Mar 2025"
+  #define FIRMWARE_BUILD_DATE   "7 Mar 2025"
 #endif
 
 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.0.0"
+  #define FIRMWARE_VERSION   "v1.2.1"
 #endif
 
 #ifndef LORA_FREQ
@@ -662,10 +662,6 @@ void setup() {
   float tcxo = 1.6f;
 #endif
 
-#ifdef DISPLAY_CLASS
-  display.begin();
-#endif
-
 #if defined(NRF52_PLATFORM)
   SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI);
   SPI.begin();
@@ -719,6 +715,7 @@ void setup() {
   the_mesh.begin(fs);
 
 #ifdef DISPLAY_CLASS
+  display.begin();
   ui_task.begin(the_mesh.getNodeName(), FIRMWARE_BUILD_DATE);
 #endif
 

examples/simple_room_server/main.cpp

@@ -22,11 +22,11 @@
 /* ------------------------------ Config -------------------------------- */
 
 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "6 Mar 2025"
+  #define FIRMWARE_BUILD_DATE   "7 Mar 2025"
 #endif
 
 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.1.0"
+  #define FIRMWARE_VERSION   "v1.2.1"
 #endif
 
 #ifndef LORA_FREQ
@@ -716,10 +716,6 @@ void setup() {
   float tcxo = 1.6f;
 #endif
 
-#ifdef DISPLAY_CLASS
-  display.begin();
-#endif
-
 #if defined(NRF52_PLATFORM)
   SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI);
   SPI.begin();
@@ -772,6 +768,7 @@ void setup() {
   the_mesh.begin(fs);
 
 #ifdef DISPLAY_CLASS
+  display.begin();
   ui_task.begin(the_mesh.getNodeName(), FIRMWARE_BUILD_DATE);
 #endif
 

platformio.ini

@@ -688,6 +688,7 @@ board_build.ldscript = boards/nrf52840_s140_v6.ld
 build_flags = ${nrf52840_t114.build_flags}
   -Ivariants/t114
   -DHELTEC_T114
+  -D P_LORA_TX_LED=35
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

src/helpers/HeltecV3Board.h

@@ -29,7 +29,8 @@ public:
     ESP32Board::begin();
 
     pinMode(PIN_ADC_CTRL, OUTPUT);
-    //pinMode(PIN_VEXT_EN, OUTPUT);
+    pinMode(PIN_VEXT_EN, OUTPUT);
+    digitalWrite(PIN_VEXT_EN, LOW);  // for V3.2 boards
 
     esp_reset_reason_t reason = esp_reset_reason();
     if (reason == ESP_RST_DEEPSLEEP) {

src/helpers/nrf52/T114Board.cpp

@@ -32,6 +32,11 @@ void T114Board::begin() {
   Wire.begin();
 #endif
 
+#ifdef P_LORA_TX_LED
+  pinMode(P_LORA_TX_LED, OUTPUT);
+  digitalWrite(P_LORA_TX_LED, HIGH);
+#endif
+
   pinMode(SX126X_POWER_EN, OUTPUT);
   digitalWrite(SX126X_POWER_EN, HIGH);
   delay(10);   // give sx1262 some time to power up

src/helpers/nrf52/T114Board.h

@@ -28,6 +28,15 @@ public:
   void begin();
   uint8_t getStartupReason() const override { return startup_reason; }
 
+#if defined(P_LORA_TX_LED)
+  void onBeforeTransmit() override {
+    digitalWrite(P_LORA_TX_LED, LOW);   // turn TX LED on
+  }
+  void onAfterTransmit() override {
+    digitalWrite(P_LORA_TX_LED, HIGH);   // turn TX LED off
+  }
+#endif
+
   #define BATTERY_SAMPLES 8
 
   uint16_t getBattMilliVolts() override {

src/helpers/ui/SSD1306Display.cpp

@@ -1,7 +1,7 @@
 #include "SSD1306Display.h"
 
 bool SSD1306Display::begin() {
-  return display.begin(SSD1306_SWITCHCAPVCC, DISPLAY_ADDRESS);
+  return display.begin(SSD1306_SWITCHCAPVCC, DISPLAY_ADDRESS, true, false);
 }
 
 void SSD1306Display::turnOn() {

variants/t114/variant.cpp

@@ -11,6 +11,4 @@ const uint32_t g_ADigitalPinMap[] = {
 
 void initVariant()
 {
-  pinMode(LED_BUILTIN, OUTPUT);
-  ledOff(LED_BUILTIN);
 }