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

Merge issue

This commit is contained in:
Raphael 2021-03-23 09:11:46 +01:00
parent 04c0b8d1d7
commit f65f816fca
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tasmota/tasmota_template.h
View File

@ -331,15 +331,9 @@ const char kSensorNames[] PROGMEM =
D_SENSOR_SSD1351_DC "|" D_SENSOR_SSD1351_DC "|"
D_SENSOR_XPT2046_CS "|" D_SENSOR_XPT2046_CS "|"
D_SENSOR_CSE7761_TX "|" D_SENSOR_CSE7761_RX "|" D_SENSOR_CSE7761_TX "|" D_SENSOR_CSE7761_RX "|"
<<<<<<< HEAD
D_SENSOR_VL53L0X_XSHUT "|" D_SENSOR_VL53L0X_XSHUT "|"
<<<<<<< HEAD
=======
>>>>>>> TFmini+
D_SENSOR_TFMINIPLUS_TX "|" D_SENSOR_TFMINIPLUS_RX "|" D_SENSOR_TFMINIPLUS_TX "|" D_SENSOR_TFMINIPLUS_RX "|"
=======
D_SENSOR_MAX7219_CLK "|" D_SENSOR_MAX7219_DIN "|" D_SENSOR_MAX7219_CS "|" D_SENSOR_MAX7219_CLK "|" D_SENSOR_MAX7219_DIN "|" D_SENSOR_MAX7219_CS "|"
>>>>>>> upstream/development
; ;
const char kSensorNamesFixed[] PROGMEM = const char kSensorNamesFixed[] PROGMEM =