From 6cb4900e0c0af1bebaca80a81aec913d71986646 Mon Sep 17 00:00:00 2001 From: Sacha Weatherstone Date: Fri, 31 Dec 2021 13:00:32 +1100 Subject: [PATCH 1/4] Create update_protobufs.yml --- .github/workflows/update_protobufs.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/update_protobufs.yml diff --git a/.github/workflows/update_protobufs.yml b/.github/workflows/update_protobufs.yml new file mode 100644 index 000000000..f84ad98a8 --- /dev/null +++ b/.github/workflows/update_protobufs.yml @@ -0,0 +1,24 @@ +name: "Update protobufs" +on: workflow_dispatch + +jobs: + update-protobufs: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + with: + submodules: true + + - name: Update Submodule + run: | + git pull --recurse-submodules + git submodule update --remote --recursive + - name: Commit update + run: | + git config --global user.name 'github-actions' + git config --global user.email 'bot@noreply.github.com' + git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }} + git add proto + git commit -m "Update protobuf submodule" && git push || echo "No changes to commit" From df75182bcf2cb7ac3e754f98fa8ff9191bfdb894 Mon Sep 17 00:00:00 2001 From: Sacha Weatherstone Date: Fri, 31 Dec 2021 13:04:34 +1100 Subject: [PATCH 2/4] Fix protobuf submodule --- proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto b/proto index 1d3b4806a..4a64080d1 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit 1d3b4806ab5dc4b8ab62063dbb5799ab900464e6 +Subproject commit 4a64080d160f9219768a4126414d41dc82a3d63c 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 3/4] 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 --- 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 . #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 Date: Sat, 1 Jan 2022 20:12:24 +0100 Subject: [PATCH 4/4] 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) {