Added API Services for Tilt HomeAssistant

Added api services to support blind definitions in Home Assistant. Stop tilt function when my button is pressed and the tilt operation is in progress. Bump to v1.3.2
rstrouse · Mar 4, 2023 · 71e5b8a · 71e5b8a
1 parent 259e437
commit 71e5b8a
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 5 deletions.
diff --git a/ConfigSettings.h b/ConfigSettings.h
@@ -3,7 +3,7 @@
 #ifndef configsettings_h
 #define configsettings_h
 
-#define FW_VERSION "v1.3.1"
+#define FW_VERSION "v1.3.2"
 enum DeviceStatus {
   DS_OK = 0,
   DS_ERROR = 1,

diff --git a/Somfy.cpp b/Somfy.cpp
@@ -822,6 +822,7 @@ void SomfyShade::processFrame(somfy_frame_t &frame, bool internal) {
       dir = 0;
       break;
   }
+  if(dir == 0 && this->hasTilt && this->tiltDirection != 0) this->setTiltMovement(0);
   this->setMovement(dir);
 }
 void SomfyShade::setTiltMovement(int8_t dir) {

diff --git a/SomfyController.ino.esp32.bin b/SomfyController.ino.esp32.bin
diff --git a/SomfyController.littlefs.bin b/SomfyController.littlefs.bin
diff --git a/Web.cpp b/Web.cpp
@@ -177,6 +177,71 @@ void Web::begin() {
       apiServer.send(500, _encoding_json, F("{\"status\":\"ERROR\",\"desc\":\"Shade with the specified id not found.\"}"));
     }
     });
+  apiServer.on("/tiltCommand", []() {
+    webServer.sendCORSHeaders();
+    HTTPMethod method = apiServer.method();
+    uint8_t shadeId = 255;
+    uint8_t target = 255;
+    somfy_commands command = somfy_commands::My;
+    if (method == HTTP_GET || method == HTTP_PUT || method == HTTP_POST) {
+      if (server.hasArg("shadeId")) {
+        shadeId = atoi(apiServer.arg("shadeId").c_str());
+        if (apiServer.hasArg("command")) command = translateSomfyCommand(apiServer.arg("command"));
+        else if(apiServer.hasArg("target")) target = atoi(apiServer.arg("target").c_str());
+      }
+      else if (apiServer.hasArg("plain")) {
+        Serial.println("Sending Shade Tilt Command");
+        DynamicJsonDocument doc(256);
+        DeserializationError err = deserializeJson(doc, apiServer.arg("plain"));
+        if (err) {
+          switch (err.code()) {
+          case DeserializationError::InvalidInput:
+            apiServer.send(500, _encoding_json, F("{\"status\":\"ERROR\",\"desc\":\"Invalid JSON payload\"}"));
+            break;
+          case DeserializationError::NoMemory:
+            apiServer.send(500, _encoding_json, F("{\"status\":\"ERROR\",\"desc\":\"Out of memory parsing JSON\"}"));
+            break;
+          default:
+            apiServer.send(500, _encoding_json, F("{\"status\":\"ERROR\",\"desc\":\"General JSON Deserialization failed\"}"));
+            break;
+          }
+          return;
+        }
+        else {
+          JsonObject obj = doc.as<JsonObject>();
+          if (obj.containsKey("shadeId")) shadeId = obj["shadeId"];
+          else apiServer.send(500, _encoding_json, F("{\"status\":\"ERROR\",\"desc\":\"No shade id was supplied.\"}"));
+          if (obj.containsKey("command")) {
+            String scmd = obj["command"];
+            command = translateSomfyCommand(scmd);
+          }
+          else if(obj.containsKey("target")) {
+            target = obj["target"].as<uint8_t>();
+          }
+        }
+      }
+      else apiServer.send(500, _encoding_json, F("{\"status\":\"ERROR\",\"desc\":\"No shade object supplied.\"}"));
+    }
+    SomfyShade* shade = somfy.getShadeById(shadeId);
+    if (shade) {
+      Serial.print("Received:");
+      Serial.println(apiServer.arg("plain"));
+      // Send the command to the shade.
+      if(target >= 0 && target <= 100)
+        shade->moveToTiltTarget(target);
+      else
+        shade->sendTiltCommand(command);
+      DynamicJsonDocument sdoc(256);
+      JsonObject sobj = sdoc.to<JsonObject>();
+      shade->toJSON(sobj);
+      serializeJson(sdoc, g_content);
+      apiServer.send(200, _encoding_json, g_content);
+    }
+    else {
+      apiServer.send(500, _encoding_json, F("{\"status\":\"ERROR\",\"desc\":\"Shade with the specified id not found.\"}"));
+    }
+    });
+
   server.on("/upnp.xml", []() {
     SSDP.schema(server.client());
     });

diff --git a/data/index.html b/data/index.html
@@ -3,10 +3,10 @@
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta charset="UTF-8">
-    <link rel="stylesheet" href="main.css?v=1.3.1" type="text/css" />
-    <link rel="stylesheet" href="icons.css?v=1.3.1" type="text/css" />
+    <link rel="stylesheet" href="main.css?v=1.3.2" type="text/css" />
+    <link rel="stylesheet" href="icons.css?v=1.3.2" type="text/css" />
     <link rel="icon" type="image/png" href="favicon.png" />
-    <script type="text/javascript" src="index.js?v=1.3.1"></script>
+    <script type="text/javascript" src="index.js?v=1.3.2"></script>
 </head>
 <body>
     <div id="divContainer" class="container" style="user-select:none;position:relative;">

diff --git a/data/index.js b/data/index.js
@@ -355,7 +355,7 @@ async function reopenSocket() {
     await initSockets();
 }
 class General {
-    appVersion = 'v1.3.1';
+    appVersion = 'v1.3.2';
     reloadApp = false;
     async init() {
         this.setAppVersion();