Cập nhật auto Backgroud, ESP32-S3

platformio_override.ini

@@ -11,56 +11,6 @@ default_envs = esp32s3dev_8MB_PSRAM_opi
 ; default_envs = esp32dev, esp32s3dev_8MB_PSRAM_opi
 ; default_envs = d1_mini, esp32dev, esp32s3dev_8MB_PSRAM_opi
 
-[env:d1_mini]
-board = d1_mini
-platform = ${common.platform_wled_default}
-platform_packages = ${common.platform_packages}
-upload_speed = 921600
-board_build.ldscript = ${common.ldscript_4m1m}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP8266
-  -D USERMOD_AUTO_SAVE
-  -D AUTOSAVE_AFTER_SEC=10
-  -D AUTOSAVE_PRESET_NUM=100
-  -D USERMOD_AUTO_SAVE_ON_BOOT=true
-  -D USERMOD_ANALOG_CLOCKQ
-  ; -D USERMOD_MODE_SORT
-  ; -D WLED_DISABLE_OTA
-  -D WLED_DISABLE_ALEXA
-  ; -D WLED_DISABLE_INFRARED # IR dieu khien hong ngoai
-  -D WLED_ADD_EEPROM_SUPPORT
-  -D DEFAULT_LED_COLOR_ORDER=COL_ORDER_GRB
-; #if defined(ESP8266) || (defined(ARDUINO_ARCH_ESP32) && defined(WLED_USE_PSRAM)) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(ARDUINO_ESP32_PICO)
-;   #define LEDPIN 2    // GPIO2 (D4) on Wemos D1 mini compatible boards, and on boards where GPIO16 is not available
-; #else
-;   #define LEDPIN 16   // aligns with GPIO2 (D4) on Wemos D1 mini32 compatible boards
-  -D LEDPIN=2
-  -D BTNPIN=0
-  -D TOUCHPIN=T0
-  -D IRPIN=4
-lib_deps = ${esp8266.lib_deps}
-; monitor_filters = esp8266_exception_decoder
-; change MCU frequency
-board_build.f_cpu = 160000000L
-; setupCOM
-; upload_port = COM[4]
-
-[env:esp32dev]
-board = esp32dev
-platform = ${esp32.platform}
-platform_packages = ${esp32.platform_packages}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp32} -D WLED_RELEASE_NAME=ESP32 #-D WLED_DISABLE_BROWNOUT_DET ${esp32s3.build_flags}
-  -D USERMOD_AUTO_SAVE
-  -D AUTOSAVE_AFTER_SEC=10
-  -D USERMOD_AUTO_SAVE_ON_BOOT=true
-  -D WLED_ADD_EEPROM_SUPPORT
-  -D DEFAULT_LED_COLOR_ORDER=COL_ORDER_GRB
-lib_deps = ${esp32.lib_deps}
-monitor_filters = esp32_exception_decoder
-board_build.partitions = ${esp32.default_partitions}
-; setupCOM
-; upload_port = COM[5]
 
 [env:esp32s3dev_8MB_PSRAM_opi]
 ;; ESP32-S3 development board, with 8MB FLASH and >= 8MB PSRAM (memory_type: qio_opi)
@@ -83,28 +33,32 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -D WLED_RELEASE_NAME=
   -D AUTOSAVE_PRESET_NUM=100
   -D USERMOD_AUTO_SAVE_ON_BOOT=true
   ; -D USERMOD_ANALOG_CLOCKQ
-  -D TEMPERATURE_PIN=12
-  -D IRPIN=15
-  -D LEDPIN=16
-  -D BTNPIN=17
-  ; -D RLYPIN=18
-  ; -D HW_PIN_SCL=35
-  ; -D HW_PIN_SDA=33
-  ; -D HW_PIN_CLOCKSPI=7
-  ; -D HW_PIN_DATASPI=11
-  ; -D HW_PIN_MISOSPI=9
   -D USERMOD_DALLASTEMPERATURE
-  ; -D USERMOD_FOUR_LINE_DISPLAY
-
-  ; -D USE_ALT_DISPlAY ; new versions of USERMOD_FOUR_LINE_DISPLAY and USERMOD_ROTARY_ENCODER_UI
+  -D TEMPERATURE_PIN=12
+  ; enable IR by setting remote type
+  ;  -D IRTYPE=0 ;0 Remote disabled | 1 24-key RGB | 2 24-key with CT | 3 40-key blue | 4 40-key RGB | 5 21-key RGB | 6 6-key black | 7 9-key red | 8 JSON remote
+  -D IRPIN=15  -D IRTYPE=5 ; GPIO15 21-key RGB; 
+  -D LEDPIN=16 ; GPIO16
+  -D DEFAULT_LED_COUNT=64
+  -D BTNPIN=17 ; GPIO17
+  ; PIN defines for 2 wire LEDs
+  -D CLKPIN=0 ; TX
+  -D DATAPIN=16 ; GPIO16
+
+  -D WLED_ADD_EEPROM_SUPPORT
   ; -D USERMOD_AUDIOREACTIVE
