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

Merge pull request #3304 from andrethomas/development 

MCP23008/MCP23017 bugfix - Only check for interrupts if enabled
This commit is contained in:
Theo Arends 2018-07-22 22:45:55 +02:00 committed by GitHub
parent 55ea02bd3a 7285aa356f
commit f945c0926f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sonoff/xsns_29_mcp230xx.ino
View File

@ -56,6 +56,7 @@ uint8_t mcp230xx_type = 0;
uint8_t mcp230xx_address; uint8_t mcp230xx_address;
uint8_t mcp230xx_addresses[] = { MCP230xx_ADDRESS1, MCP230xx_ADDRESS2, MCP230xx_ADDRESS3, MCP230xx_ADDRESS4, MCP230xx_ADDRESS5, MCP230xx_ADDRESS6, MCP230xx_ADDRESS7, MCP230xx_ADDRESS8 }; uint8_t mcp230xx_addresses[] = { MCP230xx_ADDRESS1, MCP230xx_ADDRESS2, MCP230xx_ADDRESS3, MCP230xx_ADDRESS4, MCP230xx_ADDRESS5, MCP230xx_ADDRESS6, MCP230xx_ADDRESS7, MCP230xx_ADDRESS8 };
uint8_t mcp230xx_pincount = 0; uint8_t mcp230xx_pincount = 0;
uint8_t mcp230xx_int_en = 0;
const char MCP230XX_SENSOR_RESPONSE[] PROGMEM = "{\"Sensor29\":{\"D\":%i,\"MODE\":%i,\"PULL-UP\":%i}}"; const char MCP230XX_SENSOR_RESPONSE[] PROGMEM = "{\"Sensor29\":{\"D\":%i,\"MODE\":%i,\"PULL-UP\":%i}}";
@ -67,6 +68,7 @@ void MCP230xx_ApplySettings(void) {
uint8_t reg_gppu = 0; uint8_t reg_gppu = 0;
uint8_t reg_gpinten = 0; uint8_t reg_gpinten = 0;
uint8_t reg_iodir = 0xFF; uint8_t reg_iodir = 0xFF;
uint8_t int_en = 0;
for (uint8_t idx = 0; idx < 8; idx++) { for (uint8_t idx = 0; idx < 8; idx++) {
switch (Settings.mcp230xx_config[idx].pinmode) { switch (Settings.mcp230xx_config[idx].pinmode) {
case 0 ... 1: case 0 ... 1:
@ -75,6 +77,7 @@ void MCP230xx_ApplySettings(void) {
case 2 ... 4: case 2 ... 4:
reg_iodir |= (1 << idx); reg_iodir |= (1 << idx);
reg_gpinten |= (1 << idx); reg_gpinten |= (1 << idx);
int_en=1;
break; break;
default: default:
break; break;
@ -98,6 +101,7 @@ void MCP230xx_ApplySettings(void) {
case 2 ... 4: case 2 ... 4:
reg_iodir |= (1 << idx - 8); reg_iodir |= (1 << idx - 8);
reg_gpinten |= (1 << idx - 8); reg_gpinten |= (1 << idx - 8);
int_en=1;
break; break;
default: default:
break; break;
@ -110,6 +114,7 @@ void MCP230xx_ApplySettings(void) {
I2cWrite8(mcp230xx_address, MCP230xx_GPINTEN + 1, reg_gpinten); I2cWrite8(mcp230xx_address, MCP230xx_GPINTEN + 1, reg_gpinten);
I2cWrite8(mcp230xx_address, MCP230xx_IODIR + 1, reg_iodir); I2cWrite8(mcp230xx_address, MCP230xx_IODIR + 1, reg_iodir);
} }
mcp230xx_int_en=int_en;
} }
void MCP230xx_Detect() void MCP230xx_Detect()
@ -308,7 +313,9 @@ boolean Xsns29(byte function)
MCP230xx_Detect(); MCP230xx_Detect();
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
MCP230xx_CheckForInterrupt(); MCP230xx_CheckForInterrupt();
}
break; break;
case FUNC_JSON_APPEND: case FUNC_JSON_APPEND:
MCP230xx_Show(1); MCP230xx_Show(1);