From c222a0929ef89f3315a924d26c4668ac77e60e75 Mon Sep 17 00:00:00 2001 From: Zefek Date: Thu, 14 May 2026 12:51:27 +0200 Subject: [PATCH 1/2] RSSI --- .gitmodules | 2 +- HeatingTemperatureRegulator.ino | 2 ++ MQTTESP8266 | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 81f3614..8ffdec7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "MQTTESP8266"] path = MQTTESP8266 url = https://github.com/Zefek/MQTTESP8266.git - branch = 6.0 + branch = RSSI [submodule "TX07K-TXC"] path = TX07K-TXC url = https://github.com/Zefek/TX07K-TXC.git diff --git a/HeatingTemperatureRegulator.ino b/HeatingTemperatureRegulator.ino index be07ce3..34c034d 100644 --- a/HeatingTemperatureRegulator.ino +++ b/HeatingTemperatureRegulator.ino @@ -115,6 +115,7 @@ struct DiagData { uint16_t sensorErr; uint8_t resetReason; uint16_t loopMaxMs; + int8_t rssi; }; #pragma pack(pop) @@ -713,6 +714,7 @@ void sendDiag() { currentDiagData.uptime = currentMillis / 60000; currentDiagData.freeRam = freeRam(); + currentDiagData.rssi = drv.GetRssi(); uint8_t buffer[sizeof(DiagData)]; memcpy(buffer, ¤tDiagData, sizeof(DiagData)); client.Publish(TOPIC_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 478a1ba67e0c4775655057f17891aa1052315c00 Mon Sep 17 00:00:00 2001 From: Zefek <32429493+Zefek@users.noreply.github.com> Date: Sun, 24 May 2026 19:55:37 +0200 Subject: [PATCH 2/2] Add workflow dispatch inputs for environment and serial port --- .github/workflows/build_environment.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_environment.yml b/.github/workflows/build_environment.yml index d30067e..7f82d9b 100644 --- a/.github/workflows/build_environment.yml +++ b/.github/workflows/build_environment.yml @@ -1,7 +1,16 @@ name: Build HeatingRegulator 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: build: runs-on: [self-hosted, iot] - environment: Home + environment: ${{ inputs.environment }} steps: - name: Checkout repository @@ -68,15 +77,15 @@ 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 Heater_Mega ./ --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 Heater_Mega --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