Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

SuperSync small updates

Browse Source
This commit is contained in:
Ewoud
2023-10-08 17:09:57 +02:00
parent 81e57bae7e
commit b07562659f
4 changed files with 963 additions and 958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wled00/FX.cpp
View File

@@ -5773,7 +5773,7 @@ uint16_t mode_2Dcrazybees(void) {
uint8_t posX, posY, aimX, aimY, hue;
int8_t deltaX, deltaY, signX, signY, error;
void aimed(uint16_t w, uint16_t h) {
if (!notifyDirect) //WLEDMM SuperSync
if (!true) //WLEDMM SuperSync
random16_set_seed(strip.now);
aimX = random8(0, w);
aimY = random8(0, h);
@@ -5790,7 +5790,7 @@ uint16_t mode_2Dcrazybees(void) {
bee_t *bee = reinterpret_cast<bee_t*>(SEGENV.data);
if (SEGENV.call == 0) {
if (notifyDirect) //WLEDMM SuperSync
if (true) //WLEDMM SuperSync
random16_set_seed(strip.now);
SEGMENT.setUpLeds();
SEGMENT.fill(BLACK);
@@ -7854,7 +7854,7 @@ uint16_t mode_2Dsoap() {
// init
if (SEGENV.call == 0) {
if (notifyDirect) {//WLEDMM SuperSync
if (true) {//WLEDMM SuperSync
random16_set_seed(535);
USER_PRINTF("SuperSync\n");
}
@@ -7863,7 +7863,7 @@ uint16_t mode_2Dsoap() {
*noise32_y = random16();
*noise32_z = random16();
} else {
if (!notifyDirect) { //WLEDMM SuperSync
if (!true) { //WLEDMM SuperSync
*noise32_x += mov;
*noise32_y += mov;
*noise32_z += mov;
@@ -7875,7 +7875,7 @@ uint16_t mode_2Dsoap() {
uint32_t noise32_y_MM = *noise32_y;
uint32_t noise32_z_MM = *noise32_z;
if (notifyDirect) { //WLEDMM SuperSync
if (true) { //WLEDMM SuperSync
noise32_x_MM = *noise32_x + mov * strip.now / 100; //10 fps (original 20-40 fps, depending on realized fps)
noise32_y_MM = *noise32_y + mov * strip.now / 100;
noise32_z_MM = *noise32_z + mov * strip.now / 100;
@@ -7984,7 +7984,7 @@ uint16_t mode_2Doctopus() {
// re-init if SEGMENT dimensions or offset changed
if (SEGENV.call == 0 || SEGENV.aux0 != cols || SEGENV.aux1 != rows || SEGMENT.custom1 != *offsX || SEGMENT.custom2 != *offsY) {
if (!notifyDirect) //WLEDMM SuperSync
if (!true) //WLEDMM SuperSync
SEGENV.step = 0; // t
SEGENV.aux0 = cols;
SEGENV.aux1 = rows;
@@ -8000,7 +8000,7 @@ uint16_t mode_2Doctopus() {
}
}
if (notifyDirect) // WLEDMM SuperSync
if (true) // WLEDMM SuperSync
SEGENV.step = (strip.now / 40) * (SEGMENT.speed / 32 + 1); // WLEDMM 40fps
else
SEGENV.step += SEGMENT.speed / 32 + 1; // 1-4 range

18
wled00/data/index.js
View File

@@ -1104,6 +1104,9 @@ function ddpAll() {
callNode(lastinfo.ip, "cfg", {"hw":{"led":{"ins":ins}}}); //self
}
//curl -s -F "update=@/Users/ewoudwijma/Developer/GitHub/MoonModules/WLED/build_output/release/WLEDMM_0.14.0-b27.31_esp32_4MB_M.bin" 192.168.8.105/update >nul &
//WLEDMM
function SuperSync() {
if (!confirm('Press Yes/OK if you know what you are doing!')) return;
@@ -1111,7 +1114,7 @@ function SuperSync() {
if (nodesData[i].info.ip != lastinfo.ip) { //do not add to self
if (gId(`ssu${i}`).innerText == "yes") { //only update if needed (see SSync column)
callNode(nodesData[i].info.ip, "cfg", {"hw":{"led":nodesData[i].cfg.hw.led}});
callNode(nodesData[i].info.ip, "cfg", {"light":{"scale-bri":nodesData[i].cfg.light["scale-bri"]}});
callNode(nodesData[i].info.ip, "cfg", {"light":nodesData[i].cfg.light});
callNode(nodesData[i].info.ip, "state", {"rb":true}); //reboot
}
}
@@ -1146,7 +1149,7 @@ function populateNodes(i,n)
if (gId(`scale-bri${nodeNr}`).innerText != nodesData[nodeNr].cfg.light["scale-bri"]) {
gId(`scale-bri${nodeNr}`).style.color = "orange";
}
if (gId(`fps${nodeNr}`).innerText != nodesData[nodeNr].cfg.light["fps"]) {
if (gId(`fps${nodeNr}`).innerText != nodesData[nodeNr].cfg.hw.led.fps) {
gId(`fps${nodeNr}`).style.color = "orange";
}
@@ -1181,7 +1184,7 @@ function populateNodes(i,n)
function fetchInfoAndCfg(ip, nodeNr, parms, callback) {
//add td placeholders
urows += `<tr>`;
for (let nm of ["ins", "pwr", "ip", "type", "rel", "ver", "vid", "fx", "scale-bri", "fps", "lpc", "lvc", "mrx", "pnl0", "pnlC", "pnlX", "ssu"])
for (let nm of ["ins", "pwr", "ip", "type", "rel", "ver", "vid", "fx", "scale-bri", "gcc", "fps", "lpc", "lvc", "mrx", "pnl0", "pnlC", "pnlX", "ssu"])
urows += `<td id="${nm}${nodeNr}"></td>`;
urows += `</tr>`;
@@ -1218,11 +1221,12 @@ function populateNodes(i,n)
//set values
let url = `<button class="btn" ${(ip == lastinfo.ip)?'style="background-color: red;"':''} title="${ip}" onclick="location.assign('http://${ip}');">${cfg.id.name}</button>`;
gId(`ins${nodeNr}`).innerHTML = url;
gId(`scale-bri${nodeNr}`).innerText = cfg.light["scale-bri"]; //show nr of panels
gId(`fps${nodeNr}`).innerText = cfg.hw.led["fps"]; //show nr of panels
gId(`scale-bri${nodeNr}`).innerText = cfg.light["scale-bri"];
gId(`gcc${nodeNr}`).innerText = cfg.light.gc.col > 1;
gId(`fps${nodeNr}`).innerText = cfg.hw.led.fps;
//store data
nodesData[nodeNr].cfg = cfg;
// nodesData[nodeNr].cfg = cfg;
//if the node has a matrix, show matrix info
if (cfg.hw.led.matrix) {
@@ -1294,7 +1298,7 @@ function populateNodes(i,n)
//set table header
urows += `<tr>`;
for (let nm of ["Instance", "Power", "IP", "Type", "Release", "Version", "Build", "Effect", "Bri%", "FPS", "LedsP#", "LedsV#", "Matrix", "Panel0", "Panels", "PanelX", "SSync"])
for (let nm of ["Instance", "Power", "IP", "Type", "Release", "Version", "Build", "Effect", "Bri%", "Gamma", "FPS", "LedsP#", "LedsV#", "Matrix", "Panel0", "Panels", "PanelX", "SSync"])
urows += `<th style="font-size:80%;">${nm}</th>`;
urows += `</tr>`;

1887
wled00/html_ui.h
View File

File diff suppressed because it is too large Load Diff

2
wled00/wled.h
View File

@@ -8,7 +8,7 @@
*/
// version code in format yymmddb (b = daily build)
#define VERSION 2310071
#define VERSION 2310080
//uncomment this if you have a "my_config.h" file you'd like to use
//#define WLED_USE_MY_CONFIG