Merge branch 'development' into zigbee_aqara_plug

CHANGELOG.md

@@ -18,6 +18,7 @@ All notable changes to this project will be documented in this file.
 - TuyaMcu rewrite by btsimonh (#17051)
 - WS2812 sends signal to only ``Pixels`` leds instead of sending to 512 leds (#17055)
 - Zigbee improved Aqara plug support and completed cluster 0x0702
+- ESP32 LVGL library from v8.3.2 to v8.3.3 (no functional change)
 
 ### Fixed
 - SenseAir S8 module detection (#17033)

lib/libesp32_lvgl/lvgl/library.json

@@ -1,6 +1,6 @@
 {
 	"name": "lvgl",
-	"version": "8.3.2",
+	"version": "8.3.3",
 	"keywords": "graphics, gui, embedded, tft, lvgl",
 	"description": "Graphics library to create embedded GUI with easy-to-use graphical elements, beautiful visual effects and low memory footprint. It offers anti-aliasing, opacity, and animations using only one frame buffer.",
 	"repository": {

lib/libesp32_lvgl/lvgl/library.properties

@@ -1,5 +1,5 @@
 name=lvgl
-version=8.3.2
+version=8.3.3
 author=kisvegabor
 maintainer=kisvegabor,embeddedt,pete-pjb
 sentence=Full-featured Graphics Library for Embedded Systems

lib/libesp32_lvgl/lvgl/lv_conf_template.h

@@ -1,6 +1,6 @@
 /**
  * @file lv_conf.h
- * Configuration file for v8.3.2
+ * Configuration file for v8.3.3
  */
 
 /*

lib/libesp32_lvgl/lvgl/lvgl.h

@@ -15,7 +15,7 @@ extern "C" {
  ***************************/
 #define LVGL_VERSION_MAJOR 8
 #define LVGL_VERSION_MINOR 3
-#define LVGL_VERSION_PATCH 1
+#define LVGL_VERSION_PATCH 3
 #define LVGL_VERSION_INFO ""
 
 /*********************

tasmota/tasmota_xdrv_driver/xdrv_58_range_extender.ino

@@ -95,10 +95,8 @@ const char kDrvRgxCommands[] PROGMEM = "Rgx|" // Prefix
                                        "|"
                                        "NAPT"
 #endif // USE_WIFI_RANGE_EXTENDER_NAPT
-#ifdef ESP32
                                        "|"
                                        "Clients"
-#endif // ESP32
                                        "|"
                                        "Address"
                                        "|"
@@ -111,9 +109,7 @@ void (*const DrvRgxCommand[])(void) PROGMEM = {
 #ifdef USE_WIFI_RANGE_EXTENDER_NAPT
     &CmndRgxNAPT,
 #endif // USE_WIFI_RANGE_EXTENDER_NAPT
-#ifdef ESP32
     &CmndRgxClients,
-#endif // ESP32
     &CmndRgxAddresses,
     &CmndRgxAddresses,
 };
@@ -172,17 +168,18 @@ void RgxCheckConfig(void)
   }
 }
 
-#ifdef ESP32
 void CmndRgxClients(void)
 {
+  Response_P(PSTR("{\"RgxClients\":{"));
+  const char *sep = "";
+
+#if defined(ESP32)
   wifi_sta_list_t wifi_sta_list = {0};
   tcpip_adapter_sta_list_t adapter_sta_list = {0};
 
   esp_wifi_ap_get_sta_list(&wifi_sta_list);
   tcpip_adapter_get_sta_list(&wifi_sta_list, &adapter_sta_list);
 
-  Response_P(PSTR("{\"RgxClients\":{"));
-  const char *sep = "";
   for (int i=0; i<adapter_sta_list.num; i++)
   {
     const uint8_t *m = adapter_sta_list.sta[i].mac;
@@ -190,9 +187,21 @@ void CmndRgxClients(void)
       sep, m[0], m[1], m[2], m[3], m[4], m[5], adapter_sta_list.sta[i].ip, wifi_sta_list.sta[i].rssi);
     sep = ",";
   }
+#elif defined(ESP8266)
+  struct station_info *station = wifi_softap_get_station_info();
+  while (station)
+  {
+    const uint8_t *m = station->bssid;
+    ResponseAppend_P(PSTR("%s\"%02X%02X%02X%02X%02X%02X\":{\"" D_CMND_IPADDRESS "\":\"%_I\"}"),
+      sep, m[0], m[1], m[2], m[3], m[4], m[5], station->ip.addr);
+    sep = ",";
+    station = STAILQ_NEXT(station, next);
+  }
+  wifi_softap_free_station_info();
+#endif
+
   ResponseAppend_P(PSTR("}}"));
 }
-#endif // ESP32
 
 void CmndRgxState(void)
 {