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

Merge remote-tracking branch 'upstream/development' into max31855

This commit is contained in:
Markus Past 2018-12-30 12:55:28 +01:00
parent 1e125fc4c6 8b84ec35f7
commit 42dbda1ffb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sonoff/sonoff_template.h
View File

@ -464,11 +464,11 @@ const uint8_t kGpioNiceList[] PROGMEM = {
#endif
#ifdef USE_MGC3130
GPIO_MGC3130_XFER,
GPIO_MGC3130_RESET
GPIO_MGC3130_RESET,
#endif
#ifdef USE_AZ7798
GPIO_AZ_TXD, // AZ-Instrument 7798 CO2 datalogger Serial interface
GPIO_AZ_RXD // AZ-Instrument 7798 CO2 datalogger Serial interface
GPIO_AZ_RXD, // AZ-Instrument 7798 CO2 datalogger Serial interface
#endif
#ifdef USE_MAX31855
GPIO_MAX31855CS, // MAX31855 Serial interface