+  ; -D WLED_AP_SSID_UNIQUE ; ENABLE FOR V2.0.0
+
 lib_deps = ${esp32s3.lib_deps}
   OneWire@~2.3.5
-  olikraus/U8g2 @ ^2.28.8
+  ; olikraus/U8g2 @ ^2.28.8
 board_build.partitions = tools/WLED_ESP32_8MB.csv
 board_build.f_flash = 80000000L
 board_build.flash_mode = qio
 monitor_filters = esp32_exception_decoder
+; setupCOM
+upload_port = COM[4]
+
 
 ; [env:WLED_tasmota_1M]
 ; board = esp01_1m
@@ -163,3 +117,58 @@ monitor_filters = esp32_exception_decoder
 ;   
 ; set default color order of your led strip
 ;   -D DEFAULT_LED_COLOR_ORDER=COL_ORDER_GRB
+
+
+
+[env:d1_mini]
+board = d1_mini
+platform = ${common.platform_wled_default}
+platform_packages = ${common.platform_packages}
+upload_speed = 921600
+board_build.ldscript = ${common.ldscript_4m1m}
+build_unflags = ${common.build_unflags}
+build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP8266
+  -D USERMOD_AUTO_SAVE
+  -D AUTOSAVE_AFTER_SEC=10
+  -D AUTOSAVE_PRESET_NUM=100
+  -D USERMOD_AUTO_SAVE_ON_BOOT=true
+  -D USERMOD_ANALOG_CLOCKQ
+  ; -D USERMOD_MODE_SORT
+  ; -D WLED_DISABLE_OTA
+  -D WLED_DISABLE_ALEXA
+  ; -D WLED_DISABLE_INFRARED # IR dieu khien hong ngoai
+  -D WLED_ADD_EEPROM_SUPPORT
+  -D DEFAULT_LED_COLOR_ORDER=COL_ORDER_GRB
+; #if defined(ESP8266) || (defined(ARDUINO_ARCH_ESP32) && defined(WLED_USE_PSRAM)) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(ARDUINO_ESP32_PICO)
+;   #define LEDPIN 2    // GPIO2 (D4) on Wemos D1 mini compatible boards, and on boards where GPIO16 is not available
+; #else
+;   #define LEDPIN 16   // aligns with GPIO2 (D4) on Wemos D1 mini32 compatible boards
+  -D LEDPIN=2
+  -D BTNPIN=0
+  -D TOUCHPIN=T0
+  -D IRPIN=4
+  -D WLED_AP_SSID_UNIQUE
+lib_deps = ${esp8266.lib_deps}
+; monitor_filters = esp8266_exception_decoder
+; change MCU frequency
+board_build.f_cpu = 160000000L
+; setupCOM
+; upload_port = COM[4]
+
+[env:esp32dev]
+board = esp32dev
+platform = ${esp32.platform}
+platform_packages = ${esp32.platform_packages}
+build_unflags = ${common.build_unflags}
+build_flags = ${common.build_flags_esp32} -D WLED_RELEASE_NAME=ESP32 #-D WLED_DISABLE_BROWNOUT_DET ${esp32s3.build_flags}
+  -D USERMOD_AUTO_SAVE
+  -D AUTOSAVE_AFTER_SEC=10
+  -D USERMOD_AUTO_SAVE_ON_BOOT=true
+  -D WLED_ADD_EEPROM_SUPPORT
+  -D WLED_AP_SSID_UNIQUE
+  -D LEDPIN=4
+lib_deps = ${esp32.lib_deps}
+monitor_filters = esp32_exception_decoder
+board_build.partitions = ${esp32.default_partitions}
+; setupCOM
+upload_port = COM[3]

tools/cdata.js

@@ -403,7 +403,7 @@ const char PAGE_dmxmap[] PROGMEM = R"=====()=====";
       filter: "html-minify",
     },
     {
-      file: "favicon.ico",
+      file: "favicon-32x32.png",
       name: "favicon",
       method: "binary",
     },

tools/multi-update-bangnguyen.cmd

