Added third tab which should represend the timing control data blocks editor.
This commit is contained in:
Kai Lauterbach
parent
1cf68b8922
commit
096849b6ef
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
* -text
|
||||||
|
|
@ -1,70 +1,70 @@
|
||||||
<div id="tab-config" class="">
|
<div id="tab-config" class="">
|
||||||
<form class="pure-form pure-form-aligned" action="/" method="post">
|
<form class="pure-form pure-form-aligned" action="/" method="post">
|
||||||
<br>
|
<br>
|
||||||
<label for="startup">
|
<label for="startup">
|
||||||
<strong>Light initialization</strong>
|
<strong>Light initialization</strong>
|
||||||
</label>
|
</label>
|
||||||
<div class="pure-control-group">
|
<div class="pure-control-group">
|
||||||
<label for="startup">
|
<label for="startup">
|
||||||
<strong>Startup</strong>
|
<strong>Startup</strong>
|
||||||
</label>
|
</label>
|
||||||
<select onchange="this.form.submit()" id="startup" name="startup">
|
<select onchange="this.form.submit()" id="startup" name="startup">
|
||||||
<option {{STARTUP_SELECTED_LS_0}} value="0">Last state</option>
|
<option {{STARTUP_SELECTED_LS_0}} value="0">Last state</option>
|
||||||
<option {{STARTUP_SELECTED_ON_1}} value="1">On</option>
|
<option {{STARTUP_SELECTED_ON_1}} value="1">On</option>
|
||||||
<option {{STARTUP_SELECTED_OFF_2}} value="2">Off</option>
|
<option {{STARTUP_SELECTED_OFF_2}} value="2">Off</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="pure-control-group">
|
<div class="pure-control-group">
|
||||||
<label for="scene">
|
<label for="scene">
|
||||||
<strong>Scene</strong>
|
<strong>Scene</strong>
|
||||||
</label>
|
</label>
|
||||||
<select onchange="this.form.submit()" id="scene" name="scene">
|
<select onchange="this.form.submit()" id="scene" name="scene">
|
||||||
<option {{SCENE_SELECTED_RELAX_0}} value="0">Relax</option>
|
<option {{SCENE_SELECTED_RELAX_0}} value="0">Relax</option>
|
||||||
<option {{SCENE_SELECTED_BRIGHT_1}} value="1">Bright</option>
|
<option {{SCENE_SELECTED_BRIGHT_1}} value="1">Bright</option>
|
||||||
<option {{SCENE_SELECTED_NIGHT_2}} value="2">Night</option>
|
<option {{SCENE_SELECTED_NIGHT_2}} value="2">Night</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
<label for="startup">
|
<label for="startup">
|
||||||
<strong>Wifi</strong>
|
<strong>Wifi</strong>
|
||||||
</label>
|
</label>
|
||||||
<div class="pure-control-group">
|
<div class="pure-control-group">
|
||||||
<label for="ip">SSID</label>
|
<label for="ip">SSID</label>
|
||||||
<input id="ssid" name="ssid" type="text" value="{{WIFI_SSID}}">
|
<input id="ssid" name="ssid" type="text" value="{{WIFI_SSID}}">
|
||||||
</div>
|
</div>
|
||||||
<div class="pure-control-group">
|
<div class="pure-control-group">
|
||||||
<label for="wpw">Passphrase</label>
|
<label for="wpw">Passphrase</label>
|
||||||
<input id="wpw" name="wpw" type="text" placeholder="1234password">
|
<input id="wpw" name="wpw" type="text" placeholder="1234password">
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
<label for="startup">
|
<label for="startup">
|
||||||
<strong>Network</strong>
|
<strong>Network</strong>
|
||||||
</label>
|
</label>
|
||||||
<div class="pure-control-group">
|
<div class="pure-control-group">
|
||||||
<label for="dip">
|
<label for="dip">
|
||||||
<strong>Dynamic-IP</strong>
|
<strong>Dynamic-IP</strong>
|
||||||
</label>
|
</label>
|
||||||
<a class="pure-button {{DIP_LINK_ON_PRIMARY}}" href="/?dip=true">ON</a>
|
<a class="pure-button {{DIP_LINK_ON_PRIMARY}}" href="/?dip=true">ON</a>
|
||||||
<a class="pure-button {{DIP_LINK_OFF_PRIMARY}}" href="/?dip=false">OFF</a>
|
<a class="pure-button {{DIP_LINK_OFF_PRIMARY}}" href="/?dip=false">OFF</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="pure-control-group">
|
<div class="pure-control-group">
|
||||||
<label for="ip">IP</label>
|
<label for="ip">IP</label>
|
||||||
<input id="ip" name="ip" type="text" value="{{WIFI_CFG_IP}}">
|
<input id="ip" name="ip" type="text" value="{{WIFI_CFG_IP}}">
|
||||||
</div>
|
</div>
|
||||||
<div class="pure-control-group">
|
<div class="pure-control-group">
|
||||||
<label for="gwip">Gateway IP</label>
|
<label for="gwip">Gateway IP</label>
|
||||||
<input id="gwip" name="gwip" type="text" value="{{WIFI_CFG_GW}}">
|
<input id="gwip" name="gwip" type="text" value="{{WIFI_CFG_GW}}">
|
||||||
</div>
|
</div>
|
||||||
<div class="pure-control-group">
|
<div class="pure-control-group">
|
||||||
<label for="ip">Netmask</label>
|
<label for="ip">Netmask</label>
|
||||||
<input id="netmask" name="netmas" type="text" value="{{WIFI_CFG_NM}}">
|
<input id="netmask" name="netmas" type="text" value="{{WIFI_CFG_NM}}">
|
||||||
</div>
|
</div>
|
||||||
<div class="pure-control-group">
|
<div class="pure-control-group">
|
||||||
<label for="ip">DNS</label>
|
<label for="ip">DNS</label>
|
||||||
<input id="netmask" name="dns" type="text" value="{{WIFI_CFG_DNS}}">
|
<input id="netmask" name="dns" type="text" value="{{WIFI_CFG_DNS}}">
|
||||||
</div>
|
</div>
|
||||||
<div class="pure-controls">
|
<div class="pure-controls">
|
||||||
<button type="submit" class="pure-button pure-button-primary">Save</button>
|
<button type="submit" class="pure-button pure-button-primary">Save</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div><!-- end of config div -->
|
</div><!-- end of config div -->
|
||||||
|
|
|
||||||
|
|
@ -1,254 +1,251 @@
|
||||||
<!-- bottom -->
|
<!-- bottom -->
|
||||||
<script>
|
<div id="tab-tde" class=""> <!-- timing editor -->
|
||||||
var tabMain = document.getElementById("tab-lights");
|
<div id="tc-edit-container" class=""></div>
|
||||||
var tabConfig = document.getElementById("tab-config");
|
</div> <!-- end of tab-tde -->
|
||||||
var tabTDE = document.getElementById("tab-tde");
|
<script>
|
||||||
|
function addTabListener() {
|
||||||
var amain = document.getElementById("tab-a-lights");
|
try {
|
||||||
var acfg = document.getElementById("tab-a-config");
|
var tabMain = document.getElementById("tab-lights");
|
||||||
var atde = document.getElementById("tab-a-tde");
|
var tabConfig = document.getElementById("tab-config");
|
||||||
|
var tabTDE = document.getElementById("tab-tde");
|
||||||
|
var amain = document.getElementById("tab-a-lights");
|
||||||
document.getElementById("tab-a-lights").addEventListener("click", function() {
|
var acfg = document.getElementById("tab-a-config");
|
||||||
tabMain.classList.add("visible");
|
var atde = document.getElementById("tab-a-tde");
|
||||||
tabConfig.classList.remove("visible");
|
amain.addEventListener("click", function() {
|
||||||
tabTDE.classList.remove("visible");
|
tabMain.classList.add("visible");
|
||||||
|
tabConfig.classList.remove("visible");
|
||||||
amain.classList.add("pure-button-primary");
|
tabTDE.classList.remove("visible");
|
||||||
acfg.classList.remove("pure-button-primary");
|
amain.classList.add("pure-button-primary");
|
||||||
atde.classList.remove("pure-button-primary");
|
acfg.classList.remove("pure-button-primary");
|
||||||
});
|
atde.classList.remove("pure-button-primary");
|
||||||
|
});
|
||||||
document.getElementById("tab-a-config").addEventListener("click", function() {
|
acfg.addEventListener("click", function() {
|
||||||
tabMain.classList.remove("visible");
|
tabMain.classList.remove("visible");
|
||||||
tabConfig.classList.add("visible");
|
tabConfig.classList.add("visible");
|
||||||
tabTDE.classList.remove("visible");
|
tabTDE.classList.remove("visible");
|
||||||
|
amain.classList.remove("pure-button-primary");
|
||||||
amain.classList.remove("pure-button-primary");
|
acfg.classList.add("pure-button-primary");
|
||||||
acfg.classList.add("pure-button-primary");
|
atde.classList.remove("pure-button-primary");
|
||||||
atde.classList.remove("pure-button-primary");
|
});
|
||||||
});
|
atde.addEventListener("click", function() {
|
||||||
|
tabMain.classList.remove("visible");
|
||||||
document.getElementById("tab-a-tde").addEventListener("click", function() {
|
tabConfig.classList.remove("visible");
|
||||||
tabMain.classList.remove("visible");
|
tabTDE.classList.add("visible");
|
||||||
tabConfig.classList.remove("visible");
|
amain.classList.remove("pure-button-primary");
|
||||||
tabTDE.classList.add("visible");
|
acfg.classList.remove("pure-button-primary");
|
||||||
|
atde.classList.add("pure-button-primary");
|
||||||
amain.classList.remove("pure-button-primary");
|
});
|
||||||
acfg.classList.remove("pure-button-primary");
|
} catch (error) {
|
||||||
atde.classList.add("pure-button-primary");
|
console.log("Fehler in load listener of the tab action listener management: " + error.message);
|
||||||
});
|
}
|
||||||
|
}
|
||||||
function loadGraphData() {
|
window.addEventListener('load', function() {
|
||||||
console.log('----> generate graph <----');
|
addTabListener();
|
||||||
$.getJSON('/tc_data_blocks', function(data) {
|
});
|
||||||
var currenttime = [];
|
function loadGraphData() {
|
||||||
var time = [];
|
console.log('----> generate graph <----');
|
||||||
var channel1 = [];
|
$.getJSON('/tc_data_blocks_read', function(data) {
|
||||||
var channel2 = [];
|
var currenttime = [];
|
||||||
var channel3 = [];
|
var time = [];
|
||||||
var channel4 = [];
|
var channel1 = [];
|
||||||
for (var i = 0; i < data['tcdata'].length; i++) {
|
var channel2 = [];
|
||||||
time.push(data['tcdata'][i]['hour'] + ':' + (data['tcdata'][i]['min'] < 10 ? '0' : '') + data['tcdata'][i]['min']);
|
var channel3 = [];
|
||||||
channel1.push(data['tcdata'][i]['ch1']);
|
var channel4 = [];
|
||||||
channel2.push(data['tcdata'][i]['ch2']);
|
for (var i = 0; i < data['tcdata'].length; i++) {
|
||||||
channel3.push(data['tcdata'][i]['ch3']);
|
time.push(data['tcdata'][i]['hour'] + ':' + (data['tcdata'][i]['min'] < 10 ? '0' : '') + data['tcdata'][i]['min']);
|
||||||
channel4.push(data['tcdata'][i]['ch4']);
|
channel1.push(data['tcdata'][i]['ch1']);
|
||||||
}
|
channel2.push(data['tcdata'][i]['ch2']);
|
||||||
currenttime.push(data['currenttime']['hour']);
|
channel3.push(data['tcdata'][i]['ch3']);
|
||||||
currenttime.push(data['currenttime']['min']);
|
channel4.push(data['tcdata'][i]['ch4']);
|
||||||
console.log(currenttime);
|
}
|
||||||
var currentTimeStr = currenttime[0] + ':' + (currenttime[1] < 10 ? '0' : '') + currenttime[1];
|
currenttime.push(data['currenttime']['hour']);
|
||||||
var index = time.indexOf(currentTimeStr);
|
currenttime.push(data['currenttime']['min']);
|
||||||
if (index === -1) {
|
console.log(currenttime);
|
||||||
var lowerIndex = -1;
|
var currentTimeStr = currenttime[0] + ':' + (currenttime[1] < 10 ? '0' : '') + currenttime[1];
|
||||||
var upperIndex = -1;
|
var index = time.indexOf(currentTimeStr);
|
||||||
for (var i = 0; i < time.length - 1; i++) {
|
if (index === -1) {
|
||||||
console.log(time[i] + ' <= ' + currentTimeStr + ' >= ' + time[i + 1]);
|
var lowerIndex = -1;
|
||||||
const currentDate = new Date();
|
var upperIndex = -1;
|
||||||
const year = currentDate.getFullYear();
|
for (var i = 0; i < time.length - 1; i++) {
|
||||||
const month = (currentDate.getMonth() + 1).toString().padStart(2, '0');
|
console.log(time[i] + ' <= ' + currentTimeStr + ' >= ' + time[i + 1]);
|
||||||
const day = currentDate.getDate().toString().padStart(2, '0');
|
const currentDate = new Date();
|
||||||
const dateString = `${year}-${month}-${day}`;
|
const year = currentDate.getFullYear();
|
||||||
const start = moment(dateString + ' ' + time[i], 'YYYY-MM-DD HH:mm');
|
const month = (currentDate.getMonth() + 1).toString().padStart(2, '0');
|
||||||
const curr = moment(dateString + ' ' + currentTimeStr, 'YYYY-MM-DD HH:mm');
|
const day = currentDate.getDate().toString().padStart(2, '0');
|
||||||
const end = moment(dateString + ' ' + time[i + 1], 'YYYY-MM-DD HH:mm');
|
const dateString = `${year}-${month}-${day}`;
|
||||||
console.log(start.format('YYYY-MM-DD HH:mm') + ' <= ' + curr.format('YYYY-MM-DD HH:mm') + ' >= ' + end.format('YYYY-MM-DD HH:mm'));
|
const start = moment(dateString + ' ' + time[i], 'YYYY-MM-DD HH:mm');
|
||||||
console.log(curr.isBetween(start, end));
|
const curr = moment(dateString + ' ' + currentTimeStr, 'YYYY-MM-DD HH:mm');
|
||||||
if (curr.isBetween(start, end)) {
|
const end = moment(dateString + ' ' + time[i + 1], 'YYYY-MM-DD HH:mm');
|
||||||
lowerIndex = i;
|
console.log(start.format('YYYY-MM-DD HH:mm') + ' <= ' + curr.format('YYYY-MM-DD HH:mm') + ' >= ' + end.format('YYYY-MM-DD HH:mm'));
|
||||||
upperIndex = i + 1;
|
console.log(curr.isBetween(start, end));
|
||||||
break;
|
if (curr.isBetween(start, end)) {
|
||||||
}
|
lowerIndex = i;
|
||||||
}
|
upperIndex = i + 1;
|
||||||
console.log('lowerIndex=' + lowerIndex);
|
break;
|
||||||
console.log('upperIndex=' + upperIndex);
|
}
|
||||||
if (lowerIndex === -1 || upperIndex === -1) {
|
}
|
||||||
console.log("Error: Current time not found in time array and not between two elements in time array.");
|
console.log('lowerIndex=' + lowerIndex);
|
||||||
lowerIndex = 0;
|
console.log('upperIndex=' + upperIndex);
|
||||||
upperIndex = 1;
|
if (lowerIndex === -1 || upperIndex === -1) {
|
||||||
var tmp1 = time[0].split(':');
|
console.log("Error: Current time not found in time array and not between two elements in time array.");
|
||||||
console.log('tmp1 = ' + tmp1);
|
lowerIndex = 0;
|
||||||
currenttime[0] = tmp1[0];
|
upperIndex = 1;
|
||||||
currenttime[1] = tmp1[1];
|
var tmp1 = time[0].split(':');
|
||||||
}
|
console.log('tmp1 = ' + tmp1);
|
||||||
var lowerTime = time[lowerIndex].split(":");
|
currenttime[0] = tmp1[0];
|
||||||
var upperTime = time[upperIndex].split(":");
|
currenttime[1] = tmp1[1];
|
||||||
var timeDiff = (currenttime[0] - lowerTime[0]) + ((currenttime[1] - lowerTime[1]) / 60);
|
}
|
||||||
var indexFloat = lowerIndex + timeDiff / ((upperTime[0] - lowerTime[0]) + ((upperTime[1] - lowerTime[1]) / 60));
|
var lowerTime = time[lowerIndex].split(":");
|
||||||
console.log("Index (float): " + indexFloat);
|
var upperTime = time[upperIndex].split(":");
|
||||||
} else {
|
var timeDiff = (currenttime[0] - lowerTime[0]) + ((currenttime[1] - lowerTime[1]) / 60);
|
||||||
console.log("Index (integer): " + index);
|
var indexFloat = lowerIndex + timeDiff / ((upperTime[0] - lowerTime[0]) + ((upperTime[1] - lowerTime[1]) / 60));
|
||||||
console.log("Index (float): " + index);
|
console.log("Index (float): " + indexFloat);
|
||||||
}
|
} else {
|
||||||
if (indexFloat > index) {
|
console.log("Index (integer): " + index);
|
||||||
index = indexFloat;
|
console.log("Index (float): " + index);
|
||||||
}
|
}
|
||||||
console.log("index in graph >>>" + index);
|
if (indexFloat > index) {
|
||||||
var trace1 = {
|
index = indexFloat;
|
||||||
x: time,
|
}
|
||||||
y: channel1,
|
console.log("index in graph >>>" + index);
|
||||||
name: 'Channel 1',
|
var trace1 = {
|
||||||
type: 'scatter',
|
x: time,
|
||||||
mode: 'lines+markers',
|
y: channel1,
|
||||||
};
|
name: 'Channel 1',
|
||||||
var trace2 = {
|
type: 'scatter',
|
||||||
x: time,
|
mode: 'lines+markers',
|
||||||
y: channel2,
|
};
|
||||||
name: 'Channel 2',
|
var trace2 = {
|
||||||
type: 'scatter',
|
x: time,
|
||||||
mode: 'lines+markers',
|
y: channel2,
|
||||||
};
|
name: 'Channel 2',
|
||||||
var trace3 = {
|
type: 'scatter',
|
||||||
x: time,
|
mode: 'lines+markers',
|
||||||
y: channel3,
|
};
|
||||||
name: 'Channel 3',
|
var trace3 = {
|
||||||
type: 'scatter',
|
x: time,
|
||||||
mode: 'lines+markers',
|
y: channel3,
|
||||||
};
|
name: 'Channel 3',
|
||||||
var trace4 = {
|
type: 'scatter',
|
||||||
x: time,
|
mode: 'lines+markers',
|
||||||
y: channel4,
|
};
|
||||||
name: 'Channel 4',
|
var trace4 = {
|
||||||
type: 'scatter',
|
x: time,
|
||||||
mode: 'lines+markers',
|
y: channel4,
|
||||||
};
|
name: 'Channel 4',
|
||||||
var layout = {
|
type: 'scatter',
|
||||||
title: 'Timing Control Data Blocks',
|
mode: 'lines+markers',
|
||||||
xaxis: {
|
};
|
||||||
title: 'Time',
|
var layout = {
|
||||||
tickangle: -45,
|
title: 'Timing Control Data Blocks',
|
||||||
},
|
xaxis: {
|
||||||
yaxis: {
|
title: 'Time',
|
||||||
title: 'Brightness',
|
tickangle: -45,
|
||||||
range: [0, 255],
|
},
|
||||||
},
|
yaxis: {
|
||||||
shapes: [{
|
title: 'Brightness',
|
||||||
type: 'line',
|
range: [0, 255],
|
||||||
x0: index,
|
},
|
||||||
y0: 0,
|
shapes: [{
|
||||||
x1: index,
|
type: 'line',
|
||||||
y1: 255,
|
x0: index,
|
||||||
line: {
|
y0: 0,
|
||||||
color: 'lightgrey',
|
x1: index,
|
||||||
width: 3,
|
y1: 255,
|
||||||
dash: 'dot'
|
line: {
|
||||||
}
|
color: 'lightgrey',
|
||||||
}]
|
width: 3,
|
||||||
};
|
dash: 'dot'
|
||||||
Plotly.newPlot('plot_chart', [trace1, trace2, trace3, trace4], layout);
|
}
|
||||||
});
|
}]
|
||||||
}
|
};
|
||||||
setInterval(loadGraphData, 10000);
|
Plotly.newPlot('plot_chart', [trace1, trace2, trace3, trace4], layout);
|
||||||
loadGraphData();
|
});
|
||||||
|
}
|
||||||
function updateLightState() {
|
setInterval(loadGraphData, 10000);
|
||||||
console.log('----> setting bri and power switch <----');
|
loadGraphData();
|
||||||
for (let i = 1; i <= {{LIGHT_COUNT}}; i++) {
|
function updateLightState() {
|
||||||
const lightURL = `http://{{IP_ADDRESS}}/state?light=${i}`;
|
console.log('----> setting bri and power switch <----');
|
||||||
fetch(lightURL).then(response => response.json()).then(data => {
|
for (let i = 1; i <= {{LIGHT_COUNT}}; i++) {
|
||||||
const briSlider = document.getElementById(`bri${i - 1}`);
|
const lightURL = `http://{{IP_ADDRESS}}/state?light=${i}`;
|
||||||
const briSliderVal = document.getElementById(`bri${i - 1}_val`);
|
fetch(lightURL).then(response => response.json()).then(data => {
|
||||||
const onLinkOn = document.getElementById(`on${i - 1}_on`);
|
const briSlider = document.getElementById(`bri${i - 1}`);
|
||||||
const onLinkOff = document.getElementById(`on${i - 1}_off`);
|
const briSliderVal = document.getElementById(`bri${i - 1}_val`);
|
||||||
briSlider.value = data.bri;
|
const onLinkOn = document.getElementById(`on${i - 1}_on`);
|
||||||
briSliderVal.innerHTML = (Math.round((data.bri * 100.0 / 255.0) * 100) / 100).toFixed(2);
|
const onLinkOff = document.getElementById(`on${i - 1}_off`);
|
||||||
console.log('data.on ' + i + ' = ' + data.on);
|
briSlider.value = data.bri;
|
||||||
if (data.on == true) {
|
briSliderVal.innerHTML = (Math.round((data.bri * 100.0 / 255.0) * 100) / 100).toFixed(2);
|
||||||
onLinkOn.classList.add('pure-button-primary');
|
console.log('data.on ' + i + ' = ' + data.on);
|
||||||
onLinkOff.classList.remove('pure-button-primary');
|
if (data.on == true) {
|
||||||
} else {
|
onLinkOn.classList.add('pure-button-primary');
|
||||||
onLinkOn.classList.remove('pure-button-primary');
|
onLinkOff.classList.remove('pure-button-primary');
|
||||||
onLinkOff.classList.add('pure-button-primary');
|
} else {
|
||||||
}
|
onLinkOn.classList.remove('pure-button-primary');
|
||||||
}).catch(error => console.error(error));
|
onLinkOff.classList.add('pure-button-primary');
|
||||||
}
|
}
|
||||||
}
|
}).catch(error => console.error(error));
|
||||||
setInterval(updateLightState, 10000);
|
}
|
||||||
updateLightState();
|
}
|
||||||
|
setInterval(updateLightState, 10000);
|
||||||
function updatePWMValues() {
|
updateLightState();
|
||||||
console.log('----> setting pwm data <----');
|
function updatePWMValues() {
|
||||||
for (let i = 0; i < {{LIGHT_COUNT}}; i++) {
|
console.log('----> setting pwm data <----');
|
||||||
const lightID = i + 1;
|
for (let i = 0; i < {{LIGHT_COUNT}}; i++) {
|
||||||
const pwmElement = document.getElementById(`light${i}_pwm`);
|
const lightID = i + 1;
|
||||||
const pwmElementTxt = document.getElementById(`light${i}_pwm_txt`);
|
const pwmElement = document.getElementById(`light${i}_pwm`);
|
||||||
if (pwmElement) {
|
const pwmElementTxt = document.getElementById(`light${i}_pwm_txt`);
|
||||||
const url = `http://{{IP_ADDRESS}}/state?light=${lightID}`;
|
if (pwmElement) {
|
||||||
fetch(url).then(response => response.json()).then(data => {
|
const url = `http://{{IP_ADDRESS}}/state?light=${lightID}`;
|
||||||
const pwmValue = ((Math.round((data.curpwm - ((data.curpwm >= {{PWM_MIN}}) ? {{PWM_MIN}} : 0)) / {{PWM_MAX}} * 10000) / 100).toFixed(2));
|
fetch(url).then(response => response.json()).then(data => {
|
||||||
console.log('curpwm[' + i + '] = ' + data.curpwm + ' = ' + pwmValue);
|
const pwmValue = ((Math.round((data.curpwm - ((data.curpwm >= {{PWM_MIN}}) ? {{PWM_MIN}} : 0)) / {{PWM_MAX}} * 10000) / 100).toFixed(2));
|
||||||
pwmElement.innerText = pwmValue.toString();
|
console.log('curpwm[' + i + '] = ' + data.curpwm + ' = ' + pwmValue);
|
||||||
pwmElement.value = pwmValue;
|
pwmElement.innerText = pwmValue.toString();
|
||||||
pwmElementTxt.innerText = pwmValue.toString();
|
pwmElement.value = pwmValue;
|
||||||
}).catch(error => console.error(error));
|
pwmElementTxt.innerText = pwmValue.toString();
|
||||||
}
|
}).catch(error => console.error(error));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
updatePWMValues();
|
}
|
||||||
setInterval(updatePWMValues, 5000);
|
updatePWMValues();
|
||||||
|
setInterval(updatePWMValues, 5000);
|
||||||
|
var links = document.querySelectorAll('[id^="on"][id$="_off"]');
|
||||||
var links = document.querySelectorAll('[id^="on"][id$="_off"]');
|
links.forEach(function(link) {
|
||||||
|
link.addEventListener('click', function(event) {
|
||||||
links.forEach(function(link) {
|
event.preventDefault();
|
||||||
link.addEventListener('click', function(event) {
|
var id = this.id.replace('on', '').replace('_off', '');
|
||||||
|
var xhr = new XMLHttpRequest();
|
||||||
event.preventDefault();
|
xhr.open('GET', 'http://{{IP_ADDRESS}}/?on' + id + '=false&transition=' + document.getElementById('transition').value, true);
|
||||||
|
xhr.send();
|
||||||
var id = this.id.replace('on', '').replace('_off', '');
|
updateLightState();
|
||||||
|
this.classList.add('pure-button-primary');
|
||||||
var xhr = new XMLHttpRequest();
|
document.getElementById('on'+id+'_on').classList.remove('pure-button-primary');
|
||||||
xhr.open('GET', 'http://{{IP_ADDRESS}}/?on' + id + '=false&transition=' + document.getElementById('transition').value, true);
|
});
|
||||||
|
});
|
||||||
xhr.send();
|
var links = document.querySelectorAll('[id^="on"][id$="_on"]');
|
||||||
updateLightState();
|
links.forEach(function(link) {
|
||||||
this.classList.add('pure-button-primary');
|
link.addEventListener('click', function(event) {
|
||||||
document.getElementById('on'+id+'_on').classList.remove('pure-button-primary');
|
event.preventDefault();
|
||||||
});
|
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);
|
||||||
var links = document.querySelectorAll('[id^="on"][id$="_on"]');
|
xhr.send();
|
||||||
|
updateLightState();
|
||||||
links.forEach(function(link) {
|
this.classList.add('pure-button-primary');
|
||||||
link.addEventListener('click', function(event) {
|
document.getElementById('on'+id+'_off').classList.remove('pure-button-primary');
|
||||||
|
});
|
||||||
event.preventDefault();
|
});
|
||||||
|
var xhr = new XMLHttpRequest();
|
||||||
var id = this.id.replace('on', '').replace('_on', '');
|
xhr.open('GET', 'http://{{IP_ADDRESS}}/tc_data_edit');
|
||||||
|
xhr.onload = function() {
|
||||||
var xhr = new XMLHttpRequest();
|
if (xhr.status === 200) {
|
||||||
xhr.open('GET', 'http://{{IP_ADDRESS}}/?on' + id + '=true&transition=' + document.getElementById('transition').value, true);
|
document.getElementById('tc-edit-container').innerHTML = xhr.responseText;
|
||||||
|
} else {
|
||||||
xhr.send();
|
console.log('Fehler beim Laden der URL: ' + xhr.status);
|
||||||
updateLightState();
|
}
|
||||||
this.classList.add('pure-button-primary');
|
};
|
||||||
document.getElementById('on'+id+'_off').classList.remove('pure-button-primary');
|
xhr.send();
|
||||||
});
|
</script>
|
||||||
});
|
</div>
|
||||||
</script>
|
</fieldset>
|
||||||
|
</body>
|
||||||
</div>
|
</html>
|
||||||
</fieldset>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,8 @@
|
||||||
<!-- middle -->
|
<!-- middle -->
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<div id="plot_chart"></div>
|
<div id="plot_chart"></div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</div><!-- end of lights control tab -->
|
</div><!-- end of lights control tab -->
|
||||||
|
|
||||||
<div id="tab-tde"> <!-- timing editor -->
|
|
||||||
Not implemented yet.
|
|
||||||
</div>
|
|
||||||
|
|
|
||||||
|
|
@ -1,108 +1,106 @@
|
||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>Light setup - {{LIGHT_NAME}}</title>
|
<title>Light setup - {{LIGHT_NAME}}</title>
|
||||||
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
|
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
|
||||||
<script src="https://cdn.plot.ly/plotly-latest.min.js"></script>
|
<script src="https://cdn.plot.ly/plotly-latest.min.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.29.1/moment.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.29.1/moment.min.js"></script>
|
||||||
<link rel="stylesheet" href="https://unpkg.com/purecss@0.6.2/build/pure-min.css">
|
<link rel="stylesheet" href="https://unpkg.com/purecss@0.6.2/build/pure-min.css">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<style>
|
<style>
|
||||||
#tab-lights, #tab-config, #tab-tde {
|
#tab-lights, #tab-config, #tab-tde {
|
||||||
display: none;
|
display: none;
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
color: black;
|
color: black;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
#tab-lights.visible {
|
#tab-lights.visible {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
#tab-config.visible {
|
#tab-config.visible {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
#tab-tde.visible {
|
#tab-tde.visible {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<h3>{{LIGHT_NAME}}</h3>
|
<h3>{{LIGHT_NAME}}</h3>
|
||||||
<div class="pure-form pure-form-aligned">
|
<div class="pure-form pure-form-aligned">
|
||||||
<div class="pure-controls">
|
<div class="pure-controls">
|
||||||
<a href="/update" class="pure-button">update</a>
|
<a href="/update" class="pure-button">update</a>
|
||||||
<a href="/?reset=1" class="pure-button">reset light</a>
|
<a href="/?reset=1" class="pure-button">reset light</a>
|
||||||
<a href="/?resettc" class="pure-button">reset timing control data</a>
|
<a href="/?resettc" class="pure-button">reset timing control data</a>
|
||||||
<a href="/?alert=1" class="pure-button">alert</a>
|
<a href="/?alert=1" class="pure-button">alert</a>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
<div><!-- Tab links -->
|
<div><!-- Tab links -->
|
||||||
<a href="#" id="tab-a-lights" class="pure-button pure-button-primary">Lights control</a>
|
<a href="#" id="tab-a-lights" class="pure-button pure-button-primary">Lights control</a>
|
||||||
<a href="#" id="tab-a-config" class="pure-button">Config</a>
|
<a href="#" id="tab-a-config" class="pure-button">Config</a>
|
||||||
<a href="#" id="tab-a-tde" class="pure-button">Timing data edit</a>
|
<a href="#" id="tab-a-tde" class="pure-button">Timing data edit</a>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
<div id="tab-lights" class="visible"> <!-- lights control tab -->
|
<div id="tab-lights" class="visible"> <!-- lights control tab -->
|
||||||
<br>
|
<br>
|
||||||
<div class="pure-control-group">
|
<div class="pure-control-group">
|
||||||
<label for="tc_on">
|
<label for="tc_on">
|
||||||
<strong>Timing control</strong>
|
<strong>Timing control</strong>
|
||||||
</label>
|
</label>
|
||||||
<a id="tc_on" class="pure-button {{TC_LINK_PRIMARY_ON}}" href="#">ON</a>
|
<a id="tc_on" class="pure-button {{TC_LINK_PRIMARY_ON}}" href="#">ON</a>
|
||||||
<a id="tc_off" class="pure-button {{TC_LINK_PRIMARY_OFF}}" href="#">OFF</a>
|
<a id="tc_off" class="pure-button {{TC_LINK_PRIMARY_OFF}}" href="#">OFF</a>
|
||||||
<br>
|
<br>
|
||||||
<label for="transition">Transition time (s)</label>
|
<label for="transition">Transition time (s)</label>
|
||||||
<input id="transition" name="transition" type="text" placeholder="10" value="{{TRANSITION_TIME}}">
|
<input id="transition" name="transition" type="text" placeholder="10" value="{{TRANSITION_TIME}}">
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
<script>
|
<script>
|
||||||
var links = document.querySelectorAll('[id^="tc_on"]');
|
var links = document.querySelectorAll('[id^="tc_on"]');
|
||||||
links.forEach(function(link) {
|
links.forEach(function(link) {
|
||||||
link.addEventListener('click', function(event) {
|
link.addEventListener('click', function(event) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
var xhr = new XMLHttpRequest();
|
var xhr = new XMLHttpRequest();
|
||||||
xhr.open('GET', 'http://{{IP_ADDRESS}}/?tc=true', true);
|
xhr.open('GET', 'http://{{IP_ADDRESS}}/?tc=true', true);
|
||||||
xhr.send();
|
xhr.send();
|
||||||
console.log('tc=true call');
|
console.log('tc=true call');
|
||||||
document.getElementById('tc_on').classList.add('pure-button-primary');
|
document.getElementById('tc_on').classList.add('pure-button-primary');
|
||||||
document.getElementById('tc_off').classList.remove('pure-button-primary');
|
document.getElementById('tc_off').classList.remove('pure-button-primary');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
var links = document.querySelectorAll('[id^="tc_off"]');
|
var links = document.querySelectorAll('[id^="tc_off"]');
|
||||||
links.forEach(function(link) {
|
links.forEach(function(link) {
|
||||||
link.addEventListener('click', function(event) {
|
link.addEventListener('click', function(event) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
var xhr = new XMLHttpRequest();
|
var xhr = new XMLHttpRequest();
|
||||||
xhr.open('GET', 'http://{{IP_ADDRESS}}/?tc=false', true);
|
xhr.open('GET', 'http://{{IP_ADDRESS}}/?tc=false', true);
|
||||||
xhr.send();
|
xhr.send();
|
||||||
console.log('tc=false call');
|
console.log('tc=false call');
|
||||||
document.getElementById('tc_off').classList.add('pure-button-primary');
|
document.getElementById('tc_off').classList.add('pure-button-primary');
|
||||||
document.getElementById('tc_on').classList.remove('pure-button-primary');
|
document.getElementById('tc_on').classList.remove('pure-button-primary');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
let timeoutId;
|
||||||
let timeoutId;
|
function sendSliderValue(x) {
|
||||||
function sendSliderValue(x) {
|
x = x - 1;
|
||||||
x = x - 1;
|
clearTimeout(timeoutId);
|
||||||
clearTimeout(timeoutId);
|
timeoutId = setTimeout(() => {
|
||||||
timeoutId = setTimeout(() => {
|
var value = document.getElementById(`bri${x}`).value;
|
||||||
var value = document.getElementById(`bri${x}`).value;
|
var url = `http://{{IP_ADDRESS}}/?bri${x}=${value}`;
|
||||||
var url = `http://{{IP_ADDRESS}}/?bri${x}=${value}`;
|
fetch(url).then(response => {
|
||||||
fetch(url).then(response => {
|
if (!response.ok) {
|
||||||
if (!response.ok) {
|
throw new Error(`HTTP error! status: ${response.status}`);
|
||||||
throw new Error(`HTTP error! status: ${response.status}`);
|
}
|
||||||
}
|
console.log(`Sent slider value ${value} to ${url}`);
|
||||||
console.log(`Sent slider value ${value} to ${url}`);
|
}).catch(error => {
|
||||||
}).catch(error => {
|
console.error(`Error sending slider value to ${url}: ${error}`);
|
||||||
console.error(`Error sending slider value to ${url}: ${error}`);
|
});
|
||||||
});
|
}, 500);
|
||||||
}, 500);
|
}
|
||||||
}
|
</script>
|
||||||
</script>
|
<br>
|
||||||
<br>
|
<table border=0>
|
||||||
<table border=0>
|
<tr>
|
||||||
<tr>
|
<td>
|
||||||
<td>
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,29 +1,29 @@
|
||||||
<h4>Light {{LIGHT_NUMBER}}</h4>
|
<h4>Light {{LIGHT_NUMBER}}</h4>
|
||||||
<div class="pure-control-group">
|
<div class="pure-control-group">
|
||||||
<label for="power">
|
<label for="power">
|
||||||
<strong>Power</strong>
|
<strong>Power</strong>
|
||||||
</label>
|
</label>
|
||||||
<a id="on{{LIGHT_NUMBER_DEC}}_on" class="pure-button" href="#">ON</a>
|
<a id="on{{LIGHT_NUMBER_DEC}}_on" class="pure-button" href="#">ON</a>
|
||||||
<a id="on{{LIGHT_NUMBER_DEC}}_off" class="pure-button" href="#">OFF</a>
|
<a id="on{{LIGHT_NUMBER_DEC}}_off" class="pure-button" href="#">OFF</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="pure-control-group">
|
<div class="pure-control-group">
|
||||||
<label for="bri{{LIGHT_NUMBER_DEC}}">Bri</label>
|
<label for="bri{{LIGHT_NUMBER_DEC}}">Bri</label>
|
||||||
<input id="bri{{LIGHT_NUMBER_DEC}}" onchange="sendSliderValue({{LIGHT_NUMBER}})" name="bri{{LIGHT_NUMBER_DEC}}" type="range" min="0" max="255" value="25">
|
<input id="bri{{LIGHT_NUMBER_DEC}}" onchange="sendSliderValue({{LIGHT_NUMBER}})" name="bri{{LIGHT_NUMBER_DEC}}" type="range" min="0" max="255" value="25">
|
||||||
|
|
||||||
<span id="bri{{LIGHT_NUMBER_DEC}}_val" name="bri{{LIGHT_NUMBER_DEC}}">9</span>
|
<span id="bri{{LIGHT_NUMBER_DEC}}_val" name="bri{{LIGHT_NUMBER_DEC}}">9</span>
|
||||||
%
|
%
|
||||||
<br>
|
<br>
|
||||||
<label for="light{{LIGHT_NUMBER_DEC}}_pwm">PWM-Value</label>
|
<label for="light{{LIGHT_NUMBER_DEC}}_pwm">PWM-Value</label>
|
||||||
<input type="range" min="0" max="100" value="0" id="light{{LIGHT_NUMBER_DEC}}_pwm" disabled>
|
<input type="range" min="0" max="100" value="0" id="light{{LIGHT_NUMBER_DEC}}_pwm" disabled>
|
||||||
|
|
||||||
<span id="light{{LIGHT_NUMBER_DEC}}_pwm_txt"></span>
|
<span id="light{{LIGHT_NUMBER_DEC}}_pwm_txt"></span>
|
||||||
%
|
%
|
||||||
<script>
|
<script>
|
||||||
var slider{{LIGHT_NUMBER_DEC}} = document.getElementById("bri{{LIGHT_NUMBER_DEC}}");
|
var slider{{LIGHT_NUMBER_DEC}} = document.getElementById("bri{{LIGHT_NUMBER_DEC}}");
|
||||||
var output{{LIGHT_NUMBER_DEC}} = document.getElementById("bri{{LIGHT_NUMBER_DEC}}_val");
|
var output{{LIGHT_NUMBER_DEC}} = document.getElementById("bri{{LIGHT_NUMBER_DEC}}_val");
|
||||||
output{{LIGHT_NUMBER_DEC}}.innerHTML = (Math.round((slider{{LIGHT_NUMBER_DEC}}.value * 100.0 / 255.0) * 100) / 100).toFixed(2);
|
output{{LIGHT_NUMBER_DEC}}.innerHTML = (Math.round((slider{{LIGHT_NUMBER_DEC}}.value * 100.0 / 255.0) * 100) / 100).toFixed(2);
|
||||||
slider{{LIGHT_NUMBER_DEC}}.oninput = function() {
|
slider{{LIGHT_NUMBER_DEC}}.oninput = function() {
|
||||||
output{{LIGHT_NUMBER_DEC}}.innerHTML = (Math.round((this.value * 100.0 / 255.0) * 100) / 100).toFixed(2);
|
output{{LIGHT_NUMBER_DEC}}.innerHTML = (Math.round((this.value * 100.0 / 255.0) * 100) / 100).toFixed(2);
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
184
firmware/data/tc_data_edit.html
Normal file
184
firmware/data/tc_data_edit.html
Normal file
|
|
@ -0,0 +1,184 @@
|
||||||
|
<br>
|
||||||
|
<div id="tc-edit-plotly-graph"></div>
|
||||||
|
<a href="#" onclick="sendTCData()" class="pure-button">Daten senden</a>
|
||||||
|
<script>
|
||||||
|
var dataPoints = [];
|
||||||
|
for (var i = 0; i < 10; i++) {
|
||||||
|
var xValue = i * 2;
|
||||||
|
dataPoints.push({ x: xValue, y: [0, 0, 0, 0] });
|
||||||
|
}
|
||||||
|
var options = {
|
||||||
|
title: {
|
||||||
|
text: "Graph Title"
|
||||||
|
},
|
||||||
|
data: [{
|
||||||
|
type: "line",
|
||||||
|
dataPoints: dataPoints
|
||||||
|
}]
|
||||||
|
};
|
||||||
|
var inputIdPrefixes = ["hour", "minute", "ch1", "ch2", "ch3", "ch4"];
|
||||||
|
var inputData = {
|
||||||
|
hour: [],
|
||||||
|
minute: [],
|
||||||
|
ch1: [],
|
||||||
|
ch2: [],
|
||||||
|
ch3: [],
|
||||||
|
ch4: []
|
||||||
|
};
|
||||||
|
var trace1 = {
|
||||||
|
x: [],
|
||||||
|
y: [],
|
||||||
|
mode: 'lines',
|
||||||
|
name: 'ch1'
|
||||||
|
};
|
||||||
|
var trace2 = {
|
||||||
|
x: [],
|
||||||
|
y: [],
|
||||||
|
mode: 'lines',
|
||||||
|
name: 'ch2'
|
||||||
|
};
|
||||||
|
var trace3 = {
|
||||||
|
x: [],
|
||||||
|
y: [],
|
||||||
|
mode: 'lines',
|
||||||
|
name: 'ch3'
|
||||||
|
};
|
||||||
|
var trace4 = {
|
||||||
|
x: [],
|
||||||
|
y: [],
|
||||||
|
mode: 'lines',
|
||||||
|
name: 'ch4'
|
||||||
|
};
|
||||||
|
var data = [trace1, trace2, trace3, trace4];
|
||||||
|
var layout = {
|
||||||
|
xaxis: {
|
||||||
|
title: 'Uhrzeit'
|
||||||
|
},
|
||||||
|
yaxis: {
|
||||||
|
title: 'Wert'
|
||||||
|
},
|
||||||
|
margin: {
|
||||||
|
l: 50,
|
||||||
|
r: 50,
|
||||||
|
b: 50,
|
||||||
|
t: 50,
|
||||||
|
pad: 4
|
||||||
|
},
|
||||||
|
hovermode: 'closest'
|
||||||
|
};
|
||||||
|
Plotly.newPlot('tc-edit-plotly-graph', data, layout);
|
||||||
|
var layout = {
|
||||||
|
title: 'Werte der Kanäle ch1 - ch4',
|
||||||
|
xaxis: {
|
||||||
|
title: 'Uhrzeit',
|
||||||
|
range: ['00:00', '23:59'],
|
||||||
|
tickformat: '%H:%M'
|
||||||
|
},
|
||||||
|
yaxis: {
|
||||||
|
title: 'Wert in %',
|
||||||
|
range: [0, 100]
|
||||||
|
}
|
||||||
|
};
|
||||||
|
var plotDiv = document.getElementById('plot');
|
||||||
|
Plotly.newPlot(plotDiv, [], layout, {responsive: true});
|
||||||
|
var data = [ { x: ['00:00', '02:00', '04:00', '06:00', '08:00', '10:00', '12:00', '14:00', '16:00', '18:00'],
|
||||||
|
y: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
|
name: 'Channel 1',
|
||||||
|
mode: 'lines+markers',
|
||||||
|
line: {
|
||||||
|
shape: 'spline'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
x: ['00:00', '02:00', '04:00', '06:00', '08:00', '10:00', '12:00', '14:00', '16:00', '18:00'],
|
||||||
|
y: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
|
name: 'Channel 2',
|
||||||
|
mode: 'lines+markers',
|
||||||
|
line: {
|
||||||
|
shape: 'spline'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
x: ['00:00', '02:00', '04:00', '06:00', '08:00', '10:00', '12:00', '14:00', '16:00', '18:00'],
|
||||||
|
y: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
|
name: 'Channel 3',
|
||||||
|
mode: 'lines+markers',
|
||||||
|
line: {
|
||||||
|
shape: 'spline'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
x: ['00:00', '02:00', '04:00', '06:00', '08:00', '10:00', '12:00', '14:00', '16:00', '18:00'],
|
||||||
|
y: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
|
name: 'Channel 4',
|
||||||
|
mode: 'lines+markers',
|
||||||
|
line: {
|
||||||
|
shape: 'spline'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
];
|
||||||
|
var layout = {
|
||||||
|
xaxis: {
|
||||||
|
title: 'Time (hh:mm)',
|
||||||
|
showgrid: false,
|
||||||
|
zeroline: false
|
||||||
|
},
|
||||||
|
yaxis: {
|
||||||
|
title: 'Value (%)',
|
||||||
|
showline: false
|
||||||
|
}
|
||||||
|
};
|
||||||
|
Plotly.newPlot('graph', data, layout);
|
||||||
|
var layout = {
|
||||||
|
title: 'Graph',
|
||||||
|
xaxis: {
|
||||||
|
title: 'Uhrzeit'
|
||||||
|
},
|
||||||
|
yaxis: {
|
||||||
|
title: 'Prozent'
|
||||||
|
},
|
||||||
|
hovermode: 'closest'
|
||||||
|
};
|
||||||
|
var plot_data = [{ x: [],
|
||||||
|
y: [],
|
||||||
|
mode: 'lines+markers',
|
||||||
|
line: { shape: 'spline' }
|
||||||
|
}];
|
||||||
|
Plotly.newPlot('graph', plot_data, layout);
|
||||||
|
function updateData() {
|
||||||
|
for (let i = 0; i < 10; i++) {
|
||||||
|
let hour = document.getElementById(`hour-${i}`).value;
|
||||||
|
let minute = document.getElementById(`minute-${i}`).value;
|
||||||
|
for (let j = 1; j <= 4; j++) {
|
||||||
|
let value = parseFloat(document.getElementById(`ch${j}-${i}`).value);
|
||||||
|
let index = i * 4 + (j - 1);
|
||||||
|
data[index].x = `${hour}:${minute}`;
|
||||||
|
data[index].y = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Plotly.update('graph', data, layout);
|
||||||
|
}
|
||||||
|
for (let i = 0; i < 10; i++) {
|
||||||
|
document.getElementById(`hour-${i}`).addEventListener('input', updateData);
|
||||||
|
document.getElementById(`minute-${i}`).addEventListener('input', updateData);
|
||||||
|
for (let j = 1; j <= 4; j++) {
|
||||||
|
document.getElementById(`ch${j}-${i}`).addEventListener('input', updateData);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
function sendTCData() {
|
||||||
|
var data = [];
|
||||||
|
for (var i = 0; i < 10; i++) {
|
||||||
|
var hh = document.getElementById("hh_" + i).value;
|
||||||
|
var mm = document.getElementById("mm_" + i).value;
|
||||||
|
var ch1 = document.getElementById("ch1_" + i).value;
|
||||||
|
var ch2 = document.getElementById("ch2_" + i).value;
|
||||||
|
var ch3 = document.getElementById("ch3_" + i).value;
|
||||||
|
var ch4 = document.getElementById("ch4_" + i).value;
|
||||||
|
data.push({ "hh": hh, "mm": mm, "ch1": ch1, "ch2": ch2, "ch3": ch3, "ch4": ch4 });
|
||||||
|
}
|
||||||
|
var jsonData = encodeURIComponent(JSON.stringify(data));
|
||||||
|
var xhr = new XMLHttpRequest();
|
||||||
|
xhr.open("POST", "http://{{IP_ADDRESS}}}}/tc_data_block_store?data=" + jsonData);
|
||||||
|
xhr.send();
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
@ -472,13 +472,28 @@ void init_webserver()
|
||||||
server.send(200, "text/plain", output);
|
server.send(200, "text/plain", output);
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on("/tc_data_blocks", []()
|
server.on("/tc_data_blocks_read", []()
|
||||||
{
|
{
|
||||||
String output = tc_getJsonData();
|
String output = tc_getJsonData();
|
||||||
|
|
||||||
server.send(200, "application/json", output);
|
server.send(200, "application/json", output);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
server.on("/tc_data_blocks_store", []()
|
||||||
|
{
|
||||||
|
if (server.hasArg("data"))
|
||||||
|
{
|
||||||
|
String jsonData = server.arg("data");
|
||||||
|
tc_jsonDataBlocksToEEPROM(jsonData);
|
||||||
|
server.send(200, "text/html", "tcdata saved");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
server.on("/tc_data_edit", []()
|
||||||
|
{
|
||||||
|
server.send(200, "text/html", genTCEditHTML());
|
||||||
|
});
|
||||||
|
|
||||||
server.on("/", []()
|
server.on("/", []()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
@ -703,6 +718,11 @@ String genConfigHTML()
|
||||||
return replacePlaceholder(getConfigHTML());
|
return replacePlaceholder(getConfigHTML());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String genTCEditHTML()
|
||||||
|
{
|
||||||
|
return replacePlaceholder(getTCDataEditHTML());
|
||||||
|
}
|
||||||
|
|
||||||
String genLightControlHTML()
|
String genLightControlHTML()
|
||||||
{
|
{
|
||||||
String http_content = "";
|
String http_content = "";
|
||||||
|
|
@ -868,6 +888,14 @@ String getConfigHTML()
|
||||||
|
|
||||||
//********************************//
|
//********************************//
|
||||||
|
|
||||||
|
String getTCDataEditHTML()
|
||||||
|
{
|
||||||
|
// load file
|
||||||
|
return loadSPIFFSFile("/tc_data_edit.html");
|
||||||
|
}
|
||||||
|
|
||||||
|
//********************************//
|
||||||
|
|
||||||
String getLightControlHTML()
|
String getLightControlHTML()
|
||||||
{
|
{
|
||||||
// load file
|
// load file
|
||||||
|
|
|
||||||
|
|
@ -1,254 +1,286 @@
|
||||||
<!-- bottom -->
|
<!-- bottom -->
|
||||||
<script>
|
<div id="tab-tde" class=""> <!-- timing editor -->
|
||||||
var tabMain = document.getElementById("tab-lights");
|
<div id="tc-edit-container" class=""></div>
|
||||||
var tabConfig = document.getElementById("tab-config");
|
</div> <!-- end of tab-tde -->
|
||||||
var tabTDE = document.getElementById("tab-tde");
|
|
||||||
|
<script>
|
||||||
var amain = document.getElementById("tab-a-lights");
|
function addTabListener() {
|
||||||
var acfg = document.getElementById("tab-a-config");
|
try {
|
||||||
var atde = document.getElementById("tab-a-tde");
|
var tabMain = document.getElementById("tab-lights");
|
||||||
|
var tabConfig = document.getElementById("tab-config");
|
||||||
|
var tabTDE = document.getElementById("tab-tde");
|
||||||
document.getElementById("tab-a-lights").addEventListener("click", function() {
|
|
||||||
tabMain.classList.add("visible");
|
var amain = document.getElementById("tab-a-lights");
|
||||||
tabConfig.classList.remove("visible");
|
var acfg = document.getElementById("tab-a-config");
|
||||||
tabTDE.classList.remove("visible");
|
var atde = document.getElementById("tab-a-tde");
|
||||||
|
|
||||||
amain.classList.add("pure-button-primary");
|
|
||||||
acfg.classList.remove("pure-button-primary");
|
amain.addEventListener("click", function() {
|
||||||
atde.classList.remove("pure-button-primary");
|
tabMain.classList.add("visible");
|
||||||
});
|
tabConfig.classList.remove("visible");
|
||||||
|
tabTDE.classList.remove("visible");
|
||||||
document.getElementById("tab-a-config").addEventListener("click", function() {
|
|
||||||
tabMain.classList.remove("visible");
|
amain.classList.add("pure-button-primary");
|
||||||
tabConfig.classList.add("visible");
|
acfg.classList.remove("pure-button-primary");
|
||||||
tabTDE.classList.remove("visible");
|
atde.classList.remove("pure-button-primary");
|
||||||
|
});
|
||||||
amain.classList.remove("pure-button-primary");
|
|
||||||
acfg.classList.add("pure-button-primary");
|
acfg.addEventListener("click", function() {
|
||||||
atde.classList.remove("pure-button-primary");
|
tabMain.classList.remove("visible");
|
||||||
});
|
tabConfig.classList.add("visible");
|
||||||
|
tabTDE.classList.remove("visible");
|
||||||
document.getElementById("tab-a-tde").addEventListener("click", function() {
|
|
||||||
tabMain.classList.remove("visible");
|
amain.classList.remove("pure-button-primary");
|
||||||
tabConfig.classList.remove("visible");
|
acfg.classList.add("pure-button-primary");
|
||||||
tabTDE.classList.add("visible");
|
atde.classList.remove("pure-button-primary");
|
||||||
|
});
|
||||||
amain.classList.remove("pure-button-primary");
|
|
||||||
acfg.classList.remove("pure-button-primary");
|
atde.addEventListener("click", function() {
|
||||||
atde.classList.add("pure-button-primary");
|
tabMain.classList.remove("visible");
|
||||||
});
|
tabConfig.classList.remove("visible");
|
||||||
|
tabTDE.classList.add("visible");
|
||||||
function loadGraphData() {
|
|
||||||
console.log('----> generate graph <----');
|
amain.classList.remove("pure-button-primary");
|
||||||
$.getJSON('/tc_data_blocks', function(data) {
|
acfg.classList.remove("pure-button-primary");
|
||||||
var currenttime = [];
|
atde.classList.add("pure-button-primary");
|
||||||
var time = [];
|
});
|
||||||
var channel1 = [];
|
} catch (error) {
|
||||||
var channel2 = [];
|
console.log("Fehler in load listener of the tab action listener management: " + error.message);
|
||||||
var channel3 = [];
|
}
|
||||||
var channel4 = [];
|
}
|
||||||
for (var i = 0; i < data['tcdata'].length; i++) {
|
window.addEventListener('load', function() {
|
||||||
time.push(data['tcdata'][i]['hour'] + ':' + (data['tcdata'][i]['min'] < 10 ? '0' : '') + data['tcdata'][i]['min']);
|
addTabListener();
|
||||||
channel1.push(data['tcdata'][i]['ch1']);
|
});
|
||||||
channel2.push(data['tcdata'][i]['ch2']);
|
|
||||||
channel3.push(data['tcdata'][i]['ch3']);
|
function loadGraphData() {
|
||||||
channel4.push(data['tcdata'][i]['ch4']);
|
console.log('----> generate graph <----');
|
||||||
}
|
$.getJSON('/tc_data_blocks_read', function(data) {
|
||||||
currenttime.push(data['currenttime']['hour']);
|
var currenttime = [];
|
||||||
currenttime.push(data['currenttime']['min']);
|
var time = [];
|
||||||
console.log(currenttime);
|
var channel1 = [];
|
||||||
var currentTimeStr = currenttime[0] + ':' + (currenttime[1] < 10 ? '0' : '') + currenttime[1];
|
var channel2 = [];
|
||||||
var index = time.indexOf(currentTimeStr);
|
var channel3 = [];
|
||||||
if (index === -1) {
|
var channel4 = [];
|
||||||
var lowerIndex = -1;
|
for (var i = 0; i < data['tcdata'].length; i++) {
|
||||||
var upperIndex = -1;
|
time.push(data['tcdata'][i]['hour'] + ':' + (data['tcdata'][i]['min'] < 10 ? '0' : '') + data['tcdata'][i]['min']);
|
||||||
for (var i = 0; i < time.length - 1; i++) {
|
channel1.push(data['tcdata'][i]['ch1']);
|
||||||
console.log(time[i] + ' <= ' + currentTimeStr + ' >= ' + time[i + 1]);
|
channel2.push(data['tcdata'][i]['ch2']);
|
||||||
const currentDate = new Date();
|
channel3.push(data['tcdata'][i]['ch3']);
|
||||||
const year = currentDate.getFullYear();
|
channel4.push(data['tcdata'][i]['ch4']);
|
||||||
const month = (currentDate.getMonth() + 1).toString().padStart(2, '0');
|
}
|
||||||
const day = currentDate.getDate().toString().padStart(2, '0');
|
currenttime.push(data['currenttime']['hour']);
|
||||||
const dateString = `${year}-${month}-${day}`;
|
currenttime.push(data['currenttime']['min']);
|
||||||
const start = moment(dateString + ' ' + time[i], 'YYYY-MM-DD HH:mm');
|
console.log(currenttime);
|
||||||
const curr = moment(dateString + ' ' + currentTimeStr, 'YYYY-MM-DD HH:mm');
|
var currentTimeStr = currenttime[0] + ':' + (currenttime[1] < 10 ? '0' : '') + currenttime[1];
|
||||||
const end = moment(dateString + ' ' + time[i + 1], 'YYYY-MM-DD HH:mm');
|
var index = time.indexOf(currentTimeStr);
|
||||||
console.log(start.format('YYYY-MM-DD HH:mm') + ' <= ' + curr.format('YYYY-MM-DD HH:mm') + ' >= ' + end.format('YYYY-MM-DD HH:mm'));
|
if (index === -1) {
|
||||||
console.log(curr.isBetween(start, end));
|
var lowerIndex = -1;
|
||||||
if (curr.isBetween(start, end)) {
|
var upperIndex = -1;
|
||||||
lowerIndex = i;
|
for (var i = 0; i < time.length - 1; i++) {
|
||||||
upperIndex = i + 1;
|
console.log(time[i] + ' <= ' + currentTimeStr + ' >= ' + time[i + 1]);
|
||||||
break;
|
const currentDate = new Date();
|
||||||
}
|
const year = currentDate.getFullYear();
|
||||||
}
|
const month = (currentDate.getMonth() + 1).toString().padStart(2, '0');
|
||||||
console.log('lowerIndex=' + lowerIndex);
|
const day = currentDate.getDate().toString().padStart(2, '0');
|
||||||
console.log('upperIndex=' + upperIndex);
|
const dateString = `${year}-${month}-${day}`;
|
||||||
if (lowerIndex === -1 || upperIndex === -1) {
|
const start = moment(dateString + ' ' + time[i], 'YYYY-MM-DD HH:mm');
|
||||||
console.log("Error: Current time not found in time array and not between two elements in time array.");
|
const curr = moment(dateString + ' ' + currentTimeStr, 'YYYY-MM-DD HH:mm');
|
||||||
lowerIndex = 0;
|
const end = moment(dateString + ' ' + time[i + 1], 'YYYY-MM-DD HH:mm');
|
||||||
upperIndex = 1;
|
console.log(start.format('YYYY-MM-DD HH:mm') + ' <= ' + curr.format('YYYY-MM-DD HH:mm') + ' >= ' + end.format('YYYY-MM-DD HH:mm'));
|
||||||
var tmp1 = time[0].split(':');
|
console.log(curr.isBetween(start, end));
|
||||||
console.log('tmp1 = ' + tmp1);
|
if (curr.isBetween(start, end)) {
|
||||||
currenttime[0] = tmp1[0];
|
lowerIndex = i;
|
||||||
currenttime[1] = tmp1[1];
|
upperIndex = i + 1;
|
||||||
}
|
break;
|
||||||
var lowerTime = time[lowerIndex].split(":");
|
}
|
||||||
var upperTime = time[upperIndex].split(":");
|
}
|
||||||
var timeDiff = (currenttime[0] - lowerTime[0]) + ((currenttime[1] - lowerTime[1]) / 60);
|
console.log('lowerIndex=' + lowerIndex);
|
||||||
var indexFloat = lowerIndex + timeDiff / ((upperTime[0] - lowerTime[0]) + ((upperTime[1] - lowerTime[1]) / 60));
|
console.log('upperIndex=' + upperIndex);
|
||||||
console.log("Index (float): " + indexFloat);
|
if (lowerIndex === -1 || upperIndex === -1) {
|
||||||
} else {
|
console.log("Error: Current time not found in time array and not between two elements in time array.");
|
||||||
console.log("Index (integer): " + index);
|
lowerIndex = 0;
|
||||||
console.log("Index (float): " + index);
|
upperIndex = 1;
|
||||||
}
|
var tmp1 = time[0].split(':');
|
||||||
if (indexFloat > index) {
|
console.log('tmp1 = ' + tmp1);
|
||||||
index = indexFloat;
|
currenttime[0] = tmp1[0];
|
||||||
}
|
currenttime[1] = tmp1[1];
|
||||||
console.log("index in graph >>>" + index);
|
}
|
||||||
var trace1 = {
|
var lowerTime = time[lowerIndex].split(":");
|
||||||
x: time,
|
var upperTime = time[upperIndex].split(":");
|
||||||
y: channel1,
|
var timeDiff = (currenttime[0] - lowerTime[0]) + ((currenttime[1] - lowerTime[1]) / 60);
|
||||||
name: 'Channel 1',
|
var indexFloat = lowerIndex + timeDiff / ((upperTime[0] - lowerTime[0]) + ((upperTime[1] - lowerTime[1]) / 60));
|
||||||
type: 'scatter',
|
console.log("Index (float): " + indexFloat);
|
||||||
mode: 'lines+markers',
|
} else {
|
||||||
};
|
console.log("Index (integer): " + index);
|
||||||
var trace2 = {
|
console.log("Index (float): " + index);
|
||||||
x: time,
|
}
|
||||||
y: channel2,
|
if (indexFloat > index) {
|
||||||
name: 'Channel 2',
|
index = indexFloat;
|
||||||
type: 'scatter',
|
}
|
||||||
mode: 'lines+markers',
|
console.log("index in graph >>>" + index);
|
||||||
};
|
var trace1 = {
|
||||||
var trace3 = {
|
x: time,
|
||||||
x: time,
|
y: channel1,
|
||||||
y: channel3,
|
name: 'Channel 1',
|
||||||
name: 'Channel 3',
|
type: 'scatter',
|
||||||
type: 'scatter',
|
mode: 'lines+markers',
|
||||||
mode: 'lines+markers',
|
};
|
||||||
};
|
var trace2 = {
|
||||||
var trace4 = {
|
x: time,
|
||||||
x: time,
|
y: channel2,
|
||||||
y: channel4,
|
name: 'Channel 2',
|
||||||
name: 'Channel 4',
|
type: 'scatter',
|
||||||
type: 'scatter',
|
mode: 'lines+markers',
|
||||||
mode: 'lines+markers',
|
};
|
||||||
};
|
var trace3 = {
|
||||||
var layout = {
|
x: time,
|
||||||
title: 'Timing Control Data Blocks',
|
y: channel3,
|
||||||
xaxis: {
|
name: 'Channel 3',
|
||||||
title: 'Time',
|
type: 'scatter',
|
||||||
tickangle: -45,
|
mode: 'lines+markers',
|
||||||
},
|
};
|
||||||
yaxis: {
|
var trace4 = {
|
||||||
title: 'Brightness',
|
x: time,
|
||||||
range: [0, 255],
|
y: channel4,
|
||||||
},
|
name: 'Channel 4',
|
||||||
shapes: [{
|
type: 'scatter',
|
||||||
type: 'line',
|
mode: 'lines+markers',
|
||||||
x0: index,
|
};
|
||||||
y0: 0,
|
var layout = {
|
||||||
x1: index,
|
title: 'Timing Control Data Blocks',
|
||||||
y1: 255,
|
xaxis: {
|
||||||
line: {
|
title: 'Time',
|
||||||
color: 'lightgrey',
|
tickangle: -45,
|
||||||
width: 3,
|
},
|
||||||
dash: 'dot'
|
yaxis: {
|
||||||
}
|
title: 'Brightness',
|
||||||
}]
|
range: [0, 255],
|
||||||
};
|
},
|
||||||
Plotly.newPlot('plot_chart', [trace1, trace2, trace3, trace4], layout);
|
shapes: [{
|
||||||
});
|
type: 'line',
|
||||||
}
|
x0: index,
|
||||||
setInterval(loadGraphData, 10000);
|
y0: 0,
|
||||||
loadGraphData();
|
x1: index,
|
||||||
|
y1: 255,
|
||||||
function updateLightState() {
|
line: {
|
||||||
console.log('----> setting bri and power switch <----');
|
color: 'lightgrey',
|
||||||
for (let i = 1; i <= {{LIGHT_COUNT}}; i++) {
|
width: 3,
|
||||||
const lightURL = `http://{{IP_ADDRESS}}/state?light=${i}`;
|
dash: 'dot'
|
||||||
fetch(lightURL).then(response => response.json()).then(data => {
|
}
|
||||||
const briSlider = document.getElementById(`bri${i - 1}`);
|
}]
|
||||||
const briSliderVal = document.getElementById(`bri${i - 1}_val`);
|
};
|
||||||
const onLinkOn = document.getElementById(`on${i - 1}_on`);
|
Plotly.newPlot('plot_chart', [trace1, trace2, trace3, trace4], layout);
|
||||||
const onLinkOff = document.getElementById(`on${i - 1}_off`);
|
});
|
||||||
briSlider.value = data.bri;
|
}
|
||||||
briSliderVal.innerHTML = (Math.round((data.bri * 100.0 / 255.0) * 100) / 100).toFixed(2);
|
setInterval(loadGraphData, 10000);
|
||||||
console.log('data.on ' + i + ' = ' + data.on);
|
loadGraphData();
|
||||||
if (data.on == true) {
|
|
||||||
onLinkOn.classList.add('pure-button-primary');
|
function updateLightState() {
|
||||||
onLinkOff.classList.remove('pure-button-primary');
|
console.log('----> setting bri and power switch <----');
|
||||||
} else {
|
for (let i = 1; i <= {{LIGHT_COUNT}}; i++) {
|
||||||
onLinkOn.classList.remove('pure-button-primary');
|
const lightURL = `http://{{IP_ADDRESS}}/state?light=${i}`;
|
||||||
onLinkOff.classList.add('pure-button-primary');
|
fetch(lightURL).then(response => response.json()).then(data => {
|
||||||
}
|
const briSlider = document.getElementById(`bri${i - 1}`);
|
||||||
}).catch(error => console.error(error));
|
const briSliderVal = document.getElementById(`bri${i - 1}_val`);
|
||||||
}
|
const onLinkOn = document.getElementById(`on${i - 1}_on`);
|
||||||
}
|
const onLinkOff = document.getElementById(`on${i - 1}_off`);
|
||||||
setInterval(updateLightState, 10000);
|
briSlider.value = data.bri;
|
||||||
updateLightState();
|
briSliderVal.innerHTML = (Math.round((data.bri * 100.0 / 255.0) * 100) / 100).toFixed(2);
|
||||||
|
console.log('data.on ' + i + ' = ' + data.on);
|
||||||
function updatePWMValues() {
|
if (data.on == true) {
|
||||||
console.log('----> setting pwm data <----');
|
onLinkOn.classList.add('pure-button-primary');
|
||||||
for (let i = 0; i < {{LIGHT_COUNT}}; i++) {
|
onLinkOff.classList.remove('pure-button-primary');
|
||||||
const lightID = i + 1;
|
} else {
|
||||||
const pwmElement = document.getElementById(`light${i}_pwm`);
|
onLinkOn.classList.remove('pure-button-primary');
|
||||||
const pwmElementTxt = document.getElementById(`light${i}_pwm_txt`);
|
onLinkOff.classList.add('pure-button-primary');
|
||||||
if (pwmElement) {
|
}
|
||||||
const url = `http://{{IP_ADDRESS}}/state?light=${lightID}`;
|
}).catch(error => console.error(error));
|
||||||
fetch(url).then(response => response.json()).then(data => {
|
}
|
||||||
const pwmValue = ((Math.round((data.curpwm - ((data.curpwm >= {{PWM_MIN}}) ? {{PWM_MIN}} : 0)) / {{PWM_MAX}} * 10000) / 100).toFixed(2));
|
}
|
||||||
console.log('curpwm[' + i + '] = ' + data.curpwm + ' = ' + pwmValue);
|
setInterval(updateLightState, 10000);
|
||||||
pwmElement.innerText = pwmValue.toString();
|
updateLightState();
|
||||||
pwmElement.value = pwmValue;
|
|
||||||
pwmElementTxt.innerText = pwmValue.toString();
|
function updatePWMValues() {
|
||||||
}).catch(error => console.error(error));
|
console.log('----> setting pwm data <----');
|
||||||
}
|
for (let i = 0; i < {{LIGHT_COUNT}}; i++) {
|
||||||
}
|
const lightID = i + 1;
|
||||||
}
|
const pwmElement = document.getElementById(`light${i}_pwm`);
|
||||||
updatePWMValues();
|
const pwmElementTxt = document.getElementById(`light${i}_pwm_txt`);
|
||||||
setInterval(updatePWMValues, 5000);
|
if (pwmElement) {
|
||||||
|
const url = `http://{{IP_ADDRESS}}/state?light=${lightID}`;
|
||||||
// Suche nach allen Links auf der Seite mit IDs von on0_off bis on3_off
|
fetch(url).then(response => response.json()).then(data => {
|
||||||
var links = document.querySelectorAll('[id^="on"][id$="_off"]');
|
const pwmValue = ((Math.round((data.curpwm - ((data.curpwm >= {{PWM_MIN}}) ? {{PWM_MIN}} : 0)) / {{PWM_MAX}} * 10000) / 100).toFixed(2));
|
||||||
// Füge einen Klick-Listener zu jedem Link hinzu
|
console.log('curpwm[' + i + '] = ' + data.curpwm + ' = ' + pwmValue);
|
||||||
links.forEach(function(link) {
|
pwmElement.innerText = pwmValue.toString();
|
||||||
link.addEventListener('click', function(event) {
|
pwmElement.value = pwmValue;
|
||||||
// Verhindere, dass der Link die Seite neu lädt
|
pwmElementTxt.innerText = pwmValue.toString();
|
||||||
event.preventDefault();
|
}).catch(error => console.error(error));
|
||||||
// Extrahiere die Zahl aus der ID des Links
|
}
|
||||||
var id = this.id.replace('on', '').replace('_off', '');
|
}
|
||||||
// Erstelle eine neue Anfrage an die entsprechende URL
|
}
|
||||||
var xhr = new XMLHttpRequest();
|
updatePWMValues();
|
||||||
xhr.open('GET', 'http://{{IP_ADDRESS}}/?on' + id + '=false&transition=' + document.getElementById('transition').value, true);
|
setInterval(updatePWMValues, 5000);
|
||||||
// Sende die Anfrage im Hintergrund
|
|
||||||
xhr.send();
|
// Suche nach allen Links auf der Seite mit IDs von on0_off bis on3_off
|
||||||
updateLightState();
|
var links = document.querySelectorAll('[id^="on"][id$="_off"]');
|
||||||
this.classList.add('pure-button-primary');
|
// Füge einen Klick-Listener zu jedem Link hinzu
|
||||||
document.getElementById('on'+id+'_on').classList.remove('pure-button-primary');
|
links.forEach(function(link) {
|
||||||
});
|
link.addEventListener('click', function(event) {
|
||||||
});
|
// Verhindere, dass der Link die Seite neu lädt
|
||||||
// Suche nach allen Links auf der Seite mit IDs von on0_off bis on3_off
|
event.preventDefault();
|
||||||
var links = document.querySelectorAll('[id^="on"][id$="_on"]');
|
// Extrahiere die Zahl aus der ID des Links
|
||||||
// Füge einen Klick-Listener zu jedem Link hinzu
|
var id = this.id.replace('on', '').replace('_off', '');
|
||||||
links.forEach(function(link) {
|
// Erstelle eine neue Anfrage an die entsprechende URL
|
||||||
link.addEventListener('click', function(event) {
|
var xhr = new XMLHttpRequest();
|
||||||
// Verhindere, dass der Link die Seite neu lädt
|
xhr.open('GET', 'http://{{IP_ADDRESS}}/?on' + id + '=false&transition=' + document.getElementById('transition').value, true);
|
||||||
event.preventDefault();
|
// Sende die Anfrage im Hintergrund
|
||||||
// Extrahiere die Zahl aus der ID des Links
|
xhr.send();
|
||||||
var id = this.id.replace('on', '').replace('_on', '');
|
updateLightState();
|
||||||
// Erstelle eine neue Anfrage an die entsprechende URL
|
this.classList.add('pure-button-primary');
|
||||||
var xhr = new XMLHttpRequest();
|
document.getElementById('on'+id+'_on').classList.remove('pure-button-primary');
|
||||||
xhr.open('GET', 'http://{{IP_ADDRESS}}/?on' + id + '=true&transition=' + document.getElementById('transition').value, true);
|
});
|
||||||
// Sende die Anfrage im Hintergrund
|
});
|
||||||
xhr.send();
|
// Suche nach allen Links auf der Seite mit IDs von on0_off bis on3_off
|
||||||
updateLightState();
|
var links = document.querySelectorAll('[id^="on"][id$="_on"]');
|
||||||
this.classList.add('pure-button-primary');
|
// Füge einen Klick-Listener zu jedem Link hinzu
|
||||||
document.getElementById('on'+id+'_off').classList.remove('pure-button-primary');
|
links.forEach(function(link) {
|
||||||
});
|
link.addEventListener('click', function(event) {
|
||||||
});
|
// Verhindere, dass der Link die Seite neu lädt
|
||||||
</script>
|
event.preventDefault();
|
||||||
|
// Extrahiere die Zahl aus der ID des Links
|
||||||
</div>
|
var id = this.id.replace('on', '').replace('_on', '');
|
||||||
</fieldset>
|
// Erstelle eine neue Anfrage an die entsprechende URL
|
||||||
</body>
|
var xhr = new XMLHttpRequest();
|
||||||
</html>
|
xhr.open('GET', 'http://{{IP_ADDRESS}}/?on' + id + '=true&transition=' + document.getElementById('transition').value, true);
|
||||||
|
// Sende die Anfrage im Hintergrund
|
||||||
|
xhr.send();
|
||||||
|
updateLightState();
|
||||||
|
this.classList.add('pure-button-primary');
|
||||||
|
document.getElementById('on'+id+'_off').classList.remove('pure-button-primary');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Erstellen einer neuen XMLHttpRequest-Instanz
|
||||||
|
var xhr = new XMLHttpRequest();
|
||||||
|
// Angeben der URL und des HTTP-Request-Typs
|
||||||
|
xhr.open('GET', 'http://{{IP_ADDRESS}}/tc_data_edit');
|
||||||
|
// Festlegen der Funktion, die aufgerufen wird, wenn die Anfrage abgeschlossen ist
|
||||||
|
xhr.onload = function() {
|
||||||
|
// Überprüfen, ob die Anfrage erfolgreich war
|
||||||
|
if (xhr.status === 200) {
|
||||||
|
// Fügen Sie den empfangenen HTML-Code in den Container ein
|
||||||
|
document.getElementById('tc-edit-container').innerHTML = xhr.responseText;
|
||||||
|
} else {
|
||||||
|
// Wenn die Anfrage fehlgeschlagen ist, geben Sie einen Fehler aus
|
||||||
|
console.log('Fehler beim Laden der URL: ' + xhr.status);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
// Senden der Anfrage
|
||||||
|
xhr.send();
|
||||||
|
|
||||||
|
</script>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,8 @@
|
||||||
<!-- middle -->
|
<!-- middle -->
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<div id="plot_chart"></div>
|
<div id="plot_chart"></div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</div><!-- end of lights control tab -->
|
</div><!-- end of lights control tab -->
|
||||||
|
|
||||||
<div id="tab-tde"> <!-- timing editor -->
|
|
||||||
Not implemented yet.
|
|
||||||
</div>
|
|
||||||
|
|
|
||||||
227
firmware/html/tc_data_edit.html
Normal file
227
firmware/html/tc_data_edit.html
Normal file
|
|
@ -0,0 +1,227 @@
|
||||||
|
<br>
|
||||||
|
<div id="tc-edit-plotly-graph"></div>
|
||||||
|
<a href="#" onclick="sendTCData()" class="pure-button">Daten senden</a>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
// Variablen für die Datenpunkte des Graphen
|
||||||
|
var dataPoints = [];
|
||||||
|
for (var i = 0; i < 10; i++) {
|
||||||
|
var xValue = i * 2;
|
||||||
|
dataPoints.push({ x: xValue, y: [0, 0, 0, 0] });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Optionen für den Graphen
|
||||||
|
var options = {
|
||||||
|
title: {
|
||||||
|
text: "Graph Title"
|
||||||
|
},
|
||||||
|
data: [{
|
||||||
|
type: "line",
|
||||||
|
dataPoints: dataPoints
|
||||||
|
}]
|
||||||
|
};
|
||||||
|
|
||||||
|
// ID-Präfixe für die Eingabefelder
|
||||||
|
var inputIdPrefixes = ["hour", "minute", "ch1", "ch2", "ch3", "ch4"];
|
||||||
|
|
||||||
|
// Aktuelle Eingabefeld-Daten
|
||||||
|
var inputData = {
|
||||||
|
hour: [],
|
||||||
|
minute: [],
|
||||||
|
ch1: [],
|
||||||
|
ch2: [],
|
||||||
|
ch3: [],
|
||||||
|
ch4: []
|
||||||
|
};
|
||||||
|
|
||||||
|
// initialisiere Graph
|
||||||
|
var trace1 = {
|
||||||
|
x: [], // Uhrzeit
|
||||||
|
y: [], // Wert für ch1
|
||||||
|
mode: 'lines',
|
||||||
|
name: 'ch1'
|
||||||
|
};
|
||||||
|
var trace2 = {
|
||||||
|
x: [], // Uhrzeit
|
||||||
|
y: [], // Wert für ch2
|
||||||
|
mode: 'lines',
|
||||||
|
name: 'ch2'
|
||||||
|
};
|
||||||
|
var trace3 = {
|
||||||
|
x: [], // Uhrzeit
|
||||||
|
y: [], // Wert für ch3
|
||||||
|
mode: 'lines',
|
||||||
|
name: 'ch3'
|
||||||
|
};
|
||||||
|
var trace4 = {
|
||||||
|
x: [], // Uhrzeit
|
||||||
|
y: [], // Wert für ch4
|
||||||
|
mode: 'lines',
|
||||||
|
name: 'ch4'
|
||||||
|
};
|
||||||
|
var data = [trace1, trace2, trace3, trace4];
|
||||||
|
var layout = {
|
||||||
|
xaxis: {
|
||||||
|
title: 'Uhrzeit'
|
||||||
|
},
|
||||||
|
yaxis: {
|
||||||
|
title: 'Wert'
|
||||||
|
},
|
||||||
|
margin: {
|
||||||
|
l: 50,
|
||||||
|
r: 50,
|
||||||
|
b: 50,
|
||||||
|
t: 50,
|
||||||
|
pad: 4
|
||||||
|
},
|
||||||
|
hovermode: 'closest'
|
||||||
|
};
|
||||||
|
Plotly.newPlot('tc-edit-plotly-graph', data, layout);
|
||||||
|
|
||||||
|
// initialisiere Graph
|
||||||
|
var layout = {
|
||||||
|
title: 'Werte der Kanäle ch1 - ch4',
|
||||||
|
xaxis: {
|
||||||
|
title: 'Uhrzeit',
|
||||||
|
range: ['00:00', '23:59'],
|
||||||
|
tickformat: '%H:%M'
|
||||||
|
},
|
||||||
|
yaxis: {
|
||||||
|
title: 'Wert in %',
|
||||||
|
range: [0, 100]
|
||||||
|
}
|
||||||
|
};
|
||||||
|
var plotDiv = document.getElementById('plot');
|
||||||
|
Plotly.newPlot(plotDiv, [], layout, {responsive: true});
|
||||||
|
|
||||||
|
// initialisiere Graph
|
||||||
|
var data = [ { x: ['00:00', '02:00', '04:00', '06:00', '08:00', '10:00', '12:00', '14:00', '16:00', '18:00'],
|
||||||
|
y: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
|
name: 'Channel 1',
|
||||||
|
mode: 'lines+markers',
|
||||||
|
line: {
|
||||||
|
shape: 'spline'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
x: ['00:00', '02:00', '04:00', '06:00', '08:00', '10:00', '12:00', '14:00', '16:00', '18:00'],
|
||||||
|
y: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
|
name: 'Channel 2',
|
||||||
|
mode: 'lines+markers',
|
||||||
|
line: {
|
||||||
|
shape: 'spline'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
x: ['00:00', '02:00', '04:00', '06:00', '08:00', '10:00', '12:00', '14:00', '16:00', '18:00'],
|
||||||
|
y: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
|
name: 'Channel 3',
|
||||||
|
mode: 'lines+markers',
|
||||||
|
line: {
|
||||||
|
shape: 'spline'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
x: ['00:00', '02:00', '04:00', '06:00', '08:00', '10:00', '12:00', '14:00', '16:00', '18:00'],
|
||||||
|
y: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
|
name: 'Channel 4',
|
||||||
|
mode: 'lines+markers',
|
||||||
|
line: {
|
||||||
|
shape: 'spline'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
var layout = {
|
||||||
|
xaxis: {
|
||||||
|
title: 'Time (hh:mm)',
|
||||||
|
showgrid: false,
|
||||||
|
zeroline: false
|
||||||
|
},
|
||||||
|
yaxis: {
|
||||||
|
title: 'Value (%)',
|
||||||
|
showline: false
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
Plotly.newPlot('graph', data, layout);
|
||||||
|
|
||||||
|
// initialisiere Graph
|
||||||
|
var layout = {
|
||||||
|
title: 'Graph',
|
||||||
|
xaxis: {
|
||||||
|
title: 'Uhrzeit'
|
||||||
|
},
|
||||||
|
yaxis: {
|
||||||
|
title: 'Prozent'
|
||||||
|
},
|
||||||
|
hovermode: 'closest'
|
||||||
|
};
|
||||||
|
|
||||||
|
var plot_data = [{ x: [],
|
||||||
|
y: [],
|
||||||
|
mode: 'lines+markers',
|
||||||
|
line: { shape: 'spline' }
|
||||||
|
}];
|
||||||
|
|
||||||
|
Plotly.newPlot('graph', plot_data, layout);
|
||||||
|
|
||||||
|
// Funktion zum Aktualisieren der Daten
|
||||||
|
function updateData() {
|
||||||
|
// Schleife über alle Eingabefelder für die Uhrzeit
|
||||||
|
for (let i = 0; i < 10; i++) {
|
||||||
|
// Uhrzeit aus den Eingabefeldern auslesen
|
||||||
|
let hour = document.getElementById(`hour-${i}`).value;
|
||||||
|
let minute = document.getElementById(`minute-${i}`).value;
|
||||||
|
|
||||||
|
// Schleife über alle Eingabefelder für die Kanäle
|
||||||
|
for (let j = 1; j <= 4; j++) {
|
||||||
|
// Wert aus dem Eingabefeld auslesen
|
||||||
|
let value = parseFloat(document.getElementById(`ch${j}-${i}`).value);
|
||||||
|
|
||||||
|
// Datenpunkt aktualisieren
|
||||||
|
let index = i * 4 + (j - 1);
|
||||||
|
data[index].x = `${hour}:${minute}`;
|
||||||
|
data[index].y = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Daten im Graph aktualisieren
|
||||||
|
Plotly.update('graph', data, layout);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Event-Listener für alle Eingabefelder registrieren
|
||||||
|
for (let i = 0; i < 10; i++) {
|
||||||
|
// Uhrzeit-Eingabefelder
|
||||||
|
document.getElementById(`hour-${i}`).addEventListener('input', updateData);
|
||||||
|
document.getElementById(`minute-${i}`).addEventListener('input', updateData);
|
||||||
|
|
||||||
|
// Kanal-Eingabefelder
|
||||||
|
for (let j = 1; j <= 4; j++) {
|
||||||
|
document.getElementById(`ch${j}-${i}`).addEventListener('input', updateData);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function sendTCData() {
|
||||||
|
// Sammle Daten aus Eingabefeldern
|
||||||
|
var data = [];
|
||||||
|
for (var i = 0; i < 10; i++) {
|
||||||
|
var hh = document.getElementById("hh_" + i).value;
|
||||||
|
var mm = document.getElementById("mm_" + i).value;
|
||||||
|
var ch1 = document.getElementById("ch1_" + i).value;
|
||||||
|
var ch2 = document.getElementById("ch2_" + i).value;
|
||||||
|
var ch3 = document.getElementById("ch3_" + i).value;
|
||||||
|
var ch4 = document.getElementById("ch4_" + i).value;
|
||||||
|
data.push({ "hh": hh, "mm": mm, "ch1": ch1, "ch2": ch2, "ch3": ch3, "ch4": ch4 });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Codiere Daten als JSON und URL-encode
|
||||||
|
var jsonData = encodeURIComponent(JSON.stringify(data));
|
||||||
|
|
||||||
|
// Sende Daten an Server
|
||||||
|
var xhr = new XMLHttpRequest();
|
||||||
|
xhr.open("POST", "http://{{IP_ADDRESS}}}}/tc_data_block_store?data=" + jsonData);
|
||||||
|
xhr.send();
|
||||||
|
}
|
||||||
|
|
||||||
|
</script>
|
||||||
|
|
@ -371,7 +371,7 @@ bool tc_check_no_data_block()
|
||||||
uint8_t e = EEPROM.read(EEPROM_TIMING_DATA_ADDRESS);
|
uint8_t e = EEPROM.read(EEPROM_TIMING_DATA_ADDRESS);
|
||||||
//Serial.println(e);
|
//Serial.println(e);
|
||||||
|
|
||||||
if (e == 255)
|
if (e > 23) // the maximum value for tis memory section is 23
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
@ -416,12 +416,60 @@ void tc_jsonDataBlocksToEEPROM(String json_data_string)
|
||||||
for (uint8_t i = 0; i < NUMBER_OF_TIMER_DATA_BLOCKS; i++)
|
for (uint8_t i = 0; i < NUMBER_OF_TIMER_DATA_BLOCKS; i++)
|
||||||
{
|
{
|
||||||
JsonObject obj = doc[i];
|
JsonObject obj = doc[i];
|
||||||
tc_data[i].hh = obj["hour"];
|
|
||||||
tc_data[i].mm = obj["min"];
|
// Check and set the limits of the hour value
|
||||||
tc_data[i].ch1 = obj["ch1"];
|
int hour = obj["hour"];
|
||||||
tc_data[i].ch2 = obj["ch2"];
|
if (hour < 0) {
|
||||||
tc_data[i].ch3 = obj["ch3"];
|
hour = 0;
|
||||||
tc_data[i].ch4 = obj["ch4"];
|
} else if (hour > 23) {
|
||||||
|
hour = 23;
|
||||||
|
}
|
||||||
|
tc_data[i].hh = hour;
|
||||||
|
|
||||||
|
// Check and set the limits of the minute value
|
||||||
|
int minute = obj["min"];
|
||||||
|
if (minute < 0) {
|
||||||
|
minute = 0;
|
||||||
|
} else if (minute > 59) {
|
||||||
|
minute = 59;
|
||||||
|
}
|
||||||
|
tc_data[i].mm = minute;
|
||||||
|
|
||||||
|
// Check and set the limits of the ch1 value
|
||||||
|
int ch1 = obj["ch1"];
|
||||||
|
if (ch1 < 0) {
|
||||||
|
ch1 = 0;
|
||||||
|
} else if (ch1 > 255) {
|
||||||
|
ch1 = 255;
|
||||||
|
}
|
||||||
|
tc_data[i].ch1 = ch1;
|
||||||
|
|
||||||
|
// Check and set the limits of the ch2 value
|
||||||
|
int ch2 = obj["ch2"];
|
||||||
|
if (ch2 < 0) {
|
||||||
|
ch2 = 0;
|
||||||
|
} else if (ch2 > 255) {
|
||||||
|
ch2 = 255;
|
||||||
|
}
|
||||||
|
tc_data[i].ch2 = ch2;
|
||||||
|
|
||||||
|
// Check and set the limits of the ch3 value
|
||||||
|
int ch3 = obj["ch3"];
|
||||||
|
if (ch3 < 0) {
|
||||||
|
ch3 = 0;
|
||||||
|
} else if (ch3 > 255) {
|
||||||
|
ch3 = 255;
|
||||||
|
}
|
||||||
|
tc_data[i].ch3 = ch3;
|
||||||
|
|
||||||
|
// Check and set the limits of the ch4 value
|
||||||
|
int ch4 = obj["ch4"];
|
||||||
|
if (ch4 < 0) {
|
||||||
|
ch4 = 0;
|
||||||
|
} else if (ch4 > 255) {
|
||||||
|
ch4 = 255;
|
||||||
|
}
|
||||||
|
tc_data[i].ch4 = ch4;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write the tc_data array to the EEPROM
|
// Write the tc_data array to the EEPROM
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,10 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
cat $1 | sed -e"s/^ *//ig" | sed -e "s/^\/\/.*//ig" | sed -e "s/ \/\/ .*//ig" | sed -E '/^\s*$/d' | sed '/^[[:space:]]*$/d'
|
# Remove leading whitespace and comments starting with //
|
||||||
|
sed -e 's/^[[:space:]]*//' -e '/^\/\/.*/d' $1 |
|
||||||
|
# Remove one line comments starting with //
|
||||||
|
sed -e 's/^\/\/.*$//' |
|
||||||
|
# Remove trailing comments starting with //
|
||||||
|
sed -e 's/ \/\/.*$//' |
|
||||||
|
# Remove empty lines
|
||||||
|
sed '/^\s*$/d'
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue