From 637e77e2a990ccec8f93dcb8af206c83c760fa39 Mon Sep 17 00:00:00 2001 From: Zefek <32429493+Zefek@users.noreply.github.com> Date: Thu, 7 May 2026 19:21:33 +0200 Subject: [PATCH 1/6] Update MQTTESP8266 library installation method Replaced MQTTESP8266 library installation with a specific git URL. --- .github/workflows/build_environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_environment.yml b/.github/workflows/build_environment.yml index b96dc05..f146566 100644 --- a/.github/workflows/build_environment.yml +++ b/.github/workflows/build_environment.yml @@ -33,7 +33,7 @@ jobs: & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" lib install "DallasTemperature@4.0.6" & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" lib install "OneWire@2.3.8" & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" lib install "TX07K-TXC@1.0.4" - & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" lib install "MQTTESP8266@5.1.2" + & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" lib install --git-url https://github.com/Zefek/MQTTESP8266.git#6.0 - name: Generate configs from secrets repo shell: powershell From 91785276c2cdeb3e95f2e26db5e96b2031261dff Mon Sep 17 00:00:00 2001 From: Zefek <32429493+Zefek@users.noreply.github.com> Date: Thu, 7 May 2026 19:22:43 +0200 Subject: [PATCH 2/6] Change MQTTESP8266 library installation method Updated MQTTESP8266 library installation to use a specific GitHub commit. --- .github/workflows/pull_request_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request_build.yml b/.github/workflows/pull_request_build.yml index 56f4314..01af116 100644 --- a/.github/workflows/pull_request_build.yml +++ b/.github/workflows/pull_request_build.yml @@ -33,7 +33,7 @@ jobs: arduino-cli lib install "LiquidCrystal_I2C@2.0.0" arduino-cli lib install "DallasTemperature@4.0.6" arduino-cli lib install "OneWire@2.3.8" - arduino-cli lib install "MQTTESP8266@5.1.2" + arduino-cli lib install --git-url https://github.com/Zefek/MQTTESP8266.git#6.0 arduino-cli lib install "TX07K-TXC@1.0.4" - name: Set configs From bf528acd8f0f7077707f4f1f7d0d308fd0ef3c4f Mon Sep 17 00:00:00 2001 From: Zefek <32429493+Zefek@users.noreply.github.com> Date: Thu, 7 May 2026 19:27:43 +0200 Subject: [PATCH 3/6] Enable unsafe library installation in Arduino CLI --- .github/workflows/pull_request_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pull_request_build.yml b/.github/workflows/pull_request_build.yml index 01af116..93c25af 100644 --- a/.github/workflows/pull_request_build.yml +++ b/.github/workflows/pull_request_build.yml @@ -22,6 +22,7 @@ jobs: - name: Initialize Arduino CLI run: | arduino-cli config init + arduino-cli config set library.enable_unsafe_install true arduino-cli core update-index - name: Install required board core From c7a8a81b7bf7aa485e754f37d2e5ada84df7f860 Mon Sep 17 00:00:00 2001 From: Zefek Date: Thu, 7 May 2026 21:30:31 +0200 Subject: [PATCH 4/6] Update na v 6 --- HeatingTemperatureRegulator.ino | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/HeatingTemperatureRegulator.ino b/HeatingTemperatureRegulator.ino index 14919d8..be07ce3 100644 --- a/HeatingTemperatureRegulator.ino +++ b/HeatingTemperatureRegulator.ino @@ -27,6 +27,7 @@ void OutsideTemperatureChanged(double temperature, uint8_t channel, uint8_t sensorId, uint8_t* rawData, bool transmitedByButton); void MQTTMessageReceive(char* topic, uint8_t* payload, uint16_t length); +void OnBusy(uint8_t count); void computeRequiredTemperature(); void DataTimeout(); @@ -180,6 +181,7 @@ unsigned long heaterStartTimeoutBegin = 0; bool checkHeaterStartTimeout = false; unsigned long lastWasteGasReadMillis = 0; unsigned short wasteGasGradientCount = 0; +bool closedRequired = false; int freeRam() { extern int __heap_start, *__brkval; @@ -204,6 +206,7 @@ void setup() { tempSensors.Init(); drv.Init(64); drv.DataTimeout = DataTimeout; + drv.OnBusy = OnBusy; delay(1000); pinMode(MOREHEATINGRELAYPIN, OUTPUT); pinMode(LESSHEATINGRELAYPIN, OUTPUT); @@ -303,7 +306,15 @@ bool IsLeapYear(int year) void DataTimeout() { - drv.Close(); + closedRequired = true; +} + +void OnBusy(uint8_t count) +{ + if(count > 10) + { + closedRequired = true; + } } void MQTTMessageReceive(char* topic, uint8_t* payload, unsigned int length) @@ -852,7 +863,11 @@ void CheckHeaterStartTimeout() void loop() { currentMillis = millis(); wdt_reset(); - + if(closedRequired) + { + drv.Close(); + closedRequired = false; + } if(!client.Loop()) { MQTTConnect(); From 3ec6231e43027b46d072089cb46e0470ceda336f Mon Sep 17 00:00:00 2001 From: Zefek Date: Fri, 8 May 2026 12:06:42 +0200 Subject: [PATCH 5/6] Instalace z gitu --- .github/workflows/build_environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_environment.yml b/.github/workflows/build_environment.yml index f146566..1da71db 100644 --- a/.github/workflows/build_environment.yml +++ b/.github/workflows/build_environment.yml @@ -19,6 +19,7 @@ jobs: - name: Initialize Arduino CLI run: | & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" core update-index + & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" config set library.enable_unsafe_install true - name: Install required board core run: | From f65ec3d9c0aabc1fb8051eda536b59031549128f Mon Sep 17 00:00:00 2001 From: Zefek <32429493+Zefek@users.noreply.github.com> Date: Sat, 9 May 2026 13:39:45 +0200 Subject: [PATCH 6/6] Submoduly a sketch (#76) --- .github/workflows/build_environment.yml | 22 ++++------------------ .github/workflows/pull_request_build.yml | 17 +++-------------- .gitmodules | 8 ++++++++ MQTTESP8266 | 1 + TX07K-TXC | 1 + sketch.yaml | 13 +++++++++++++ 6 files changed, 30 insertions(+), 32 deletions(-) create mode 100644 .gitmodules create mode 160000 MQTTESP8266 create mode 160000 TX07K-TXC create mode 100644 sketch.yaml diff --git a/.github/workflows/build_environment.yml b/.github/workflows/build_environment.yml index 1da71db..d30067e 100644 --- a/.github/workflows/build_environment.yml +++ b/.github/workflows/build_environment.yml @@ -15,26 +15,12 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + with: + submodules: true - name: Initialize Arduino CLI run: | & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" core update-index - & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" config set library.enable_unsafe_install true - - - name: Install required board core - run: | - & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" core install arduino:avr@1.8.7 - - - name: Install custom Arduino libraries (Windows) - shell: powershell - run: | - & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" lib update-index - & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" lib install "Ds1302@1.1.0" - & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" lib install "LiquidCrystal_I2C@2.0.0" - & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" lib install "DallasTemperature@4.0.6" - & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" lib install "OneWire@2.3.8" - & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" lib install "TX07K-TXC@1.0.4" - & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" lib install --git-url https://github.com/Zefek/MQTTESP8266.git#6.0 - name: Generate configs from secrets repo shell: powershell @@ -82,7 +68,7 @@ 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 --fqbn arduino:avr:mega ./ --output-dir build + & "$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 - name: Upload firmware to Arduino env: @@ -92,5 +78,5 @@ jobs: 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 --fqbn arduino:avr: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 --profile Heater_Mega --port $env:SERIAL_PORT --input-dir build diff --git a/.github/workflows/pull_request_build.yml b/.github/workflows/pull_request_build.yml index 93c25af..dc6ccce 100644 --- a/.github/workflows/pull_request_build.yml +++ b/.github/workflows/pull_request_build.yml @@ -15,6 +15,8 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + with: + submodules: true - name: Install Arduino CLI uses: arduino/setup-arduino-cli@81d310742121c928ea9c8bbd407b4217b432ae02 # v2.0.0 @@ -22,21 +24,8 @@ jobs: - name: Initialize Arduino CLI run: | arduino-cli config init - arduino-cli config set library.enable_unsafe_install true arduino-cli core update-index - - name: Install required board core - run: arduino-cli core install arduino:avr@1.8.7 # např. pro Arduino Uno - - - name: Install libraries - run: | - arduino-cli lib install "Ds1302@1.1.0" - arduino-cli lib install "LiquidCrystal_I2C@2.0.0" - arduino-cli lib install "DallasTemperature@4.0.6" - arduino-cli lib install "OneWire@2.3.8" - arduino-cli lib install --git-url https://github.com/Zefek/MQTTESP8266.git#6.0 - arduino-cli lib install "TX07K-TXC@1.0.4" - - name: Set configs run: | cp config_default.h config.h @@ -50,4 +39,4 @@ jobs: - name: Compile Arduino project run: | - arduino-cli compile --fqbn arduino:avr:mega ./ + arduino-cli compile --profile Heater_Mega ./ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..81f3614 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,8 @@ +[submodule "MQTTESP8266"] + path = MQTTESP8266 + url = https://github.com/Zefek/MQTTESP8266.git + branch = 6.0 +[submodule "TX07K-TXC"] + path = TX07K-TXC + url = https://github.com/Zefek/TX07K-TXC.git + branch = main diff --git a/MQTTESP8266 b/MQTTESP8266 new file mode 160000 index 0000000..0fc63a7 --- /dev/null +++ b/MQTTESP8266 @@ -0,0 +1 @@ +Subproject commit 0fc63a725df0f208de012f7cbcc4f4243d4a72ad diff --git a/TX07K-TXC b/TX07K-TXC new file mode 160000 index 0000000..31d4008 --- /dev/null +++ b/TX07K-TXC @@ -0,0 +1 @@ +Subproject commit 31d4008090fb70e8170d5f65cd840d36f1b7ce13 diff --git a/sketch.yaml b/sketch.yaml new file mode 100644 index 0000000..eb0e2fe --- /dev/null +++ b/sketch.yaml @@ -0,0 +1,13 @@ +profiles: + Heater_Mega: + fqbn: arduino:avr:mega + platforms: + - platform: arduino:avr (1.8.7) + libraries: + - Ds1302 (1.1.0) + - LiquidCrystal_I2C (2.0.0) + - DallasTemperature (4.0.6) + - OneWire (2.3.8) + - dir: MQTTESP8266 + - dir: TX07K-TXC +default_profile: Heater_Mega