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

Cleanup #else and #endif statements with // USE_MCP230xx_OUTPUT comments

This commit is contained in:
andrethomas 2018-08-14 21:36:10 +02:00
parent 6427f5f3da
commit 18f47be237
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sonoff/xsns_29_mcp230xx.ino
View File

@ -60,7 +60,7 @@ uint8_t mcp230xx_int_en = 0;
#ifdef USE_MCP230xx_OUTPUT #ifdef USE_MCP230xx_OUTPUT
uint16_t mcp230xx_tele_count = 0; uint16_t mcp230xx_tele_count = 0;
#endif #endif // USE_MCP230xx_OUTPUT
const char MCP230XX_SENSOR_RESPONSE[] PROGMEM = "{\"Sensor29_D%i\":{\"MODE\":%i,\"PULL-UP\":\"%s\",\"STATE\":\"%s\"}}"; const char MCP230XX_SENSOR_RESPONSE[] PROGMEM = "{\"Sensor29_D%i\":{\"MODE\":%i,\"PULL-UP\":\"%s\",\"STATE\":\"%s\"}}";
@ -103,7 +103,7 @@ void MCP230xx_ApplySettings(void) {
uint8_t reg_iodir = 0xFF; uint8_t reg_iodir = 0xFF;
#ifdef USE_MCP230xx_OUTPUT #ifdef USE_MCP230xx_OUTPUT
uint8_t reg_portpins = 0x00; uint8_t reg_portpins = 0x00;
#endif #endif USE_MCP230xx_OUTPUT
for (uint8_t idx = 0; idx < 8; idx++) { for (uint8_t idx = 0; idx < 8; idx++) {
switch (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pinmode) { switch (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pinmode) {
case 0 ... 1: case 0 ... 1:
@ -133,18 +133,18 @@ void MCP230xx_ApplySettings(void) {
if (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pullup && (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pinmode < 5)) { if (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pullup && (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pinmode < 5)) {
reg_gppu |= (1 << idx); reg_gppu |= (1 << idx);
} }
#else #else // not USE_MCP230xx_OUTPUT
if (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pullup) { if (Settings.mcp230xx_config[idx+(mcp230xx_port*8)].pullup) {
reg_gppu |= (1 << idx); reg_gppu |= (1 << idx);
} }
#endif #endif // USE_MCP230xx_OUTPUT
} }
I2cWrite8(mcp230xx_address, MCP230xx_GPPU+mcp230xx_port, reg_gppu); I2cWrite8(mcp230xx_address, MCP230xx_GPPU+mcp230xx_port, reg_gppu);
I2cWrite8(mcp230xx_address, MCP230xx_GPINTEN+mcp230xx_port, reg_gpinten); I2cWrite8(mcp230xx_address, MCP230xx_GPINTEN+mcp230xx_port, reg_gpinten);
I2cWrite8(mcp230xx_address, MCP230xx_IODIR+mcp230xx_port, reg_iodir); I2cWrite8(mcp230xx_address, MCP230xx_IODIR+mcp230xx_port, reg_iodir);
#ifdef USE_MCP230xx_OUTPUT #ifdef USE_MCP230xx_OUTPUT
I2cWrite8(mcp230xx_address, MCP230xx_GPIO+mcp230xx_port, reg_portpins); I2cWrite8(mcp230xx_address, MCP230xx_GPIO+mcp230xx_port, reg_portpins);
#endif #endif // USE_MCP230xx_OUTPUT
} }
mcp230xx_int_en=int_en; mcp230xx_int_en=int_en;
} }
@ -306,7 +306,7 @@ bool MCP230xx_Command(void) {
if (data == "RESET4") { MCP230xx_Reset(4); return serviced; } if (data == "RESET4") { MCP230xx_Reset(4); return serviced; }
#ifdef USE_MCP230xx_OUTPUT #ifdef USE_MCP230xx_OUTPUT
if (data == "RESET5") { MCP230xx_Reset(5); return serviced; } if (data == "RESET5") { MCP230xx_Reset(5); return serviced; }
#endif #endif // USE_MCP230xx_OUTPUT
_a = data.indexOf(","); _a = data.indexOf(",");
pin = data.substring(0, _a).toInt(); pin = data.substring(0, _a).toInt();
if (pin < mcp230xx_pincount) { if (pin < mcp230xx_pincount) {
@ -321,7 +321,7 @@ bool MCP230xx_Command(void) {
uint8_t pinmod = Settings.mcp230xx_config[pin].pinmode; uint8_t pinmod = Settings.mcp230xx_config[pin].pinmode;
sprintf(pinstatustxtr,ConvertNumTxt(portdata>>(pin-(port*8))&1,pinmod)); sprintf(pinstatustxtr,ConvertNumTxt(portdata>>(pin-(port*8))&1,pinmod));
snprintf_P(mqtt_data, sizeof(mqtt_data), MCP230XX_SENSOR_RESPONSE,pin,pinmod,pulluptxtr,pinstatustxtr); snprintf_P(mqtt_data, sizeof(mqtt_data), MCP230XX_SENSOR_RESPONSE,pin,pinmod,pulluptxtr,pinstatustxtr);
#else #else // not USE_MCP230xx_OUTPUT
sprintf(pinstatustxtr,ConvertNumTxt(portdata>>(pin-(port*8))&1)); sprintf(pinstatustxtr,ConvertNumTxt(portdata>>(pin-(port*8))&1));
snprintf_P(mqtt_data, sizeof(mqtt_data), MCP230XX_SENSOR_RESPONSE,pin,Settings.mcp230xx_config[pin].pinmode,pulluptxtr,pinstatustxtr); snprintf_P(mqtt_data, sizeof(mqtt_data), MCP230XX_SENSOR_RESPONSE,pin,Settings.mcp230xx_config[pin].pinmode,pulluptxtr,pinstatustxtr);
#endif //USE_MCP230xx_OUTPUT #endif //USE_MCP230xx_OUTPUT
@ -431,7 +431,7 @@ void MCP230xx_OutputTelemetry(void) {
} }
} }
#endif #endif // USE_MCP230xx_OUTPUT
/*********************************************************************************************\ /*********************************************************************************************\
@ -452,7 +452,7 @@ boolean Xsns29(byte function)
mcp230xx_tele_count=0; mcp230xx_tele_count=0;
MCP230xx_OutputTelemetry(); MCP230xx_OutputTelemetry();
} }
#endif #endif // USE_MCP230xx_OUTPUT
break; break;
case FUNC_EVERY_50_MSECOND: case FUNC_EVERY_50_MSECOND:
if (mcp230xx_int_en) { // Only check for interrupts if its enabled on one of the pins if (mcp230xx_int_en) { // Only check for interrupts if its enabled on one of the pins