merged dev

This commit is contained in:
2024-02-11 21:50:56 +00:00
10 changed files with 457 additions and 1555 deletions

File diff suppressed because one or more lines are too long

View File

@@ -4,9 +4,6 @@
<title>eMAKER Printer Climate Control</title>
<!--Import Google Icon Font-->
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
<!--Import materialize.css-->
<link type="text/css" rel="stylesheet" href="css/materialize.min.css" media="screen,projection" />
<!--Let browser know website is optimized for mobile-->
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta charset="utf-8" />
@@ -26,140 +23,14 @@
</div>
<!-- Data row-->
<div class="row">
<div class="card light-blue darken-3">
<div class="card-tabs">
<ul class="tabs tabs-transparent">
<li class="tab col s12 m6 l3"><a href="#tabValues">Values</a>
</li>
<li class="tab col s12 m6 l3"><a href="#tabSettings">Settings</a>
</li>
</ul>
</div>
<div class="card-content white">
<div id="tabValues" class="active">
<div class="row">
<div class="col s12 m6 l3">
<div class="card light-blue darken-3 z-depth-3">
<div class="card-content white-text">
<span class="card-title">Temperature</span>
<div class="input-field">
<input disabled id="tempinfo" type="number" value="-1" />
</div>
</div>
</div>
</div>
<div class="col s12 m6 l3">
<div class="card light-blue darken-3 z-depth-3">
<div class="card-content white-text">
<span class="card-title">Humidity</span>
<div class="input-field">
<input disabled id="humidityinfo" type="number" value="-1" />
</div>
</div>
</div>
</div>
<div class="col s12 m6 l3">
<div class="card light-blue darken-3 z-depth-3">
<div class="card-content white-text">
<span class="card-title">Pressure</span>
<div class="input-field">
<input disabled id="pressureinfo" type="number" value="-1" />
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col s12 m6 l3">
<div class="card light-blue darken-3 z-depth-3">
<div class="card-content white-text">
<span class="card-title">Layers</span>
<div class="input-field">
<input disabled id="layersinfo" type="number" value="-1" />
<label for="layersinfo">Layer count</label>
</div>
</div>
<div class="card-action">
<a id="resetLayers" href="#">Reset</a>
</div>
</div>
</div>
</div>
</div>
<div id="tabSettings">
<div class="row">
<div class="col s12 m6 l3"><!-- Process settings -->
<div class="card light-blue darken-3 z-depth-3">
<div class="card-content white-text">
<span class="card-title">Settings</span>
<div class="input-field">
<input id="Iim" type="number" value="-1" />
<label for="Iim">Lower current</label>
</div>
<div class="input-field">
<input id="Imp" type="number" value="-1" />
<label for="Imp">Upper Current</label>
</div>
<div class="input-field">
<input id="Tu" type="number" value="-1" />
<label for="Tu">Upper Temperature</label>
</div>
<div class="input-field">
<input id="Tl" type="number" value="-1" />
<label for="Tl">Lower Temperature</label>
</div>
</div>
<div class="card-action">
<a class="waves-effect waves-light btn" id="btnSetParams" onclick="setParams()">Submit</a>
</div>
</div>
</div>
<div class="col s12 m6 l3"><!-- Connect to network-->
<div class="card light-blue darken-3 z-depth-3">
<div class="card-content white-text">
<span class="card-title">Network</span>
<div class="input-field">
<input id="ssid" type="text" value="" />
<label for="ssid">SSID</label>
</div>
<div class="input-field">
<input id="pass" type="text" value="" />
<label for="pass">Password</label>
</div>
<div class="input-field">
<input id="ip" type="text" value="192.168.0.2" />
<label for="ip">IP Address</label>
</div>
<div class="input-field">
<input id="gateway" type="text" value="192.168.0.1" />
<label for="gateway">Gateway IP</label>
</div>
<div class="card-action">
<a class="waves-effect waves-light btn" id="btnSetParams" onclick="joinNetwork()">Submit</a>
</div>
</div>
</div>
</div>
<div class="col s12 m6 l3"><!-- Connect to network-->
<div class="card light-blue darken-3 z-depth-3">
<div class="card-content white-text">
<span class="card-title">Networks</span>
<table id="networks">
</table>
<div class="card-action">
<a class="waves-effect waves-light btn" id="btnSetParams" onclick="scanNetworks()">Scan</a>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="card">
<div class="card-content">
<a href="/wifimanager.html">WiFi</a>
</div>
</div>
</div>
</div>
<script type="text/javascript" src="js/aja.min.js"></script>
<script type="text/javascript" src="js/materialize.min.js"></script>
<script type="text/javascript" src="js/scripts.js"></script>
</body>
</html>

9
data/js/aja.min.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,45 +1,64 @@
var _elapsedTime = 0;
function getParams() {
aja()
.url('/params')
.on('success', function (data) {
document.getElementById('Iim').value = data.Iim || -1;
document.getElementById('Imp').value = data.Imp || -1;
document.getElementById('Tu').value = data.Tu || -1;
document.getElementById('Tl').value = data.Tl || -1;
M.updateTextFields();
})
.go();
const url = '/paraams';
fetch(url)
.then((respone)=>{
return respone.json();
})
.then((data)=>{
document.getElementById('Iim').value = data.Iim || -1;
document.getElementById('Imp').value = data.Imp || -1;
document.getElementById('Tu').value = data.Tu || -1;
document.getElementById('Tl').value = data.Tl || -1;
M.updateTextFields();
})
}
function setParams() {
aja()
.method('post')
.url('/params')
.data({ Iim: document.getElementById('Iim').value, Imp: document.getElementById('Imp').value, Tu: document.getElementById('Tu').value, Tl: document.getElementById('Tl').value})
.go();
const data = new URLSearchParams();
data.append('Iim',document.getElementById('Iim').value);
data.append('Imp',document.getElementById('Imp').value);
data.append('Tu',document.getElementById('Tu').value);
data.append('Tl',document.getElementById('Tl').value);
fetch('/params', {
method: 'POST',
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
},
body: data
})
}
function joinNetwork() {
aja()
.method('post')
.url('/setWiFi')
.data({ ssid: document.getElementById('ssid').value, pass: document.getElementById('pass').value, ip: document.getElementById('ip').value, gateway: document.getElementById('gateway').value})
.go();
const data = new URLSearchParams();
data.append('ssid', document.getElementById("ssid").value);
data.append('pass', document.getElementById("pass").value);
data.append('gateway', document.getElementById("gateway").value);
data.append('ip', document.getElementById("ip").value);
fetch('/setWiFi', {
method: 'POST',
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
},
body: data
})
}
function scanNetworks() {
aja()
.url('/scanNetworks')
.on('success', function (data) {
var listHTML = "";
data.forEach((network)=>{
listHTML += '<tr><td>'+network.ssid+'</td><td>'+network.channel+'</td><td>'+network.rssi+'</td></tr>';
});
document.getElementById("networks").innerHTML = listHTML;
})
.go();
async function scanNetworks() {
let raw = await fetch("/scanNetworks");
let data = await raw.json();
var listHTML = "";
data.forEach((network)=>{
listHTML += '<tr><td>'+network.ssid+'</td><td>'+network.channel+'</td><td>'+network.rssi+'</td></tr>';
});
document.getElementById("networks").innerHTML = listHTML;
}
setInterval(function () {

32
data/wifimanager.html Normal file
View File

@@ -0,0 +1,32 @@
<!DOCTYPE html>
<html>
<head>
<title>ESP Wi-Fi Manager</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" href="data:,">
<link rel="stylesheet" type="text/css" href="style.css">
</head>
<body>
<div class="topnav">
<h1>ESP Wi-Fi Manager</h1>
</div>
<div class="content">
<div class="card-grid">
<div class="card">
<p>
<label for="ssid">SSID</label>
<input type="text" id ="ssid" name="ssid"><br>
<label for="pass">Password</label>
<input type="text" id ="pass" name="pass"><br>
<label for="ip">IP Address</label>
<input type="text" id ="ip" name="ip" value="192.168.1.200"><br>
<label for="gateway">Gateway Address</label>
<input type="text" id ="gateway" name="gateway" value="192.168.1.1"><br>
<button type ="submit" onClick="joinNetwork()" value ="Submit">
</p>
</div>
</div>
</div>
<script type="text/javascript" src="js/scripts.js"></script>
</body>
</html>