github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-26 04:11:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Month plot fix and some other things

Browse Source
This commit is contained in:
Gunnar Skjold
2022-01-08 10:13:02 +01:00
parent 8fe1a1edf2
commit 327fed6f08
11 changed files with 140 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
web/application.js
View File

@@ -754,6 +754,30 @@ var fetch = function() {
$('.jc').addClass('text-danger');
}
var mt = parseInt(json.mt);
switch(mt) {
case 1:
$('.jmt').html("Aidon");
break;
case 2:
$('.jmt').html("Kaifa");
break;
case 3:
$('.jmt').html("Kamstrup");
break;
case 8:
$('.jmt').html("Iskra");
break;
case 9:
$('.jmt').html("Landis");
break;
case 10:
$('.jmt').html("Sagecom");
break;
default:
$('.jmt').html("");
}
setTimeout(fetch, interval);
var price = parseFloat(json.p);

3
web/data.json
View File

@@ -31,5 +31,6 @@
"mm" : %d,
"me" : %d,
"p" : %s,
"c" : %lu
"c" : %lu,
"mt" : %d
}

9
web/debugging.html
View File

@@ -1,4 +1,10 @@
<div class="alert alert-warning">!!NOTE!!<br/>Telnet debugging is not considered safe and should be switched off when not in use</div>
<div class="alert alert-danger">
!!WARNING!!<br/>
Telnet debugging is not considered safe and should be switched off when not in use.<br/>
<br/>
!!WARNING!!<br/>
Enabling debugging can cause sudden reboots. Do not leave this on unless you are debugging!
</div>
<form method="post" action="/save">
<input type="hidden" name="debugConfig" value="true"/>
<div class="my-3 p-3 bg-white rounded shadow">
@@ -15,6 +21,7 @@
<label class="col-6">Debug level</label>
<div class="col-6">
<select class="form-control form-control-sm" name="debugLevel">
<option value="1" ${config.debugLevel1}>Verbose</option>
<option value="2" ${config.debugLevel2}>Debug</option>
<option value="3" ${config.debugLevel3}>Info</option>
<option value="4" ${config.debugLevel4}>Warning</option>

5
web/foot.html
View File

@@ -10,10 +10,9 @@
</div>
</div>
<script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"></script>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script src="https://www.gstatic.com/charts/loader.js"></script>
<script src="application-${version}.js"></script>

4
web/head32.html
View File

@@ -52,7 +52,7 @@
<ul class="navbar-nav bd-navbar-nav flex-row">
<li class="nav-item">
<div class="dropdown">
<a class="dropdown-toggle nav-link" href="#" role="button" id="config-link" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="dropdown-toggle nav-link" href="#" role="button" id="config-link" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Config<span class="d-none d-md-inline d-lg-none d-xl-inline">uration</span>
</a>
@@ -70,7 +70,7 @@
</li>
<li class="nav-item">
<div class="dropdown">
<a class="dropdown-toggle nav-link" href="#" role="button" id="system-link" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="dropdown-toggle nav-link" href="#" role="button" id="system-link" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Sys<span class="d-none d-sm-inline">tem</span>
</a>
<div class="dropdown-menu" aria-labelledby="system-link">

4
web/head8266.html
View File

@@ -52,7 +52,7 @@
<ul class="navbar-nav bd-navbar-nav flex-row">
<li class="nav-item">
<div class="dropdown">
<a class="dropdown-toggle nav-link" href="#" role="button" id="config-link" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="dropdown-toggle nav-link" href="#" role="button" id="config-link" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Config<span class="d-none d-md-inline d-lg-none d-xl-inline">uration</span>
</a>
@@ -69,7 +69,7 @@
</li>
<li class="nav-item">
<div class="dropdown">
<a class="dropdown-toggle nav-link" href="#" role="button" id="system-link" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="dropdown-toggle nav-link" href="#" role="button" id="system-link" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Sys<span class="d-none d-sm-inline">tem</span>
</a>
<div class="dropdown-menu" aria-labelledby="system-link">

17
web/index.html
View File

@@ -1,21 +1,21 @@
<div class="bg-white rounded shadow p-1 mb-3">
<div class="row">
<div class="col-md-2 col-6">
<div class="d-flex flex-wrap">
<div class="flex-fill">
<div class="text-center">Up <span class="ju">{cs}</span></div>
</div>
<div class="col-md-3 col-6 rt ">
<div class="flex-fill rt">
<div class="text-center">Temperature: <span class="jt">{temp}</span>&deg;C</div>
</div>
<div class="col-md-2 col-6 rv">
<div class="flex-fill rv">
<div class="text-center">ESP volt: <span class="jv">{vcc}</span>V</div>
</div>
<div class="col-md-3 col-6">
<div class="flex-fill">
<div class="text-center">WiFi RSSI: <span class="jr">{rssi}</span>dBm</div>
</div>
<div class="col-md-2 col-6">
<div class="flex-fill">
<div class="text-center">Free mem: <span class="jm">{mem}</span>kb</div>
</div>
<div class="col-md-3 col-6 rc">
<div class="flex-fill rc">
<div class="text-center"><span class="jc"></span></div>
</div>
</div>
@@ -34,7 +34,8 @@
</span>
</div>
<div class="row ric" style="display: {da};">
<div class="col-12 text-right"><span class="jic">{tPI}</span> kWh</div>
<div class="col-5"><span class="jmt"></span></div>
<div class="col-7 text-right"><span class="jic">{tPI}</span> kWh</div>
</div>
</div>
</div>