From 53ac72d9f81001cbc274ad3bcd2d356a16fc92d6 Mon Sep 17 00:00:00 2001 From: Zefek Date: Thu, 14 May 2026 11:59:23 +0200 Subject: [PATCH 1/2] RSSI --- .gitmodules | 2 +- Garage.ino | 4 +++- MQTTESP8266 | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index f2db511..662ba6c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "MQTTESP8266"] path = MQTTESP8266 url = https://github.com/Zefek/MQTTESP8266.git - branch = 6.0 + branch = RSSI diff --git a/Garage.ino b/Garage.ino index d7ba556..be6e789 100644 --- a/Garage.ino +++ b/Garage.ino @@ -27,6 +27,7 @@ struct DiagData { uint8_t resetReason; uint16_t loopMaxMs; uint16_t doorCycles; + int8_t rssi; }; #pragma pack(pop) @@ -46,7 +47,7 @@ AM2302::AM2302_Sensor am2302{ TEMPERATURE_SENSOR_PIN }; char temperatureData[10]; bool doorMoveDetected = false; bool closeRequired = false; -DiagData currentDiagData = { 0, 0, 0, 0, 0, 0, 0, 0 }; +DiagData currentDiagData = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }; unsigned long lastDiagSendMillis = 0; extern int __heap_start, *__brkval; @@ -150,6 +151,7 @@ void sendDiag() { currentDiagData.uptime = currentMillis / 60000; currentDiagData.freeRam = freeRam(); + currentDiagData.rssi = espDrv.GetRssi(); uint8_t buffer[sizeof(DiagData)]; memcpy(buffer, ¤tDiagData, sizeof(DiagData)); mqttClient.Publish(GARAGE_DIAG, buffer, sizeof(DiagData), false); diff --git a/MQTTESP8266 b/MQTTESP8266 index 0fc63a7..97b3634 160000 --- a/MQTTESP8266 +++ b/MQTTESP8266 @@ -1 +1 @@ -Subproject commit 0fc63a725df0f208de012f7cbcc4f4243d4a72ad +Subproject commit 97b36343a40c0e56fac11d5ee85b6c7c4c51a48a From d1fe2548844b05a0f4b2ac82de8547bc4656ade1 Mon Sep 17 00:00:00 2001 From: Zefek <32429493+Zefek@users.noreply.github.com> Date: Sun, 24 May 2026 19:57:07 +0200 Subject: [PATCH 2/2] Refactor deployment workflow for environment inputs --- .github/workflows/deployment.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 6867e51..b280930 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -1,7 +1,16 @@ name: Deploy Garage on Environment on: - deployment: + workflow_dispatch: + inputs: + environment: + required: true + type: choice + options: + - Home + serial_port: + required: true + type: string permissions: contents: read @@ -10,7 +19,7 @@ permissions: jobs: deployment: runs-on: [self-hosted, iot] - environment: Home + environment: ${{ inputs.environment }} steps: @@ -69,14 +78,14 @@ jobs: - name: Compile Arduino project run: | - & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" compile --profile Garage_UNO ./ --output-dir build + & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" compile ./ --output-dir build - name: Upload firmware to Arduino env: - SERIAL_PORT: ${{ github.event.deployment.payload.serial_port }} + SERIAL_PORT: ${{ github.event.inputs.serial_port }} run: | if ($env:SERIAL_PORT -notmatch '^COM\d+$') { Write-Error "Invalid serial port format: $env:SERIAL_PORT" exit 1 } - & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" upload --profile Garage_UNO --port $env:SERIAL_PORT --input-dir build + & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" upload --port $env:SERIAL_PORT --input-dir build