lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into ipad-pcmode

Browse Source
This commit is contained in:
Blaz Kristan 2023-04-11 21:03:09 +02:00
commit d77883dd7a
5 changed files with 567 additions and 553 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
platformio.ini
View File

@ -70,6 +70,14 @@ platform_packages = platformio/framework-arduinoespressif8266
platformio/tool-esptool #@ ~1.413.0 platformio/tool-esptool #@ ~1.413.0
platformio/tool-esptoolpy #@ ~1.30000.0 platformio/tool-esptoolpy #@ ~1.30000.0
## previous platform for 8266, in case of problems with the new one
## you'll need makuna/NeoPixelBus@ 2.6.9 for arduino_core_3_2_0, which does not support Ucs890x
;; platform_wled_default = ${common.arduino_core_3_2_0}
;; platform_packages = tasmota/framework-arduinoespressif8266 @ 3.20704.7
;; platformio/toolchain-xtensa @ ~2.40802.200502
;; platformio/tool-esptool @ ~1.413.0
;; platformio/tool-esptoolpy @ ~1.30000.0
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# FLAGS: DEBUG # FLAGS: DEBUG
# #
@ -106,7 +114,7 @@ build_flags =
-DBEARSSL_SSL_BASIC -DBEARSSL_SSL_BASIC
-D CORE_DEBUG_LEVEL=0 -D CORE_DEBUG_LEVEL=0
-D NDEBUG -D NDEBUG
-Wno-attributes ;; silence warnings about unknown attribute 'maybe_unused' in NeopixelBus -Wno-attributes ;; silence warnings about unknown attribute 'maybe_unused' in NeoPixelBus
#build_flags for the IRremoteESP8266 library (enabled decoders have to appear here) #build_flags for the IRremoteESP8266 library (enabled decoders have to appear here)
-D _IR_ENABLE_DEFAULT_=false -D _IR_ENABLE_DEFAULT_=false
-D DECODE_HASH=true -D DECODE_HASH=true
@ -154,7 +162,7 @@ upload_speed = 115200
# LIBRARIES: required dependencies # LIBRARIES: required dependencies
# Please note that we don't always use the latest version of a library. # Please note that we don't always use the latest version of a library.
# #
# The following libraries have been included (and some of them changd) in the source: # The following libraries have been included (and some of them changed) in the source:
# ArduinoJson@5.13.5, E131@1.0.0(changed), Time@1.5, Timezone@1.2.1 # ArduinoJson@5.13.5, E131@1.0.0(changed), Time@1.5, Timezone@1.2.1
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
lib_compat_mode = strict lib_compat_mode = strict
@ -189,15 +197,15 @@ build_flags =
-Wno-register ;; leaves some warnings when compiling C files: command-line option '-Wno-register' is valid for C++/ObjC++ but not for C -Wno-register ;; leaves some warnings when compiling C files: command-line option '-Wno-register' is valid for C++/ObjC++ but not for C
;-Dregister= # remove warnings in C++17 due to use of deprecated register keyword by the FastLED library ;; warning: this can be dangerous ;-Dregister= # remove warnings in C++17 due to use of deprecated register keyword by the FastLED library ;; warning: this can be dangerous
-Wno-misleading-indentation -Wno-misleading-indentation
; NONOSDK22x_190703 = 2.2.2-dev(38a443e) ; NONOSDK22x_190703 = 2.2.2-dev(38a443e)
-DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
; lwIP 2 - Higher Bandwidth no Features ; lwIP 2 - Higher Bandwidth no Features
; -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH ; -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
; lwIP 1.4 - Higher Bandwidth (Aircoookie has) ; lwIP 1.4 - Higher Bandwidth (Aircoookie has)
-DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
; VTABLES in Flash ; VTABLES in Flash
-DVTABLES_IN_FLASH -DVTABLES_IN_FLASH
; restrict to minimal mime-types ; restrict to minimal mime-types
-DMIMETYPE_MINIMAL -DMIMETYPE_MINIMAL
lib_deps = lib_deps =
@ -219,7 +227,7 @@ build_flags = -g
-D CONFIG_ASYNC_TCP_USE_WDT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
#use LITTLEFS library by lorol in ESP32 core 1.x.x instead of built-in in 2.x.x #use LITTLEFS library by lorol in ESP32 core 1.x.x instead of built-in in 2.x.x
-D LOROL_LITTLEFS -D LOROL_LITTLEFS
; -DARDUINO_USB_CDC_ON_BOOT=0 ;; this flag is mandatory for "classic ESP32" when builing with arduino-esp32 >=2.0.3 ; -DARDUINO_USB_CDC_ON_BOOT=0 ;; this flag is mandatory for "classic ESP32" when building with arduino-esp32 >=2.0.3
default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv
@ -231,18 +239,18 @@ lib_deps =
[esp32_idf_V4] [esp32_idf_V4]
;; experimental buildenv for ESP32 using ESP-IDF 4.4.x / arduino-esp32 v2.0.5 ;; experimental build environment for ESP32 using ESP-IDF 4.4.x / arduino-esp32 v2.0.5
;; very similar to the normal ESP32 flags, but omitting Lorol LittleFS, as littlefs is included in the new framework already. ;; very similar to the normal ESP32 flags, but omitting Lorol LittleFS, as littlefs is included in the new framework already.
;; ;;
;; please note that you can NOT update existing ESP32 installs with a "V4" build. Also updating by OTA will not work properly. ;; please note that you can NOT update existing ESP32 installs with a "V4" build. Also updating by OTA will not work properly.
;; You need to completely erasse your device (esptool erase_flash) first, then install the "V4" build from VSCode+platformio. ;; You need to completely erase your device (esptool erase_flash) first, then install the "V4" build from VSCode+platformio.
platform = espressif32@5.2.0 platform = espressif32@5.2.0
platform_packages = platform_packages =
build_flags = -g build_flags = -g
-DARDUINO_ARCH_ESP32 -DESP32 -DARDUINO_ARCH_ESP32 -DESP32
#-DCONFIG_LITTLEFS_FOR_IDF_3_2 #-DCONFIG_LITTLEFS_FOR_IDF_3_2
-D CONFIG_ASYNC_TCP_USE_WDT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
-DARDUINO_USB_CDC_ON_BOOT=0 ;; this flag is mandatory for "classic ESP32" when builing with arduino-esp32 >=2.0.3 -DARDUINO_USB_CDC_ON_BOOT=0 ;; this flag is mandatory for "classic ESP32" when building with arduino-esp32 >=2.0.3
default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv
lib_deps = lib_deps =
${env.lib_deps} ${env.lib_deps}
@ -402,7 +410,7 @@ board_build.partitions = ${esp32.default_partitions}
board_build.f_flash = 80000000L board_build.f_flash = 80000000L
board_build.flash_mode = qio board_build.flash_mode = qio
[env:esp32dev_V4_qio80] [env:esp32dev_V4_dio80]
;; experimental ESP32 env using ESP-IDF V4.4.x ;; experimental ESP32 env using ESP-IDF V4.4.x
;; Warning: this build environment is not stable!! ;; Warning: this build environment is not stable!!
;; please erase your device before installing. ;; please erase your device before installing.
@ -605,7 +613,8 @@ board_build.flash_mode = dio
[env:wemos_shield_esp32] [env:wemos_shield_esp32]
board = esp32dev board = esp32dev
platform = espressif32@3.2 platform = ${esp32.platform}
platform_packages = ${esp32.platform_packages}
upload_speed = 460800 upload_speed = 460800
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags_esp32} build_flags = ${common.build_flags_esp32}
@ -630,7 +639,8 @@ board = esp32dev
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags_esp32} -D LEDPIN=27 -D BTNPIN=39 build_flags = ${common.build_flags_esp32} -D LEDPIN=27 -D BTNPIN=39
lib_deps = ${esp32.lib_deps} lib_deps = ${esp32.lib_deps}
platform = espressif32@3.2 platform = ${esp32.platform}
platform_packages = ${esp32.platform_packages}
board_build.partitions = ${esp32.default_partitions} board_build.partitions = ${esp32.default_partitions}
[env:sp501e] [env:sp501e]
@ -736,7 +746,8 @@ lib_deps = ${esp8266.lib_deps}
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
[env:elekstube_ips] [env:elekstube_ips]
board = esp32dev board = esp32dev
platform = espressif32@3.2 platform = ${esp32.platform}
platform_packages = ${esp32.platform_packages}
upload_speed = 921600 upload_speed = 921600
build_flags = ${common.build_flags_esp32} -D WLED_DISABLE_BROWNOUT_DET -D WLED_DISABLE_INFRARED build_flags = ${common.build_flags_esp32} -D WLED_DISABLE_BROWNOUT_DET -D WLED_DISABLE_INFRARED
-D USERMOD_RTC -D USERMOD_RTC

