Merge branch 'master' into TLORA-18

.github/workflows/main_matrix.yml

@@ -42,6 +42,7 @@ jobs:
           - board: m5stack-core
           - board: m5stack-coreink
           - board: tbeam-s3-core
+          - board: feather_diy
         # - board: pico
 
     runs-on: ubuntu-latest
@@ -181,6 +182,7 @@ jobs:
           - board: rak4631_eink
           - board: t-echo
           - board: pca10059_diy_eink
+          - board: feather_diy
 
     runs-on: ubuntu-latest
     steps:

src/platform/nrf52/architecture.h

@@ -45,7 +45,7 @@
     #define HW_VENDOR HardwareModel_T_ECHO
 #elif defined(NORDIC_PCA10059)
     #define HW_VENDOR HardwareModel_NRF52840_PCA10059
-#elif defined(PRIVATE_HW)
+#elif defined(PRIVATE_HW) || defined(FEATHER_DIY)
     #define HW_VENDOR HardwareModel_PRIVATE_HW
 #else
     #define HW_VENDOR HardwareModel_NRF52_UNKNOWN

variants/feather_diy/platformio.ini

@@ -0,0 +1,11 @@
+; The very slick RAK wireless RAK 4631 / 4630 board - Unified firmware for 5005/19003, with or without OLED RAK 1921
+[env:feather_diy]
+extends = nrf52840_base
+board = adafruit_feather_nrf52840
+build_flags = ${nrf52840_base.build_flags} -Ivariants/feather_diy -D feather_diy
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/feather_diy>
+lib_deps = 
+  ${nrf52840_base.lib_deps}
+debug_tool = jlink
+; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
+;upload_protocol = jlink

variants/feather_diy/variant.h

@@ -0,0 +1,33 @@
+// For OLED LCD
+#define I2C_SDA 22
+#define I2C_SCL 23
+
+#define BUTTON_PIN 7
+
+#define LORA_DIO0 -1  // a No connect on the SX1262/SX1268 module
+#define LORA_RESET 13 // RST for SX1276, and for SX1262/SX1268
+#define LORA_DIO1 11  // IRQ for SX1262/SX1268
+#define LORA_DIO2 12  // BUSY for SX1262/SX1268
+#define LORA_DIO3     // Not connected on PCB, but internally on the TTGO SX1262/SX1268, if DIO3 is high the TXCO is enabled
+
+#define RF95_SCK SCK
+#define RF95_MISO MI
+#define RF95_MOSI MO
+#define RF95_NSS D2
+
+// supported modules list
+#define USE_SX1262
+
+// common pinouts for SX126X modules
+#define SX126X_CS RF95_NSS // NSS for SX126X
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_DIO2
+#define SX126X_RESET LORA_RESET
+#define SX126X_RXEN 10
+#define SX126X_TXEN 9
+
+#ifdef EBYTE_E22
+// Internally the TTGO module hooks the SX126x-DIO2 in to control the TX/RX switch
+// (which is the default for the sx1262interface code)
+#define SX126X_E22
+#endif