6.3.0.17 Add features

6.3.0.17 20181211 * Add support for TheoV2 sensors as documented on https://sidweb.nl * Add support for SDM220 (arendst#3610) * Enhance support for MPU6050 using DMP (arendst#4581)
gemu2015 · Dec 11, 2018 · d5cf9bd · d5cf9bd
1 parent 9c12dbe
commit d5cf9bd
Show file tree

Hide file tree

Showing 31 changed files with 714 additions and 43 deletions.
diff --git a/sonoff/_changelog.ino b/sonoff/_changelog.ino
@@ -1,4 +1,9 @@
-/* 6.3.0.16 20181201
+/* 6.3.0.17 20181211
+ * Add support for TheoV2 sensors as documented on https://sidweb.nl
+ * Add support for SDM220 (#3610)
+ * Enhance support for MPU6050 using DMP (#4581)
+ *
+ * 6.3.0.16 20181201
  * Add support for iFan02 Fanspeed in Domoticz using a selector (#4517)
  * Add Announce Switches to MQTT Discovery (#4531)
  * Update MCP230xx driver to support interrupt retention over teleperiod (#4547)

diff --git a/sonoff/i18n.h b/sonoff/i18n.h
@@ -49,12 +49,6 @@
 #define D_JSON_COUNT "Count"
 #define D_JSON_COUNTER "Counter"
 #define D_JSON_CURRENT "Current"         // As in Voltage and Current
-#define D_JSON_PHASE_ANGLE     "Phase angle"
-#define D_JSON_IMPORT_ACTIVE   "Import Active Power"
-#define D_JSON_EXPORT_ACTIVE   "Export Active Power"
-#define D_JSON_IMPORT_REACTIVE "Import Reactive Power"
-#define D_JSON_EXPORT_REACTIVE "Export Reactive Power"
-#define D_JSON_TOTAL_REACTIVE  "Total Reactive Power"
 #define D_JSON_DATA "Data"
 #define D_JSON_DISTANCE "Distance"
 #define D_JSON_DNSSERVER "DNSServer"
@@ -65,6 +59,8 @@
 #define D_JSON_ERASE "Erase"
 #define D_JSON_ERROR "Error"
 #define D_JSON_EVERY "Every"
+#define D_JSON_EXPORT_ACTIVE "ExportActivePower"
+#define D_JSON_EXPORT_REACTIVE "ExportReactivePower"
 #define D_JSON_FAILED "Failed"
 #define D_JSON_FALLBACKTOPIC "FallbackTopic"
 #define D_JSON_FEATURES "Features"
@@ -86,6 +82,8 @@
 #define D_JSON_I2CSCAN_NO_DEVICES_FOUND "No devices found"
 #define D_JSON_ID "Id"
 #define D_JSON_ILLUMINANCE "Illuminance"
+#define D_JSON_IMPORT_ACTIVE "ImportActivePower"
+#define D_JSON_IMPORT_REACTIVE "ImportReactivePower"
 #define D_JSON_INFRARED "Infrared"
 #define D_JSON_UNKNOWN "Unknown"
 #define D_JSON_LIGHT "Light"
@@ -99,6 +97,7 @@
 #define D_JSON_NONE "None"
 #define D_JSON_OR "or"
 #define D_JSON_PERIOD "Period"
+#define D_JSON_PHASE_ANGLE "PhaseAngle"
 #define D_JSON_POWERFACTOR "Factor"
 #define D_JSON_POWERUSAGE "Power"
 #define D_JSON_ACTIVE_POWERUSAGE "ActivePower"
@@ -135,6 +134,7 @@
 #define D_JSON_TIME "Time"
 #define D_JSON_TODAY "Today"
 #define D_JSON_TOTAL "Total"
+#define D_JSON_TOTAL_REACTIVE "TotalReactivePower"
 #define D_JSON_TOTAL_START_TIME "TotalStartTime"
 #define D_JSON_TVOC "TVOC"
 #define D_JSON_TYPE "Type"
@@ -546,6 +546,7 @@ const char HTTP_SNS_HUM[] PROGMEM = "%s{s}%s " D_HUMIDITY "{m}%s%%{e}";
 const char HTTP_SNS_PRESSURE[] PROGMEM = "%s{s}%s " D_PRESSURE "{m}%s %s{e}";                                // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
 const char HTTP_SNS_SEAPRESSURE[] PROGMEM = "%s{s}%s " D_PRESSUREATSEALEVEL "{m}%s %s{e}";                   // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
 const char HTTP_SNS_ANALOG[] PROGMEM = "%s{s}%s " D_ANALOG_INPUT "%d{m}%d{e}";                               // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
+const char HTTP_SNS_ILLUMINANCE[] PROGMEM = "%s{s}%s " D_ILLUMINANCE "{m}%d " D_UNIT_LUX "{e}";              // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
 
 #if defined(USE_MHZ19) || defined(USE_SENSEAIR)
 const char HTTP_SNS_CO2[] PROGMEM = "%s{s}%s " D_CO2 "{m}%d " D_UNIT_PARTS_PER_MILLION "{e}";                // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>

diff --git a/sonoff/language/bg-BG.h b/sonoff/language/bg-BG.h
@@ -536,6 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "A"

diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h
@@ -536,6 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "A"

diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h
@@ -536,6 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "A"

diff --git a/sonoff/language/el-GR.h b/sonoff/language/el-GR.h
@@ -536,6 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "A"

diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h
@@ -536,7 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
-
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -594,6 +594,7 @@
 #define D_LOG_UPNP "UPP: "         // UPnP
 #define D_LOG_WIFI "WIF: "         // Wifi
 
+//SDM220
 #define D_PHASE_ANGLE     "Phase Angle"
 #define D_IMPORT_ACTIVE   "Import Active"
 #define D_EXPORT_ACTIVE   "Export Active"

diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h
@@ -536,6 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "A"

diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h
@@ -536,6 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "A"

diff --git a/sonoff/language/he-HE.h b/sonoff/language/he-HE.h
@@ -536,6 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "A"

diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h
@@ -536,6 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "A"

diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h
@@ -536,6 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "A"

diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h
@@ -536,6 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "A"

diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h
@@ -536,6 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "A"

diff --git a/sonoff/language/pt-BR.h b/sonoff/language/pt-BR.h
@@ -536,6 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "A"

diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h
@@ -536,7 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
-
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "A"

diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h
@@ -536,6 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "А"

diff --git a/sonoff/language/sv-SE.h b/sonoff/language/sv-SE.h
@@ -536,7 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
-
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -594,6 +594,7 @@
 #define D_LOG_UPNP "UPP: "         // UPnP
 #define D_LOG_WIFI "WIF: "         // Wifi
 
+//SDM220
 #define D_PHASE_ANGLE     "Phase Angle"
 #define D_IMPORT_ACTIVE   "Import Active"
 #define D_EXPORT_ACTIVE   "Export Active"

diff --git a/sonoff/language/tr-TR.h b/sonoff/language/tr-TR.h
@@ -536,6 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "A"

diff --git a/sonoff/language/uk-UK.h b/sonoff/language/uk-UK.h
@@ -536,6 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "А"

diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h
@@ -536,6 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "安"

diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h
@@ -536,6 +536,7 @@
 #define D_SENSOR_SSPI_SCLK "SSPI SCLK"
 #define D_SENSOR_SSPI_CS   "SSPI CS"
 #define D_SENSOR_SSPI_DC   "SSPI DC"
+#define D_SENSOR_RF_SENSOR "RF Sensor"
 
 // Units
 #define D_UNIT_AMPERE "安"

diff --git a/sonoff/my_user_config.h b/sonoff/my_user_config.h
@@ -357,7 +357,7 @@
 #define USE_SERIAL_BRIDGE                        // Add support for software Serial Bridge (+0k8 code)
 //#define USE_SDM120                               // Add support for Eastron SDM120-Modbus energy meter (+1k7 code)
   #define SDM120_SPEED         9600              // SDM120-Modbus RS485 serial speed (default: 2400 baud)
-  #define USE_SDM220                             // add extra parameters for SDM220 (+0k1 code)
+  #define USE_SDM220                             // Add extra parameters for SDM220 (+0k1 code)
 //#define USE_SDM630                               // Add support for Eastron SDM630-Modbus energy meter (+2k code)
   #define SDM630_SPEED         9600              // SDM630-Modbus RS485 serial speed (default: 9600 baud)
 //#define USE_MP3_PLAYER                           // Use of the DFPlayer Mini MP3 Player RB-DFR-562 commands: play, volume and stop
@@ -399,6 +399,10 @@
 
 #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
+
 /*********************************************************************************************\
  * Debug features are only supported in development branch
 \*********************************************************************************************/

diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino
@@ -2766,6 +2766,7 @@ void loop(void)
   uint32_t my_sleep = millis();
 
   XdrvCall(FUNC_LOOP);
+  XsnsCall(FUNC_LOOP);
 
   OsWatchLoop();
 

diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h
@@ -140,6 +140,7 @@ enum UserSelectablePins {
   GPIO_SSPI_SCLK,      // Software SPI Serial Clock
   GPIO_SSPI_CS,        // Software SPI Chip Select
   GPIO_SSPI_DC,        // Software SPI Data or Command
+  GPIO_RF_SENSOR,      // Rf receiver with sensor decoding
   GPIO_SENSOR_END };
 
 // Programmer selectable GPIO functionality offset by user selectable GPIOs
@@ -199,7 +200,8 @@ const char kSensorNames[] PROGMEM =
   D_SENSOR_RFSEND "|" D_SENSOR_RFRECV "|"
   D_SENSOR_TUYA_TX "|" D_SENSOR_TUYA_RX "|"
   D_SENSOR_MGC3130_XFER "|" D_SENSOR_MGC3130_RESET "|"
-  D_SENSOR_SSPI_MISO "|" D_SENSOR_SSPI_MOSI "|" D_SENSOR_SSPI_SCLK "|" D_SENSOR_SSPI_CS "|" D_SENSOR_SSPI_DC;
+  D_SENSOR_SSPI_MISO "|" D_SENSOR_SSPI_MOSI "|" D_SENSOR_SSPI_SCLK "|" D_SENSOR_SSPI_CS "|" D_SENSOR_SSPI_DC "|"
+  D_SENSOR_RF_SENSOR;
 
 /********************************************************************************************/
 
