Skip to content

Commit e7f67f9

Browse files
committed
Update sonoff_template.h
Fix PN532 compile error
1 parent f587510 commit e7f67f9

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Diff for: sonoff/sonoff_template.h

+10-10
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ enum UserSelectablePins {
162162
GPIO_MCP39F5_TX, // MCP39F501 Serial interface (Shelly2)
163163
GPIO_MCP39F5_RX, // MCP39F501 Serial interface (Shelly2)
164164
GPIO_MCP39F5_RST, // MCP39F501 Reset (Shelly2)
165-
GPIO_PN532_RXD, // PN532 NFC Serial Rx
166165
GPIO_PN532_TXD, // PN532 NFC Serial Tx
166+
GPIO_PN532_RXD, // PN532 NFC Serial Rx
167167
GPIO_SENSOR_END };
168168

169169
// Programmer selectable GPIO functionality offset by user selectable GPIOs
@@ -228,7 +228,7 @@ const char kSensorNames[] PROGMEM =
228228
D_SENSOR_BUTTON "1i|" D_SENSOR_BUTTON "2i|" D_SENSOR_BUTTON "3i|" D_SENSOR_BUTTON "4i|"
229229
D_SENSOR_BUTTON "1in|" D_SENSOR_BUTTON "2in|" D_SENSOR_BUTTON "3in|" D_SENSOR_BUTTON "4in|"
230230
D_SENSOR_NRG_SEL "|" D_SENSOR_NRG_SEL "i|" D_SENSOR_NRG_CF1 "|" D_SENSOR_HLW_CF "|" D_SENSOR_HJL_CF "|"
231-
D_SENSOR_MCP39F5_TX "|" D_SENSOR_MCP39F5_RX "|" D_SENSOR_MCP39F5_RST
231+
D_SENSOR_MCP39F5_TX "|" D_SENSOR_MCP39F5_RX "|" D_SENSOR_MCP39F5_RST "|"
232232
D_SENSOR_PN532_TX "|" D_SENSOR_PN532_RX
233233
;
234234

@@ -536,23 +536,23 @@ const uint8_t kGpioNiceList[] PROGMEM = {
536536
GPIO_TUYA_TX, // Tuya Serial interface
537537
GPIO_TUYA_RX, // Tuya Serial interface
538538
#endif
539-
#ifdef USE_MGC3130
540-
GPIO_MGC3130_XFER,
541-
GPIO_MGC3130_RESET,
542-
#endif
543539
#ifdef USE_AZ7798
544540
GPIO_AZ_TXD, // AZ-Instrument 7798 CO2 datalogger Serial interface
545541
GPIO_AZ_RXD, // AZ-Instrument 7798 CO2 datalogger Serial interface
546542
#endif
543+
#ifdef USE_PN532_HSU
544+
GPIO_PN532_TXD, // PN532 HSU Tx
545+
GPIO_PN532_RXD, // PN532 HSU Rx
546+
#endif
547+
#ifdef USE_MGC3130
548+
GPIO_MGC3130_XFER,
549+
GPIO_MGC3130_RESET,
550+
#endif
547551
#ifdef USE_MAX31855
548552
GPIO_MAX31855CS, // MAX31855 Serial interface
549553
GPIO_MAX31855CLK, // MAX31855 Serial interface
550554
GPIO_MAX31855DO, // MAX31855 Serial interface
551555
#endif
552-
#ifdef USE_PN532_HSU
553-
GPIO_PN532_RXD, // PN532 HSU Rx
554-
GPIO_PN532_TXD, // PN532 HSU Tx
555-
#endif
556556
};
557557

558558
const uint8_t kModuleNiceList[MAXMODULE] PROGMEM = {

0 commit comments

Comments
 (0)