2
wled00/data/pixart/getPixelValues.js
View File

@ -273,7 +273,7 @@ function getPixelRGBValues(base64Image) {
//Aggregated Strings That should be returned to the user //Aggregated Strings That should be returned to the user
if (i > 0){ if (i > 0){
JSONledString = JSONledString + '\n'; JSONledString = JSONledString + '\n<NEXT COMMAND (multiple commands not supported in API/preset setup)>\n';
curlString = curlString + ' && '; curlString = curlString + ' && ';
} }
JSONledString += thisJSONledString; JSONledString += thisJSONledString;

10
wled00/data/pixart/pixart.htm
View File

@ -60,7 +60,7 @@
</td> </td>
<td class="adaptiveTD"> <td class="adaptiveTD">
<select id="colorFormatSelector" class="mainSelector"> <select id="colorFormatSelector" class="mainSelector">
<option value="hex" selected>HEX (#f4f4f4)</option> <option value="hex" selected>HEX (&quot;f4f4f4&quot;)</option>
<option value="dec">DEC (244,244,244)</option> <option value="dec">DEC (244,244,244)</option>
</select> </select>
</td> </td>
@ -71,9 +71,9 @@
</td> </td>
<td class="adaptiveTD"> <td class="adaptiveTD">
<select id="addressingSelector" class="mainSelector"> <select id="addressingSelector" class="mainSelector">
<option value="hybrid" selected>Hybrid (#f0f0f0,10, 17, #f4f4f4)</option> <option value="hybrid" selected>Hybrid (&quot;f0f0f0&quot;,10, 17, &quot;f4f4f4&quot;)</option>
<option value="range">Range (10, 17, #f4f4f4)</option> <option value="range">Range (10, 17, &quot;f4f4f4&quot;)</option>
<option value="single">Single (#f4f4f4)</option> <option value="single">Single (&quot;f4f4f4&quot;)</option>
</select> </select>
</td> </td>
</tr> </tr>
@ -196,7 +196,7 @@
<button id="sendJSONledbutton" class="buttonclass"></button> <button id="sendJSONledbutton" class="buttonclass"></button>
</div> </div>
<div> <div>
<h3><div id="version">Version 1.0.7</div>&nbsp;-&nbsp; <a href="https://github.com/werkstrom/WLED-PixelArtConverter/blob/main/README.md" target="_blank">Help/About</a></h3> <h3><div id="version">Version 1.0.8</div>&nbsp;-&nbsp; <a href="https://github.com/werkstrom/WLED-PixelArtConverter/blob/main/README.md" target="_blank">Help/About</a></h3>
</div> </div>
</div> </div>
<div id=bottom-part style="display: none" class=bottom-part></div> <div id=bottom-part style="display: none" class=bottom-part></div>

2
wled00/data/pixart/pixart.js
View File

@ -69,7 +69,6 @@ cjb.addEventListener('click', async () => {
lSS.addEventListener("change", gen); lSS.addEventListener("change", gen);
szY.addEventListener("change", gen); szY.addEventListener("change", gen);
szX.addEventListener("change", gen); szX.addEventListener("change", gen);
//frm.addEventListener("change", gen);
cFS.addEventListener("change", gen); cFS.addEventListener("change", gen);
aS.addEventListener("change", gen); aS.addEventListener("change", gen);
brgh.addEventListener("change", gen); brgh.addEventListener("change", gen);
@ -115,6 +114,7 @@ cLN.oninput = () => {
frm.addEventListener("change", () => { frm.addEventListener("change", () => {
for (var i = 0; i < hideableRows.length; i++) { for (var i = 0; i < hideableRows.length; i++) {
hideableRows[i].classList.toggle("hide", frm.value !== "ha"); hideableRows[i].classList.toggle("hide", frm.value !== "ha");
gen();
} }
}); });

1043
wled00/html_pixart.h
View File

File diff suppressed because it is too large Load Diff