@@ -382,6 +384,9 @@ const uint8_t kGpioNiceList[] PROGMEM = {
   GPIO_RFSEND,         // RF transmitter
   GPIO_RFRECV,         // RF receiver
 #endif
+#ifdef USE_RF_SENSOR
+  GPIO_RF_SENSOR,      // Rf receiver with sensor decoding
+#endif
 #ifdef USE_SR04
   GPIO_SR04_TRIG,      // SR04 Trigger pin
   GPIO_SR04_ECHO,      // SR04 Echo pin

diff --git a/sonoff/sonoff_version.h b/sonoff/sonoff_version.h
@@ -20,7 +20,7 @@
 #ifndef _SONOFF_VERSION_H_
 #define _SONOFF_VERSION_H_
 
-#define VERSION            0x06030010
+#define VERSION            0x06030011
 
 #define D_PROGRAMNAME      "Sonoff-Tasmota"
 #define D_AUTHOR           "Theo Arends"

diff --git a/sonoff/support_features.ino b/sonoff/support_features.ino
@@ -361,10 +361,15 @@ void GetFeatures(void)
 #ifdef USE_MGC3130
   feature_sns2 |= 0x00004000;  // xsns_36_mgc3130.ino
 #endif
-
-//  feature_sns2 |= 0x00008000;
-//  feature_sns2 |= 0x00010000;
-//  feature_sns2 |= 0x00020000;
+#ifdef USE_RF_SENSOR
+  feature_sns2 |= 0x00008000;  // xsns_37_rfsensor.ino
+#endif
+#ifdef USE_THEO_V2
+  feature_sns2 |= 0x00010000;
+#endif
+#ifdef USE_ALECTO_V2
+  feature_sns2 |= 0x00020000;
+#endif
 //  feature_sns2 |= 0x00040000;
 //  feature_sns2 |= 0x00080000;
 //  feature_sns2 |= 0x00100000;

diff --git a/sonoff/support_rtc.ino b/sonoff/support_rtc.ino
@@ -87,6 +87,20 @@ String GetTimeZone(void)
   return String(tz);  // -03:45
 }
 
+String GetDT(uint32_t time)
+{
+  // "2017-03-07T11:08:02" - ISO8601:2004
+
+  char dt[20];
+  TIME_T tmpTime;
+
+  BreakTime(time, tmpTime);
+  snprintf_P(dt, sizeof(dt), PSTR("%04d-%02d-%02dT%02d:%02d:%02d"),
+    tmpTime.year +1970, tmpTime.month, tmpTime.day_of_month, tmpTime.hour, tmpTime.minute, tmpTime.second);
+
+  return String(dt);  // 2017-03-07T11:08:02
+}
+
 /*
  * timestamps in https://en.wikipedia.org/wiki/ISO_8601 format
  *
@@ -101,39 +115,27 @@ String GetTimeZone(void)
 String GetDateAndTime(byte time_type)
 {
   // "2017-03-07T11:08:02-07:00" - ISO8601:2004
-  char dt[27];
-  TIME_T tmpTime;
+  uint32_t time = local_time;
 
   switch (time_type) {
     case DT_ENERGY:
-      BreakTime(Settings.energy_kWhtotal_time, tmpTime);
-      tmpTime.year += 1970;
+      time = Settings.energy_kWhtotal_time;
       break;
     case DT_UTC:
-      BreakTime(utc_time, tmpTime);
-      tmpTime.year += 1970;
+      time = utc_time;
       break;
     case DT_RESTART:
       if (restart_time == 0) {
         return "";
       }
-      BreakTime(restart_time, tmpTime);
-      tmpTime.year += 1970;
+      time = restart_time;
       break;
-    default:
-      tmpTime = RtcTime;
   }
-
-
-  snprintf_P(dt, sizeof(dt), PSTR("%04d-%02d-%02dT%02d:%02d:%02d"),
-    tmpTime.year, tmpTime.month, tmpTime.day_of_month, tmpTime.hour, tmpTime.minute, tmpTime.second);
-
+  String dt = GetDT(time);  // 2017-03-07T11:08:02
   if (Settings.flag3.time_append_timezone && (DT_LOCAL == time_type)) {
-//  if (Settings.flag3.time_append_timezone && ((DT_LOCAL == time_type) || (DT_ENERGY == time_type))) {
-    strncat(dt, GetTimeZone().c_str(), sizeof(dt) - strlen(dt) -1);
+    dt += GetTimeZone();    // 2017-03-07T11:08:02-07:00
   }
-
-  return String(dt);  // 2017-03-07T11:08:02-07:00
+  return dt;  // 2017-03-07T11:08:02-07:00
 }
 
 String GetTime(int type)