Add more support

* Add support for decoding Theo V2 sensors as documented on https://sidweb.nl using 434MHz RF sensor receiver * Add support for decoding Alecto V2 sensors like ACH2010, WS3000 and DKW2012 using 868MHz RF sensor receiver * Add support for Manzoku Power Strip (#4590)
arendst · Dec 11, 2018 · b3e5e35 · b3e5e35
1 parent 3779b84
commit b3e5e35
Show file tree

Hide file tree

Showing 24 changed files with 103 additions and 24 deletions.
diff --git a/sonoff/_changelog.ino b/sonoff/_changelog.ino
@@ -1,6 +1,8 @@
 /* 6.3.0.17 20181211
- * Add support for TheoV2 sensors as documented on https://sidweb.nl
+ * Add support for decoding Theo V2 sensors as documented on https://sidweb.nl using 434MHz RF sensor receiver
+ * Add support for decoding Alecto V2 sensors like ACH2010, WS3000 and DKW2012 using 868MHz RF sensor receiver
  * Add support for SDM220 (#3610)
+ * Add support for Manzoku Power Strip (#4590)
  * Enhance support for MPU6050 using DMP (#4581)
  *
  * 6.3.0.16 20181201

diff --git a/sonoff/language/bg-BG.h b/sonoff/language/bg-BG.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "Размер на флаш паметта за програми"
 #define D_PROGRAM_SIZE "Размер на програмата"
 #define D_PROJECT "Проект"
+#define D_RAIN "Rain"
 #define D_RECEIVED "Получено"
 #define D_RESTART "Рестарт"
 #define D_RESTARTING "Рестартиране"
@@ -553,6 +554,7 @@
 #define D_UNIT_MICROMETER "µm"
 #define D_UNIT_MICROSECOND "µs"
 #define D_UNIT_MILLIAMPERE "mA"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
 #define D_UNIT_MILLISECOND "ms"
 #define D_UNIT_MINUTE "min"

diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "Velikost paměti flash"
 #define D_PROGRAM_SIZE "Velikost programu"
 #define D_PROJECT "Projekt"
+#define D_RAIN "Rain"
 #define D_RECEIVED "Přijatý"
 #define D_RESTART "Restart"
 #define D_RESTARTING "Restartování"
@@ -553,6 +554,7 @@
 #define D_UNIT_MICROMETER "um"
 #define D_UNIT_MICROSECOND "us"
 #define D_UNIT_MILLIAMPERE "mA"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
 #define D_UNIT_MILLISECOND "ms"
 #define D_UNIT_MINUTE "min"

diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "Ges. Flash Speicher"
 #define D_PROGRAM_SIZE "Ben. Flash Speicher"
 #define D_PROJECT "Projekt"
+#define D_RAIN "Regen"
 #define D_RECEIVED "erhalten"
 #define D_RESTART "Neustart"
 #define D_RESTARTING "starte neu"
@@ -553,6 +554,7 @@
 #define D_UNIT_MICROMETER "µm"
 #define D_UNIT_MICROSECOND "µs"
 #define D_UNIT_MILLIAMPERE "mA"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
 #define D_UNIT_MILLISECOND "ms"
 #define D_UNIT_MINUTE "min"

diff --git a/sonoff/language/el-GR.h b/sonoff/language/el-GR.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "Μέγεθος προγράμματος στη Flash"
 #define D_PROGRAM_SIZE "Μέγεθος προγράμματος"
 #define D_PROJECT "Έργο"
+#define D_RAIN "Rain"
 #define D_RECEIVED "Ελήφθη"
 #define D_RESTART "Επανεκκίνηση"
 #define D_RESTARTING "Επανεκκινεί"
@@ -553,6 +554,7 @@
 #define D_UNIT_MICROMETER "um"
 #define D_UNIT_MICROSECOND "us"
 #define D_UNIT_MILLIAMPERE "mA"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
 #define D_UNIT_MILLISECOND "ms"
 #define D_UNIT_MINUTE "Min"

diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "Program Flash Size"
 #define D_PROGRAM_SIZE "Program Size"
 #define D_PROJECT "Project"
+#define D_RAIN "Rain"
 #define D_RECEIVED "Received"
 #define D_RESTART "Restart"
 #define D_RESTARTING "Restarting"
@@ -553,6 +554,7 @@
 #define D_UNIT_MICROMETER "um"
 #define D_UNIT_MICROSECOND "us"
 #define D_UNIT_MILLIAMPERE "mA"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
 #define D_UNIT_MILLISECOND "ms"
 #define D_UNIT_MINUTE "Min"

diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "Tamaño de Flash de Programa"
 #define D_PROGRAM_SIZE "Tamaño Programa"
 #define D_PROJECT "Proyecto"
+#define D_RAIN "Rain"
 #define D_RECEIVED "Recibido"
 #define D_RESTART "Reiniciar"
 #define D_RESTARTING "Reiniciando"
@@ -553,6 +554,7 @@
 #define D_UNIT_MICROMETER "um"
 #define D_UNIT_MICROSECOND "us"
 #define D_UNIT_MILLIAMPERE "mA"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
 #define D_UNIT_MILLISECOND "ms"
 #define D_UNIT_MINUTE "Min"

diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "Taille Flash Programme"
 #define D_PROGRAM_SIZE "Taille programme"
 #define D_PROJECT "Projet"
+#define D_RAIN "Plui"
 #define D_RECEIVED "Reçu"
 #define D_RESTART "Redémarrage"
 #define D_RESTARTING "Redémarre"
@@ -553,6 +554,7 @@
 #define D_UNIT_MICROMETER "µm"
 #define D_UNIT_MICROSECOND "µs"
 #define D_UNIT_MILLIAMPERE "mA"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
 #define D_UNIT_MILLISECOND "ms"
 #define D_UNIT_MINUTE "Min"

diff --git a/sonoff/language/he-HE.h b/sonoff/language/he-HE.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "גודל תוכנית פלאש"
 #define D_PROGRAM_SIZE "גודל תוכנית"
 #define D_PROJECT "פרויקט"
+#define D_RAIN "Rain"
 #define D_RECEIVED "התקבל"
 #define D_RESTART "איתחול"
 #define D_RESTARTING "הפעלה מחדש"
@@ -553,6 +554,7 @@
 #define D_UNIT_MICROMETER "um"
 #define D_UNIT_MICROSECOND "us"
 #define D_UNIT_MILLIAMPERE "mA"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
 #define D_UNIT_MILLISECOND "ms"
 #define D_UNIT_MINUTE "Min"

diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "Program Flash Méret"
 #define D_PROGRAM_SIZE "Program Méret"
 #define D_PROJECT "Projekt"
+#define D_RAIN "Rain"
 #define D_RECEIVED "Érkezett"
 #define D_RESTART "Újraindítás"
 #define D_RESTARTING "Újraindítás"
@@ -553,6 +554,7 @@
 #define D_UNIT_MICROMETER "um"
 #define D_UNIT_MICROSECOND "µs"
 #define D_UNIT_MILLIAMPERE "mA"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
 #define D_UNIT_MILLISECOND "ms"
 #define D_UNIT_MINUTE "p"

diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "Dimensione Flash Programma"
 #define D_PROGRAM_SIZE "Dimensione Programma"
 #define D_PROJECT "Progetto"
+#define D_RAIN "Rain"
 #define D_RECEIVED "Ricevuto"
 #define D_RESTART "Riavvio"
 #define D_RESTARTING "Riavviando"
@@ -553,6 +554,7 @@
 #define D_UNIT_MICROMETER "um"
 #define D_UNIT_MICROSECOND "us"
 #define D_UNIT_MILLIAMPERE "mA"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
 #define D_UNIT_MILLISECOND "ms"
 #define D_UNIT_MINUTE "Min"

diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "Programma Flash Grootte"
 #define D_PROGRAM_SIZE "Programma Grootte"
 #define D_PROJECT "Project"
+#define D_RAIN "Regen"
 #define D_RECEIVED "Ontvangen"
 #define D_RESTART "Herstart"
 #define D_RESTARTING "Herstarten"
@@ -553,6 +554,7 @@
 #define D_UNIT_MICROMETER "um"
 #define D_UNIT_MICROSECOND "us"
 #define D_UNIT_MILLIAMPERE "mA"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
 #define D_UNIT_MILLISECOND "ms"
 #define D_UNIT_MINUTE "Min"

diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "Wielkość programu flash"
 #define D_PROGRAM_SIZE "Wielkość programu"
 #define D_PROJECT "Projekt"
+#define D_RAIN "Rain"
 #define D_RECEIVED "Otrzymany"
 #define D_RESTART "Restart"
 #define D_RESTARTING "Restartowanie"
@@ -553,6 +554,7 @@
 #define D_UNIT_MICROMETER "um"
 #define D_UNIT_MICROSECOND "us"
 #define D_UNIT_MILLIAMPERE "mA"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
 #define D_UNIT_MILLISECOND "ms"
 #define D_UNIT_MINUTE "Min"

diff --git a/sonoff/language/pt-BR.h b/sonoff/language/pt-BR.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "Tamanho do programa na memória"
 #define D_PROGRAM_SIZE "Tamanho do programa"
 #define D_PROJECT "Projeto"
+#define D_RAIN "Rain"
 #define D_RECEIVED "Recebido"
 #define D_RESTART "Reiniciar"
 #define D_RESTARTING "Reiniciando"
@@ -553,6 +554,7 @@
 #define D_UNIT_MICROMETER "um"
 #define D_UNIT_MICROSECOND "us"
 #define D_UNIT_MILLIAMPERE "mA"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
 #define D_UNIT_MILLISECOND "ms"
 #define D_UNIT_MINUTE "M"

diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "Tamanho do Programa na Flash"
 #define D_PROGRAM_SIZE "Tamanho do Programa"
 #define D_PROJECT "Projeto"
+#define D_RAIN "Rain"
 #define D_RECEIVED "Recebido"
 #define D_RESTART "Reiniciar"
 #define D_RESTARTING "A reiniciar"
@@ -553,6 +554,7 @@
 #define D_UNIT_MICROMETER "um"
 #define D_UNIT_MICROSECOND "us"
 #define D_UNIT_MILLIAMPERE "mA"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
 #define D_UNIT_MILLISECOND "ms"
 #define D_UNIT_MINUTE "Min"

diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "Размер Flash для программ"
 #define D_PROGRAM_SIZE "Размер программы "
 #define D_PROJECT "Проект"
+#define D_RAIN "Rain"
 #define D_RECEIVED "Получено"
 #define D_RESTART "Перезапуск"
 #define D_RESTARTING "Перезапуск"
@@ -553,6 +554,7 @@
 #define D_UNIT_MICROMETER "мкм"
 #define D_UNIT_MICROSECOND "мкс"
 #define D_UNIT_MILLIAMPERE "мА"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "мм рт.ст."
 #define D_UNIT_MILLISECOND "мс"
 #define D_UNIT_MINUTE "мин"

diff --git a/sonoff/language/sv-SE.h b/sonoff/language/sv-SE.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "Program-flashstorlek"
 #define D_PROGRAM_SIZE "Programstorlek"
 #define D_PROJECT "Projekt"
+#define D_RAIN "Rain"
 #define D_RECEIVED "Mottagen"
 #define D_RESTART "Omstart"
 #define D_RESTARTING "Startar om"
@@ -553,6 +554,7 @@
 #define D_UNIT_MICROMETER "um"
 #define D_UNIT_MICROSECOND "us"
 #define D_UNIT_MILLIAMPERE "mA"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
 #define D_UNIT_MILLISECOND "ms"
 #define D_UNIT_MINUTE "Min"

diff --git a/sonoff/language/tr-TR.h b/sonoff/language/tr-TR.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "Yazılım Flash Boyutu"
 #define D_PROGRAM_SIZE "Yazılım Boyutu"
 #define D_PROJECT "Proje"
+#define D_RAIN "Rain"
 #define D_RECEIVED "Alınan"
 #define D_RESTART "Yeniden Başlat"
 #define D_RESTARTING "Yeniden Başlatılıyor"
@@ -552,6 +553,7 @@
 #define D_UNIT_MICROMETER "um"
 #define D_UNIT_MICROSECOND "us"
 #define D_UNIT_MILLIAMPERE "mA"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
 #define D_UNIT_MILLISECOND "ms"
 #define D_UNIT_MINUTE "Min"

diff --git a/sonoff/language/uk-UK.h b/sonoff/language/uk-UK.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "Розмір Flash для програм"
 #define D_PROGRAM_SIZE "Розмір програм "
 #define D_PROJECT "Проект"
+#define D_RAIN "Rain"
 #define D_RECEIVED "Отримано"
 #define D_RESTART "Перезавантаження"
 #define D_RESTARTING "Перезавантаження"
@@ -553,6 +554,7 @@
 #define D_UNIT_MICROMETER "мкм"
 #define D_UNIT_MICROSECOND "мкс"
 #define D_UNIT_MILLIAMPERE "мА"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
 #define D_UNIT_MILLISECOND "мс"
 #define D_UNIT_MINUTE "хв"

diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "固件 Flash 大小"
 #define D_PROGRAM_SIZE "固件大小"
 #define D_PROJECT "项目:"
+#define D_RAIN "Rain"
 #define D_RECEIVED "已接收"
 #define D_RESTART "重启"
 #define D_RESTARTING "正在重启"
@@ -552,6 +553,7 @@
 #define D_UNIT_MICROMETER "微米"
 #define D_UNIT_MICROSECOND "微秒"
 #define D_UNIT_MILLIAMPERE "毫安"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
 #define D_UNIT_MILLISECOND "毫秒"
 #define D_UNIT_MINUTE "分"

diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h
@@ -132,6 +132,7 @@
 #define D_PROGRAM_FLASH_SIZE "韌體 Flash 大小"
 #define D_PROGRAM_SIZE "韌體大小"
 #define D_PROJECT "項目:"
+#define D_RAIN "Rain"
 #define D_RECEIVED "已接收"
 #define D_RESTART "重啟"
 #define D_RESTARTING "正在重啟"
@@ -553,6 +554,7 @@
 #define D_UNIT_MICROMETER "微米"
 #define D_UNIT_MICROSECOND "微秒"
 #define D_UNIT_MILLIAMPERE "毫安"
+#define D_UNIT_MILLIMETER "mm"
 #define D_UNIT_MILLIMETER_MERCURY "mmHg"
 #define D_UNIT_MILLISECOND "毫秒"
 #define D_UNIT_MINUTE "分"

diff --git a/sonoff/my_user_config.h b/sonoff/my_user_config.h
@@ -399,9 +399,9 @@
 
 #define USE_RC_SWITCH                            // Add support for RF transceiver using library RcSwitch (+2k7 code, 460 iram)
 
-//#define USE_RF_SENSOR                            // Add support for RF (434MHz or 868MHz) receiver (+2k code)
-//  #define USE_THEO_V2                            // Add support for 434MHz Theo V2 sensors as documented on https://sidweb.nl
-//  #define USE_ALECTO_V2                          // Add support for 868MHz Alecto V2 sensors like ACH2010, WS3000 and DKW2012
+//#define USE_RF_SENSOR                            // Add support for RF sensor receiver (434MHz or 868MHz) (+0k8 code)
+//  #define USE_THEO_V2                            // Add support for decoding Theo V2 sensors as documented on https://sidweb.nl using 434MHz RF sensor receiver (+1k4 code)
+//  #define USE_ALECTO_V2                          // Add support for decoding Alecto V2 sensors like ACH2010, WS3000 and DKW2012 using 868MHz RF sensor receiver (+1k7 code)
 
 /*********************************************************************************************\
  * Debug features are only supported in development branch

diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h
@@ -1327,14 +1327,16 @@ const mytmplt kModules[MAXMODULE] PROGMEM = {
      GPIO_NRG_CF1,     // GPIO14 BL0937 or HJL-01 CF1 current / voltage
      0, 0, 0
   },
-  { "Manzoku strip",      // "MANZOKU" labeled power strip, EU version
+  { "Manzoku strip",   // "MANZOKU" labeled power strip, EU version
+                       // https://www.amazon.de/Steckdosenleiste-AOFO-Mehrfachsteckdose-Überspannungsschutz-Sprachsteuerung/dp/B07GBSD11P/
+                       // https://www.amazon.de/Steckdosenleiste-Geekbes-USB-Anschluss-Kompatibel-gesteuert/dp/B078W23BW9/
      0,                // GPIO00
      0,                // GPIO01 Serial RXD
      0,
      GPIO_KEY1,        // GPIO03 Serial TXD + Button
      GPIO_REL2,        // GPIO04 Relay 2
      GPIO_REL1,        // GPIO05 Relay 1
-     0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, // Flash connection
      GPIO_REL3,        // GPIO12 Relay 3
      GPIO_REL4,        // GPIO13 Relay 4
      GPIO_USER,        // GPIO14