From 2a9b2d3b29bc0bd4e43ed03238dca13debcaa667 Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Tue, 27 Apr 2021 10:21:54 +0800
Subject: [PATCH] official name for t-echo board

---
 .idea/workspace.xml                   | 21 +++++++-------
 bin/build-all.sh                      |  2 +-
 bin/upload-to-bootloader.sh           |  2 +-
 bin/upload-to-rak4631.sh              |  5 ++++
 boards/{eink.json => t-echo.json}     |  2 +-
 platformio.ini                        | 40 +++++++++++++--------------
 variants/{eink => t-echo}/variant.cpp |  0
 variants/{eink => t-echo}/variant.h   |  0
 8 files changed, 39 insertions(+), 33 deletions(-)
 create mode 100755 bin/upload-to-rak4631.sh
 rename boards/{eink.json => t-echo.json} (97%)
 rename variants/{eink => t-echo}/variant.cpp (100%)
 rename variants/{eink => t-echo}/variant.h (100%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b98fbb38db..05b93ecb12 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -16,7 +16,8 @@
     <list default="true" id="58922733-b05b-4b90-9655-b9b18914977a" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/platformio.ini" beforeDir="false" afterPath="$PROJECT_DIR$/platformio.ini" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/configuration.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/configuration.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/mesh/SX1262Interface.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/src/mesh/SX1262Interface.cpp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/portduino/PortduinoGlue.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/src/portduino/PortduinoGlue.cpp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -104,7 +105,7 @@
       <workItem from="1617437366919" duration="1182000" />
       <workItem from="1618544034975" duration="1185000" />
       <workItem from="1618624455224" duration="860000" />
-      <workItem from="1619062544208" duration="2347000" />
+      <workItem from="1619062544208" duration="14562000" />
     </task>
     <servers />
   </component>
@@ -151,20 +152,20 @@
           <line>20</line>
           <option name="timeStamp" value="12" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+        <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
           <url>file://$PROJECT_DIR$/.pio/libdeps/native/RadioLib/src/modules/SX126x/SX126x.cpp</url>
-          <line>27</line>
-          <option name="timeStamp" value="15" />
+          <line>168</line>
+          <option name="timeStamp" value="21" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
           <url>file://$PROJECT_DIR$/.pio/libdeps/native/RadioLib/src/modules/SX126x/SX126x.cpp</url>
-          <line>168</line>
-          <option name="timeStamp" value="16" />
+          <line>79</line>
+          <option name="timeStamp" value="28" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+        <line-breakpoint type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
           <url>file://$PROJECT_DIR$/.pio/libdeps/native/RadioLib/src/modules/SX126x/SX126x.cpp</url>
-          <line>1537</line>
-          <option name="timeStamp" value="17" />
+          <line>27</line>
+          <option name="timeStamp" value="30" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
diff --git a/bin/build-all.sh b/bin/build-all.sh
index 110b3c915c..6a1cf9830b 100755
--- a/bin/build-all.sh
+++ b/bin/build-all.sh
@@ -8,7 +8,7 @@ BOARDS_ESP32="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec tbeam0.7"
 #BOARDS_ESP32=tbeam
 
 # FIXME note nrf52840dk build is for some reason only generating a BIN file but not a HEX file nrf52840dk-geeksville is fine
-BOARDS_NRF52="rak4631"
+BOARDS_NRF52="rak4631 t-echo"
 
 OUTDIR=release/latest
 
diff --git a/bin/upload-to-bootloader.sh b/bin/upload-to-bootloader.sh
index 95ade3e372..0dd87ef1d9 100755
--- a/bin/upload-to-bootloader.sh
+++ b/bin/upload-to-bootloader.sh
@@ -1,5 +1,5 @@
 set -e
 
 echo "Converting to uf2 for NRF52 Adafruit bootloader"
-bin/uf2conv.py .pio/build/rak4631/firmware.hex -f 0xADA52840
+bin/uf2conv.py .pio/build/t-echo/firmware.hex -f 0xADA52840
 cp flash.uf2 /media/kevinh/FTH*BOOT/
diff --git a/bin/upload-to-rak4631.sh b/bin/upload-to-rak4631.sh
new file mode 100755
index 0000000000..95ade3e372
--- /dev/null
+++ b/bin/upload-to-rak4631.sh
@@ -0,0 +1,5 @@
+set -e
+
+echo "Converting to uf2 for NRF52 Adafruit bootloader"
+bin/uf2conv.py .pio/build/rak4631/firmware.hex -f 0xADA52840
+cp flash.uf2 /media/kevinh/FTH*BOOT/
diff --git a/boards/eink.json b/boards/t-echo.json
similarity index 97%
rename from boards/eink.json
rename to boards/t-echo.json
index e2414b23f7..de86bc6186 100644
--- a/boards/eink.json
+++ b/boards/t-echo.json
@@ -15,7 +15,7 @@
     ],
     "usb_product": "TTGO_eink",
     "mcu": "nrf52840",
