mirror of https://github.com/arendst/Tasmota.git
Add interrupt control to MCP23xxx driver
- Add interrupt control to MCP23xxx driver - Enable ADE7880 in tasmota32.bin
This commit is contained in:
Theo Arends
parent
3cd8839b6d
commit
a72bbbe30a
|
|
@ -104,6 +104,7 @@
|
|||
#define USE_LM75AD // [I2cDriver20] Enable LM75AD sensor (I2C addresses 0x48 - 0x4F) (+0k5 code)
|
||||
//#define USE_APDS9960 // [I2cDriver21] Enable APDS9960 Proximity Sensor (I2C address 0x39). Disables SHT and VEML6070 (+4k7 code)
|
||||
//#define USE_MCP230xx // [I2cDriver22] Enable MCP23008/MCP23017 - Must define I2C Address in #define USE_MCP230xx_ADDR below - range 0x20 - 0x27 (+4k7 code)
|
||||
//#define USE_MCP23XXX_DRV // [I2cDriver77] Enable MCP23xxx support as virtual switch/button/relay (+3k(I2C)/+5k(SPI) code)
|
||||
//#define USE_PCA9685 // [I2cDriver1] Enable PCA9685 I2C HW PWM Driver - Must define I2C Address in #define USE_PCA9685_ADDR below - range 0x40 - 0x47 (+1k4 code)
|
||||
//#define USE_MPR121 // [I2cDriver23] Enable MPR121 controller (I2C addresses 0x5A, 0x5B, 0x5C and 0x5D) in input mode for touch buttons (+1k3 code)
|
||||
#define USE_CCS811 // [I2cDriver24] Enable CCS811 sensor (I2C address 0x5A) (+2k2 code)
|
||||
|
|
|
|||
|
|
@ -350,13 +350,9 @@
|
|||
|
||||
#define USE_DS18x20 // Add support for DS18x20 sensors with id sort, single scan and read retry (+1k3 code)
|
||||
|
||||
|
||||
#define USE_ENERGY_SENSOR // Add energy to support Shelly Pro 4PM display (+38k code)
|
||||
#define USE_ADE7953
|
||||
#define USE_MCP23XXX_DRV
|
||||
#define USE_SHELLY_PRO
|
||||
|
||||
|
||||
#define USE_I2C // I2C using library wire (+10k code, 0k2 mem, 124 iram)
|
||||
#undef USE_MLX90614
|
||||
|
||||
|
|
@ -382,6 +378,7 @@
|
|||
//#define USE_LM75AD // [I2cDriver20] Enable LM75AD sensor (I2C addresses 0x48 - 0x4F) (+0k5 code)
|
||||
//#define USE_APDS9960 // [I2cDriver21] Enable APDS9960 Proximity Sensor (I2C address 0x39). Disables SHT and VEML6070 (+4k7 code)
|
||||
//#define USE_MCP230xx // [I2cDriver22] Enable MCP23008/MCP23017 - Must define I2C Address in #define USE_MCP230xx_ADDR below - range 0x20 - 0x27 (+4k7 code)
|
||||
#define USE_MCP23XXX_DRV // [I2cDriver77] Enable MCP23xxx support as virtual switch/button/relay (+3k(I2C)/+5k(SPI) code)
|
||||
//#define USE_PCA9685 // [I2cDriver1] Enable PCA9685 I2C HW PWM Driver - Must define I2C Address in #define USE_PCA9685_ADDR below - range 0x40 - 0x47 (+1k4 code)
|
||||
//#define USE_MPR121 // [I2cDriver23] Enable MPR121 controller (I2C addresses 0x5A, 0x5B, 0x5C and 0x5D) in input mode for touch buttons (+1k3 code)
|
||||
//#define USE_CCS811 // [I2cDriver24] Enable CCS811 sensor (I2C address 0x5A) (+2k2 code)
|
||||
|
|
@ -392,7 +389,7 @@
|
|||
//#define USE_SCD30 // [I2cDriver29] Enable Sensiron SCd30 CO2 sensor (I2C address 0x61) (+3k3 code)
|
||||
//#define USE_SCD40 // [I2cDriver62] Enable Sensiron SCd40 CO2 sensor (I2C address 0x62) (+3k3 code)
|
||||
//#define USE_SPS30 // [I2cDriver30] Enable Sensiron SPS30 particle sensor (I2C address 0x69) (+1.7 code)
|
||||
//#define USE_ADE7953 // [I2cDriver7] Enable ADE7953 Energy monitor as used on Shelly 2.5 (I2C address 0x38) (+1k5)
|
||||
#define USE_ADE7953 // [I2cDriver7] Enable ADE7953 Energy monitor as used on Shelly 2.5 (I2C address 0x38) (+1k5)
|
||||
//#define USE_VL53L0X // [I2cDriver31] Enable VL53L0x time of flight sensor (I2C address 0x29) (+4k code)
|
||||
//#define USE_VL53L1X // [I2cDriver54] Enable VL53L1X time of flight sensor (I2C address 0x29) using Pololu VL53L1X library (+2k9 code)
|
||||
//#define USE_TOF10120 // [I2cDriver57] Enable TOF10120 time of flight sensor (I2C address 0x52) (+0k6 code)
|
||||
|
|
@ -606,6 +603,7 @@
|
|||
#define USE_LM75AD // [I2cDriver20] Enable LM75AD sensor (I2C addresses 0x48 - 0x4F) (+0k5 code)
|
||||
//#define USE_APDS9960 // [I2cDriver21] Enable APDS9960 Proximity Sensor (I2C address 0x39). Disables SHT and VEML6070 (+4k7 code)
|
||||
//#define USE_MCP230xx // [I2cDriver22] Enable MCP23008/MCP23017 - Must define I2C Address in #define USE_MCP230xx_ADDR below - range 0x20 - 0x27 (+4k7 code)
|
||||
#define USE_MCP23XXX_DRV // [I2cDriver77] Enable MCP23xxx support as virtual switch/button/relay (+3k(I2C)/+5k(SPI) code)
|
||||
//#define USE_PCA9685 // [I2cDriver1] Enable PCA9685 I2C HW PWM Driver - Must define I2C Address in #define USE_PCA9685_ADDR below - range 0x40 - 0x47 (+1k4 code)
|
||||
//#define USE_MPR121 // [I2cDriver23] Enable MPR121 controller (I2C addresses 0x5A, 0x5B, 0x5C and 0x5D) in input mode for touch buttons (+1k3 code)
|
||||
//#define USE_CCS811 // [I2cDriver24] Enable CCS811 sensor (I2C address 0x5A) (+2k2 code)
|
||||
|
|
@ -617,6 +615,7 @@
|
|||
#define USE_SCD30 // [I2cDriver29] Enable Sensiron SCd30 CO2 sensor (I2C address 0x61) (+3k3 code)
|
||||
#define USE_SCD40 // [I2cDriver62] Enable Sensiron SCd40 CO2 sensor (I2C address 0x62) (+3k5 code)
|
||||
//#define USE_SPS30 // [I2cDriver30] Enable Sensiron SPS30 particle sensor (I2C address 0x69) (+1.7 code)
|
||||
#define USE_ADE7880 // [I2cDriver65] Enable ADE7880 Energy monitor as used on Shelly 3EM (I2C address 0x38) (+3k8)
|
||||
#define USE_ADE7953 // [I2cDriver7] Enable ADE7953 Energy monitor as used on Shelly 2.5 (I2C address 0x38) (+1k5)
|
||||
#define USE_VL53L0X // [I2cDriver31] Enable VL53L0x time of flight sensor (I2C address 0x29) (+4k code)
|
||||
//#define USE_VL53L1X // [I2cDriver54] Enable VL53L1X time of flight sensor (I2C address 0x29) using Pololu VL53L1X library (+2k9 code)
|
||||
|
|
@ -665,7 +664,7 @@
|
|||
//#define USE_RC522 // Add support for MFRC522 13.56Mhz Rfid reader (+6k code)
|
||||
//#define USE_MCP2515 // Add support for can bus using MCP2515 (+7k code)
|
||||
//#define USE_CANSNIFFER // Add support for can bus sniffer using MCP2515 (+5k code)
|
||||
#define USE_MCP23XXX_DRV
|
||||
#define USE_MCP23XXX_DRV // [I2cDriver77] Enable MCP23xxx support as virtual switch/button/relay (+3k(I2C)/+5k(SPI) code)
|
||||
#define USE_SHELLY_PRO // Add support for Shelly Pro
|
||||
|
||||
#define USE_MHZ19 // Add support for MH-Z19 CO2 sensor (+2k code)
|
||||
|
|
|
|||
|
|
@ -613,6 +613,7 @@
|
|||
// #define USE_MCP230xx_ADDR 0x20 // Enable MCP23008/MCP23017 I2C Address to use (Must be within range 0x20 through 0x26 - set according to your wired setup)
|
||||
// #define USE_MCP230xx_OUTPUT // Enable MCP23008/MCP23017 OUTPUT support through sensor29 commands (+2k2 code)
|
||||
// #define USE_MCP230xx_DISPLAYOUTPUT // Enable MCP23008/MCP23017 to display state of OUTPUT pins on Web UI (+0k2 code)
|
||||
// #define USE_MCP23XXX_DRV // [I2cDriver77] Enable MCP23xxx support as virtual switch/button/relay (+3k(I2C)/+5k(SPI) code)
|
||||
// #define USE_PCA9685 // [I2cDriver1] Enable PCA9685 I2C HW PWM Driver - Must define I2C Address in #define USE_PCA9685_ADDR below - range 0x40 - 0x47 (+1k4 code)
|
||||
// #define USE_PCA9685_ADDR 0x40 // Enable PCA9685 I2C Address to use (Must be within range 0x40 through 0x47 - set according to your wired setup)
|
||||
// #define USE_PCA9685_FREQ 50 // Define default PWM frequency in Hz to be used (must be within 24 to 1526) - If other value is used, it will rever to 50Hz
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#if defined(USE_I2C) || defined(USE_SPI)
|
||||
#ifdef USE_MCP23XXX_DRV
|
||||
/*********************************************************************************************\
|
||||
* MCP23008/17 - I2C GPIO Expander to be used as virtual button/switch/relay only
|
||||
* MCP23008/17 (I2C) and MCP23S17 (SPI) GPIO Expander to be used as virtual button/switch/relay only
|
||||
*
|
||||
* Docs at https://www.microchip.com/wwwproducts/en/MCP23008
|
||||
* https://www.microchip.com/wwwproducts/en/MCP23017
|
||||
|
|
@ -21,52 +21,52 @@
|
|||
*
|
||||
* Restrictions:
|
||||
* - Supports MCP23017 (=I2C) and MCP23S17 (=SPI)
|
||||
* - Uses incremental I2C addresses / SPI Chip select until template pin count reached
|
||||
* - Max support for 28 switches (input), 32 buttons (input), 32 relays (output)
|
||||
*
|
||||
* Supported template fields:
|
||||
* NAME - Template name
|
||||
* ADDR - Sequential list of I2C addresses
|
||||
* GPIO - Sequential list of pin 1 and up with configured GPIO function
|
||||
* Function Code Description
|
||||
* -------------- -------- ----------------------------------------
|
||||
* ------------------- -------- ----------------------------------------
|
||||
* None 0 Not used
|
||||
* Button1..32 32..63 Button to Gnd with internal pullup
|
||||
* Button_n1..32 64..95 Button to Gnd without internal pullup
|
||||
* Button_i1..32 96..127 Button inverted to Vcc with internal pullup
|
||||
* Button_in1..32 128..159 Button inverted to Vcc without internal pullup
|
||||
* Switch1..28 160..187 Switch to Gnd with internal pullup
|
||||
* Switch_n1..28 192..219 Switch to Gnd without internal pullup
|
||||
* Relay1..28 224..255 Relay
|
||||
* Relay_i1..28 256..287 Relay inverted
|
||||
* Button1..32 B 32..63 Button to Gnd with internal pullup
|
||||
* Button_n1..32 Bn 64..95 Button to Gnd without internal pullup
|
||||
* Button_i1..32 Bi 96..127 Button inverted to Vcc with internal pullup
|
||||
* Button_in1..32 Bin 128..159 Button inverted to Vcc without internal pullup
|
||||
* Switch1..28 S 160..187 Switch to Gnd with internal pullup
|
||||
* Switch_n1..28 Sn 192..219 Switch to Gnd without internal pullup
|
||||
* Relay1..28 R 224..255 Relay
|
||||
* Relay_i1..28 Ri 256..287 Relay inverted
|
||||
*
|
||||
* Prepare a template to be loaded either by:
|
||||
* - a rule like: rule3 on file#mcp23x.dat do {"NAME":"MCP23017 A=Ri8-1, B=B1-8","ADDR":32,"GPIO":[263,262,261,260,259,258,257,256,32,33,34,35,36,37,38,39]} endon
|
||||
* - a script like: -y{"NAME":"MCP23017 A=Ri8-1, B=B1-8","ADDR":32,"GPIO":[263,262,261,260,259,258,257,256,32,33,34,35,36,37,38,39]}
|
||||
* - file called mcp23x.dat with contents: {"NAME":"MCP23017 A=Ri8-1, B=B1-8","ADDR":32,"GPIO":[263,262,261,260,259,258,257,256,32,33,34,35,36,37,38,39]}
|
||||
* - a rule like: rule3 on file#mcp23x.dat do {"NAME":"MCP23017 A=Ri8-1, B=B1-8","GPIO":[263,262,261,260,259,258,257,256,32,33,34,35,36,37,38,39]} endon
|
||||
* - a script like: -y{"NAME":"MCP23017 A=Ri8-1, B=B1-8","GPIO":[263,262,261,260,259,258,257,256,32,33,34,35,36,37,38,39]}
|
||||
* - file called mcp23x.dat with contents: {"NAME":"MCP23017 A=Ri8-1, B=B1-8","GPIO":[263,262,261,260,259,258,257,256,32,33,34,35,36,37,38,39]}
|
||||
*
|
||||
* S3 S2 B2 B3 B1 S1 R1 R4 R2 R3 S4
|
||||
* {"NAME":"MCP23S17 Shelly Pro 4PM","GPIO":[194,193,65,66,0,64,192,0,224,0,0,0,227,225,226,195]}
|
||||
*
|
||||
* Inverted relays and buttons Ri8 Ri7 Ri6 Ri5 Ri4 Ri3 Ri2 Ri1 B1 B2 B3 B4 B5 B6 B7 B8
|
||||
* {"NAME":"MCP23017 A=Ri8-1, B=B1-8","ADDR":32,"GPIO":[263,262,261,260,259,258,257,256,32,33,34,35,36,37,38,39]}
|
||||
* {"NAME":"MCP23017 A=Ri8-1, B=B1-8","GPIO":[263,262,261,260,259,258,257,256,32,33,34,35,36,37,38,39]}
|
||||
*
|
||||
* Inverted relays and buttons Ri1 Ri2 Ri3 Ri4 Ri5 Ri6 Ri7 Ri8 B1 B2 B3 B4 B5 B6 B7 B8
|
||||
* {"NAME":"MCP23017 A=Ri1-8, B=B1-8","ADDR":32,"GPIO":[256,257,258,259,260,261,262,263,32,33,34,35,36,37,38,39]}
|
||||
* {"NAME":"MCP23017 A=Ri1-8, B=B1-8","GPIO":[256,257,258,259,260,261,262,263,32,33,34,35,36,37,38,39]}
|
||||
*
|
||||
* Relays and buttons R1 R2 R3 R4 R5 R6 R7 R8 B1 B2 B3 B4 B5 B6 B7 B8
|
||||
* {"NAME":"MCP23017 A=R1-8, B=B1-8","ADDR":32,"GPIO":[224,225,226,227,228,229,230,231,32,33,34,35,36,37,38,39]}
|
||||
* {"NAME":"MCP23017 A=R1-8, B=B1-8","GPIO":[224,225,226,227,228,229,230,231,32,33,34,35,36,37,38,39]}
|
||||
*
|
||||
* Buttons and relays B1 B2 B3 B4 B5 B6 B7 B8 R1 R2 R3 R4 R5 R6 R7 R8
|
||||
* {"NAME":"MCP23017 A=B1-8, B=R1-8","ADDR":32,"GPIO":[32,33,34,35,36,37,38,39,224,225,226,227,228,229,230,231]}
|
||||
* {"NAME":"MCP23017 A=B1-8, B=R1-8","GPIO":[32,33,34,35,36,37,38,39,224,225,226,227,228,229,230,231]}
|
||||
*
|
||||
* Buttons, relays, buttons and relays B1 B2 B3 B4 B5 B6 B7 B8 R1 R2 R3 R4 R5 R6 R7 R8 B9 B10B11B12B13B14B15B16R9 R10 R11 R12 R13 R14 R15 R16
|
||||
* {"NAME":"MCP23017 A=B1-8, B=R1-8, C=B9-16, D=R9-16","ADDR":[32,33],"GPIO":[32,33,34,35,36,37,38,39,224,225,226,227,228,229,230,231,40,41,42,43,44,45,46,47,232,233,234,235,236,237,238,239]}
|
||||
* {"NAME":"MCP23017 A=B1-8, B=R1-8, C=B9-16, D=R9-16","GPIO":[32,33,34,35,36,37,38,39,224,225,226,227,228,229,230,231,40,41,42,43,44,45,46,47,232,233,234,235,236,237,238,239]}
|
||||
*
|
||||
* {"NAME":"MCP23017 A=R1-8, B=B1-8, C=R9-16, D=B9-16","ADDR":[32,33],"GPIO":[224,225,226,227,228,229,230,231,32,33,34,35,36,37,38,39,232,233,234,235,236,237,238,239,40,41,42,43,44,45,46,47]}
|
||||
* {"NAME":"MCP23017 A=R1-8, B=B1-8, C=R9-16, D=B9-16","GPIO":[224,225,226,227,228,229,230,231,32,33,34,35,36,37,38,39,232,233,234,235,236,237,238,239,40,41,42,43,44,45,46,47]}
|
||||
*
|
||||
* 32 relays R1 R2 R3 R4 R5 R6 R7 R8 R9 R10 R11 R12 R13 R14 R15 R16 R17 R18 R19 R20 R21 R22 R23 R24 R25 R26 R27 R28 R29 R30 R31 R32
|
||||
* {"NAME":"MCP23017 A=Ri1-8, B=Ri9-16, C=Ri17-24, D=Ri25-32","ADDR":[32,33],"GPIO":[256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287]}
|
||||
* {"NAME":"MCP23017 A=R1-8, B=R9-16, C=R17-24, D=R25-32","ADDR":[32,33],"GPIO":[224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255]}
|
||||
* {"NAME":"MCP23017 A=Ri1-8, B=Ri9-16, C=Ri17-24, D=Ri25-32","GPIO":[256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287]}
|
||||
* {"NAME":"MCP23017 A=R1-8, B=R9-16, C=R17-24, D=R25-32","GPIO":[224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255]}
|
||||
*
|
||||
\*********************************************************************************************/
|
||||
|
||||
|
|
@ -135,6 +135,7 @@ typedef struct {
|
|||
uint8_t pins; // 8 (MCP23008) or 16 (MCP23017 / MCP23S17)
|
||||
uint8_t type; // 1 (MCP23008) or 2 (MCP23017) or 3 (MCP23S17)
|
||||
int8_t pin_cs;
|
||||
int8_t pin_int;
|
||||
} tMcp23xDevice;
|
||||
|
||||
struct MCP230 {
|
||||
|
|
@ -150,6 +151,7 @@ struct MCP230 {
|
|||
uint8_t switch_max;
|
||||
int8_t button_offset;
|
||||
int8_t switch_offset;
|
||||
bool interrupt;
|
||||
} Mcp23x;
|
||||
|
||||
uint16_t *Mcp23x_gpio_pin = nullptr;
|
||||
|
|
@ -417,6 +419,13 @@ String MCP23xTemplateLoadFile(void) {
|
|||
return mcptmplt;
|
||||
}
|
||||
|
||||
void MCP23xSetPinModes(uint8_t pin, uint8_t flags) {
|
||||
MCP23xPinMode(pin, flags);
|
||||
if (Mcp23x.device[Mcp23x.chip].pin_int > -1) { // Mcp23x.chip is updated by call to MCP23xPinMode
|
||||
MCP23xPinInterruptMode(pin, MCP23XXX_CHANGE);
|
||||
}
|
||||
}
|
||||
|
||||
bool MCP23xLoadTemplate(void) {
|
||||
String mcptmplt = MCP23xTemplateLoadFile();
|
||||
uint32_t len = mcptmplt.length() +1;
|
||||
|
|
@ -426,41 +435,17 @@ bool MCP23xLoadTemplate(void) {
|
|||
JsonParserObject root = parser.getRootObject();
|
||||
if (!root) { return false; }
|
||||
|
||||
// rule3 on file#mcp23x.dat do {"NAME":"MCP23017","ADDR":32,"GPIO":[32,33,34,35,36,37,38,39,224,225,226,227,228,229,230,231]} endon
|
||||
// rule3 on file#mcp23x.dat do {"NAME":"MCP23017","ADDR":32,"GPIO":[263,262,261,260,259,258,257,256,32,33,34,35,36,37,38,39]} endon
|
||||
// rule3 on file#mcp23x.dat do {"NAME":"MCP23017 A=Ri8-1, B=B1-8","ADDR":[32,33],"GPIO":[263,262,261,260,259,258,257,256,32,33,34,35,36,37,38,39]} endon
|
||||
// rule3 on file#mcp23x.dat do {"NAME":"MCP23017 A=Ri8-1, B=B1-8, C=Ri16-9, D=B9-16","ADDR":[32,33],"GPIO":[263,262,261,260,259,258,257,256,32,33,34,35,36,37,38,39,271,270,269,268,267,266,265,264,40,41,42,43,44,45,46,47]} endon
|
||||
// rule3 on file#mcp23x.dat do {"NAME":"MCP23017","GPIO":[32,33,34,35,36,37,38,39,224,225,226,227,228,229,230,231]} endon
|
||||
// rule3 on file#mcp23x.dat do {"NAME":"MCP23017","GPIO":[263,262,261,260,259,258,257,256,32,33,34,35,36,37,38,39]} endon
|
||||
// rule3 on file#mcp23x.dat do {"NAME":"MCP23017 A=Ri8-1, B=B1-8","GPIO":[263,262,261,260,259,258,257,256,32,33,34,35,36,37,38,39]} endon
|
||||
// rule3 on file#mcp23x.dat do {"NAME":"MCP23017 A=Ri8-1, B=B1-8, C=Ri16-9, D=B9-16","GPIO":[263,262,261,260,259,258,257,256,32,33,34,35,36,37,38,39,271,270,269,268,267,266,265,264,40,41,42,43,44,45,46,47]} endon
|
||||
|
||||
// {"NAME":"MCP23017","ADDR":32,"GPIO":[32,33,34,35,36,37,38,39,224,225,226,227,228,229,230,231]}
|
||||
// {"NAME":"MCP23017","ADDR":[32,33],"GPIO":[32,33,34,35,36,37,38,39,224,225,226,227,228,229,230,231,40,41,42,43,44,45,46,47,232,233,234,235,236,237,238,239]}
|
||||
// {"NAME":"MCP23017","GPIO":[32,33,34,35,36,37,38,39,224,225,226,227,228,229,230,231]}
|
||||
// {"NAME":"MCP23017","GPIO":[32,33,34,35,36,37,38,39,224,225,226,227,228,229,230,231,40,41,42,43,44,45,46,47,232,233,234,235,236,237,238,239]}
|
||||
JsonParserToken val = root[PSTR(D_JSON_NAME)];
|
||||
if (val) {
|
||||
AddLog(LOG_LEVEL_DEBUG, PSTR("MCP: Template %s"), val.getStr());
|
||||
}
|
||||
/*
|
||||
JsonParserArray arr = root[PSTR("ADDR")];
|
||||
if (arr) {
|
||||
uint32_t i;
|
||||
for (i = 0; i < Mcp23x.max_devices; i++) {
|
||||
JsonParserToken val = arr[i];
|
||||
if (!val) { break; }
|
||||
|
||||
uint8_t address = val.getUInt();
|
||||
uint32_t j;
|
||||
for (j = 0; j < Mcp23x.max_devices; j++) {
|
||||
if (address == Mcp23x.device[Mcp23x.max_devices].address) {
|
||||
j = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (j) { return false; } // Requested I2C address not present
|
||||
|
||||
}
|
||||
} else {
|
||||
val = root[PSTR("ADDR")];
|
||||
|
||||
}
|
||||
*/
|
||||
JsonParserArray arr = root[PSTR(D_JSON_GPIO)];
|
||||
if (arr) {
|
||||
uint32_t pin = 0;
|
||||
|
|
@ -471,39 +456,33 @@ bool MCP23xLoadTemplate(void) {
|
|||
if (mpin) { // Above GPIO_NONE
|
||||
if ((mpin >= AGPIO(GPIO_SWT1)) && (mpin < (AGPIO(GPIO_SWT1) + MAX_SWITCHES_SET))) {
|
||||
Mcp23x.switch_max++;
|
||||
MCP23xPinMode(pin, INPUT_PULLUP);
|
||||
// MCP23xPinInterruptMode(pin, MCP23XXX_CHANGE);
|
||||
MCP23xSetPinModes(pin, INPUT_PULLUP);
|
||||
}
|
||||
else if ((mpin >= AGPIO(GPIO_SWT1_NP)) && (mpin < (AGPIO(GPIO_SWT1_NP) + MAX_SWITCHES_SET))) {
|
||||
mpin -= (AGPIO(GPIO_SWT1_NP) - AGPIO(GPIO_SWT1));
|
||||
Mcp23x.switch_max++;
|
||||
MCP23xPinMode(pin, INPUT);
|
||||
// MCP23xPinInterruptMode(pin, MCP23XXX_CHANGE);
|
||||
MCP23xSetPinModes(pin, INPUT);
|
||||
}
|
||||
else if ((mpin >= AGPIO(GPIO_KEY1)) && (mpin < (AGPIO(GPIO_KEY1) + MAX_KEYS_SET))) {
|
||||
Mcp23x.button_max++;
|
||||
MCP23xPinMode(pin, INPUT_PULLUP);
|
||||
// MCP23xPinInterruptMode(pin, MCP23XXX_CHANGE);
|
||||
MCP23xSetPinModes(pin, INPUT_PULLUP);
|
||||
}
|
||||
else if ((mpin >= AGPIO(GPIO_KEY1_NP)) && (mpin < (AGPIO(GPIO_KEY1_NP) + MAX_KEYS_SET))) {
|
||||
mpin -= (AGPIO(GPIO_KEY1_NP) - AGPIO(GPIO_KEY1));
|
||||
Mcp23x.button_max++;
|
||||
MCP23xPinMode(pin, INPUT);
|
||||
// MCP23xPinInterruptMode(pin, MCP23XXX_CHANGE);
|
||||
MCP23xSetPinModes(pin, INPUT);
|
||||
}
|
||||
else if ((mpin >= AGPIO(GPIO_KEY1_INV)) && (mpin < (AGPIO(GPIO_KEY1_INV) + MAX_KEYS_SET))) {
|
||||
bitSet(Mcp23x.button_inverted, mpin - AGPIO(GPIO_KEY1_INV));
|
||||
mpin -= (AGPIO(GPIO_KEY1_INV) - AGPIO(GPIO_KEY1));
|
||||
Mcp23x.button_max++;
|
||||
MCP23xPinMode(pin, INPUT_PULLUP);
|
||||
// MCP23xPinInterruptMode(pin, MCP23XXX_CHANGE);
|
||||
MCP23xSetPinModes(pin, INPUT_PULLUP);
|
||||
}
|
||||
else if ((mpin >= AGPIO(GPIO_KEY1_INV_NP)) && (mpin < (AGPIO(GPIO_KEY1_INV_NP) + MAX_KEYS_SET))) {
|
||||
bitSet(Mcp23x.button_inverted, mpin - AGPIO(GPIO_KEY1_INV_NP));
|
||||
mpin -= (AGPIO(GPIO_KEY1_INV_NP) - AGPIO(GPIO_KEY1));
|
||||
Mcp23x.button_max++;
|
||||
MCP23xPinMode(pin, INPUT);
|
||||
// MCP23xPinInterruptMode(pin, MCP23XXX_CHANGE);
|
||||
MCP23xSetPinModes(pin, INPUT);
|
||||
}
|
||||
else if ((mpin >= AGPIO(GPIO_REL1)) && (mpin < (AGPIO(GPIO_REL1) + MAX_RELAYS_SET))) {
|
||||
Mcp23x.relay_max++;
|
||||
|
|
@ -565,12 +544,14 @@ void MCP23xModuleInit(void) {
|
|||
SPI.begin(Pin(GPIO_SPI_CLK), Pin(GPIO_SPI_MISO), Pin(GPIO_SPI_MOSI), -1);
|
||||
#endif
|
||||
while ((Mcp23x.max_devices < MCP23XXX_MAX_DEVICES) && PinUsed(GPIO_MCP23SXX_CS, Mcp23x.max_devices)) {
|
||||
Mcp23x.chip = Mcp23x.max_devices;
|
||||
Mcp23x.device[Mcp23x.chip].pin_int = (PinUsed(GPIO_MCP23XXX_INT, Mcp23x.chip)) ? Pin(GPIO_MCP23XXX_INT, Mcp23x.chip) : -1;
|
||||
Mcp23x.device[Mcp23x.chip].pin_cs = Pin(GPIO_MCP23SXX_CS, Mcp23x.max_devices);
|
||||
digitalWrite(Mcp23x.device[Mcp23x.chip].pin_cs, 1);
|
||||
pinMode(Mcp23x.device[Mcp23x.chip].pin_cs, OUTPUT);
|
||||
Mcp23x.device[Mcp23x.chip].interface = MCP23X_SPI;
|
||||
Mcp23x.device[Mcp23x.chip].address = MCP23XXX_ADDR_START << 1;
|
||||
AddLog(LOG_LEVEL_INFO, PSTR("SPI: MCP23S17 found"));
|
||||
AddLog(LOG_LEVEL_INFO, PSTR("SPI: MCP23S17 found at CS%d"), Mcp23x.chip +1);
|
||||
Mcp23x.device[Mcp23x.chip].type = 3;
|
||||
Mcp23x.device[Mcp23x.chip].pins = 16;
|
||||
MCP23xWrite(MCP23X17_IOCONA, 0b01011000); // Enable INT mirror, Slew rate disabled, HAEN pins for addressing
|
||||
|
|
@ -584,10 +565,12 @@ void MCP23xModuleInit(void) {
|
|||
}
|
||||
} else {
|
||||
#endif // USE_SPI
|
||||
#ifdef USE_I2C
|
||||
uint8_t mcp23xxx_address = MCP23XXX_ADDR_START;
|
||||
while ((Mcp23x.max_devices < MCP23XXX_MAX_DEVICES) && (mcp23xxx_address < MCP23XXX_ADDR_END)) {
|
||||
Mcp23x.chip = Mcp23x.max_devices;
|
||||
if (I2cSetDevice(mcp23xxx_address)) {
|
||||
Mcp23x.device[Mcp23x.chip].pin_int = (PinUsed(GPIO_MCP23XXX_INT, Mcp23x.chip)) ? Pin(GPIO_MCP23XXX_INT, Mcp23x.chip) : -1;
|
||||
Mcp23x.device[Mcp23x.chip].interface = MCP23X_I2C;
|
||||
Mcp23x.device[Mcp23x.chip].address = mcp23xxx_address;
|
||||
|
||||
|
|
@ -622,6 +605,7 @@ void MCP23xModuleInit(void) {
|
|||
mcp23xxx_address = MCP23XXX_ADDR_END;
|
||||
}
|
||||
}
|
||||
#endif // USE_I2C
|
||||
#ifdef USE_SPI
|
||||
}
|
||||
#endif // USE_SPI
|
||||
|
|
@ -645,7 +629,8 @@ void MCP23xModuleInit(void) {
|
|||
}
|
||||
|
||||
void MCP23xServiceInput(void) {
|
||||
// I found no way to receive interrupts in a consistent manner; noise received at undefined moments - unstable usage
|
||||
// I found no reliable way to receive interrupts; noise received at undefined moments - unstable usage
|
||||
Mcp23x.interrupt = 0;
|
||||
// This works with no interrupt
|
||||
uint32_t pin_offset = 0;
|
||||
for (Mcp23x.chip = 0; Mcp23x.chip < Mcp23x.max_devices; Mcp23x.chip++) {
|
||||
|
|
@ -671,6 +656,21 @@ void MCP23xServiceInput(void) {
|
|||
}
|
||||
}
|
||||
|
||||
void IRAM_ATTR MCP23xInputIsr(void) {
|
||||
Mcp23x.interrupt = 1;
|
||||
}
|
||||
|
||||
void MCP23xInit(void) {
|
||||
if (Mcp23x.button_max || Mcp23x.switch_max) {
|
||||
for (Mcp23x.chip = 0; Mcp23x.chip < Mcp23x.max_devices; Mcp23x.chip++) {
|
||||
if (Mcp23x.device[Mcp23x.chip].pin_int > -1) {
|
||||
uint32_t gpio = MCP23xRead16(MCP23X17_GPIOA); // Clear interrupt
|
||||
attachInterrupt(Mcp23x.device[Mcp23x.chip].pin_int, MCP23xInputIsr, CHANGE);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void MCP23xPower(void) {
|
||||
power_t rpower = XdrvMailbox.index >> Mcp23x.relay_offset;
|
||||
for (uint32_t index = 0; index < Mcp23x.relay_max; index++) {
|
||||
|
|
@ -728,6 +728,12 @@ bool Xdrv67(uint32_t function) {
|
|||
MCP23xModuleInit();
|
||||
} else if (Mcp23x.max_devices) {
|
||||
switch (function) {
|
||||
case FUNC_LOOP:
|
||||
case FUNC_SLEEP_LOOP:
|
||||
if (!Mcp23x.interrupt) { return false; }
|
||||
AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("MCP: Interrupt"));
|
||||
MCP23xServiceInput();
|
||||
break;
|
||||
case FUNC_EVERY_100_MSECOND:
|
||||
if (Mcp23x.button_max || Mcp23x.switch_max) {
|
||||
MCP23xServiceInput();
|
||||
|
|
@ -736,6 +742,9 @@ bool Xdrv67(uint32_t function) {
|
|||
case FUNC_SET_POWER:
|
||||
MCP23xPower();
|
||||
break;
|
||||
case FUNC_INIT:
|
||||
MCP23xInit();
|
||||
break;
|
||||
case FUNC_ADD_BUTTON:
|
||||
result = MCP23xAddButton();
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
* {"NAME":"Shelly Pro 1PM","GPIO":[9568,1,9472,1,768,0,0,0,672,704,736,0,0,0,5600,6214,0,0,0,5568,0,0,0,0,0,0,0,0,3459,0,0,32,4736,0,160,0],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,5600,4700,3350"}
|
||||
* {"NAME":"Shelly Pro 2","GPIO":[0,1,0,1,768,0,0,0,672,704,736,0,0,0,5600,6214,0,0,0,5568,0,0,0,0,0,0,0,0,0,0,0,32,4736,4737,160,161],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,5600,4700,3350;AdcParam2 2,5600,4700,3350"}
|
||||
* {"NAME":"Shelly Pro 2PM","GPIO":[9568,1,9472,1,768,0,0,0,672,704,736,9569,0,0,5600,6214,0,0,0,5568,0,0,0,0,0,0,0,0,3460,0,0,32,4736,4737,160,161],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,5600,4700,3350;AdcParam2 2,5600,4700,3350"}
|
||||
* {"NAME":"Shelly Pro 4PM","GPIO":[0,6210,0,6214,9568,0,0,0,0,0,9569,0,10272,0,5600,0,0,0,0,5568,0,0,0,0,0,0,0,0,736,704,3461,0,4736,0,0,672],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,5600,4700,3350;rule3 on file#mcp23x.dat do {\"NAME\":\"MCP23S17 Shelly Pro 4PM\",\"GPIO\":[194,193,65,66,0,64,192,0,224,0,0,0,227,225,226,195]} endon"}
|
||||
* {"NAME":"Shelly Pro 4PM","GPIO":[0,6210,0,6214,9568,0,0,0,0,0,9569,0,10272,0,5600,0,0,0,0,5568,0,0,0,0,0,0,0,0,736,704,3461,10240,4736,0,0,672],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,5600,4700,3350;rule3 on file#mcp23x.dat do {\"NAME\":\"MCP23S17 Shelly Pro 4PM\",\"GPIO\":[194,193,65,66,0,64,192,0,224,0,0,0,227,225,226,195]} endon"}
|
||||
*
|
||||
* Shelly Pro 1/2 uses SPI to control one 74HC595 for relays/leds and one ADE7953 (1PM) or two ADE7953 (2PM) for energy monitoring
|
||||
* Shelly Pro 4 uses an SPI to control one MCP23S17 for buttons/switches/relays/leds and two ADE7953 for energy monitoring and a second SPI for the display
|
||||
|
|
|
|||
|
|
@ -444,13 +444,17 @@ bool Ade7880SetCalibrate(void) {
|
|||
uint32_t start = millis();
|
||||
#endif // ADE7880_PROFILING
|
||||
|
||||
int reset = Pin(GPIO_RESET);
|
||||
if (-1 == reset) { reset = 16; } // Reset pin ADE7880 in Shelly 3EM
|
||||
pinMode(reset, OUTPUT);
|
||||
digitalWrite(reset, 0);
|
||||
int pin_reset = Pin(GPIO_RESET);
|
||||
#ifdef ESP8266
|
||||
if (-1 == pin_reset) { pin_reset = 16; } // Reset pin ADE7880 in Shelly 3EM
|
||||
#endif
|
||||
if (pin_reset >= 0) {
|
||||
pinMode(pin_reset, OUTPUT);
|
||||
digitalWrite(pin_reset, 0);
|
||||
delay(1);
|
||||
digitalWrite(reset, 1);
|
||||
pinMode(reset, INPUT);
|
||||
digitalWrite(pin_reset, 1);
|
||||
pinMode(pin_reset, INPUT);
|
||||
}
|
||||
|
||||
Ade7880.cycle_count = 2; // Skip first two cycles
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue