Updated all

bangnguyendev · May 20, 2024 · f2176b6 · f2176b6
1 parent 4a411c4
commit f2176b6
Show file tree

Hide file tree

Showing 46 changed files with 10,044 additions and 9,237 deletions.
diff --git a/build_output/firmware/d1_mini.bin b/build_output/firmware/d1_mini.bin
diff --git a/build_output/firmware/d1_mini.bin.gz b/build_output/firmware/d1_mini.bin.gz
diff --git a/build_output/firmware/esp32dev.bin b/build_output/firmware/esp32dev.bin
diff --git a/build_output/firmware/esp32dev.bin.gz b/build_output/firmware/esp32dev.bin.gz
diff --git a/build_output/firmware/esp8266_2m.bin b/build_output/firmware/esp8266_2m.bin
diff --git a/build_output/firmware/esp8266_2m.bin.gz b/build_output/firmware/esp8266_2m.bin.gz
diff --git a/build_output/release/ARGB_1.0.0_ESP32.bin b/build_output/release/ARGB_1.0.0_ESP32.bin
diff --git a/build_output/release/ARGB_1.0.0_ESP8266.bin b/build_output/release/ARGB_1.0.0_ESP8266.bin
diff --git a/pio-scripts/output_bins.py b/pio-scripts/output_bins.py
@@ -30,12 +30,12 @@ def bin_rename_copy(source, target, env):
     map_file = "{}map{}{}.map".format(OUTPUT_DIR, os.path.sep, variant)
     bin_file = "{}firmware{}{}.bin".format(OUTPUT_DIR, os.path.sep, variant)
 
-    release_name = _get_cpp_define_value(env, "WLED_RELEASE_NAME")
+    release_name = _get_cpp_define_value(env, "WLED_RELEASE_NAME") # WLED_RELEASE_NAME LÀ DEFINE_NAME DANH DAU VIEC RELEASE
 
     if release_name:
         _create_dirs(["release"])
         version = _get_cpp_define_value(env, "WLED_VERSION")
-        release_file = "{}release{}WLED_{}_{}.bin".format(OUTPUT_DIR, os.path.sep, version, release_name)
+        release_file = "{}release{}ARGB_{}_{}.bin".format(OUTPUT_DIR, os.path.sep, version, release_name)
         shutil.copy(str(target[0]), release_file)
 
     # check if new target files exist and remove if necessary

diff --git a/platformio.ini b/platformio.ini
@@ -25,7 +25,7 @@
 ; default_envs = esp8266_2m
 ; default_envs = esp01_1m_full
 ; default_envs = esp07
-default_envs = d1_mini
+; default_envs = d1_mini
 ; default_envs = heltec_wifi_kit_8
 ; default_envs = h803wf
 ; default_envs = d1_mini_debug

diff --git a/platformio_override.ini b/platformio_override.ini
@@ -6,6 +6,8 @@
 
 [platformio]
 default_envs = d1_mini
+; default_envs = esp32dev
+; default_envs = d1_mini, esp8266_2m, esp32dev
 
 [env:d1_mini]
 board = d1_mini
@@ -14,13 +16,55 @@ 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 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
+lib_deps = ${esp8266.lib_deps}
+; monitor_filters = esp8266_exception_decoder
+; change MCU frequency
+board_build.f_cpu = 160000000L
+; setupCOM
+upload_port = COM[3]
+
+
+[env:esp8266_2m]
+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 USERMOD_AUTO_SAVE
   ; -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
 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
+  -D USERMOD_AUTO_SAVE
+  -D WLED_ADD_EEPROM_SUPPORT
+lib_deps = ${esp32.lib_deps}
+monitor_filters = esp32_exception_decoder
+board_build.partitions = ${esp32.default_partitions}
+; setupCOM
+upload_port = COM[5]
 
 ; [env:WLED_tasmota_1M]
 ; board = esp01_1m

diff --git a/tools/fps_test.htm b/tools/fps_test.htm
@@ -116,7 +116,7 @@
         }
         function req(command) {
             var ip = document.getElementById('ip').value;
-            if (!ip) {alert("Please enter WLED IP"); return;}
+            if (!ip) {alert("Please enter ARGB IP"); return;}
             if (ip != localStorage.getItem('locIpFps')) localStorage.setItem('locIpFps', document.getElementById('ip').value);
             var url = command ? `http://${ip}/json/si` : `http://${ip}/json/effects`;
             var type = command ? 'post':'get';
@@ -209,7 +209,7 @@
 </head>
 <body onload="S()">
     <h2>Starship monitoring dashboard</h2>
-    (or rather just a WLED frame rate tester lol)<br><br>
+    (or rather just a ARGB frame rate tester lol)<br><br>
     IP: <input id="ip" /><br>
     Time per effect: <input type=number id=secs value=5 max=15 min=2 />s<br>
     Effects to test:

diff --git a/usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h b/usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h
@@ -401,7 +401,7 @@ class FourLineDisplayUsermod : public Usermod {
       } else {
         // alternate IP address and server name
         line = knownIp.toString();
-        if (showName && strcmp(serverDescription, "WLED") != 0) {
+        if (showName && strcmp(serverDescription, "ARGB") != 0) {
           line = serverDescription;
         }
         center(line, getCols()-1);

diff --git a/wled00/data/favicon.ico b/wled00/data/favicon.ico
diff --git a/wled00/data/index.htm b/wled00/data/index.htm
@@ -5,7 +5,7 @@
 	<meta charset="utf-8">
 	<meta name="theme-color" content="#222222">
 	<meta content="yes" name="apple-mobile-web-app-capable">
-	<link rel="shortcut icon" href="data:image/x-icon;base64,AAABAAEAEBAAAAEAGACGAAAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAQAAAAEAgGAAAAH/P/YQAAAE1JREFUOI1j/P//PwOxgNGeAUMxE9G6cQCKDWAhpADZ2f8PMjBS3QW08QK20KaZC2gfC9hCnqouoNgARgY7zMxAyNlUdQHlXiAlO2MDAD63EVqNHAe0AAAAAElFTkSuQmCC"/>
+	<link rel="shortcut icon" href="favicon.ico"/>
 	<title>ARGB-bangnguyendev</title>
 	<script>
 	function feedback(){}

diff --git a/wled00/data/index.js b/wled00/data/index.js
@@ -209,7 +209,7 @@ function onLoad()
 		loc = true;
 		locip = localStorage.getItem('locIp');
 		if (!locip) {
-			locip = prompt("File Mode. Please enter WLED IP!");
+			locip = prompt("File Mode. Please enter ARGB IP!");
 			localStorage.setItem('locIp', locip);
 		}
 	} else {
@@ -1019,11 +1019,11 @@ function btype(b)
 	return "?";
 }
 
-function bname(o)
-{
-	if (o.name=="WLED") return o.ip;
-	return o.name;
-}
+// function bname(o) //bangnguyendev khong su dung
+// {
+// 	if (o.name=="ARGB") return o.ip; //http://{ip nodes}/json/nodes
+// 	return o.name;
+// }
 
 function populateNodes(i,n)
 {
@@ -1035,7 +1035,7 @@ function populateNodes(i,n)
 		for (var o of n.nodes) {
 			if (o.name) {
 				let onoff = `<i class="icons e-icon flr ${o.type&0x80?'':'off'}" onclick="rmtTgl('${o.ip}',this);"">&#xe08f;</i>`;
-				var url = `<button class="btn" title="${o.ip}" onclick="location.assign('http://${o.ip}');"><div class="bname">${bname(o)}</div>${o.vid<2307130?'':onoff}</button>`;
+				var url = `<button class="btn" title="${o.ip}" onclick="location.assign('http://${o.ip}');"><div class="bname">${o.name}<br>${o.ip}</div>${o.vid<2307130?'':onoff}</button>`;
 				urows += inforow(url,`${btype(o.type&0x7F)}<br><i>${o.vid==0?"N/A":o.vid}</i>`);
 				nnodes++;
 			}
@@ -1295,7 +1295,7 @@ function displayRover(i,s)
 {
 	gId('rover').style.transform = (i.live && s.lor == 0 && i.liveseg<0) ? "translateY(0px)":"translateY(100%)";
 	var sour = i.lip ? i.lip:""; if (sour.length > 2) sour = " from " + sour;
-	gId('lv').innerHTML = `WLED is receiving live ${i.lm} data${sour}`;
+	gId('lv').innerHTML = `ARGB is receiving live ${i.lm} data${sour}`;
 	gId('roverstar').style.display = (i.live && s.lor) ? "block":"none";
 }
 

diff --git a/wled00/data/liveview.htm b/wled00/data/liveview.htm
@@ -4,7 +4,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1">
   <meta charset="utf-8">
   <meta name="theme-color" content="#222222">
-  <title>WLED Live Preview</title>
+  <title>ARGB Live Preview</title>
   <style>
   body {
     margin: 0;

diff --git a/wled00/data/liveviewws2D.htm b/wled00/data/liveviewws2D.htm
@@ -4,7 +4,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1">
 	<meta charset="utf-8">
 	<meta name="theme-color" content="#222222">
-	<title>WLED Live Preview</title>
+	<title>ARGB Live Preview</title>
 	<style>
 	body {
 		margin: 0;

diff --git a/wled00/data/msg.htm b/wled00/data/msg.htm
@@ -3,7 +3,7 @@
 
 <head>
 	<meta content='width=device-width' name='viewport'>
-	<title>WLED Message</title>
+	<title>ARGB Message</title>
 	<script>
 		function B() { window.history.back() };
 		function RS() { window.location = "../settings"; }

diff --git a/wled00/data/pixart/pixart.htm b/wled00/data/pixart/pixart.htm
@@ -4,7 +4,7 @@
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
     <meta http-equiv="Pragma" content="no-cache">
     <meta http-equiv="Expires" content="0">
-    <title>WLED Pixel Art Converter</title>
+    <title>ARGB Pixel Art Converter</title>
     <link rel="stylesheet" href="pixart.css">
     <link rel="shortcut icon" href="favicon-16x16.png">
     <script type="text/javascript">
@@ -24,10 +24,10 @@ <h1 style="display: flex; align-items: center;">
               <rect style="fill:#003FFF" x="18" y="10" width="4" height="8"/>
               <rect style="fill:#003FFF" x="22" y="6" width="8" height="4"/>
             </svg>
-            WLED Pixel Art Converter
+            ARGB Pixel Art Converter
           </h1>
         </div>
-        <h2>Convert image to WLED JSON (pixel art on WLED matrix)</h2>
+        <h2>Convert image to ARGB JSON (pixel art on ARGB matrix)</h2>
         <p>
           <table id="fieldTable"  style="width: 100%; table-layout: fixed; align-content: center;">
             <tr>
@@ -48,7 +48,7 @@ <h2>Convert image to WLED JSON (pixel art on WLED matrix)</h2>
               </td>
               <td class="adaptiveTD">
                 <select id="formatSelector" class="mainSelector">
-                  <option value="wled" selected>WLED JSON</option>
+                  <option value="wled" selected>ARGB JSON</option>
                   <option value="curl">CURL</option>
                   <option value="ha">Home Assistant YAML</option>
                 </select>

diff --git a/wled00/data/pixart/site.webmanifest b/wled00/data/pixart/site.webmanifest
@@ -1,5 +1,5 @@
 {
-    "name": "WLED Pixel Art Convertor",
+    "name": "ARGB Pixel Art Convertor",
     "short_name": "ledconv",
     "icons": [
        {

diff --git a/wled00/data/pxmagic/pxmagic.htm b/wled00/data/pxmagic/pxmagic.htm
@@ -597,7 +597,7 @@
                 <label for="output">Output</label>
                 <select name="output" id="output" required>
                   <option value="">Select a choice</option>
-                  <option value="json" selected>WLED JSON</option>
+                  <option value="json" selected>ARGB JSON</option>
                   <option value="ha">Home Assistant</option>
                   <option value="curl">CURL</option>
                 </select>
@@ -754,7 +754,7 @@
             <div class="column-full" validate>
               <div class="custom-select">
                 <label for="images">
-                  <span>Images upload to WLED</span>
+                  <span>Images upload to ARGB</span>
                   <a id="wledEdit" href="http://[wled-ip]/edit" target="_blank">
                     upload
                   </a>

diff --git a/wled00/data/settings_2D.htm b/wled00/data/settings_2D.htm
@@ -39,7 +39,7 @@
 			loc = true;
 			locip = localStorage.getItem('locIp');
 			if (!locip) {
-				locip = prompt("File Mode. Please enter WLED IP!");
+				locip = prompt("File Mode. Please enter ARGB IP!");
 				localStorage.setItem('locIp', locip);
 			}
 		} else {

diff --git a/wled00/data/settings_dmx.htm b/wled00/data/settings_dmx.htm
@@ -58,7 +58,7 @@
 			loc = true;
 			locip = localStorage.getItem('locIp');
 			if (!locip) {
-				locip = prompt("File Mode. Please enter WLED IP!");
+				locip = prompt("File Mode. Please enter ARGB IP!");
 				localStorage.setItem('locIp', locip);
 			}
 		} else {

diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
@@ -661,7 +661,7 @@
 				loc = true;
 				locip = localStorage.getItem('locIp');
 				if (!locip) {
-					locip = prompt("File Mode. Please enter WLED IP!");
+					locip = prompt("File Mode. Please enter ARGB IP!");
 					localStorage.setItem('locIp', locip);
 				}
 			} else {

diff --git a/wled00/data/settings_sec.htm b/wled00/data/settings_sec.htm
@@ -69,7 +69,7 @@
 				loc = true;
 				locip = localStorage.getItem('locIp');
 				if (!locip) {
-					locip = prompt("File Mode. Please enter WLED IP!");
+					locip = prompt("File Mode. Please enter ARGB IP!");
 					localStorage.setItem('locIp', locip);
 				}
 			} else {

diff --git a/wled00/data/settings_time.htm b/wled00/data/settings_time.htm
@@ -37,7 +37,7 @@
 			loc = true;
 			locip = localStorage.getItem('locIp');
 			if (!locip) {
-				locip = prompt("File Mode. Please enter WLED IP!");
+				locip = prompt("File Mode. Please enter ARGB IP!");
 				localStorage.setItem('locIp', locip);
 			}
 		} else {

diff --git a/wled00/data/settings_wifi.htm b/wled00/data/settings_wifi.htm
@@ -124,7 +124,7 @@
 				loc = true;
 				locip = localStorage.getItem('locIp');
 				if (!locip) {
-					locip = prompt("File Mode. Please enter WLED IP!");
+					locip = prompt("File Mode. Please enter ARGB IP!");
 					localStorage.setItem('locIp', locip);
 				}
 			} else {
@@ -208,7 +208,7 @@ <h3>Wireless Remote</h3>
 			<h3>Ethernet Type</h3>
 			<select name="ETH">
 				<option value="0">None</option>
-				<option value="9">ABC! WLED V43 & compatible</option>
+				<option value="9">ABC! ARGB V43 & compatible</option>
 				<option value="2">ESP32-POE</option>
 				<option value="6">ESP32Deux</option>
 				<option value="7">KIT-VE</option>

diff --git a/wled00/data/simple.htm b/wled00/data/simple.htm
@@ -5,7 +5,7 @@
 	<meta charset="utf-8">
 	<meta name="theme-color" content="#222222">
 	<meta content="yes" name="apple-mobile-web-app-capable">
-	<link rel="shortcut icon" href="data:image/x-icon;base64,AAABAAEAEBAAAAEAGACGAAAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAQAAAAEAgGAAAAH/P/YQAAAE1JREFUOI1j/P//PwOxgNGeAUMxE9G6cQCKDWAhpADZ2f8PMjBS3QW08QK20KaZC2gfC9hCnqouoNgARgY7zMxAyNlUdQHlXiAlO2MDAD63EVqNHAe0AAAAAElFTkSuQmCC"/>
+	<link rel="shortcut icon" href="favicon.ico"/>
 	<title>ARGB-bangnguyendev</title>
 	<script>
 	function feedback(){}

diff --git a/wled00/data/simple.js b/wled00/data/simple.js
@@ -164,7 +164,7 @@ async function onLoad()
 		loc = true;
 		locip = localStorage.getItem('locIp');
 		if (!locip) {
-			locip = prompt("File Mode. Please enter WLED IP!");
+			locip = prompt("File Mode. Please enter ARGB IP!");
 			localStorage.setItem('locIp', locip);
 		}
 	} else {
@@ -604,7 +604,7 @@ function populateNodes(i,n)
 		for (var x=0;x<n.nodes.length;x++) {
 			var o = n.nodes[x];
 			if (o.name) {
-				var url = `<button class="btn tab" title="${o.ip}" onclick="location.assign('http://${o.ip}');">${bname(o)}</button>`;
+				var url = `<button class="btn tab" title="${o.ip}" onclick="location.assign('http://${o.ip}');">${cmDNS}</button>`;
 				urows += inforow(url,`${btype(o.type)}<br><i>${o.vid==0?"N/A":o.vid}</i>`);
 				nnodes++;
 			}

diff --git a/wled00/html_cpal.h b/wled00/html_cpal.h
@@ -9,7 +9,7 @@
 // Autogenerated from wled00/data/cpal/cpal.htm, do not edit!!
 const uint16_t PAGE_cpal_L = 5004;
 const uint8_t PAGE_cpal[] PROGMEM = {
-  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xbd, 0x3b, 0xfd, 0x73, 0xdb, 0xb6,
+  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0xbd, 0x3b, 0xfd, 0x73, 0xdb, 0xb6,
   0x92, 0xbf, 0xfb, 0xaf, 0x40, 0x90, 0xd4, 0x21, 0x2b, 0x88, 0x26, 0x69, 0x4b, 0xb2, 0x25, 0xd1,
   0xbd, 0xd4, 0x49, 0x9f, 0x73, 0x13, 0x37, 0x99, 0xc6, 0xe7, 0xb6, 0xe7, 0xf3, 0x1b, 0xc3, 0xe4,
   0x4a, 0x42, 0x43, 0x11, 0x2c, 0x08, 0xc9, 0x76, 0x65, 0xfd, 0xef, 0x37, 0x0b, 0x7e, 0x88, 0xd4,