From 475348489ef751c989f5cca134e4f50e96eb36eb Mon Sep 17 00:00:00 2001
From: riddick <93053584+PlumRugOfDoom@users.noreply.github.com>
Date: Sat, 1 Jan 2022 19:11:40 +0100
Subject: [PATCH 1/3] Add status LED for diy targets and the core-pcb (#1049)

* Update device-install.sh

fix for #911

* add status led for diy target

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 src/configuration.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/configuration.h b/src/configuration.h
index 597f60094..f2fc060d6 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -244,6 +244,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BUTTON_PIN 39 // The middle button GPIO on the T-Beam
 #define EXT_NOTIFY_OUT 12 // Overridden default pin to use for Ext Notify Plugin (#975).
+#define LED_PIN 2 // add status LED (compatible with core-pcb and DIY targets)
 
 #define LORA_DIO0 26  // a No connect on the SX1262/SX1268 module
 #define LORA_RESET 23 // RST for SX1276, and for SX1262/SX1268

From 6e706e05854073a43353bb1e87cc3805ec8bf176 Mon Sep 17 00:00:00 2001
From: Sjoer van der Ploeg <sfjuocekr@gmail.com>
Date: Sat, 1 Jan 2022 20:12:24 +0100
Subject: [PATCH 2/3] Update MQTT.cpp (#1050)

Was missing a colon in the logs!
---
 src/mqtt/MQTT.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp
index 6235f37f7..26ef2a3e7 100644
--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@@ -95,7 +95,7 @@ void MQTT::reconnect()
         }
         pubSub.setServer(serverAddr, serverPort);
 
-        DEBUG_MSG("Connecting to MQTT server %s, port: %d, username: %s, password %s\n", serverAddr, serverPort, mqttUsername, mqttPassword);
+        DEBUG_MSG("Connecting to MQTT server %s, port: %d, username: %s, password: %s\n", serverAddr, serverPort, mqttUsername, mqttPassword);
         auto myStatus = (statusTopic + owner.id);
         bool connected = pubSub.connect(owner.id, mqttUsername, mqttPassword, myStatus.c_str(), 1, true, "offline");
         if (connected) {

From 333b19580428f403a336b4a50529e2d0f0fb7ec2 Mon Sep 17 00:00:00 2001
From: linagee <linagee@users.noreply.github.com>
Date: Sat, 1 Jan 2022 13:00:32 -0700
Subject: [PATCH 3/3] Don't commit vim swap files to repo (#1051)

---
 .gitignore                  |   3 +++
 bin/.promote-release.sh.swp | Bin 12288 -> 0 bytes
 2 files changed, 3 insertions(+)
 delete mode 100644 bin/.promote-release.sh.swp

diff --git a/.gitignore b/.gitignore
index 40bba6f69..3d181a39a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,6 @@ flash.uf2
 cmake-build*
 __pycache__
 
+*.swp
+*.swo
+*~
diff --git a/bin/.promote-release.sh.swp b/bin/.promote-release.sh.swp
deleted file mode 100644
index 0dddde02b17cd4bae1d425c6efcf64ae2f262208..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI&ON$dh5CGtcSMh=Vfif$IxXC2ZgBKA*(cnhKN6y<bQ<?5{(mizdWOotutOx&r
zzf(aGtK)<v9&%Tzq3Cq_QC;6Hr1Q~yI>Woe32?g%@aySUb#Qb5Uru^(v@BGp$)~AZ
zZT8^B_>QrKo{T2r9Sc8f4$L09qFs`WA$x4%lQz$m6m(P}nqr_ymD%iUT++%El;y@|
zjdx2IY2c|Q6=)drj%+d|0wS<2Z~<;l#-sGzUjG_iz4B&zT1Fxu0wN#+A|L`HAOa#F
z0{^u@Y<lpKD?Ha#dA{p=fA!r^IuQ^75fA|p5CIVo0TB=Z5fA|p5P^SCK$QTuE&>FO
z^#A|n_y6}x0N*%1b9~}39Gc@k$4!o(y#7bG&!@f8L_h>YKm<fU1VlgtL_h>YKm<f!
zTYw7fu>V?Bc>Ue{(aTrU=g;0_(*{i?Mu(M&y3O~y9#s*IvjKy4ZC#>u$Cwl5t*J|6
zD~y`3^lA}t^C%o~x<C^#5G?~%&XxOE)TVfw4sY7LHbL`zAAmEh^P=;nG8X%*vkUcc
z@6TLH5LLBa%>DKv*uz;HB5JiFR5-`R)54sjOp(v5$aiG`bd}yaOb^++>o44}ImO!9
z>JXq~(S~a+ylEoxCui$ZTsV*X3Z81$kPmpwe9F_NmZV^bRT4?s(WM+B&K%#Z4QW&9
R?2X9l*mzxgpojxP_ziF4!36*S