mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix kCommandSource adding heating source

This commit is contained in:
Javier Arigita 2020-04-18 20:51:03 +02:00
parent 5122ea6c10
commit a979136161
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasmota/xdrv_39_heating.ino
View File

@ -55,11 +55,7 @@ typedef union {
uint16_t status_output : 1; // Status of the output switch
uint16_t status_cycle_active : 1; // Status showing if cycle is active (Output ON) or not (Output OFF)
uint16_t state_emergency : 1; // State for heating emergency
<<<<<<< HEAD
uint16_t counter_seconds : 6; // Second counter
=======
uint16_t counter_seconds : 6; // Second counter used to track minutes
>>>>>>> new_branch_dev
};
} HeatingBitfield;