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

fixes

This commit is contained in:
Marcus 2021-11-03 18:51:59 +01:00
parent 17155798c0
commit f58c06daee
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tasmota/tasmota_template.h
View File

@ -394,19 +394,12 @@ const char kSensorNames[] PROGMEM =
D_SENSOR_BL0939_RX "|"
D_SENSOR_BL0942_RX "|"
D_SENSOR_HM330X_SET "|"
<<<<<<< HEAD
D_SENSOR_HEARTBEAT "|" D_SENSOR_HEARTBEAT "_i|"
<<<<<<< HEAD
D_GPIO_SHIFT595_SRCLK "|" D_GPIO_SHIFT595_RCLK "|" D_GPIO_SHIFT595_OE "|" D_GPIO_SHIFT595_SER "|"
D_SENSOR_SOLAXX1_RTS "|"
D_SENSOR_OPTION " E|"
;
=======
=======
D_SENSOR_SDM230_TX "|" D_SENSOR_SDM230_RX
>>>>>>> changed: BUILDS.md
;
>>>>>>> changed: BUILDS.md
;
const char kSensorNamesFixed[] PROGMEM =
D_SENSOR_USER;