andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-06 11:49:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

group channel status after halt & xoff fix

Browse Source
This commit is contained in:
Andrey Klimov
2021-08-24 00:32:12 +03:00
parent 09fa78b0c8
commit 56a8c5c80b
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
compiled/lighthub21/firmware.bin
View File

Binary file not shown.

3
compiled/update_bin.sh
View File

@@ -5,12 +5,11 @@ cp ../.pio/build/mega2560slim-5100/firmware.hex mega2560slim-5100
cp ../.pio/build/mega2560slim-5100/firmware.bin mega2560slim-5100 cp ../.pio/build/mega2560slim-5100/firmware.bin mega2560slim-5100
cp ../.pio/build/mega2560slim2/firmware.hex mega2560slim2 cp ../.pio/build/mega2560slim2/firmware.hex mega2560slim2
cp ../.pio/build/mega2560slim2/firmware.bin mega2560slim2 cp ../.pio/build/mega2560slim2/firmware.bin mega2560slim2
cp ../.pio/build/due-5100/firmware.bin due-5100
cp ../.pio/build/mega2560-5100/firmware.hex mega2560-5100 cp ../.pio/build/mega2560-5100/firmware.hex mega2560-5100
cp ../.pio/build/due-5500/firmware.bin due-5500
cp ../.pio/build/nrf52840/firmware.hex nrf52840-5500 cp ../.pio/build/nrf52840/firmware.hex nrf52840-5500
cp ../.pio/build/esp32-wifi/firmware.bin esp32-wifi cp ../.pio/build/esp32-wifi/firmware.bin esp32-wifi
cp ../.pio/build/stm32-enc2860/firmware.bin stm32-enc2860 cp ../.pio/build/stm32-enc2860/firmware.bin stm32-enc2860
cp ../.pio/build/esp8266-wifi/firmware.bin esp8266-wifi cp ../.pio/build/esp8266-wifi/firmware.bin esp8266-wifi
cp ../.pio/build/lighthub21/firmware.bin lighthub21 cp ../.pio/build/lighthub21/firmware.bin lighthub21
cp ../.pio/build/mega2560-5500/firmware.hex mega2560-5500 cp ../.pio/build/mega2560-5500/firmware.hex mega2560-5500
cp ../.pio/build/stm32/firmware.* stm32

2
lighthub/item.cpp
View File

@@ -880,6 +880,7 @@ int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion)
break; break;
case CMD_XON: case CMD_XON:
chActive=(isActive()>0);
if (!chActive) //if channel was'nt active before CMD_XON if (!chActive) //if channel was'nt active before CMD_XON
{ {
cmd.loadItemDef(this); cmd.loadItemDef(this);
@@ -894,6 +895,7 @@ int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion)
} }
break; break;
case CMD_HALT: case CMD_HALT:
chActive=(isActive()>0);
if (chActive) //if channel was active before CMD_HALT if (chActive) //if channel was active before CMD_HALT
{ {
cmd.Cmd(CMD_OFF); cmd.Cmd(CMD_OFF);