Fix compilation error

2019-10-01 16:45:53 +02:00 · 2019-10-01 16:45:53 +02:00 · be4867e7f6
parent aa5b5e891e
commit be4867e7f6
25 changed files with 191 additions and 7 deletions
--- a/sonoff/language/bg-BG.h
+++ b/sonoff/language/bg-BG.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "Датчикът DS18x20 е зает"
 #define D_SENSOR_CRC_ERROR "Датчик DS18x20 - грешка CRC"
--- a/sonoff/language/cs-CZ.h
+++ b/sonoff/language/cs-CZ.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "Sensor DS18x20 obsazen"
 #define D_SENSOR_CRC_ERROR "Sensor DS18x20 chyba CRC"
--- a/sonoff/language/de-DE.h
+++ b/sonoff/language/de-DE.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "Sensor beschäftigt"
 #define D_SENSOR_CRC_ERROR "Sensor CRC-Fehler"
--- a/sonoff/language/el-GR.h
+++ b/sonoff/language/el-GR.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "Ο αισθητήρας είναι απασχολημένος"
 #define D_SENSOR_CRC_ERROR "Σφάλμα CRC αισθητήρα"
--- a/sonoff/language/en-GB.h
+++ b/sonoff/language/en-GB.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "Sensor busy"
 #define D_SENSOR_CRC_ERROR "Sensor CRC error"
--- a/sonoff/language/es-ES.h
+++ b/sonoff/language/es-ES.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "Sensor ocupado"
 #define D_SENSOR_CRC_ERROR "Error CRC del Sensor"
--- a/sonoff/language/fr-FR.h
+++ b/sonoff/language/fr-FR.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "Capteur occupé"
 #define D_SENSOR_CRC_ERROR "Erreur CRC capteur"
--- a/sonoff/language/he-HE.h
+++ b/sonoff/language/he-HE.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "שרת עסוק"
 #define D_SENSOR_CRC_ERROR "בחיישן CRC שגיאת"
--- a/sonoff/language/hu-HU.h
+++ b/sonoff/language/hu-HU.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "Szenzor foglalt"
 #define D_SENSOR_CRC_ERROR "Szenzor CRC hiba"
--- a/sonoff/language/it-IT.h
+++ b/sonoff/language/it-IT.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "Sensore occupato"
 #define D_SENSOR_CRC_ERROR "Sensore errore CRC"
--- a/sonoff/language/ko-KO.h
+++ b/sonoff/language/ko-KO.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "센서가 사용 중"
 #define D_SENSOR_CRC_ERROR "센서 CRC 에러"
--- a/sonoff/language/nl-NL.h
+++ b/sonoff/language/nl-NL.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "Sensor bezet"
 #define D_SENSOR_CRC_ERROR "Sensor CRC fout"
--- a/sonoff/language/pl-PL.h
+++ b/sonoff/language/pl-PL.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "Czujnik DS18x20 zajęty"
 #define D_SENSOR_CRC_ERROR "Czujnik DS18x20 błąd CRC"
--- a/sonoff/language/pt-BR.h
+++ b/sonoff/language/pt-BR.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "Sensor ocupado"
 #define D_SENSOR_CRC_ERROR "Erro sensor CRC"
--- a/sonoff/language/pt-PT.h
+++ b/sonoff/language/pt-PT.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "Sensor ocupado"
 #define D_SENSOR_CRC_ERROR "Erro Sensor CRC"
--- a/sonoff/language/ru-RU.h
+++ b/sonoff/language/ru-RU.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "Датчик DS18x20 занят"
 #define D_SENSOR_CRC_ERROR "Датчик DS18x20 - ошибка CRC"
--- a/sonoff/language/sk-SK.h
+++ b/sonoff/language/sk-SK.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "Sensor DS18x20 obsadený"
 #define D_SENSOR_CRC_ERROR "Sensor DS18x20 chyba CRC"
--- a/sonoff/language/sv-SE.h
+++ b/sonoff/language/sv-SE.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "Sensor upptagen"
 #define D_SENSOR_CRC_ERROR "Sensor CRC-fel"
