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

Merge pull request #3556 from MadDoct/development 

Correct bug with toggle command and pinmode 6 when using interlocking
This commit is contained in:
Theo Arends 2018-08-23 09:54:31 +02:00 committed by GitHub
parent 640e34607b 87374edb61
commit 0cee695df4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sonoff/xsns_29_mcp230xx.ino
View File

@ -68,9 +68,7 @@ const char MCP230XX_CMND_RESPONSE[] PROGMEM = "{\"S29cmnd_D%i\":{\"COMMAND\":\"%
const char* ConvertNumTxt(uint8_t statu, uint8_t pinmod=0) { const char* ConvertNumTxt(uint8_t statu, uint8_t pinmod=0) {
#ifdef USE_MCP230xx_OUTPUT #ifdef USE_MCP230xx_OUTPUT
if (pinmod == 6) { if (pinmod == 6 && statu < 2) statu = abs(statu-1);
if (statu < 2) statu = abs(statu-1);
}
#endif // USE_MCP230xx_OUTPUT #endif // USE_MCP230xx_OUTPUT
switch (statu) { switch (statu) {
case 0: case 0:
@ -300,7 +298,7 @@ void MCP230xx_SetOutPin(uint8_t pin,uint8_t pinstate) {
uint8_t pinmo = Settings.mcp230xx_config[pin].pinmode; uint8_t pinmo = Settings.mcp230xx_config[pin].pinmode;
uint8_t interlock = Settings.flag.interlock; uint8_t interlock = Settings.flag.interlock;
int pinadd = (pin % 2)+1-(3*(pin % 2)); //check if pin is odd or even and convert to 1 (if even) or -1 (if odd) int pinadd = (pin % 2)+1-(3*(pin % 2)); //check if pin is odd or even and convert to 1 (if even) or -1 (if odd)
char cmnd[7], stt[7]; char cmnd[7], stt[4];
if (pin > 7) port=1; if (pin > 7) port=1;
portpins = MCP230xx_readGPIO(port); portpins = MCP230xx_readGPIO(port);
if (interlock && pinmo == Settings.mcp230xx_config[pin+pinadd].pinmode) { if (interlock && pinmo == Settings.mcp230xx_config[pin+pinadd].pinmode) {
@ -311,7 +309,11 @@ void MCP230xx_SetOutPin(uint8_t pin,uint8_t pinstate) {
if (pinstate) portpins &= ~(1 << pin+pinadd-(port*8)),portpins |= (1 << pin-(port*8)); else portpins &= ~(1 << pin-(port*8)); if (pinstate) portpins &= ~(1 << pin+pinadd-(port*8)),portpins |= (1 << pin-(port*8)); else portpins &= ~(1 << pin-(port*8));
} }
} else { } else {
if (pinmo == 6) {
portpins |= (1 << pin+pinadd-(port*8)),portpins ^= (1 << pin-(port*8));
} else {
portpins &= ~(1 << pin+pinadd-(port*8)),portpins ^= (1 << pin-(port*8)); portpins &= ~(1 << pin+pinadd-(port*8)),portpins ^= (1 << pin-(port*8));
}
} }
} else { } else {
if (pinstate < 2) { if (pinstate < 2) {