add support for heltec t114

diff --git a/Boards.h b/Boards.h
index d2b4a6fb6df5ad3bf5812782304a4c5def0396a0..2c718109549b3c7d28013a069fe8175143a0bd52 100644 (file)
--- a/Boards.h
+++ b/Boards.h
@@ -89,6 +89,12 @@
   #define MODEL_C5            0xC5 // Heltec Lora32 v3, 433 MHz
   #define MODEL_CA            0xCA // Heltec Lora32 v3, 868 MHz
 
+  // https://resource.heltec.cn/download/Mesh_Node_T114/Datasheet.pdf
+  #define PRODUCT_HELTEC_T114 0xC2 // Heltec Mesh Node T114
+  #define BOARD_HELTEC_T114   0x3C
+  #define MODEL_C6            0xC6 // Heltec Mesh Node T114, 470-510 MHz (HT-n5262-LF)
+  #define MODEL_C7            0xC7 // Heltec Mesh Node T114, 863-928 MHz (HT-n5262-HF)
+
   #define PRODUCT_RAK4631     0x10
   #define BOARD_RAK4631       0x51
   #define MODEL_11            0x11 // RAK4631, 433 Mhz
@@ -609,12 +615,96 @@
       const int pin_led_tx = LED_GREEN;
       const int pin_tcxo_enable = -1;
 
+    #elif BOARD_MODEL == BOARD_HELTEC_T114
+      #define MODEM SX1262
+      #define HAS_EEPROM false
+      #define HAS_DISPLAY true
+      #define HAS_BLUETOOTH false
+      #define HAS_BLE true
+      #define HAS_CONSOLE false
+      #define HAS_PMU false
+      #define HAS_NP false
+      #define HAS_SD false
+      #define HAS_TCXO true
+      #define HAS_RF_SWITCH_RX_TX true
+      #define HAS_BUSY true
+      #define HAS_INPUT true
+      #define DIO2_AS_RF_SWITCH true
+      #define CONFIG_UART_BUFFER_SIZE 6144
+      #define CONFIG_QUEUE_SIZE 6144
+      #define CONFIG_QUEUE_MAX_LENGTH 200
+      #define EEPROM_SIZE 296
+      #define EEPROM_OFFSET EEPROM_SIZE-EEPROM_RESERVED
+      #define BLE_MANUFACTURER "Heltec"
+      #define BLE_MODEL "HT-n5262"
+
+      // ADC
+      #define PIN_T114_ADC_EN 6
+
+      // External sensors
+      #define PIN_T114_VEXT_EN 21
+
+      // LED
+      #define LED_T114_GREEN 3
+      #define PIN_T114_LED 14
+
+      // SPI
+      #define PIN_T114_MOSI 22
+      #define PIN_T114_MISO 23
+      #define PIN_T114_SCK  19
+      #define PIN_T114_SS   24
+
+      // SX1262
+      #define PIN_T114_RST  25
+      #define PIN_T114_DIO1 20
+      #define PIN_T114_BUSY 17
+
+      // TFT
+      #define DISPLAY_SCALE 2
+      #define PIN_T114_TFT_MOSI 9
+      #define PIN_T114_TFT_MISO 11 // not connected
+      #define PIN_T114_TFT_SCK 8
+      #define PIN_T114_TFT_SS 11
+      #define PIN_T114_TFT_DC 12
+      #define PIN_T114_TFT_RST 2
+      #define PIN_T114_TFT_EN 3
+      #define PIN_T114_TFT_BLGT 15
+
+      // pins for buttons on Heltec T114
+      const int pin_btn_usr1 = 42;
+
+      // pins for sx1262 on Heltec T114
+      const int pin_rxen = -1;
+      const int pin_reset = PIN_T114_RST;
+      const int pin_cs = PIN_T114_SS;
+      const int pin_sclk = PIN_T114_SCK;
+      const int pin_mosi = PIN_T114_MOSI;
+      const int pin_miso = PIN_T114_MISO;
+      const int pin_busy = PIN_T114_BUSY;
+      const int pin_dio = PIN_T114_DIO1;
+      const int pin_led_rx = 35;
+      const int pin_led_tx = 35;
+      const int pin_tcxo_enable = -1;
+
+      // pins for ST7789 display on Heltec T114
+      const int DISPLAY_DC = PIN_T114_TFT_DC;
+      const int DISPLAY_CS = PIN_T114_TFT_SS;
+      const int DISPLAY_MISO = PIN_T114_TFT_MISO;
+      const int DISPLAY_MOSI = PIN_T114_TFT_MOSI;
+      const int DISPLAY_CLK = PIN_T114_TFT_SCK;
+      const int DISPLAY_BL_PIN = PIN_T114_TFT_BLGT;
+      const int DISPLAY_RST = PIN_T114_TFT_RST;
+
     #else
       #error An unsupported nRF board was selected. Cannot compile RNode firmware.
     #endif
 
   #endif
 