--- a/sonoff/language/tr-TR.h
+++ b/sonoff/language/tr-TR.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "Sensör başgül"
 #define D_SENSOR_CRC_ERROR "Sensor CRC hatası"
--- a/sonoff/language/uk-UK.h
+++ b/sonoff/language/uk-UK.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "Датчик DS18x20 зайнятий"
 #define D_SENSOR_CRC_ERROR "Датчик DS18x20 - помилка CRC"
--- a/sonoff/language/zh-CN.h
+++ b/sonoff/language/zh-CN.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "传感器正忙"
 #define D_SENSOR_CRC_ERROR "传感器 CRC 校验错误"
--- a/sonoff/language/zh-TW.h
+++ b/sonoff/language/zh-TW.h
@ -447,6 +447,14 @@
 #define D_CLOSE "Close"
 #define D_DOMOTICZ_SHUTTER "Shutter"

+// xdrv_28_pcf8574.ino
+#define D_CONFIGURE_PCF8574 "Configure PCF8574"
+#define D_PCF8574_PARAMETERS "PCF8574 parameters"
+#define D_INVERT_PORTS "Invert Ports"
+#define D_DEVICE "Device"
+#define D_DEVICE_INPUT "Input"
+#define D_DEVICE_OUTPUT "Output"
+
 // xsns_05_ds18b20.ino
 #define D_SENSOR_BUSY "傳感器正忙"
 #define D_SENSOR_CRC_ERROR "傳感器 CRC 校驗錯誤"
--- a/sonoff/my_user_config.h
+++ b/sonoff/my_user_config.h
@ -372,6 +372,7 @@
 //  #define USE_MLX90614                           // Enable MLX90614 ir temp sensor (I2C address 0x5a) (+0.6k code)
 //  #define USE_CHIRP                              // Enable CHIRP soil moisture sensor (variable I2C address, default 0x20)
 //  #define USE_PAJ7620                            // Enable PAJ7620 gesture sensor (I2C address 0x73) (+2.5k code)
+//  #define USE_PCF8574                            // Enable PCF8574 I/O Expander (I2C addresses 0x20 - 0x27 and 0x38 - 0x3F) (+1k9 code)

 //  #define USE_DISPLAY                            // Add I2C Display Support (+2k code)
    #define USE_DISPLAY_MODES1TO5                // Enable display mode 1 to 5 in addition to mode 0
--- a/sonoff/support_features.ino
+++ b/sonoff/support_features.ino
@ -450,10 +450,15 @@ void GetFeatures(void)
 #ifdef USE_DDS2382
  feature5 |= 0x00000040;  // Xnrg_09_dds2382.ino
 #endif
-//  feature5 |= 0x00000080;
-
-//  feature5 |= 0x00000100;
-//  feature5 |= 0x00000200;
+#ifdef USE_SM2135
+  feature5 |= 0x00000080;  // Xdrv_026_sm2135.ino
+#endif
+#ifdef USE_SHUTTER
+  feature5 |= 0x00000100;  // Xdrv_027_shutter.ino
+#endif
+#ifdef USE_PCF8574
+  feature5 |= 0x00000200;  // Xdrv_028_pcf8574.ino
+#endif
 //  feature5 |= 0x00000400;
 //  feature5 |= 0x00000800;

--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@ -126,7 +126,9 @@ a_setoption = [[
    "Enable Weekend Energy Tariff",
    "","","",
    "","","","",
-    "","","",""
+    "","",
+    "Enable shutter support",
+    "Invert PCF8574 ports"
    ]]

 a_features = [[
@ -167,8 +169,8 @@ a_features = [[
    "USE_MAX31865","USE_CHIRP","USE_SOLAX_X1","USE_PAJ7620"
    ],[
    "USE_BUZZER","USE_RDM6300","USE_IBEACON","USE_SML_M",
-    "USE_INA226","USE_A4988_Stepper","USE_DDS2382","",
-    "","","","",
+    "USE_INA226","USE_A4988_Stepper","USE_DDS2382","USE_SM2135",
+    "USE_SHUTTER","USE_PCF8574","","",
    "","","","",
    "","","","",
    "","","","",