-    "variant": "eink",
+    "variant": "t-echo",
     "variants_dir": "variants",
     "bsp": {
       "name": "adafruit"
diff --git a/platformio.ini b/platformio.ini
index 4683a3856d..33890730f1 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -16,9 +16,9 @@
 ;default_envs = tlora_v1_3
 ;default_envs = tlora-v2
 ;default_envs = lora-relay-v1 # nrf board
-;default_envs = eink
+default_envs = t-echo
 ;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 = 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 = rak4631
 ;default_envs = rak4630
 
@@ -72,7 +72,7 @@ lib_deps =
   1202 ; CRC32, explicitly needed because dependency is missing in the ble ota update lib
   https://github.com/meshtastic/arduino-fsm.git#829e967b8a95c094f73c60ef8dacfe66eae38940
   https://github.com/meshtastic/SparkFun_Ublox_Arduino_Library.git#31015a55e630a2df77d9d714669c621a5bf355ad
-  https://github.com/meshtastic/RadioLib.git#242bfade03b31556eedf0bb88ea83c2562ce96f8
+  https://github.com/meshtastic/RadioLib.git#b022e575f8dce1fb879577ea07f177bc817f5f52
   https://github.com/meshtastic/TinyGPSPlus.git#f0f47067ef2f67c856475933188251c1ef615e79
   https://github.com/meshtastic/AXP202X_Library.git#8404abb6d4b486748636bc6ad72d2a47baaf5460
   Wire ; explicitly needed here because the AXP202 library forgets to add it
@@ -340,32 +340,32 @@ lib_deps =
   ${arduino_base.lib_deps}
 
 ; First prototype eink/nrf52840/sx1262 device
-[env:eink]
+[env:t-echo]
 extends = nrf52840_base
-board = eink
+board = t-echo
 # add our variants files to the include and src paths
 # define build flags for the TFT_eSPI library
-build_flags = ${nrf52_base.build_flags} -Ivariants/eink
+build_flags = ${nrf52_base.build_flags} -Ivariants/t-echo
   -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
-src_filter = ${nrf52_base.src_filter} +<../variants/eink>
+src_filter = ${nrf52_base.src_filter} +<../variants/t-echo>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   https://github.com/geeksville/EPD_Libraries.git
   TFT_eSPI
 
-; First prototype eink/nrf52840/sx1262 device
-[env:eink0.1]
-extends = nrf52840_base
-board = eink0.1
-# add our variants files to the include and src paths
-# define build flags for the TFT_eSPI library
-build_flags = ${nrf52_base.build_flags} -Ivariants/eink0.1
-  -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
-src_filter = ${nrf52_base.src_filter} +<../variants/eink0.1>
-lib_deps = 
-  ${nrf52840_base.lib_deps}
-  https://github.com/geeksville/EPD_Libraries.git
-  TFT_eSPI
+; First prototype eink/nrf52840/sx1262 device (removed from build because didn't ship in quantity)
+;[env:eink0.1]
+;extends = nrf52840_base
+;board = eink0.1
+;# add our variants files to the include and src paths
+;# define build flags for the TFT_eSPI library
+;build_flags = ${nrf52_base.build_flags} -Ivariants/eink0.1
+;  -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
+;src_filter = ${nrf52_base.src_filter} +<../variants/eink0.1>
+;lib_deps = 
+;  ${nrf52840_base.lib_deps}
+;  https://github.com/geeksville/EPD_Libraries.git
+;  TFT_eSPI
 
 ; The https://github.com/BigCorvus/SX1262-LoRa-BLE-Relay board by @BigCorvus
 [env:lora-relay-v1]
diff --git a/variants/eink/variant.cpp b/variants/t-echo/variant.cpp
similarity index 100%
rename from variants/eink/variant.cpp
rename to variants/t-echo/variant.cpp
diff --git a/variants/eink/variant.h b/variants/t-echo/variant.h
similarity index 100%
rename from variants/eink/variant.h
rename to variants/t-echo/variant.h