Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating pxmagic and WLED UI #3296

Merged
merged 26 commits into from
Oct 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b4f08fa
Adding Pixel Magic Tool to WLED
ajotanc Jun 13, 2023
61637f1
Revert "Adding Pixel Magic Tool to WLED"
ajotanc Jun 14, 2023
68860ae
Adding Pixel Magic Tool to WLED
ajotanc Jun 14, 2023
c361c34
Corrections and performance improvements
ajotanc Jun 16, 2023
ea96412
Remove IE compatibility tag
Aircoookie Jun 16, 2023
0d28728
Corrections and performance improvements
ajotanc Jun 16, 2023
94aeb19
Enable pxmagic by default
Aircoookie Jun 22, 2023
44197d9
Updating pxmagic and inserting it in the WLED UI with option to enabl…
ajotanc Jul 20, 2023
e010e67
Revert "Updating pxmagic and inserting it in the WLED UI with option …
ajotanc Jul 20, 2023
aec0bc5
Updating pxmagic and WLED UI
ajotanc Jul 20, 2023
cd6b3d7
Merge remote-tracking branch 'upstream/main' into pxmagic
ajotanc Jul 20, 2023
37dc17a
Correction
ajotanc Jul 20, 2023
acfc166
Corrections
ajotanc Sep 28, 2023
f2d00e6
Merge remote-tracking branch 'upstream/main' into pxmagic
ajotanc Sep 28, 2023
c9b9d86
Corrections
ajotanc Sep 28, 2023
4194e66
Corrections
ajotanc Sep 28, 2023
ba49da7
Modifications
ajotanc Oct 16, 2023
7a4e0cc
Revert "Modifications"
ajotanc Oct 16, 2023
3581f4c
Modifications
ajotanc Oct 16, 2023
c43b4f9
Merge branch 'main' into pxmagic
ajotanc Oct 16, 2023
5da33af
Corrections made, added in a very accessible place
ajotanc Oct 16, 2023
c33c7eb
Correction related to enabling and disabling PXM in the User Interface
ajotanc Oct 16, 2023
b6f4396
Some functionality improvements
ajotanc Oct 19, 2023
aca0104
Add brand
ajotanc Oct 20, 2023
0e20248
Fix gitignore.
blazoncek Oct 21, 2023
5820792
Revert changes.
blazoncek Oct 21, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions wled00/data/index.htm
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,11 @@
</label>
</div>
</div>
<div style="padding-bottom: 10px;">
<button class="btn btn-xs" type="button" onclick="window.location.href=getURL('/cpal.htm')"><i class="icons btn-icon">&#xe18a;</i></button>
<button class="btn btn-xs" type="button" onclick="palettesData=null;localStorage.removeItem('wledPalx');requestJson({rmcpal:true});setTimeout(loadPalettes,250,loadPalettesData);"><i class="icons btn-icon">&#xe037;</i></button>
</div>
</div>
<div style="padding-block: 10px;">
<button class="btn btn-xs" type="button" onclick="togglePixelMagicTool()"><i class="icons btn-icon">&#xe410;</i></button>
<button class="btn btn-xs" type="button" onclick="window.location.href=getURL('/cpal.htm')"><i class="icons btn-icon">&#xe18a;</i></button>
<button class="btn btn-xs" type="button" onclick="palettesData=null;localStorage.removeItem('wledPalx');requestJson({rmcpal:true});setTimeout(loadPalettes,250,loadPalettesData);"><i class="icons btn-icon">&#xe037;</i></button>
</div>
</div>

Expand Down Expand Up @@ -392,6 +393,7 @@
<button class="btn" onclick="setLor(2)">Override until reboot</button><br>
<span class="h">For best performance, it is recommended to turn off the streaming source when not in use.</span>
</div>

<i id="roverstar" class="icons huge" onclick="setLor(0)">&#xe410;</i><br>
<script src="index.js"></script>
</body>
Expand Down
Loading
Loading