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

Merge pull request #6526 from andrethomas/mcp230xx 

MCP230xx: Prevent inadvertent pinmode change
This commit is contained in:
Theo Arends 2019-09-30 22:09:49 +02:00 committed by GitHub
parent d7d0316769 dea255db26
commit 0e240bbeb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sonoff/xsns_29_mcp230xx.ino
View File

@ -655,9 +655,9 @@ bool MCP230xx_Command(void) {
intmode = atoi(subStr(sub_string, XdrvMailbox.data, ",", 4)); intmode = atoi(subStr(sub_string, XdrvMailbox.data, ",", 4));
} }
#ifdef USE_MCP230xx_OUTPUT #ifdef USE_MCP230xx_OUTPUT
if ((pin < mcp230xx_pincount) && (pinmode > 0) && (pinmode < 7) && (pullup < 2)) { if ((pin < mcp230xx_pincount) && (pinmode > 0) && (pinmode < 7) && (pullup < 2) && (paramcount > 2)) {
#else // not use OUTPUT #else // not use OUTPUT
if ((pin < mcp230xx_pincount) && (pinmode > 0) && (pinmode < 5) && (pullup < 2)) { if ((pin < mcp230xx_pincount) && (pinmode > 0) && (pinmode < 5) && (pullup < 2) && (paramcount > 2)) {
#endif // USE_MCP230xx_OUTPUT #endif // USE_MCP230xx_OUTPUT
Settings.mcp230xx_config[pin].pinmode=pinmode; Settings.mcp230xx_config[pin].pinmode=pinmode;
Settings.mcp230xx_config[pin].pullup=pullup; Settings.mcp230xx_config[pin].pullup=pullup;