1 Hour fading

Geo-Glow · Oct 18, 2024 · 85523a2 · 85523a2
1 parent f30065f
commit 85523a2
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 13 deletions.
diff --git a/include/NanoleafApiWrapper.h b/include/NanoleafApiWrapper.h
@@ -31,14 +31,15 @@ class NanoleafApiWrapper
 
     bool setPower(const bool &state);
 
-    bool setStaticColors(const JsonObject &doc);
-
     bool registerEvents(const std::vector<int> &eventIds);
 
     void processEvents();
 
     typedef std::function<void()> LayoutChangeCallback;
+    typedef std::function<void()> ColorCallback;
     void setLayoutChangeCallback(LayoutChangeCallback callback);
+    void setColorCallback(ColorCallback callback);
+    bool setStaticColors(const JsonObject &doc);
 
 private:
     bool sendRequest(
@@ -56,6 +57,7 @@ class NanoleafApiWrapper
     WiFiClient *eventClient;
     bool registeredForEvents = false;
     LayoutChangeCallback layoutChangeCallback;
+    ColorCallback colorCallback;
 };
 
 #endif
diff --git a/src/Controller.cpp b/src/Controller.cpp
@@ -19,7 +19,7 @@ char nanoleafBaseUrl[55] = "";   // NanoLeaf Baseurl (http://<ip>:<port>)
 char nanoleafAuthToken[33] = ""; // Nanoleaf Auth Token
 
 // Setup Vars
-char friendId[4] = "";
+char friendId[36] = "";
 char name[36] = "";
 char groupId[36] = "";
 
@@ -28,6 +28,8 @@ unsigned long lastPublishTime = 0;
 bool shouldSaveConfig = false;
 bool layoutChanged = false;
 bool initialSetupDone = false;
+unsigned long lastColorTime = 0;
+bool currentlyShowingCustomColor = false;
 
 #if defined(ESP32)
 #define LED_BUILTIN 2
@@ -67,12 +69,12 @@ void connectToWifi(bool useSavedCredentials)
 
 void setupWiFiManager()
 {
-    wifiManager.setDebugOutput(false); // Disable the debug output to keep Serial clean
+    wifiManager.setDebugOutput(true); // Disable the debug output to keep Serial clean
     wifiManager.setSaveConfigCallback(saveConfigCallback);
 
     WiFiManagerParameter customGroupId("groupId", "Group ID", groupId, 36);
     WiFiManagerParameter customName("name", "Name", name, 36);
-    WiFiManagerParameter customFriendId("friendId", "FriendID", friendId, 4);
+    WiFiManagerParameter customFriendId("friendId", "FriendID", friendId, 36);
 
     wifiManager.addParameter(&customGroupId);
     wifiManager.addParameter(&customName);
@@ -428,8 +430,8 @@ void initialSetup()
         }
     }
 
-    Serial.println("MQTT Verbindung wird aufgebaut...");
-    setupMQTTClient();
+    /*Serial.println("MQTT Verbindung wird aufgebaut...");
+    setupMQTTClient();*/
 
     Serial.println("Generating Auth token");
     while (!nanoleaf.isConnected())
@@ -440,20 +442,26 @@ void initialSetup()
     }
 
     initialSetupDone = true;
-    digitalWrite(LED_BUILTIN, LOW);
+    digitalWrite(LED_BUILTIN, HIGH);
     saveConfigToFile();
 
     Serial.println("Ersteinrichtung abgeschlossen. Der ESP wird neu gestartet...");
     ESP.restart();
 }
 
+void colorCallback()
+{
+    lastColorTime = millis();
+    currentlyShowingCustomColor = true;
+}
+
 void setup()
 {
     Serial.begin(115200);
 
     // Initialize onboard led and turn off
     pinMode(LED_BUILTIN, OUTPUT);
-    digitalWrite(LED_BUILTIN, LOW);
+    digitalWrite(LED_BUILTIN, HIGH);
 
     loadConfigFromFile();
 
@@ -467,6 +475,7 @@ void setup()
     ensureNanoleafURL();
     setupMQTTClient();
     attemptNanoleafConnection();
+    nanoleaf.setColorCallback(colorCallback);
     publishStatus();
     publishInitialHeartbeat();
 }
@@ -475,16 +484,23 @@ void loop()
 {
     mqttClient.loop();
     nanoleaf.processEvents();
+    unsigned long now = millis();
+
+    if (now - lastColorTime >= 20000 && currentlyShowingCustomColor)
+    {
+        nanoleaf.setPower(false);
+        currentlyShowingCustomColor = false;
+    }
 
     if (layoutChanged)
     {
         publishStatus();
         layoutChanged = false;
     }
 
-    if (millis() - lastPublishTime >= PUBLISH_INTERVAL)
+    if (now - lastPublishTime >= PUBLISH_INTERVAL)
     {
         publishHeartbeat();
-        lastPublishTime = millis();
+        lastPublishTime = now;
     }
 }
diff --git a/src/NanoleafApiWrapper.cpp b/src/NanoleafApiWrapper.cpp
@@ -173,6 +173,11 @@ void NanoleafApiWrapper::setLayoutChangeCallback(LayoutChangeCallback callback)
     this->layoutChangeCallback = callback;
 }
 
+void NanoleafApiWrapper::setColorCallback(ColorCallback callback)
+{
+    this->colorCallback = callback;
+}
+
 bool NanoleafApiWrapper::identify()
 {
     return sendRequest("PUT", "/identify", nullptr, nullptr, true);
@@ -234,10 +239,14 @@ bool NanoleafApiWrapper::setStaticColors(const JsonObject &doc)
 
         auto rgb = kv.value().as<JsonArray>();
 
-        animData += tileId + " 2 " + String(rgb[0].as<int>()) + " " + String(rgb[1].as<int>()) + " " +
-                    String(rgb[2].as<int>()) + " 0 " + String(10 * 360) + " 0 0 0 0 360 ";
+        // animData += tileId + " 2 " + String(rgb[0].as<int>()) + " " + String(rgb[1].as<int>()) + " " +
+        //            String(rgb[2].as<int>()) + " 0 " + String(10 * 360) + " 0 0 0 0 360 ";
+        animData += tileId + " 2 " + "0 0 0 0 30 " + String(rgb[0].as<int>()) + " " + String(rgb[1].as<int>()) + " " +
+                    String(rgb[2].as<int>()) + " 0 50 ";
     }
 
+    Serial.println(animData);
+
     for (const auto &triangleId : triangleIds)
     {
         animData += triangleId + " 2 " + String(fromFriendColor[0].as<int>()) + " " + String(fromFriendColor[1].as<int>()) + " " +
@@ -255,5 +264,6 @@ bool NanoleafApiWrapper::setStaticColors(const JsonObject &doc)
     jsonPayload["write"]["palette"].add(JsonObject());
     jsonPayload["write"]["palette"][0]["hue"] = 0;
 
+    this->colorCallback();
     return sendRequest("PUT", "/effects", &jsonPayload, nullptr, true);
 }