Merge branch 'master' into master

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>

protobufs

@@ -1 +1 @@
-Subproject commit b4e24c3a868f9e5fd782d2e256b05456d578923b
+Subproject commit b4044f8f9f3681d4d20521dbe13ee42c96eae353

variants/hackerboxes_esp32_io/platformio.ini

@@ -0,0 +1,12 @@
+[env:hackerboxes-esp32-io]
+extends = esp32_base
+board = esp32dev
+board_level = extra
+build_flags = 
+  ${esp32_base.build_flags}
+  -D PRIVATE_HW
+  -I variants/hackerboxes_esp32_io
+monitor_speed = 115200
+upload_protocol = esptool
+;upload_port = /dev/ttyUSB0
+upload_speed = 921600

variants/hackerboxes_esp32_io/variant.h

@@ -0,0 +1,30 @@
+#define BUTTON_PIN 0
+
+// HACKBOX LoRa IO Kit
+// Uses a ESP-32-WROOM and a RA-01SH (SX1262) LoRa Board
+
+#define LED_PIN 2      // LED
+#define LED_STATE_ON 1 // State when LED is lit
+
+#define HAS_SCREEN 0
+#define HAS_GPS 0
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+
+#define USE_SX1262
+#define LORA_SCK 18
+#define LORA_MISO 19
+#define LORA_MOSI 23
+#define LORA_CS 5
+#define LORA_DIO0 RADIOLIB_NC
+#define LORA_RESET 27
+#define LORA_DIO1 33
+#define LORA_DIO2 RADIOLIB_NC
+#define LORA_BUSY 32
+
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_BUSY
+#define SX126X_RESET LORA_RESET
+#define SX126X_MAX_POWER 22 // Max power of the RA-01SH is 22db

variants/hackerboxes_esp32c3_oled/platformio.ini

@@ -0,0 +1,14 @@
+[env:hackerboxes-esp32c3-oled]
+extends = esp32c3_base
+board = esp32-c3-devkitm-1
+board_level = extra
+build_flags = 
+  ${esp32_base.build_flags}
+  -D PRIVATE_HW
+  -D ARDUINO_USB_MODE=1
+  -D ARDUINO_USB_CDC_ON_BOOT=1
+  -I variants/hackerboxes_esp32c3_oled
+monitor_speed = 115200
+upload_protocol = esptool
+;upload_port = /dev/ttyUSB0
+upload_speed = 921600

variants/hackerboxes_esp32c3_oled/variant.h

@@ -0,0 +1,36 @@
+#define BUTTON_PIN 9
+
+// Hackerboxes LoRa ESP32-C3 OLED Kit
+// Uses a ESP32-C3 OLED Board and a RA-01SH (SX1262) LoRa Board
+
+#define LED_PIN 8      // LED
+#define LED_STATE_ON 1 // State when LED is lit
+
+#define HAS_SCREEN 0
+#define HAS_GPS 0
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+
+// #define USE_SSD1306_72_40
+// #define I2C_SDA 5 // I2C pins for this board
+// #define I2C_SCL 6 //
+// #define TFT_WIDTH 72
+// #define TFT_HEIGHT 40
+
+#define USE_SX1262
+#define LORA_SCK 4
+#define LORA_MISO 7
+#define LORA_MOSI 3
+#define LORA_CS 1
+#define LORA_DIO0 RADIOLIB_NC
+#define LORA_RESET 0
+#define LORA_DIO1 20
+#define LORA_DIO2 RADIOLIB_NC
+#define LORA_BUSY 10
+
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_BUSY
+#define SX126X_RESET LORA_RESET
+#define SX126X_MAX_POWER 22 // Max power of the RA-01SH is 22db

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 6
-build = 2
+build = 3