Merge branch 'main' into main

Author: ph1p

README.md

@@ -302,6 +302,43 @@ curl http://your-server/api/data
 
 ---
 
+## Use HTTP API in Home Assistant
+
+An example configuration for an automation to set the brightness based on the sun's position. Dims the display when the sun is setting.
+
+- Add the following code to your `configuration.yaml`:
+  ```yaml
+  rest_command:
+    obegraensad_brightness_high:
+      url: "http://your-server/api/brightness/"
+      method: PATCH
+      content_type: "application/x-www-form-urlencoded"
+      payload: "value=100"
+    obegraensad_brightness_low:
+      url: "http://your-server/api/brightness/"
+      method: PATCH
+      content_type: "application/x-www-form-urlencoded"
+      payload: "value=1"
+  ```
+- Go to *Settings* --> *Automations* and create a new automation.
+- Select *Edit in YAML* and add the following content:
+  ```yaml
+  alias: Obegraensad low bightness
+  description: ""
+  triggers:
+    - trigger: sun
+      event: sunset
+      offset: 0
+  conditions: []
+  actions:
+    - action: rest_command.obegraensad_brightness_low
+      data: {}
+  mode: single
+  ```
+- To set the brightness back to bright, create e.g. another automation or a condition in which `rest_command.obegraensad_brightness_high` is called.
+
+---
+
 # Plugin Scheduler
 
 It is possible to switch between plugins automatically.  

frontend/src/app.tsx

@@ -109,7 +109,7 @@ export const App: Component = () => {
             }
           >
             <ScreenInfo>
-              <h2 class="text-4xl">A Plugin currently running</h2>
+              <h2 class="text-4xl">A plugin is currently running</h2>
               <p class="text-xl mt-2 text-gray-300">
                 Select "Draw" to show the canvas.
               </p>

lib/AsyncElegantOTA/AsyncElegantOTA.h

@@ -7,7 +7,6 @@
 #ifdef ESP32
 #include <AsyncTCP.h>
 #include <Update.h>
-#include <esp_int_wdt.h>
 #include <esp_task_wdt.h>
 #endif
 #ifdef ESP8266
@@ -52,4 +51,4 @@ class AsyncElegantOtaClass
 
 extern AsyncElegantOtaClass AsyncElegantOTA;
 
-#endif
+#endif

partitions-4MB.csv

@@ -0,0 +1,7 @@
+# Name   ,Type ,SubType  ,Offset ,Size  ,Flags
+nvs      ,data ,nvs      ,36K    ,20K   ,
+otadata  ,data ,ota      ,56K    ,8K    ,
+app0     ,app  ,ota_0    ,64K    ,1856K  ,
+app1     ,app  ,ota_1    ,1920K  ,1856K ,
+spiffs   ,data ,spiffs   ,3776K  ,256K   ,
+coredump ,data ,coredump ,4032K  ,64K   ,

platformio.ini

@@ -24,21 +24,42 @@ monitor_speed = 115200
 monitor_filters = esp32_exception_decoder
 ;build_flags = -DARDUINO_USB_CDC_ON_BOOT=1
 ;              -DARDUINO_USB_MODE=1
+; extra_scripts = upload.py
+; upload_protocol = custom
+; upload_url = http://192.168.178.50/update
+; upload_port = 192.168.178.50
 
+[env:ESP32-wemos]
+#platform = espressif32
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/54.03.20/platform-espressif32.zip
+board = wemos_d1_mini32
+framework = arduino
+lib_deps =
+	https://github.com/ESP32Async/ESPAsyncWebServer
+	bblanchon/ArduinoJson@^6.21.5
+	https://github.com/tzapu/WiFiManager.git#v2.0.17
+	mickey9801/ButtonFever@^1.0
+build_flags = -fexceptions
+board_build.partitions = partitions-4MB.csv
+monitor_speed = 115200
+monitor_filters = esp32_exception_decoder
 ; extra_scripts = upload.py
 ; upload_protocol = custom
 ; upload_url = http://192.168.178.50/update
 ; upload_port = 192.168.178.50
 
 [env:esp32dev]
-platform = espressif32
+#platform = espressif32
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/54.03.20/platform-espressif32.zip
 board = esp32dev
 framework = arduino
 lib_deps =
-	https://github.com/me-no-dev/ESPAsyncWebServer.git
+	https://github.com/ESP32Async/ESPAsyncWebServer
 	bblanchon/ArduinoJson@^6.21.5
 	https://github.com/tzapu/WiFiManager.git#v2.0.17
 	mickey9801/ButtonFever@^1.0
+build_flags = -fexceptions
+board_build.partitions = partitions-4MB.csv
 monitor_speed = 115200
 monitor_filters = esp32_exception_decoder
 ; extra_scripts = upload.py

src/screen.cpp

@@ -109,9 +109,9 @@ void Screen_::restoreCache()
 // CACHE END
 
 // STORAGE START
-#ifdef ENABLE_STORAGE
 void Screen_::loadFromStorage()
 {
+#ifdef ENABLE_STORAGE
   storage.begin("led-wall", true);
   setBrightness(255);
 
@@ -128,17 +128,19 @@ void Screen_::loadFromStorage()
   setBrightness(storage.getUInt("brightness", 255));
   setCurrentRotation(storage.getUInt("rotation", 0));
   storage.end();
+#endif
 }
 
 void Screen_::persist()
 {
+#ifdef ENABLE_STORAGE
   storage.begin("led-wall");
   storage.putBytes("data", renderBuffer_, ROWS * COLS);
   storage.putUInt("brightness", brightness_);
   storage.putUInt("rotation", currentRotation);
   storage.end();
-}
 #endif
+}
 // STORAGE END
 
 void Screen_::setup()
@@ -168,10 +170,9 @@ void Screen_::setup()
   SPI.begin(PIN_CLOCK, 34, PIN_DATA, 25); // SCLK, MISO, MOSI, SS
   SPI.beginTransaction(SPISettings(10000000, MSBFIRST, SPI_MODE0));
 
-  hw_timer_t *Screen_timer = timerBegin(0, 80, true);
-  timerAttachInterrupt(Screen_timer, &onScreenTimer, true);
-  timerAlarmWrite(Screen_timer, TIMER_INTERVAL_US, true);
-  timerAlarmEnable(Screen_timer);
+  hw_timer_t *Screen_timer = timerBegin(1000000);
+  timerAttachInterrupt(Screen_timer, &onScreenTimer);
+  timerAlarm(Screen_timer, TIMER_INTERVAL_US, true, 0);
 #endif
 }