+  #ifndef DISPLAY_SCALE
+    #define DISPLAY_SCALE 1
+  #endif
+
   #ifndef HAS_RF_SWITCH_RX_TX
     const int pin_rxen = -1;
     const int pin_txen = -1;

diff --git a/Display.h b/Display.h
index 98e8920e60028bd0cfc2612870ca44c1d16b3b4c..7a741d7b6355f80e8f4964ec4ae855a744b390a9 100644 (file)
--- a/Display.h
+++ b/Display.h
@@ -18,6 +18,9 @@
 
 #if BOARD_MODEL == BOARD_TDECK
   #include <Adafruit_ST7789.h>
+#elif BOARD_MODEL == BOARD_HELTEC_T114
+  #include "ST7789Spi.h"
+  #define COLOR565(r, g, b) (((r & 0xF8) << 8) | ((g & 0xFC) << 3) | ((b & 0xF8) >> 3))
 #elif BOARD_MODEL == BOARD_TBEAM_S_V1
   #include <Adafruit_SH110X.h>
 #else
@@ -77,6 +80,10 @@
   Adafruit_ST7789 display = Adafruit_ST7789(DISPLAY_CS, DISPLAY_DC, -1);
   #define SSD1306_WHITE ST77XX_WHITE
   #define SSD1306_BLACK ST77XX_BLACK
+#elif BOARD_MODEL == BOARD_HELTEC_T114
+  ST7789Spi display(&SPI1, DISPLAY_RST, DISPLAY_DC, DISPLAY_CS);
+  #define SSD1306_WHITE ST77XX_WHITE
+  #define SSD1306_BLACK ST77XX_BLACK
 #elif BOARD_MODEL == BOARD_TBEAM_S_V1
   Adafruit_SH1106G display = Adafruit_SH1106G(128, 64, &Wire, -1);
   #define SSD1306_WHITE SH110X_WHITE
@@ -121,15 +128,15 @@ GFXcanvas1 disp_area(64, 64);
 
 void update_area_positions() {
   if (disp_mode == DISP_MODE_PORTRAIT) {
-    p_ad_x = 0;
-    p_ad_y = 0;
-    p_as_x = 0;
-    p_as_y = 64;
+    p_ad_x = 0 * DISPLAY_SCALE;
+    p_ad_y = 0 * DISPLAY_SCALE;
+    p_as_x = 0 * DISPLAY_SCALE;
+    p_as_y = 64 * DISPLAY_SCALE;
   } else if (disp_mode == DISP_MODE_LANDSCAPE) {
-    p_ad_x = 0;
-    p_ad_y = 0;
-    p_as_x = 64;
-    p_as_y = 0;
+    p_ad_x = 0 * DISPLAY_SCALE;
+    p_ad_y = 0 * DISPLAY_SCALE;
+    p_as_x = 64 * DISPLAY_SCALE;
+    p_as_y = 0 * DISPLAY_SCALE;
   }
 }
 
@@ -137,6 +144,9 @@ uint8_t display_contrast = 0x00;
 #if BOARD_MODEL == BOARD_TBEAM_S_V1
   void set_contrast(Adafruit_SH1106G *display, uint8_t value) {
   }