@@ -0,0 +1,16 @@
+@echo off
+SETLOCAL
+SET FWPATH=D:\Github\ARGB-bangnguyendev\build_output\release
+GOTO ESPS
+
+:UPDATEONE
+IF NOT EXIST %FWPATH%\%2 GOTO SKIP
+	ping -w 1000 -n 1 %1 | find "TTL=" || GOTO SKIP
+	ECHO Updating %1
+	curl -s -F "update=@%FWPATH%/%2" %1/update >nul
+:SKIP
+GOTO:EOF
+
+:ESPS
+call :UPDATEONE 192.168.5.17 ARGB_1.0.0_ESP32_S3_N8R8.bin
+

usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h

@@ -300,7 +300,7 @@ void PIRsensorSwitch::publishHomeAssistantAutodiscovery()
     device[F("name")] = serverDescription;
     device[F("ids")]  = String(F("wled-sensor-")) + mqttClientID;
     device[F("mf")]   = "WLED";
-    device[F("mdl")]  = F("FOSS");
+    device[F("mdl")]  = F("HAPPY SMART LIGHT");
     device[F("sw")]   = versionString;
 
     sprintf_P(buf, PSTR("homeassistant/binary_sensor/%s/config"), uid);

wled00/data/index.js

@@ -670,12 +670,12 @@ function populateInfo(i)
 				urows += inforow(k,val);
 		}
 	}
-	var vcn = "bangnguyendev";
-	if (i.ver.startsWith("1.0.")) vcn = "bangnguyendev";
-//	if (i.ver.includes("-bl")) vcn = "Supāku";
+	var vcn = "Happy Smart Light";
+	if (i.ver.startsWith("1.0.")) vcn = "Happy Smart Light";
+	// if (i.ver.includes("-bl")) vcn = "beta";
 	if (i.cn) vcn = i.cn;
 
-	cn += `v${i.ver} - ${vcn}<br><br><table>
+	cn += `${vcn} - v${i.ver}<br><br><table>
 ${urows}
 ${urows===""?'':'<tr><td colspan=2><hr style="height:1px;border-width:0;color:gray;background-color:gray"></td></tr>'}
 ${i.opt&0x100?inforow("Debug","<button class=\"btn btn-xs\" onclick=\"requestJson({'debug':"+(i.opt&0x0080?"false":"true")+"});\"><i class=\"icons "+(i.opt&0x0080?"on":"off")+"\">&#xe08f;</i></button>"):''}

wled00/data/pxmagic/.gitattributes

@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto

wled00/data/pxmagic/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Alerson Jorge
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

wled00/data/pxmagic/README.md

