Merge pull request #3 from jp112sdl/develop

Develop

Author: jp112sdl

DualFunctions.ino

@@ -1,14 +1,45 @@
-void switch_dual_relay(byte DIRECTION) {
+void switch_relay(byte DIRECTION) {
   DEBUG("Schalte Relais Num " + String(DIRECTION));
-  dual_relay_switched_millis = millis();
+  relay_switched_millis = millis();
   DRIVING_DIRECTION = DIRECTION;
   if (DRIVING_DIRECTION > DIRECTION_NONE) shutter_start_value_percent = ShutterConfig.CurrentValue;
+  switch (GlobalConfig.Model) {
+    case Model_Dual:
+      switch_hvio_dualr2_relay(DIRECTION);
+      break;
+    case Model_HVIO:
+      switch_hvio_dualr2_relay(DIRECTION);
+      break;
+    case Model_DualR2:
+      switch_hvio_dualr2_relay(DIRECTION);
+      break;
+  }
+}
+
+void switch_hvio_dualr2_relay(byte DIRECTION) {
+  switch (DIRECTION) {
+    case DIRECTION_NONE:
+      digitalWrite(Relay1, LOW);
+      digitalWrite(Relay2, LOW);
+      break;
+    case DIRECTION_UP:
+      digitalWrite(Relay2, LOW);
+      digitalWrite(Relay1, HIGH);
+      break;
+    case DIRECTION_DOWN:
+      digitalWrite(Relay1, LOW);
+      digitalWrite(Relay2, HIGH);
+      break;
+  }
+}
+
+void switch_dual_relay(byte DIRECTION) {
   Serial.write(0xA0);
   Serial.write(0x04);
   Serial.write(DIRECTION & 0xFF);
   Serial.write(0xA1);
   Serial.write('\n');
-  Serial.flush();  
+  Serial.flush();
 }
 
 byte serial_in_byte;                        // Received byte

FileHandling.ino

@@ -7,10 +7,11 @@
 //#define JSONCONFIG_LOXUSERNAME            "loxusername"
 //#define JSONCONFIG_LOXPASSWORD            "loxpassword"
 #define JSONCONFIG_BACKENDTYPE            "backendtype"
+#define JSONCONFIG_MODEL                  "model"
 #define JSONCONFIG_SHUTTER_MOTORSWITCHINGTIME "sh_mst"
 #define JSONCONFIG_SHUTTER_DRIVETIMEUP        "sh_dtup"
 #define JSONCONFIG_SHUTTER_DRIVETIMEDOWN      "sh_dtdown"
-#define JSONCONFIG_SHUTTER_DRIVEUNTILCALIB    "sh_cal"
+#define JSONCONFIG_SHUTTER_DRIVESUNTILCALIB    "sh_cal"
 
 bool loadSystemConfig() {
   DEBUG(F("loadSystemConfig mounting FS..."), "loadSystemConfig()", _slInformational);
@@ -43,11 +44,12 @@ bool loadSystemConfig() {
           //((json[JSONCONFIG_LOXPASSWORD]).as<String>()).toCharArray(LoxoneConfig.Password, VARIABLESIZE);
           ((json[JSONCONFIG_LOXUDPPORT]).as<String>()).toCharArray(LoxoneConfig.UDPPort, 10);
           GlobalConfig.BackendType = json[JSONCONFIG_BACKENDTYPE];
+                    GlobalConfig.Model = json[JSONCONFIG_MODEL];
           GlobalConfig.Hostname = "Sonoff-" + String(GlobalConfig.DeviceName);
           ShutterConfig.MotorSwitchingTime = json[JSONCONFIG_SHUTTER_MOTORSWITCHINGTIME].as<float>();
           ShutterConfig.DriveTimeUp = json[JSONCONFIG_SHUTTER_DRIVETIMEUP].as<float>();
           ShutterConfig.DriveTimeDown = json[JSONCONFIG_SHUTTER_DRIVETIMEDOWN].as<float>();
-          ShutterConfig.DriveUntilCalib = json[JSONCONFIG_SHUTTER_DRIVEUNTILCALIB];
+          ShutterConfig.DrivesUntilCalib = json[JSONCONFIG_SHUTTER_DRIVESUNTILCALIB];
         } else {
           DEBUG(F("\nloadSystemConfig ERROR loading config"), "loadSystemConfig()", _slInformational);
         }
@@ -78,11 +80,12 @@ bool saveSystemConfig() {
   //json[JSONCONFIG_LOXUSERNAME] = LoxoneConfig.Username;
   //json[JSONCONFIG_LOXPASSWORD] = LoxoneConfig.Password;
   json[JSONCONFIG_LOXUDPPORT] = LoxoneConfig.UDPPort;
+  json[JSONCONFIG_MODEL] = GlobalConfig.Model;
 
   json[JSONCONFIG_SHUTTER_MOTORSWITCHINGTIME] = ShutterConfig.MotorSwitchingTime;
   json[JSONCONFIG_SHUTTER_DRIVETIMEUP] = ShutterConfig.DriveTimeUp;
   json[JSONCONFIG_SHUTTER_DRIVETIMEDOWN] = ShutterConfig.DriveTimeDown;
-  json[JSONCONFIG_SHUTTER_DRIVEUNTILCALIB] = ShutterConfig.DriveUntilCalib;
+  json[JSONCONFIG_SHUTTER_DRIVESUNTILCALIB] = ShutterConfig.DrivesUntilCalib;
 
   SPIFFS.remove("/" + configJsonFile);
   File configFile = SPIFFS.open("/" + configJsonFile, "w");

Helpers.ino

@@ -20,12 +20,12 @@ byte calculatePercent(byte startValue, byte DIRECTION) {
   int x = 0;
   switch (DIRECTION) {
     case DIRECTION_UP:
-      x = (millis() - dual_relay_switched_millis) / (ShutterConfig.DriveTimeUp * 10);
+      x = (millis() - relay_switched_millis) / (ShutterConfig.DriveTimeUp * 10);
       x = startValue + x;
       if (x > 100) x = 100;
       return x;
     case DIRECTION_DOWN:
-      x = (millis() - dual_relay_switched_millis) / (ShutterConfig.DriveTimeDown * 10);
+      x = (millis() - relay_switched_millis) / (ShutterConfig.DriveTimeDown * 10);
       x = startValue - x;
       if (x < 0) x = 0;
       return x;