+#elif BOARD_MODEL == BOARD_HELTEC_T114
+  void set_contrast(ST7789Spi *display, uint8_t value) {
+  }
 #elif BOARD_MODEL == BOARD_TDECK
   void set_contrast(Adafruit_ST7789 *display, uint8_t value) {
     static uint8_t level = 0;
@@ -198,6 +208,24 @@ bool display_init() {
       delay(50);
       digitalWrite(pin_display_en, HIGH);
       Wire.begin(SDA_OLED, SCL_OLED);
+    #elif BOARD_MODEL == BOARD_HELTEC_T114
+
+      // enable vext (not required for screen to work, but is done in Heltec example)
+      digitalWrite(PIN_T114_VEXT_EN, HIGH);
+      pinMode(PIN_T114_VEXT_EN, OUTPUT);
+
+      // enable power to display
+      digitalWrite(PIN_T114_TFT_EN, LOW);
+      pinMode(PIN_T114_TFT_EN, OUTPUT);
+
+      // enable backlight led (display is always black without this)
+      digitalWrite(PIN_T114_TFT_BLGT, LOW);
+      pinMode(PIN_T114_TFT_BLGT, OUTPUT);
+
+      // enable adc (not required for screen to work, but is done in Heltec example)
+      digitalWrite(PIN_T114_ADC_EN, HIGH);
+      pinMode(PIN_T114_ADC_EN, OUTPUT);
+
     #elif BOARD_MODEL == BOARD_TBEAM_S_V1
       Wire.begin(SDA_OLED, SCL_OLED);
     #endif
@@ -235,6 +263,10 @@ bool display_init() {
     #if BOARD_MODEL == BOARD_TDECK
     display.init(240, 320);
     display.setSPISpeed(80e6);
+    #elif BOARD_MODEL == BOARD_HELTEC_T114
+    display.init();
+    // set white as default pixel colour for Heltec T114
+    display.setRGB(COLOR565(0xFF, 0xFF, 0xFF));
     if (false) {
     #elif BOARD_MODEL == BOARD_TBEAM_S_V1
     if (!display.begin(display_address, true)) {
@@ -250,7 +282,9 @@ bool display_init() {
         } else {
           disp_mode = DISP_MODE_PORTRAIT;
         }
+        #if BOARD_MODEL != BOARD_HELTEC_T114
         display.setRotation(display_rotation);
+        #endif
       } else {
         #if BOARD_MODEL == BOARD_RNODE_NG_20
           disp_mode = DISP_MODE_PORTRAIT;
@@ -279,6 +313,8 @@ bool display_init() {
         #elif BOARD_MODEL == BOARD_HELTEC32_V3
           disp_mode = DISP_MODE_PORTRAIT;
           display.setRotation(1);
+        #elif BOARD_MODEL == BOARD_HELTEC_T114
+          disp_mode = DISP_MODE_LANDSCAPE;
         #elif BOARD_MODEL == BOARD_RAK4631
           disp_mode = DISP_MODE_LANDSCAPE;
           display.setRotation(0);
@@ -300,7 +336,10 @@ bool display_init() {
 
       stat_area.cp437(true);
       disp_area.cp437(true);
+
+      #if BOARD_MODEL != BOARD_HELTEC_T114
       display.cp437(true);
+      #endif
 
       #if HAS_EEPROM
         #if MCU_VARIANT != MCU_NRF52
@@ -321,6 +360,56 @@ bool display_init() {
   #endif
 }
 
+// draws a line on the screen
+void drawLine(int16_t x, int16_t y, int16_t width, int16_t height, uint16_t colour) {
+  #if BOARD_MODEL == BOARD_HELTEC_T114
+  if(colour == SSD1306_WHITE){
+    display.setColor(WHITE);
+  } else if(colour == SSD1306_BLACK) {
+    display.setColor(BLACK);
+  }
+  display.drawLine(x, y, width, height);
+  #else
+  display.drawLine(x, y, width, height, colour);
+  #endif
+}
+
+// draws a filled rectangle on the screen
+void fillRect(int16_t x, int16_t y, int16_t width, int16_t height, uint16_t colour) {
+  #if BOARD_MODEL == BOARD_HELTEC_T114
+  if(colour == SSD1306_WHITE){
+    display.setColor(WHITE);
+  } else if(colour == SSD1306_BLACK) {
+    display.setColor(BLACK);
+  }
+  display.fillRect(x, y, width, height);
+  #else
+  display.fillRect(x, y, width, height, colour);
+  #endif
+}
+
+// draws a bitmap to the display and auto scales it based on the boards configured DISPLAY_SCALE
+void drawBitmap(int16_t startX, int16_t startY, const uint8_t* bitmap, int16_t bitmapWidth, int16_t bitmapHeight, uint16_t foregroundColour, uint16_t backgroundColour) {
+    for(int16_t row = 0; row < bitmapHeight; row++){
+        for(int16_t col = 0; col < bitmapWidth; col++){
+
+            // determine index and bitmask
+            int16_t index = row * ((bitmapWidth + 7) / 8) + (col / 8);
+            uint8_t bitmask = 1 << (7 - (col % 8));
+
+            // check if the current pixel is set in the bitmap
+            if(bitmap[index] & bitmask){
+                // draw a scaled rectangle for the foreground pixel
+                fillRect(startX + col * DISPLAY_SCALE, startY + row * DISPLAY_SCALE, DISPLAY_SCALE, DISPLAY_SCALE, foregroundColour);
+            } else {
+                // draw a scaled rectangle for the background pixel
+                fillRect(startX + col * DISPLAY_SCALE, startY + row * DISPLAY_SCALE, DISPLAY_SCALE, DISPLAY_SCALE, backgroundColour);
+            }
+
+        }
+    }
+}
+
 void draw_cable_icon(int px, int py) {
   if (cable_state == CABLE_STATE_DISCONNECTED) {
     stat_area.drawBitmap(px, py, bm_cable+0*32, 16, 16, SSD1306_WHITE, SSD1306_BLACK);
@@ -527,19 +616,19 @@ void update_stat_area() {
 
     draw_stat_area();
     if (disp_mode == DISP_MODE_PORTRAIT) {
-      display.drawBitmap(p_as_x, p_as_y, stat_area.getBuffer(), stat_area.width(), stat_area.height(), SSD1306_WHITE, SSD1306_BLACK);
+      drawBitmap(p_as_x, p_as_y, stat_area.getBuffer(), stat_area.width(), stat_area.height(), SSD1306_WHITE, SSD1306_BLACK);
     } else if (disp_mode == DISP_MODE_LANDSCAPE) {
-      display.drawBitmap(p_as_x+2, p_as_y, stat_area.getBuffer(), stat_area.width(), stat_area.height(), SSD1306_WHITE, SSD1306_BLACK);
-      if (device_init_done && !disp_ext_fb) display.drawLine(p_as_x, 0, p_as_x, 64, SSD1306_WHITE);
+      drawBitmap(p_as_x+2, p_as_y, stat_area.getBuffer(), stat_area.width(), stat_area.height(), SSD1306_WHITE, SSD1306_BLACK);
+      if (device_init_done && !disp_ext_fb) drawLine(p_as_x, 0, p_as_x, 64, SSD1306_WHITE);
     }
 
   } else {
     if (firmware_update_mode) {
-      display.drawBitmap(p_as_x, p_as_y, bm_updating, stat_area.width(), stat_area.height(), SSD1306_BLACK, SSD1306_WHITE);
+      drawBitmap(p_as_x, p_as_y, bm_updating, stat_area.width(), stat_area.height(), SSD1306_BLACK, SSD1306_WHITE);
     } else if (console_active && device_init_done) {
-      display.drawBitmap(p_as_x, p_as_y, bm_console, stat_area.width(), stat_area.height(), SSD1306_BLACK, SSD1306_WHITE);
+      drawBitmap(p_as_x, p_as_y, bm_console, stat_area.width(), stat_area.height(), SSD1306_BLACK, SSD1306_WHITE);
       if (disp_mode == DISP_MODE_LANDSCAPE) {
-        display.drawLine(p_as_x, 0, p_as_x, 64, SSD1306_WHITE);
+        drawLine(p_as_x, 0, p_as_x, 64, SSD1306_WHITE);
       }
     }
   }
@@ -700,10 +789,10 @@ void draw_disp_area() {
 void update_disp_area() {
   draw_disp_area();
 
-  display.drawBitmap(p_ad_x, p_ad_y, disp_area.getBuffer(), disp_area.width(), disp_area.height(), SSD1306_WHITE, SSD1306_BLACK);
+  drawBitmap(p_ad_x, p_ad_y, disp_area.getBuffer(), disp_area.width(), disp_area.height(), SSD1306_WHITE, SSD1306_BLACK);
   if (disp_mode == DISP_MODE_LANDSCAPE) {
     if (device_init_done && !firmware_update_mode && !disp_ext_fb) {
-      display.drawLine(0, 0, 0, 63, SSD1306_WHITE);
+      drawLine(0, 0, 0, 63, SSD1306_WHITE);
     }
   }
 }
@@ -715,11 +804,11 @@ void display_recondition() {
     disp_area.drawBitmap(0, iy, rand_seg, 64, 1, SSD1306_WHITE, SSD1306_BLACK);
   }
 
-  display.drawBitmap(p_ad_x, p_ad_y, disp_area.getBuffer(), disp_area.width(), disp_area.height(), SSD1306_WHITE, SSD1306_BLACK);
+  drawBitmap(p_ad_x, p_ad_y, disp_area.getBuffer(), disp_area.width(), disp_area.height(), SSD1306_WHITE, SSD1306_BLACK);
   if (disp_mode == DISP_MODE_PORTRAIT) {
-    display.drawBitmap(p_as_x, p_as_y, stat_area.getBuffer(), stat_area.width(), stat_area.height(), SSD1306_WHITE, SSD1306_BLACK);
+    drawBitmap(p_as_x, p_as_y, stat_area.getBuffer(), stat_area.width(), stat_area.height(), SSD1306_WHITE, SSD1306_BLACK);
   } else if (disp_mode == DISP_MODE_LANDSCAPE) {
-    display.drawBitmap(p_as_x, p_as_y, stat_area.getBuffer(), stat_area.width(), stat_area.height(), SSD1306_WHITE, SSD1306_BLACK);
+    drawBitmap(p_as_x, p_as_y, stat_area.getBuffer(), stat_area.width(), stat_area.height(), SSD1306_WHITE, SSD1306_BLACK);
   }
 }
 
@@ -750,7 +839,10 @@ void update_display(bool blank = false) {
         set_contrast(&display, display_contrast);
       }
 
-      #if BOARD_MODEL != BOARD_TDECK
+      #if BOARD_MODEL == BOARD_HELTEC_T114
+        display.clear();
+        display.display();
+      #elif BOARD_MODEL != BOARD_TDECK
         display.clearDisplay();
         display.display();
       #else
@@ -766,7 +858,9 @@ void update_display(bool blank = false) {
         set_contrast(&display, display_contrast);
       }
 
-      #if BOARD_MODEL != BOARD_TDECK
+      #if BOARD_MODEL == BOARD_HELTEC_T114
+        display.clear();
+      #elif BOARD_MODEL != BOARD_TDECK
         display.clearDisplay();
       #endif
 

diff --git a/Makefile b/Makefile
index 0d0fb51dd829745928b384acfd57463e2c5a8ae3..6be4db2a636a19624a897c7377669ad4419e2209 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,10 @@ prep-samd:
 prep-nrf:
        arduino-cli core update-index --config-file arduino-cli.yaml
        arduino-cli core install rakwireless:nrf52 --config-file arduino-cli.yaml
+       arduino-cli core install Heltec_nRF52:Heltec_nRF52 --config-file arduino-cli.yaml
+       arduino-cli config set library.enable_unsafe_install true
+       arduino-cli lib install --git-url https://github.com/liamcottle/st7789#b8e7e076714b670764139289d3829b0beff67edb
+       arduino-cli lib install --git-url https://github.com/liamcottle/esp8266-oled-ssd1306#e16cee124fe26490cb14880c679321ad8ac89c95
        pip install adafruit-nrfutil --upgrade
 
 console-site:
@@ -129,6 +133,9 @@ firmware-genericesp32: check_bt_buffers
 firmware-rak4631:
        arduino-cli compile --log --fqbn rakwireless:nrf52:WisCoreRAK4631Board -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x51\""
 
+firmware-heltec-t114:
+       arduino-cli compile --log --fqbn heltec:Heltec_nRF52:HT-n5262 -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x3C\""
+
 upload:
        arduino-cli upload -p /dev/ttyUSB0 --fqbn unsignedio:avr:rnode
 
@@ -229,7 +236,8 @@ upload-featheresp32:
 upload-rak4631:
        arduino-cli upload -p /dev/ttyACM0 --fqbn rakwireless:nrf52:WisCoreRAK4631Board
 
-
+upload-heltec-t114:
+       arduino-cli upload -p /dev/cu.usbmodem14401 --fqbn heltec:Heltec_nRF52:HT-n5262
 
 release: release-all
 
@@ -432,3 +440,8 @@ release-rak4631:
        arduino-cli compile --fqbn rakwireless:nrf52:WisCoreRAK4631Board -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x51\""
        cp build/rakwireless.nrf52.WisCoreRAK4631Board/RNode_Firmware.ino.hex build/rnode_firmware_rak4631.hex
        adafruit-nrfutil dfu genpkg --dev-type 0x0052 --application build/rnode_firmware_rak4631.hex Release/rnode_firmware_rak4631.zip
+
+release-heltec-t114:
+       arduino-cli compile --fqbn heltec:Heltec_nRF52:HT-n5262 -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x3C\""
+       cp build/heltec.Heltec_nRF52.HT-n5262/RNode_Firmware.ino.hex build/rnode_firmware_heltec_t114.hex
+       adafruit-nrfutil dfu genpkg --dev-type 0x0052 --application build/rnode_firmware_heltec_t114.hex Release/rnode_firmware_heltec_t114.zip

diff --git a/RNode_Firmware.ino b/RNode_Firmware.ino
index 6bdf4656a3599a66d1e1d04a2db1b3762c84fac4..5203f6ff0fe2b1b28e2fa7ecf0335fd840210179 100644 (file)
--- a/RNode_Firmware.ino
+++ b/RNode_Firmware.ino
@@ -105,9 +105,9 @@ void setup() {
     led_init();
   #endif
 
-  #if BOARD_MODEL != BOARD_RAK4631 && BOARD_MODEL != BOARD_RNODE_NG_22 && BOARD_MODEL != BOARD_TBEAM_S_V1
+  #if BOARD_MODEL != BOARD_RAK4631 && BOARD_MODEL != BOARD_HELTEC_T114  && BOARD_MODEL != BOARD_RNODE_NG_22 && BOARD_MODEL != BOARD_TBEAM_S_V1
   // 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 and Heltec T114, the line below will wait
   // until a serial connection is actually established with a master. Thus, it
   // is disabled on this platform.
     while (!Serial);

diff --git a/Utilities.h b/Utilities.h
index 1893636b8a35844ce17ef436a2222444d3df3145..7f6309702f89996caeff57b38045a8e19cfaf456 100644 (file)
--- a/Utilities.h
+++ b/Utilities.h
@@ -258,6 +258,12 @@ uint8_t boot_vector = 0x00;
                void led_rx_off() {     digitalWrite(pin_led_rx, LOW); }
                void led_tx_on()  { digitalWrite(pin_led_tx, HIGH); }
                void led_tx_off() { digitalWrite(pin_led_tx, LOW); }
+       #elif BOARD_MODEL == BOARD_HELTEC_T114
+        // Heltec T114 pulls pins LOW to turn on
+        void led_rx_on()  { digitalWrite(pin_led_rx, LOW); }
+        void led_rx_off() {    digitalWrite(pin_led_rx, HIGH); }
+        void led_tx_on()  { digitalWrite(pin_led_tx, LOW); }
+        void led_tx_off() { digitalWrite(pin_led_tx, HIGH); }
     #endif
 #endif
 
@@ -1118,6 +1124,9 @@ void setTXPower() {
                if (model == MODEL_11) LoRa->setTxPower(lora_txp, PA_OUTPUT_RFO_PIN);
                if (model == MODEL_12) LoRa->setTxPower(lora_txp, PA_OUTPUT_RFO_PIN);
 
+               if (model == MODEL_C6) LoRa->setTxPower(lora_txp, PA_OUTPUT_RFO_PIN);
+        if (model == MODEL_C7) LoRa->setTxPower(lora_txp, PA_OUTPUT_RFO_PIN);
+
                if (model == MODEL_A1) LoRa->setTxPower(lora_txp, PA_OUTPUT_PA_BOOST_PIN);
                if (model == MODEL_A2) LoRa->setTxPower(lora_txp, PA_OUTPUT_PA_BOOST_PIN);
                if (model == MODEL_A3) LoRa->setTxPower(lora_txp, PA_OUTPUT_RFO_PIN);
@@ -1370,7 +1379,7 @@ bool eeprom_product_valid() {
        #elif PLATFORM == PLATFORM_ESP32
        if (rval == PRODUCT_RNODE || rval == BOARD_RNODE_NG_20 || rval == BOARD_RNODE_NG_21 || rval == PRODUCT_HMBRW || rval == PRODUCT_TBEAM || rval == PRODUCT_T32_10 || rval == PRODUCT_T32_20 || rval == PRODUCT_T32_21 || rval == PRODUCT_H32_V2 || rval == PRODUCT_H32_V3 || rval == PRODUCT_TDECK_V1 || rval == PRODUCT_TBEAM_S_V1) {
        #elif PLATFORM == PLATFORM_NRF52
-       if (rval == PRODUCT_RAK4631 || rval == PRODUCT_HMBRW) {
+       if (rval == PRODUCT_RAK4631 || rval == PRODUCT_HELTEC_T114 || rval == PRODUCT_HMBRW) {
        #else
        if (false) {
        #endif
@@ -1412,6 +1421,8 @@ bool eeprom_model_valid() {
        if (model == MODEL_C4 || model == MODEL_C9) {
        #elif BOARD_MODEL == BOARD_HELTEC32_V3
        if (model == MODEL_C5 || model == MODEL_CA) {
+    #elif BOARD_MODEL == BOARD_HELTEC_T114
+    if (model == MODEL_C6 || model == MODEL_C7) {
     #elif BOARD_MODEL == BOARD_RAK4631
     if (model == MODEL_11 || model == MODEL_12) {
        #elif BOARD_MODEL == BOARD_HUZZAH32

diff --git a/arduino-cli.yaml b/arduino-cli.yaml
index cfbe258a4f13adaa939d76e3957c48da57b4397c..ea5729a4bdeff7ed8cec9bdd08bd64c45e0f73de 100644 (file)
--- a/arduino-cli.yaml
+++ b/arduino-cli.yaml
@@ -2,4 +2,5 @@ board_manager:
   additional_urls:
   - https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
   - https://raw.githubusercontent.com/RAKwireless/RAKwireless-Arduino-BSP-Index/main/package_rakwireless_index.json
+  - https://github.com/HelTecAutomation/Heltec_nRF52/releases/download/1.7.0/package_heltec_nrf_index.json
   - http://unsigned.io/arduino/package_unsignedio_UnsignedBoards_index.json

diff --git a/sx126x.cpp b/sx126x.cpp
index dc1f1412abc8fa7fa3a24c69750e2ab85dda0d06..a53faa085771e366aa17300132d5e2e5b9d73ac9 100644 (file)
--- a/sx126x.cpp
+++ b/sx126x.cpp
@@ -744,6 +744,8 @@ void sx126x::enableTCXO() {
       uint8_t buf[4] = {MODE_TCXO_1_8V_6X, 0x00, 0x00, 0xFF};
     #elif BOARD_MODEL == BOARD_RNODE_NG_22
       uint8_t buf[4] = {MODE_TCXO_1_8V_6X, 0x00, 0x00, 0xFF};
+    #elif BOARD_MODEL == BOARD_HELTEC_T114
+      uint8_t buf[4] = {MODE_TCXO_1_8V_6X, 0x00, 0x00, 0xFF};
     #endif
     executeOpcode(OP_DIO3_TCXO_CTRL_6X, buf, 4);
   #endif

diff --git a/sx128x.cpp b/sx128x.cpp
index ecd87a0c73b8c1e9ccbf5ff182b9602e63db6801..995fe7cb474174d3a2bcb3ef26769116593c48ee 100644 (file)
--- a/sx128x.cpp
+++ b/sx128x.cpp
@@ -823,6 +823,7 @@ void sx128x::disableCrc()
 byte sx128x::random()
 {
     // todo: implement
+    return -1;
 }
 
 void sx128x::setPins(int ss, int reset, int dio0, int busy, int rxen, int txen)