@@ -0,0 +1,104 @@
+![PixelMagicTool](https://github.com/ajotanc/PixelMagicTool/assets/47322034/300b240b-40a3-4a9a-a6f0-925631919d9b)
+
+# Pixel Magic Tool
+It is a tool that converts any image into code in JSON WLED format, currently being tested on a 2D Matrix panel, soon I will post news for the serpentine version.
+
+### Features
+- Converts any type of image
+- Option on tape address format
+- Result output option
+- Choice of brightness intensity
+- Convert transparent pixels to chosen color
+- Convert animated GIFs
+- Resize image
+- Select image direct from **[WLED-IP]/edit** or **upload**
+- Can save, simulate, copy or download generated code
+
+### Improvements and fixes
+### (25/10/2023)
+ - Correction in animation generation that was actually breaking
+ - Button to return to WLED if pxmagic.htm is accessed via url (http://), if accessed via external (file://) the button will not show
+ - Adjustments to CSS and some features
+ - Rremoving unnecessary html
+ - Correction of CORS error when using the file locally, it was unable to generate the images that are saved in WLED
+
+### (15/06/2023)
+- Changing the use of **document**
+- Creation of function **element** to be reduced in relation to **document.getElementById**
+- Fixes
+- Image being generated according to its size
+- Re-creation of the redone image
+- Reworked Resize, if your segment is 20x20 and you want to use 16x16 it will be fine, credits @blazoncek 
+- Default Segment Default as 0 and **data-width** and **data-height** as 16 if user opens via Desktop and not via WLED, credits @ALDIY#2452 
+- Final file size reduction
+- Improved functionality and interaction between parameters
+-
+#### (12/06/2023)
+- The API domain was **ajota.vercel.app** now it's **pixelmagictool.vercel.app**
+- Performance in **pxmagic** and **inpxmagic** version
+- Significantly decreased **pxmagic.htm** file size
+- **range** pattern now in hybrid style to improve JSON size
+- Version name change from **interface.htm** to **pxmagic.htm**
+- Version name change from **inline.htm** to **inpxmagic.htm**
+
+#### (09/06/2023)
+- Fixed animation generation
+- Fixed drag and drop function
+- Fix when saving presets and playlist
+- Function performance fixes
+- Parameter text interpretation
+- Interaction of functionality
+- Save presets via API
+- Auto default segment width and height
+
+## INTERFACE VERSION
+### Download
+**Right-Click** [[Interface]](https://raw.githubusercontent.com/ajotanc/wled-matrix-converter/main/pxmagic.htm) and select save to your local computer.
+
+### Tutorial
+Showing usability in the interface version in an easy, simple and intuitive way.
+
+https://github.com/ajotanc/wled-matrix-converter/assets/47322034/20ad60d1-3b01-42b6-9937-4dda3862a3a4
+
+## INLINE VERSION
+### Download
+**Right-Click** [[Inline]](https://raw.githubusercontent.com/ajotanc/wled-matrix-converter/main/inpxmagic.htm) and select save to your local computer.
+
+### Example of what the URL looks like
+```
+  GET http://[WLED-IP]/inpxmagic.htm?id=0&output=ha&brightness=255&pre_segment=individual&device=pixel_art_controller_001&unique_id=pixel_art_controller_001a&friendly_name=PixelArt&hostname=[WLED-IP]&color=3CCFFE5&image=33.png&download=true&simulate=false
+```
+## CURL GENERATE WLED JSON
+```bash
+# Local image upload
+# Remember to change the \path\image.png path to the desired image path.
+curl -X POST -F "file=@\path\image.png" "https://pixelmagictool.vercel.app/api/wled/image?id=0&output=json&brightness=255&pre_segment=individual&hostname=10.0.0.41&color=CCFFE5"
+
+# External image upload
+curl -X POST -F "file=@-;filename=image.png" "https://pixelmagictool.vercel.app/api/wled/image?id=0&output=curl&brightness=255&pre_segment=individual&hostname=10.0.0.41&color=CCFFE5" < <(curl -s "https://img.freepik.com/premium-vector/lightning-pixel-art-gaming-item-game-pixel-lightning_158677-585.jpg")
+# OR
+curl -o /tmp/image.png -s "https://img.freepik.com/premium-vector/lightning-pixel-art-gaming-item-game-pixel-lightning_158677-585.jpg" && curl -X POST -F "file=@/tmp/image.png" "https://pixelmagictool.vercel.app/api/wled/image?id=0&output=curl&brightness=255&pre_segment=individual&hostname=10.0.0.41&color=3CCFFE5"
+```
+
+#### Description of parameters
+| Parameters | Type | Description | Default | Required |
+| ---------- | ---- | ------- | ----------- | -------- | 
+| `id` | `integer` | Segment id | **0** | ✅
+| `output` or `o` | `string` | Output type, options [json, curl, ha] | **json** | ✅
+| `brightness` or `bri` | `integer` | Brightness of the LEDs | **128** | ✅
+| `pattern` or `pat` | `string` | Pattern type, options [individual ["FFFFFF"], index [0, "FFFFFF"], range [0, 5, "FFFFFF"] | **individual** | ✅
+| `hostname` or `hn` | `string` | WLED IP | - | ✅
+| `width` or `w` | `number` | Resize image width | **16** | ⬜️
+| `height` or `h` | `number` | Resize image height | **16** | ⬜️
+| `device` or `d` | `string` | Device name, mandatory if the output is "ha" | - | ⬜️
+| `unique_id` or `uid` | `string` | Unique device id, required if output is "ha" | - | ⬜️
+| `friendly_name` or `fn` | `string` | Friendly name of the device, mandatory if the output is "ha" | - | ⬜️
+| `color` or `c` | `string` | If the image contains a transparent background, you can change it to a desired color by passing the color in the HEX pattern | - | ⬜️
+| `animation` or `anim` | `boolean` | If true, it will return the WLED JSON according to the number of frames in the GIF image. | **false** | ⬜️
+| `amount` or `amt` | `number` | Number of frames contained in the GIF image, if the **animation** parameter is **true** | **0** | ⬜️
+| `delay` or `dl` | `number` | Delay seconds between executions **curl**, optional and only for **output** curl | **2** | ⬜️
+| `name` or `n` | `string` | Name of the preset to be saved | - | ⬜️
+| `psave` or `ps` | `number` | Preset id to be saved | - | ⬜️
+| `image` | `string` | Image that will be converted to JSON WLED, required only if using the **inpxmagic** version | - | ⬜️
+| `file` | `boolean` | If true, it will download the file according to the output, required only if using the **inpxmagic** version | **false** | ⬜️
+| `simulate` | `boolean` | If true and output is "json" then simulate JSON WLED, required only if using the **inpxmagic** version | **false** | ⬜️