From ed2de3b8854f78ee8300c9d961914b5ea20d6773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Fri, 28 Jan 2022 08:43:48 +0100
Subject: [PATCH 1/3] Fixed typo

---
 bin/check-all.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/check-all.sh b/bin/check-all.sh
index 900d37ae2..d14f9057b 100755
--- a/bin/check-all.sh
+++ b/bin/check-all.sh
@@ -11,7 +11,7 @@ export APP_VERSION=$VERSION
 
 if [[ $# -gt 0 ]]; then
     # can override which environment by passing arg
-    BOARDS="-e $@"
+    BOARDS="$@"
 else
     BOARDS="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 rak4631_5005 rak4631_19003 t-echo"
 fi

From 3611293a9895f4b10e56109ff05a701d225a6fa5 Mon Sep 17 00:00:00 2001
From: Richard Nauber <richard@nauber.dev>
Date: Fri, 28 Jan 2022 21:02:02 +0100
Subject: [PATCH 2/3] Prevent null pointer dereference in setup() if radio is
 not available.

---
 src/main.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 7ad375db5..db908a5eb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -658,16 +658,16 @@ void setup()
 
     if (!rIf)
         RECORD_CRITICALERROR(CriticalErrorCode_NoRadio);
-    else
+    else{
         router->addInterface(rIf);
 
-    // Calculate and save the bit rate to myNodeInfo
-    // TODO: This needs to be added what ever method changes the channel from the phone.
-    myNodeInfo.bitrate = (float(Constants_DATA_PAYLOAD_LEN) / 
-                    (float(rIf->getPacketTime(Constants_DATA_PAYLOAD_LEN)))
-                    ) * 1000;
-    DEBUG_MSG("myNodeInfo.bitrate = %f bytes / sec\n", myNodeInfo.bitrate);
-
+        // Calculate and save the bit rate to myNodeInfo
+        // TODO: This needs to be added what ever method changes the channel from the phone.
+        myNodeInfo.bitrate = (float(Constants_DATA_PAYLOAD_LEN) /
+                        (float(rIf->getPacketTime(Constants_DATA_PAYLOAD_LEN)))
+                        ) * 1000;
+        DEBUG_MSG("myNodeInfo.bitrate = %f bytes / sec\n", myNodeInfo.bitrate);
+    }
 
     // This must be _after_ service.init because we need our preferences loaded from flash to have proper timeout values
     PowerFSM_setup(); // we will transition to ON in a couple of seconds, FIXME, only do this for cold boots, not waking from SDS

From a4e9fca80cbbcaee3c03b6d6e38d53b11414889c Mon Sep 17 00:00:00 2001
From: Vladislav Osmanov <7123463+osmanovv@users.noreply.github.com>
Date: Fri, 28 Jan 2022 23:58:27 +0300
Subject: [PATCH 3/3] DIY versions cleaning - moved to the one folder (#1167)

---
 variants/diy/platformio.ini                      | 10 ++++++++++
 variants/{meshtastic_diy_v1 => diy/v1}/variant.h |  0
 variants/meshtastic_diy_v1/platformio.ini        |  9 ---------
 3 files changed, 10 insertions(+), 9 deletions(-)
 rename variants/{meshtastic_diy_v1 => diy/v1}/variant.h (100%)
 delete mode 100644 variants/meshtastic_diy_v1/platformio.ini

diff --git a/variants/diy/platformio.ini b/variants/diy/platformio.ini
index 165fd7cac..6cd51ee15 100644
--- a/variants/diy/platformio.ini
+++ b/variants/diy/platformio.ini
@@ -1,3 +1,13 @@
+; Meshtastic DIY v1 by Nano VHF Schematic based on ESP32-WROOM-32 (38 pins) devkit & EBYTE E22 SX1262/SX1268 module
+[env:meshtastic-diy-v1]
+extends = esp32_base
+board = esp32doit-devkit-v1
+build_flags =
+  ${esp32_base.build_flags}
+  -D DIY_V1
+  -D EBYTE_E22
+  -I variants/diy/v1
+
 ; Meshtastic DIY v1.1 new schematic based on ESP32-WROOM-32 & SX1262/SX1268 modules
 [env:meshtastic-diy-v1.1]
 extends = esp32_base
diff --git a/variants/meshtastic_diy_v1/variant.h b/variants/diy/v1/variant.h
similarity index 100%
rename from variants/meshtastic_diy_v1/variant.h
rename to variants/diy/v1/variant.h
diff --git a/variants/meshtastic_diy_v1/platformio.ini b/variants/meshtastic_diy_v1/platformio.ini
deleted file mode 100644
index d97abf87d..000000000
--- a/variants/meshtastic_diy_v1/platformio.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-; Meshtastic DIY v1 by Nano VHF Schematic based on ESP32-WROOM-32 (38 pins) devkit & EBYTE E22 SX1262/SX1268 module
-[env:meshtastic-diy-v1]
-extends = esp32_base
-board = esp32doit-devkit-v1
-build_flags =
-  ${esp32_base.build_flags}
-  -D DIY_V1
-  -D EBYTE_E22
-  -I variants/meshtastic_diy_v1
\ No newline at end of file