klaute/lumini_p30_control
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
Kai Lauterbach 2023-05-20 12:49:49 +02:00
parent 33906a2930 e2ca6ceade
commit ec8072a1a6
8 changed files with 144 additions and 293 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
firmware/20230519_firmware.ino.bin → firmware/20230520_firmware.ino.bin
View file

Binary file not shown.

BIN
firmware/20230519_firmware.spiffs.bin → firmware/20230520_firmware.spiffs.bin
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 MiB

After

Width:  |  Height:  |  Size: 2 MiB

BIN
firmware/20230519_firmware_dev.ino.bin → firmware/20230520_firmware_dev.ino.bin
View file

Binary file not shown.

82
firmware/data/bottom.js
View file

@ -310,26 +310,21 @@ pwmElementTxt.innerText = pwmValue.toString();
} }
updateLightStateAndPWMValues(); updateLightStateAndPWMValues();
setInterval(updateLightStateAndPWMValues, 5000); setInterval(updateLightStateAndPWMValues, 5000);
var links = document.querySelectorAll('[id^="on"][id$="_off"]'); function handleOnRequest(id_full, id, value) {
links.forEach(function(link) { var button = document.getElementById(id_full);
link.addEventListener('click', function(event) {
event.preventDefault();
var id_full = this.id;
var id = this.id.replace('on', '').replace('_off', '');
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('GET', 'http://{{IP_ADDRESS}}/?on' + id + '=false&transition=' + document.getElementById('transition').value, true); xhr.open('GET', 'http://{{IP_ADDRESS}}/?on' + id + '=' + value + '&transition=' + document.getElementById('transition').value, true);
xhr.onreadystatechange = function () { xhr.onreadystatechange = function () {
if (xhr.readyState === 4) { if (xhr.readyState === 4) {
var button = document.getElementById(id_full);
if (xhr.status === 200) { if (xhr.status === 200) {
button.classList.remove("pure-button-primary"); button.classList.remove("pure-button-primary");
button.classList.add("success"); button.classList.add("success");
button.innerHTML = "Disabled!"; button.innerHTML = value ? "Enabled!" : "Disabled!";
button.style.backgroundColor = "green"; button.style.backgroundColor = "green";
setTimeout(function () { setTimeout(function () {
button.classList.remove("success"); button.classList.remove("success");
button.classList.add("pure-button-primary"); button.classList.add("pure-button-primary");
button.innerHTML = "OFF"; button.innerHTML = value ? "ON" : "OFF";
button.style.backgroundColor = ""; button.style.backgroundColor = "";
}, 2000); }, 2000);
console.log('Data successfully sent to server!'); console.log('Data successfully sent to server!');
@ -341,7 +336,7 @@ button.style.backgroundColor = "red";
setTimeout(function () { setTimeout(function () {
button.classList.remove("error"); button.classList.remove("error");
button.classList.add("pure-button-primary"); button.classList.add("pure-button-primary");
button.innerHTML = "OFF"; button.innerHTML = value ? "ON" : "OFF";
button.style.backgroundColor = ""; button.style.backgroundColor = "";
}, 2000); }, 2000);
showToast('Error while sending data to server.', 'error'); showToast('Error while sending data to server.', 'error');
@ -351,54 +346,27 @@ console.log('Error while sending data to server.');
}; };
xhr.send(); xhr.send();
updateLightStateAndPWMValues(); updateLightStateAndPWMValues();
this.classList.add('pure-button-primary'); document.getElementById(id_full).classList.add('pure-button-primary');
document.getElementById('on'+id+'_on').classList.remove('pure-button-primary'); document.getElementById('on' + id + (value ? '_off' : '_on')).classList.remove('pure-button-primary');
}); }
}); function addOnButtonClickListener(id_full, id, value) {
var links = document.querySelectorAll('[id^="on"][id$="_on"]'); var link = document.getElementById(id_full);
links.forEach(function(link) { link.addEventListener('click', function (event) {
link.addEventListener('click', function(event) {
event.preventDefault(); event.preventDefault();
var id_full = this.id; handleOnRequest(id_full, id, value);
var id = this.id.replace('on', '').replace('_on', '');
var xhr = new XMLHttpRequest();
xhr.open('GET', 'http://{{IP_ADDRESS}}/?on' + id + '=true&transition=' + document.getElementById('transition').value, true);
xhr.onreadystatechange = function () {
if (xhr.readyState === 4) {
var button = document.getElementById(id_full);
if (xhr.status === 200) {
button.classList.remove("pure-button-primary");
button.classList.add("success");
button.innerHTML = "Enabled!";
button.style.backgroundColor = "green";
setTimeout(function () {
button.classList.remove("success");
button.classList.add("pure-button-primary");
button.innerHTML = "ON";
button.style.backgroundColor = "";
}, 2000);
console.log('Data successfully sent to server!');
} else {
button.classList.remove("pure-button-primary");
button.classList.add("error");
button.innerHTML = "Error!";
button.style.backgroundColor = "red";
setTimeout(function () {
button.classList.remove("error");
button.classList.add("pure-button-primary");
button.innerHTML = "ON";
button.style.backgroundColor = "";
}, 2000);
showToast('Error while sending data to server.', 'error');
console.log('Error while sending data to server.');
}
}
};
xhr.send();
updateLightStateAndPWMValues();
this.classList.add('pure-button-primary');
document.getElementById('on'+id+'_off').classList.remove('pure-button-primary');
}); });
}
var offLinks = document.querySelectorAll('[id^="on"][id$="_off"]');
offLinks.forEach(function (link) {
var id_full = link.id;
var id = link.id.replace('on', '').replace('_off', '');
addOnButtonClickListener(id_full, id, false);
});
var onLinks = document.querySelectorAll('[id^="on"][id$="_on"]');
onLinks.forEach(function (link) {
var id_full = link.id;
var id = link.id.replace('on', '').replace('_on', '');
addOnButtonClickListener(id_full, id, true);
}); });
function createTable() { function createTable() {
var table = document.createElement("table"); var table = document.createElement("table");

69
firmware/data/top.js
View file

@ -1,21 +1,18 @@
var links = document.querySelectorAll('[id^="tc_on"]'); function handleRequest(id, url) {
links.forEach(function(link) { var button = document.getElementById(id);
link.addEventListener('click', function(event) {
event.preventDefault();
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('GET', 'http://{{IP_ADDRESS}}/?tc=true', true); xhr.open('GET', url, true);
xhr.onreadystatechange = function () { xhr.onreadystatechange = function () {
if (xhr.readyState === 4) { if (xhr.readyState === 4) {
var button = document.getElementById("tc_on");
if (xhr.status === 200) { if (xhr.status === 200) {
button.classList.remove("pure-button-primary"); button.classList.remove("pure-button-primary");
button.classList.add("success"); button.classList.add("success");
button.innerHTML = "Enabled!"; button.innerHTML = (id === 'tc_on') ? "Enabled!" : "Disabled!";
button.style.backgroundColor = "green"; button.style.backgroundColor = "green";
setTimeout(function () { setTimeout(function () {
button.classList.remove("success"); button.classList.remove("success");
button.classList.add("pure-button-primary"); button.classList.add("pure-button-primary");
button.innerHTML = "ON"; button.innerHTML = (id === 'tc_on') ? "ON" : "OFF";
button.style.backgroundColor = ""; button.style.backgroundColor = "";
}, 2000); }, 2000);
console.log('Data successfully sent to server!'); console.log('Data successfully sent to server!');
@ -27,7 +24,7 @@ button.style.backgroundColor = "";
setTimeout(function () { setTimeout(function () {
button.classList.remove("error"); button.classList.remove("error");
button.classList.add("pure-button-primary"); button.classList.add("pure-button-primary");
button.innerHTML = "ON"; button.innerHTML = (id === 'tc_on') ? "ON" : "OFF";
button.style.backgroundColor = ""; button.style.backgroundColor = "";
}, 2000); }, 2000);
showToast('Error while sending data to server.', 'error'); showToast('Error while sending data to server.', 'error');
@ -36,52 +33,18 @@ console.log('Error while sending data to server.');
} }
}; };
xhr.send(); xhr.send();
document.getElementById('tc_on').classList.add('pure-button-primary'); }
document.getElementById('tc_off').classList.remove('pure-button-primary'); function addButtonClickListener(id, url) {
}); var link = document.getElementById(id);
}); link.addEventListener('click', function (event) {
var links = document.querySelectorAll('[id^="tc_off"]');
links.forEach(function(link) {
link.addEventListener('click', function(event) {
event.preventDefault(); event.preventDefault();
var xhr = new XMLHttpRequest(); handleRequest(id, url);
xhr.open('GET', 'http://{{IP_ADDRESS}}/?tc=false', true); document.getElementById(id).classList.add('pure-button-primary');
xhr.onreadystatechange = function () { document.getElementById(id === 'tc_on' ? 'tc_off' : 'tc_on').classList.remove('pure-button-primary');
if (xhr.readyState === 4) {
var button = document.getElementById("tc_off");
if (xhr.status === 200) {
button.classList.remove("pure-button-primary");
button.classList.add("success");
button.innerHTML = "Disabled!";
button.style.backgroundColor = "green";
setTimeout(function () {
button.classList.remove("success");
button.classList.add("pure-button-primary");
button.innerHTML = "OFF";
button.style.backgroundColor = "";
}, 2000);
console.log('Data successfully sent to server!');
} else {
button.classList.remove("pure-button-primary");
button.classList.add("error");
button.innerHTML = "Error!";
button.style.backgroundColor = "red";
setTimeout(function () {
button.classList.remove("error");
button.classList.add("pure-button-primary");
button.innerHTML = "OFF";
button.style.backgroundColor = "";
}, 2000);
showToast('Error while sending data to server.', 'error');
console.log('Error while sending data to server.');
}
}
};
xhr.send();
document.getElementById('tc_off').classList.add('pure-button-primary');
document.getElementById('tc_on').classList.remove('pure-button-primary');
});
}); });
}
addButtonClickListener('tc_on', 'http://{{IP_ADDRESS}}/?tc=true');
addButtonClickListener('tc_off', 'http://{{IP_ADDRESS}}/?tc=false');
let timeoutId; let timeoutId;
function sendSliderValue(x) { function sendSliderValue(x) {
x = x - 1; x = x - 1;

155
firmware/html/bottom.js
View file

@ -361,111 +361,68 @@ function updateLightStateAndPWMValues() {
updateLightStateAndPWMValues(); updateLightStateAndPWMValues();
setInterval(updateLightStateAndPWMValues, 5000); setInterval(updateLightStateAndPWMValues, 5000);
// Suche nach allen Links auf der Seite mit IDs von on0_off bis on3_off function handleOnRequest(id_full, id, value) {
var links = document.querySelectorAll('[id^="on"][id$="_off"]'); var button = document.getElementById(id_full);
// Füge einen Klick-Listener zu jedem Link hinzu var xhr = new XMLHttpRequest();
links.forEach(function(link) { xhr.open('GET', 'http://{{IP_ADDRESS}}/?on' + id + '=' + value + '&transition=' + document.getElementById('transition').value, true);
link.addEventListener('click', function(event) {
// Verhindere, dass der Link die Seite neu lädt
event.preventDefault();
// Extrahiere die Zahl aus der ID des Links
var id_full = this.id;
var id = this.id.replace('on', '').replace('_off', '');
// Erstelle eine neue Anfrage an die entsprechende URL
var xhr = new XMLHttpRequest();
xhr.open('GET', 'http://{{IP_ADDRESS}}/?on' + id + '=false&transition=' + document.getElementById('transition').value, true);
xhr.onreadystatechange = function () { xhr.onreadystatechange = function () {
if (xhr.readyState === 4) { if (xhr.readyState === 4) {
var button = document.getElementById(id_full); if (xhr.status === 200) {
if (xhr.status === 200) { button.classList.remove("pure-button-primary");
button.classList.remove("pure-button-primary"); button.classList.add("success");
button.classList.add("success"); button.innerHTML = value ? "Enabled!" : "Disabled!";
button.innerHTML = "Disabled!"; button.style.backgroundColor = "green";
button.style.backgroundColor = "green"; setTimeout(function () {
setTimeout(function () { button.classList.remove("success");
button.classList.remove("success"); button.classList.add("pure-button-primary");
button.classList.add("pure-button-primary"); button.innerHTML = value ? "ON" : "OFF";
button.innerHTML = "OFF"; button.style.backgroundColor = "";
button.style.backgroundColor = ""; }, 2000);
}, 2000); console.log('Data successfully sent to server!');
console.log('Data successfully sent to server!'); } else {
} else { button.classList.remove("pure-button-primary");
button.classList.remove("pure-button-primary"); button.classList.add("error");
button.classList.add("error"); button.innerHTML = "Error!";
button.innerHTML = "Error!"; button.style.backgroundColor = "red";
button.style.backgroundColor = "red"; setTimeout(function () {
setTimeout(function () { button.classList.remove("error");
button.classList.remove("error"); button.classList.add("pure-button-primary");
button.classList.add("pure-button-primary"); button.innerHTML = value ? "ON" : "OFF";
button.innerHTML = "OFF"; button.style.backgroundColor = "";
button.style.backgroundColor = ""; }, 2000);
}, 2000); showToast('Error while sending data to server.', 'error');
showToast('Error while sending data to server.', 'error'); console.log('Error while sending data to server.');
console.log('Error while sending data to server.');
}
} }
}; }
};
// Sende die Anfrage im Hintergrund xhr.send();
xhr.send(); updateLightStateAndPWMValues();
updateLightStateAndPWMValues(); document.getElementById(id_full).classList.add('pure-button-primary');
this.classList.add('pure-button-primary'); document.getElementById('on' + id + (value ? '_off' : '_on')).classList.remove('pure-button-primary');
document.getElementById('on'+id+'_on').classList.remove('pure-button-primary'); }
function addOnButtonClickListener(id_full, id, value) {
var link = document.getElementById(id_full);
link.addEventListener('click', function (event) {
event.preventDefault();
handleOnRequest(id_full, id, value);
}); });
}
var offLinks = document.querySelectorAll('[id^="on"][id$="_off"]');
offLinks.forEach(function (link) {
var id_full = link.id;
var id = link.id.replace('on', '').replace('_off', '');
addOnButtonClickListener(id_full, id, false);
}); });
// Suche nach allen Links auf der Seite mit IDs von on0_off bis on3_off
var links = document.querySelectorAll('[id^="on"][id$="_on"]');
// Füge einen Klick-Listener zu jedem Link hinzu
links.forEach(function(link) {
link.addEventListener('click', function(event) {
// Verhindere, dass der Link die Seite neu lädt
event.preventDefault();
// Extrahiere die Zahl aus der ID des Links
var id_full = this.id;
var id = this.id.replace('on', '').replace('_on', '');
// Erstelle eine neue Anfrage an die entsprechende URL
var xhr = new XMLHttpRequest();
xhr.open('GET', 'http://{{IP_ADDRESS}}/?on' + id + '=true&transition=' + document.getElementById('transition').value, true);
xhr.onreadystatechange = function () { var onLinks = document.querySelectorAll('[id^="on"][id$="_on"]');
if (xhr.readyState === 4) { onLinks.forEach(function (link) {
var button = document.getElementById(id_full); var id_full = link.id;
if (xhr.status === 200) { var id = link.id.replace('on', '').replace('_on', '');
button.classList.remove("pure-button-primary"); addOnButtonClickListener(id_full, id, true);
button.classList.add("success");
button.innerHTML = "Enabled!";
button.style.backgroundColor = "green";
setTimeout(function () {
button.classList.remove("success");
button.classList.add("pure-button-primary");
button.innerHTML = "ON";
button.style.backgroundColor = "";
}, 2000);
console.log('Data successfully sent to server!');
} else {
button.classList.remove("pure-button-primary");
button.classList.add("error");
button.innerHTML = "Error!";
button.style.backgroundColor = "red";
setTimeout(function () {
button.classList.remove("error");
button.classList.add("pure-button-primary");
button.innerHTML = "ON";
button.style.backgroundColor = "";
}, 2000);
showToast('Error while sending data to server.', 'error');
console.log('Error while sending data to server.');
}
}
};
// Sende die Anfrage im Hintergrund
xhr.send();
updateLightStateAndPWMValues();
this.classList.add('pure-button-primary');
document.getElementById('on'+id+'_off').classList.remove('pure-button-primary');
});
}); });
function createTable() { function createTable() {

130
firmware/html/top.js
View file

@ -1,93 +1,55 @@
var links = document.querySelectorAll('[id^="tc_on"]'); function handleRequest(id, url) {
links.forEach(function(link) { var button = document.getElementById(id);
link.addEventListener('click', function(event) {
event.preventDefault();
var xhr = new XMLHttpRequest();
xhr.open('GET', 'http://{{IP_ADDRESS}}/?tc=true', true);
xhr.onreadystatechange = function () { var xhr = new XMLHttpRequest();
if (xhr.readyState === 4) { xhr.open('GET', url, true);
var button = document.getElementById("tc_on");
if (xhr.status === 200) { xhr.onreadystatechange = function () {
button.classList.remove("pure-button-primary"); if (xhr.readyState === 4) {
button.classList.add("success"); if (xhr.status === 200) {
button.innerHTML = "Enabled!"; button.classList.remove("pure-button-primary");
button.style.backgroundColor = "green"; button.classList.add("success");
setTimeout(function () { button.innerHTML = (id === 'tc_on') ? "Enabled!" : "Disabled!";
button.classList.remove("success"); button.style.backgroundColor = "green";
button.classList.add("pure-button-primary"); setTimeout(function () {
button.innerHTML = "ON"; button.classList.remove("success");
button.style.backgroundColor = ""; button.classList.add("pure-button-primary");
}, 2000); button.innerHTML = (id === 'tc_on') ? "ON" : "OFF";
console.log('Data successfully sent to server!');
} else {
button.classList.remove("pure-button-primary");
button.classList.add("error");
button.innerHTML = "Error!";
button.style.backgroundColor = ""; button.style.backgroundColor = "";
setTimeout(function () { }, 2000);
button.classList.remove("error"); console.log('Data successfully sent to server!');
button.classList.add("pure-button-primary"); } else {
button.innerHTML = "ON"; button.classList.remove("pure-button-primary");
button.style.backgroundColor = ""; button.classList.add("error");
}, 2000); button.innerHTML = "Error!";
showToast('Error while sending data to server.', 'error'); button.style.backgroundColor = "";
console.log('Error while sending data to server.'); setTimeout(function () {
} button.classList.remove("error");
button.classList.add("pure-button-primary");
button.innerHTML = (id === 'tc_on') ? "ON" : "OFF";
button.style.backgroundColor = "";
}, 2000);
showToast('Error while sending data to server.', 'error');
console.log('Error while sending data to server.');
} }
}; }
};
xhr.send(); xhr.send();
//console.log('tc=true call'); }
document.getElementById('tc_on').classList.add('pure-button-primary');
document.getElementById('tc_off').classList.remove('pure-button-primary'); function addButtonClickListener(id, url) {
}); var link = document.getElementById(id);
}); link.addEventListener('click', function (event) {
var links = document.querySelectorAll('[id^="tc_off"]');
links.forEach(function(link) {
link.addEventListener('click', function(event) {
event.preventDefault(); event.preventDefault();
var xhr = new XMLHttpRequest(); handleRequest(id, url);
xhr.open('GET', 'http://{{IP_ADDRESS}}/?tc=false', true); document.getElementById(id).classList.add('pure-button-primary');
document.getElementById(id === 'tc_on' ? 'tc_off' : 'tc_on').classList.remove('pure-button-primary');
xhr.onreadystatechange = function () {
if (xhr.readyState === 4) {
var button = document.getElementById("tc_off");
if (xhr.status === 200) {
button.classList.remove("pure-button-primary");
button.classList.add("success");
button.innerHTML = "Disabled!";
button.style.backgroundColor = "green";
setTimeout(function () {
button.classList.remove("success");
button.classList.add("pure-button-primary");
button.innerHTML = "OFF";
button.style.backgroundColor = "";
}, 2000);
console.log('Data successfully sent to server!');
} else {
button.classList.remove("pure-button-primary");
button.classList.add("error");
button.innerHTML = "Error!";
button.style.backgroundColor = "red";
setTimeout(function () {
button.classList.remove("error");
button.classList.add("pure-button-primary");
button.innerHTML = "OFF";
button.style.backgroundColor = "";
}, 2000);
showToast('Error while sending data to server.', 'error');
console.log('Error while sending data to server.');
}
}
};
xhr.send();
//console.log('tc=false call');
document.getElementById('tc_off').classList.add('pure-button-primary');
document.getElementById('tc_on').classList.remove('pure-button-primary');
}); });
}); }
addButtonClickListener('tc_on', 'http://{{IP_ADDRESS}}/?tc=true');
addButtonClickListener('tc_off', 'http://{{IP_ADDRESS}}/?tc=false');
let timeoutId; let timeoutId;
function sendSliderValue(x) { function sendSliderValue(x) {

1
firmware/webserver.ino
View file

@ -247,6 +247,7 @@ void init_webserver()
EEPROM.commit(); EEPROM.commit();
Serial.print("Timing control = "); Serial.print("Timing control = ");
Serial.println(EEPROM.read(EEPROM_TIMING_CONTROL_ENABLED_ADDRESS)); Serial.println(EEPROM.read(EEPROM_TIMING_CONTROL_ENABLED_ADDRESS));
tc_reset();
tc_update_main(); // call the main update function to read data and set the light states tc_update_main(); // call the main update function to read data and set the light states
} }
} }