2 Commits
Author SHA1 Message Date
andryandCopilot 1c839091b6 sprinkler - small fix
Co-authored-by: Copilot <copilot@github.com>
2026-05-25 18:05:26 +03:00
andry 7e7abce6b6 Compiled bins 2026-05-25 14:59:15 +03:00
20 changed files with 50624 additions and 48300 deletions
+2 -1
View File
@@ -17,4 +17,5 @@
-DRESTART_LAN_ON_MQTT_ERRORS
-DOTA_PORT=80
-DMERCURY_ENABLE
-D ROTARYENCODER
-D ROTARYENCODER
-D SPRINKLER_ENABLE
+2 -1
View File
@@ -59,4 +59,5 @@
-D CORS=\"*\"
-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
#-DMERCURY_ENABLE
-D ROTARYENCODER
-D ROTARYENCODER
-D SPRINKLER_ENABLE
+2 -1
View File
@@ -74,4 +74,5 @@
-D CORS=\"*\"
-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
#-DMERCURY_ENABLE
-D ROTARYENCODER
-D ROTARYENCODER
-D SPRINKLER_ENABLE
+2 -1
View File
@@ -17,4 +17,5 @@
-D CORS=\"*\"
-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
#-DMERCURY_ENABLE
-D ROTARYENCODER
-D ROTARYENCODER
-D SPRINKLER_ENABLE
Binary file not shown.
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large Load Diff
+12055 -11293
View File
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -207,7 +207,7 @@ mqtt:
payload_not_available: "disconnected"
- name: "Полив водопровод"
state_topic: "edem/s_out/sprinkler/$vIN"
state_topic: "edem/s_out/sprinkler/$rVIN"
availability_topic: "edem/air/$state"
payload_available: "ready"
payload_not_available: "disconnected"
+11 -3
View File
@@ -204,7 +204,7 @@ root/s_out/sprinkler/$wMin - ON/OFF достигнут минимум воды
root/s_out/sprinkler/$rDren - ON/OFF включено реле дренажного насоса
root/s_out/sprinkler/$rPump - ON/OFF включено реле основного насоса
root/s_out/sprinkler/set - значение счетчика воды (восстанавливается при перезагрузке из данного топика)
root/s_out/sprinkler/$vIN - ON/OFF - признак открытия клапана налива бака из водопровода
root/s_out/sprinkler/$rVIN - ON/OFF - признак открытия клапана налива бака из водопровода
root/s_out/sprinkler/garden/set - требуемый обьем (или время) полива зоны
root/s_out/sprinkler/garden/cmd - ON или OFF - признак включения полива зоны
@@ -223,7 +223,7 @@ sensor:
state_topic: "root/s_out/sprinkler/$wMin"
- name: "Полив водопровод"
state_topic: "root/s_out/sprinkler/$vIN"
state_topic: "root/s_out/sprinkler/$rVIN"
- name: "Полив дренаж вкл"
state_topic: "root/s_out/sprinkler/$rDren"
@@ -323,7 +323,15 @@ button:
- name: "Полив запретить"
command_topic: "root/air/sprinkler/cmd"
payload_press: "DISABLE"
payload_press: "DISABLE"
- name: "Полив осушение бака"
command_topic: "root/air/sprinkler/cmd"
payload_press: "DRY"
#Такую проверку можно добавить везде, при ее наличии обьекты станут недоступными если контроллер оффлайн
availability_topic: "root/air/$state"
payload_available: "ready"
payload_not_available: "disconnected"
number:
+1 -1
View File
@@ -672,7 +672,7 @@ int out_sprinkler::Poll(short cause)
else
{
uint32_t flowTimer = (uint32_t)getIntFromJson(gatesObj, "@flowTimer", now);
if (isTimeOver(flowTimer, now, 1000UL))
if (isTimeOver(flowTimer, now, 1000UL) && setVal > 0)
{
updateZoneValue(currentZone, 1);
setValToJson(gatesObj, "@flowTimer", (long)now);