Variant of sx1268 with t-echo added

.github/workflows/main_matrix.yml

@@ -36,7 +36,8 @@ jobs:
           - board: meshtastic-diy-v1
           - board: rak4631
           - board: rak4631_eink
-          - board: t-echo
+          - board: t-echo-sx1262
+          - board: t-echo-sx1268
           - board: nano-g1
           - board: station-g1
           - board: m5stack-core
@@ -168,7 +169,8 @@ jobs:
         include:
           - board: rak4631
           - board: rak4631_eink
-          - board: t-echo
+          - board: t-echo-sx1262
+          - board: t-echo-sx1268
           - board: pca10059_diy_eink
 
     runs-on: ubuntu-latest

platformio.ini

@@ -13,7 +13,8 @@ default_envs = tbeam
 ;default_envs = tlora-v2
 ;default_envs = tlora-v2-1-1.6
 ;default_envs = lora-relay-v1 # nrf board
-;default_envs = t-echo
+;default_envs = t-echo-sx1262
+;default_envs = t-echo-sx1268
 ;default_envs = nrf52840dk-geeksville
 ;default_envs = native # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here
 ;default_envs = nano-g1

variants/t-echo/platformio.ini

@@ -1,5 +1,5 @@
 ; First prototype eink/nrf52840/sx1262 device
-[env:t-echo]
+[env:t-echo-sx1262]
 extends = nrf52840_base
 board = t-echo
 debug_tool = jlink
@@ -8,11 +8,31 @@ upload_protocol = jlink
 # define build flags for the TFT_eSPI library - NOTE: WE NOT LONGER USE TFT_eSPI, it was for an earlier version of the TTGO eink screens
 # -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
-build_flags = ${nrf52840_base.build_flags} -Ivariants/t-echo 
+build_flags = ${nrf52840_base.build_flags} -Ivariants/t-echo -DUSE_SX1262
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/t-echo>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   https://github.com/meshtastic/GxEPD2
   adafruit/Adafruit BusIO
   lewisxhe/PCF8563_Library@^0.0.1
 ;upload_protocol = fs
+
+
+; Another variant of the t-echo, the LoRa module uses the SX1268
+[env:t-echo-sx1268]
+extends = nrf52840_base
+board = t-echo
+debug_tool = jlink
+upload_protocol = jlink
+# add our variants files to the include and src paths
+# define build flags for the TFT_eSPI library - NOTE: WE NOT LONGER USE TFT_eSPI, it was for an earlier version of the TTGO eink screens
+# -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
+# add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
+build_flags = ${nrf52840_base.build_flags} -Ivariants/t-echo -DUSE_SX1268
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/t-echo>
+lib_deps = 
+  ${nrf52840_base.lib_deps}
+  https://github.com/meshtastic/GxEPD2
+  adafruit/Adafruit BusIO
+  lewisxhe/PCF8563_Library@^0.0.1
+;upload_protocol = fs

variants/t-echo/variant.h

@@ -122,8 +122,9 @@ External serial flash WP25R1635FZUIL0
 /*
  * Lora radio
  */
-
-#define USE_SX1262
+// t-echo has two LoRa modules, SX1268 and SX1262
+// #define USE_SX1262
+// #define USE_SX1268
 #define SX126X_CS (0 + 24) // FIXME - we really should define LORA_CS instead
 #define SX126X_DIO1 (0 + 20)
 // Note DIO2 is attached internally to the module to an analog switch for TX/RX switching