From 51403875387fac6efb86ae704b4190ab4370adea Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 25 Aug 2022 15:28:19 +0200 Subject: [PATCH] reworked web interface with new design --- HTML/app/set_app.html | 23 -- HTML/control.html | 76 +++++ HTML/head.inc | 7 - HTML/{new => }/iconsfont.css | 0 HTML/{new => }/iconsfont.woff2 | Bin HTML/index.html | 78 ++---- HTML/ioscr.js | 230 --------------- HTML/main.js | 157 +++++++++++ HTML/new/index.html | 143 ---------- HTML/new/ioscr.js | 491 --------------------------------- HTML/new/logo.png | Bin 15681 -> 0 bytes HTML/new/main.js | 27 -- HTML/{sys => }/reboot.html | 0 HTML/res.js | 115 ++++++++ HTML/set_eth.html | 40 +++ HTML/set_gprs.html | 42 +++ HTML/set_mqtt.html | 46 +++ HTML/set_sys.html | 50 ++++ HTML/set_time.html | 49 ++++ HTML/set_wifi.html | 48 ++++ HTML/style.css | 51 ---- HTML/{new => }/styles.css | 59 ++-- HTML/sys/control.html | 30 -- HTML/sys/set_eth.html | 28 -- HTML/sys/set_gprs.html | 30 -- HTML/sys/set_lora.html | 27 -- HTML/sys/set_mqtt.html | 35 --- HTML/sys/set_sys.html | 40 --- HTML/sys/set_time.html | 41 --- HTML/sys/set_wifi.html | 39 --- HTML/sys/stats.html | 51 ---- 31 files changed, 674 insertions(+), 1379 deletions(-) delete mode 100644 HTML/app/set_app.html create mode 100644 HTML/control.html delete mode 100644 HTML/head.inc rename HTML/{new => }/iconsfont.css (100%) rename HTML/{new => }/iconsfont.woff2 (100%) delete mode 100644 HTML/ioscr.js create mode 100644 HTML/main.js delete mode 100644 HTML/new/index.html delete mode 100644 HTML/new/ioscr.js delete mode 100644 HTML/new/logo.png delete mode 100644 HTML/new/main.js rename HTML/{sys => }/reboot.html (100%) create mode 100644 HTML/res.js create mode 100644 HTML/set_eth.html create mode 100644 HTML/set_gprs.html create mode 100644 HTML/set_mqtt.html create mode 100644 HTML/set_sys.html create mode 100644 HTML/set_time.html create mode 100644 HTML/set_wifi.html delete mode 100644 HTML/style.css rename HTML/{new => }/styles.css (86%) delete mode 100644 HTML/sys/control.html delete mode 100644 HTML/sys/set_eth.html delete mode 100644 HTML/sys/set_gprs.html delete mode 100644 HTML/sys/set_lora.html delete mode 100644 HTML/sys/set_mqtt.html delete mode 100644 HTML/sys/set_sys.html delete mode 100644 HTML/sys/set_time.html delete mode 100644 HTML/sys/set_wifi.html delete mode 100644 HTML/sys/stats.html diff --git a/HTML/app/set_app.html b/HTML/app/set_app.html deleted file mode 100644 index 238591b..0000000 --- a/HTML/app/set_app.html +++ /dev/null @@ -1,23 +0,0 @@ -~inc:head.inc~ - -
- -
-
-
-Settings|App[~dname~] -
-

-
- - -
ID устройства:~serial~
-
-
- -
-
-
-
- - \ No newline at end of file diff --git a/HTML/control.html b/HTML/control.html new file mode 100644 index 0000000..a9ed41e --- /dev/null +++ b/HTML/control.html @@ -0,0 +1,76 @@ + + + + + + + + + + ~name~ + + + + +
+
+ + + + + + + + + + + + + +
Ethernet:?
WiFi:?
GPRS:?
LoRaWAN:?
Основной адаптер:?
MQTT соединение 1:?
MQTT соединение 2:?
Свободной памяти:?
Минимум памяти:?
+
+
+
+ +

+ +

+ +

+ +

+ +

+ +

+
+
+
+
+ + + \ No newline at end of file diff --git a/HTML/head.inc b/HTML/head.inc deleted file mode 100644 index ffb314d..0000000 --- a/HTML/head.inc +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - -СПИ "CityLink" diff --git a/HTML/new/iconsfont.css b/HTML/iconsfont.css similarity index 100% rename from HTML/new/iconsfont.css rename to HTML/iconsfont.css diff --git a/HTML/new/iconsfont.woff2 b/HTML/iconsfont.woff2 similarity index 100% rename from HTML/new/iconsfont.woff2 rename to HTML/iconsfont.woff2 diff --git a/HTML/index.html b/HTML/index.html index 7f5a050..5463419 100644 --- a/HTML/index.html +++ b/HTML/index.html @@ -1,51 +1,29 @@ -~inc:head.inc~ - -
- -
-
-Home|State[?] -
-
-
Your device name'
 -?
-Время работы:?

-Уровень WiFi:?
-
-
-
- - + + + + + + + + + + ~name~ + + + + +
+
+
+ + +
~name~
+
+
+
+ + \ No newline at end of file diff --git a/HTML/ioscr.js b/HTML/ioscr.js deleted file mode 100644 index 0def4a0..0000000 --- a/HTML/ioscr.js +++ /dev/null @@ -1,230 +0,0 @@ -function PostData(data,page,conf,alrt,reld) { -if(conf){if (!confirm(conf)) return;} -var xhr = new XMLHttpRequest(); -xhr.open('POST',page, true); -xhr.timeout = 5000; -xhr.send(data); -xhr.onreadystatechange = function() { -if (xhr.readyState != 4) return; -if (xhr.status != 200) {alert(xhr.status+': '+xhr.statusText);} -else {if(reld)location.reload(); -if(alrt) alert(alrt); -}}} - -function GetDataFile(file, callback) { -var xhr = new XMLHttpRequest(); -xhr.overrideMimeType("application/json"); -xhr.open("GET", file, true); -xhr.onreadystatechange = function() {if (xhr.readyState === 4 && xhr.status == "200") {callback(xhr.responseText);}} -xhr.timeout = 5000; -xhr.send(null); -} - -function PrintMenu(){ -document.write("
");} - -function PrintIPInput(title,name,value){document.write(""+title+"");} -function PrintMACInput(title,name,value){document.write(""+title+"");} -function PrintTextInput(title,name,value,min,max){document.write(""+title+"");} -function PrintHexInput(title,name,value,min,max){document.write(""+title+"");} -function PrintTextInputNoReg(title,name,value,min,max){document.write(""+title+"");} -function PrintLabel(title,value){document.write(""+title+""+value+"");} -function PrintSpanLabel(title,idx){document.write(""+title+"?");} -function PrintCheckBox(title,name,checked,action){document.write(""+title+"");} -function PrintInt(title,name,value,min,max){document.write(""+title+"");} -function PrintIntId(title,id,value,min,max){document.write(""+title+"");} -function PrintSep(){document.write("");} -function PrintSaveBtn(){document.write("
");} -function PrintSaveFail(isfail){document.write("

Неверный формат данных!


");} - -function sndtmr() -{ -var body = ''; -var body2 = ''; -//var ofc = (new Date).getTimezoneOffset()*60; -var ofc = 0; -for(i=1;i<9;++i) - { - body += GetInterface(i); - if(i<8) body +='&'; - } -for(i=9;i<17;++i) - { - body2 += GetInterface(i); - if(i<16) body2 +='&'; - } -function GetInterface(n) { - var s = ''; - - s+='tm'+i+'='+ ( +Date.parse(document.getElementById('tdp'+n).value)/1000 + ofc); - s+= '%'+ ((document.getElementsByName('enb'+n)[0].checked) ? '1':'0').toString(); - s+= '%'+ ((document.getElementsByName('act'+n)[0].value == 'on') ? '1':'0').toString(); - s+= '%'+ (document.getElementsByName('prd'+n)[0].value).toString(); - return s; -} - -var xhr2 = new XMLHttpRequest(); -var xhr = new XMLHttpRequest(); -xhr.open('POST', 'index42.html', true); -xhr.send(body); - -xhr.onreadystatechange = function() { -if (xhr.readyState != 4) return; - -if (xhr.status != 200) { -alert(xhr.status + ': ' + xhr.statusText); -} else { -xhr2.open('POST', 'index42.html', true); -xhr2.send(body2); -} -} - -xhr2.onreadystatechange = function() { -if (xhr2.readyState != 4) return; -if (xhr2.status != 200) { -alert(xhr2.status + ': ' + xhr2.statusText); -} else { -alert('Timer settings saved') -location.reload(); -} -} - -} -function ClickCheckbox() -{ -for(i=1;i<17;++i) -{ -var st = !document.getElementsByName('enb'+i)[0].checked; -document.getElementById('tdp'+i).disabled = st; -document.getElementsByName('prd'+i)[0].disabled = st; -document.getElementsByName('act'+i)[0].disabled = st; -} -} - - -function configIPBoxes() { -e = document.forms.conf; -var ap = document.getElementsByName('netm'); -st = e.dhcp.checked; -function apmode(m){ -e.wfiap.disabled = m; -e.wfpap.disabled = m; -e.ipaap.disabled = m; -} -function clnmode(m){ -e.wfi.disabled = m; -e.wfp.disabled = m; -e.ipa.disabled = m; -e.mas.disabled = m; -e.gte.disabled = m; -} -if(ap[0].checked){ -apmode(true); -clnmode(false); -e.ipa.disabled = st; -e.mas.disabled = st; -e.gte.disabled = st; -} -if(ap[1].checked){ -apmode(false); -clnmode(true); -} -} - -function configIPBoxes2() { -e = document.forms.conf; -st2 = e.tsen.checked; -e.tsr.disabled = !st2; -st3 = e.clen.checked; -e.cld.disabled = !st3; -e.idd.disabled = !st3; -e.top.disabled = !st3; -e.prt.disabled = !st3; -e.clnm.disabled = !st3; -e.clps.disabled = !st3; -e.ssen.disabled = !st3; -} - -function configIPBoxesOCPP() { -e = document.forms.conf; -} - -function UnixToStr(t, base, sec) -{ -if(t.lenth < 10) t = '000000000'; -var d; -if (base == 16) d = new Date(parseInt(t,16)*1000); -else d = new Date(parseInt(t,10)*1000); -var dd = d.getDate(); if (dd < 10) dd = '0' + dd; -var mm = d.getMonth() + 1; if (mm < 10) mm = '0' + mm; -var yy = d.getFullYear() % 100; if (yy < 10) yy = '0' + yy; -var h = d.getHours(); if (h < 10) h = '0' + h; -var m = d.getMinutes(); if (m < 10) m = '0' + m; -var s = d.getSeconds(); if (s < 10) s = '0' + s; -d=yy+'/'+mm+'/'+dd+' '+h+':'+m; -if(sec==1) d+=':'+s; -return d; -} - -function FloatToString(f) -{ -var buffer = new ArrayBuffer(4); -var bytes = new Uint8Array(buffer); -var doubles = new Float32Array(buffer); -bytes[3] = '0x'+f.substr(6,2); -bytes[2] = '0x'+f.substr(4,2); -bytes[1] = '0x'+f.substr(2,2); -bytes[0] = '0x'+f.substr(0,2); -return doubles[0]; -} - -function sendtime() { -var ut = Date.parse(new Date( Date.parse(document.getElementById('curdt').value)))/1000; -var xhr = new XMLHttpRequest(); -xhr.open('POST', 'index23.html', true); -var body = 'timenow=' + ut; -xhr.send(body); -xhr.onreadystatechange = function() { -if (xhr.readyState != 4) return; -if (xhr.status != 200) { -alert(xhr.status + ': ' + xhr.statusText); -} else { -alert('Time changed'); -} -} -} - -function Pst(Rqv,Pag,Conf){ -if (confirm(Conf)) { -var xhr = new XMLHttpRequest(); -xhr.open('POST',Pag, true); -xhr.send(Rqv); -xhr.onreadystatechange = function() { -if (xhr.readyState != 4) return; -if (xhr.status != 200) { -alert(xhr.status + ': ' + xhr.statusText); -} else { -location.reload(); -} -} -} -} - diff --git a/HTML/main.js b/HTML/main.js new file mode 100644 index 0000000..85fec9d --- /dev/null +++ b/HTML/main.js @@ -0,0 +1,157 @@ +function PostData(data,page,conf,alrt,reld) { +if(conf){if (!confirm(conf)) return;} +var xhr = new XMLHttpRequest(); +xhr.open('POST',page, true); +xhr.timeout = 5000; +xhr.send(data); +xhr.onreadystatechange = function() { +if (xhr.readyState != 4) return; +if (xhr.status != 200) {alert(xhr.status+': '+xhr.statusText);} +else {if(reld)location.reload(); +if(alrt) alert(alrt); +}}} + +function GetDataFile(file, callback) { +var xhr = new XMLHttpRequest(); +xhr.overrideMimeType("application/json"); +xhr.open("GET", file, true); +xhr.onreadystatechange = function() {if (xhr.readyState === 4 && xhr.status == "200") {callback(xhr.responseText);}} +xhr.timeout = 5000; +xhr.send(null); +} + +function configIPBoxes() { +e = document.forms.conf; +var ap = document.getElementsByName('netm'); +st = e.dhcp.checked; +function apmode(m){ +e.wfiap.disabled = m; +e.wfpap.disabled = m; +e.ipaap.disabled = m; +} +function clnmode(m){ +e.wfi.disabled = m; +e.wfp.disabled = m; +e.ipa.disabled = m; +e.mas.disabled = m; +e.gte.disabled = m; +} +if(ap[0].checked){ +apmode(true); +clnmode(false); +e.ipa.disabled = st; +e.mas.disabled = st; +e.gte.disabled = st; +} +if(ap[1].checked){ +apmode(false); +clnmode(true); +} +} + +function configIPBoxes2() { +e = document.forms.conf; +st2 = e.tsen.checked; +e.tsr.disabled = !st2; +st3 = e.clen.checked; +e.cld.disabled = !st3; +e.idd.disabled = !st3; +e.top.disabled = !st3; +e.prt.disabled = !st3; +e.clnm.disabled = !st3; +e.clps.disabled = !st3; +e.ssen.disabled = !st3; +} + +function configIPBoxesOCPP() { +e = document.forms.conf; +} + +function UnixToStr(t, base, sec) +{ +if(t.lenth < 10) t = '000000000'; +var d; +if (base == 16) d = new Date(parseInt(t,16)*1000); +else d = new Date(parseInt(t,10)*1000); +var dd = d.getDate(); if (dd < 10) dd = '0' + dd; +var mm = d.getMonth() + 1; if (mm < 10) mm = '0' + mm; +var yy = d.getFullYear() % 100; if (yy < 10) yy = '0' + yy; +var h = d.getHours(); if (h < 10) h = '0' + h; +var m = d.getMinutes(); if (m < 10) m = '0' + m; +var s = d.getSeconds(); if (s < 10) s = '0' + s; +d=yy+'/'+mm+'/'+dd+' '+h+':'+m; +if(sec==1) d+=':'+s; +return d; +} + +function FloatToString(f) +{ +var buffer = new ArrayBuffer(4); +var bytes = new Uint8Array(buffer); +var doubles = new Float32Array(buffer); +bytes[3] = '0x'+f.substr(6,2); +bytes[2] = '0x'+f.substr(4,2); +bytes[1] = '0x'+f.substr(2,2); +bytes[0] = '0x'+f.substr(0,2); +return doubles[0]; +} + +function sendtime() { +var ut = Date.parse(new Date( Date.parse(document.getElementById('curdt').value)))/1000; +var xhr = new XMLHttpRequest(); +xhr.open('POST', 'index23.html', true); +var body = 'timenow=' + ut; +xhr.send(body); +xhr.onreadystatechange = function() { +if (xhr.readyState != 4) return; +if (xhr.status != 200) { +alert(xhr.status + ': ' + xhr.statusText); +} else { +alert('Time changed'); +} +} +} + +function Pst(Rqv,Pag,Conf){ +if (confirm(Conf)) { +var xhr = new XMLHttpRequest(); +xhr.open('POST',Pag, true); +xhr.send(Rqv); +xhr.onreadystatechange = function() { +if (xhr.readyState != 4) return; +if (xhr.status != 200) { +alert(xhr.status + ': ' + xhr.statusText); +} else { +location.reload(); +} +} +} +} +/*==================== SHOW NAVBAR ====================*/ +const showMenu = (headerToggle, navbarId) =>{ + const toggleBtn = document.getElementById(headerToggle), + nav = document.getElementById(navbarId) + + // Validate that variables exist + if(headerToggle && navbarId){ + toggleBtn.addEventListener('click', ()=>{ + // We add the show-menu class to the div tag with the nav__menu class + nav.classList.toggle('show-menu') + // change icon + toggleBtn.classList.toggle('bx-x') + }) + } +} +showMenu('header-toggle','navbar') + +/*==================== LINK ACTIVE ====================*/ +const linkColor = document.querySelectorAll('.nav__link') + +function colorLink(){ + linkColor.forEach(l => l.classList.remove('active')) + this.classList.add('active') +} + +linkColor.forEach(l => l.addEventListener('click', colorLink)) + + diff --git a/HTML/new/index.html b/HTML/new/index.html deleted file mode 100644 index 02d540d..0000000 --- a/HTML/new/index.html +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - Charge Point Type2 - - -
-
- - -
- -
-
-
- - - - -
-
-
- - - -
-
-
-
- - - - - \ No newline at end of file diff --git a/HTML/new/ioscr.js b/HTML/new/ioscr.js deleted file mode 100644 index 992ee82..0000000 --- a/HTML/new/ioscr.js +++ /dev/null @@ -1,491 +0,0 @@ -var Ku=1.0,Ki=0.02,sc=Ku*Ki/3600000; -var tds=['???','Пиковый','Полупиковый','Ночной']; -var tz=['+0','+1','+2','+3','+4','+5','+6','+7','+8','+9','+10','+11','+12','-12','-11','-10','-9','-8','-7','-6','-5','-4','-3','-2','-1']; -let trpend=[0,0,0]; - -function PostData(data,page,conf,alrt,reld) { -if(conf){if (!confirm(conf)) return;} -var xhr = new XMLHttpRequest(); -xhr.open('POST',page, true); -xhr.timeout = 5000; -xhr.send(data); -xhr.onreadystatechange = function() { -if (xhr.readyState != 4) return; -if (xhr.status != 200) {alert(xhr.status+': '+xhr.statusText);} -else {if(reld)location.reload(); -if(alrt) alert(alrt); -}}} - -function GetDataFile(file, callback) { -var xhr = new XMLHttpRequest(); -xhr.overrideMimeType("application/json"); -xhr.open("GET", file, true); -xhr.onreadystatechange = function() {if (xhr.readyState === 4 && xhr.status == "200") {callback(xhr.responseText);}} -xhr.timeout = 5000; -xhr.send(null); -} - -function TimeToStr(t){ - if(t>=(65535-1440))return '-----'; -if(t>=1440) t-=1440; -return (Math.floor(t/60)).toString().padStart(2,'0')+':'+(Math.floor((t%60))).toString().padStart(2,'0'); } - -function StrToTime(s){ -return parseInt(s.substring(0,2))*60+parseInt(s.substring(3,5));} - -function TimeToStrSec(t){ -hh=Math.floor(t/3600).toString().padStart(2,'0'); -mm=Math.floor((t-hh*3600)/60).toString().padStart(2,'0'); -ss=Math.floor((t-hh*3600-mm*60)).toString().padStart(2,'0'); -return hh+':'+mm+':'+ss;} - -function StrToTimeSec(s){ -return parseInt(s.substring(0,2))*3600+parseInt(s.substring(3,5))*60+parseInt(s.substring(6,8));} - -function UnixToStr(t, z, base, sec) { -if(t.lenth < 10) t = '000000000'; -var d; -if (base == 16) d = new Date((parseInt(t,16)+z)*1000); -else d=new Date((parseInt(t,10)+z)*1000); -var dd=d.getUTCDate();if(dd<10) dd='0'+dd; -var mm=d.getUTCMonth() + 1;if(mm<10) mm='0'+mm; -var yy=d.getUTCFullYear() % 100;if(yy<10) yy='0'+yy; -var h=d.getUTCHours();if(h<10) h='0'+h; -var m=d.getUTCMinutes();if(m<10) m='0'+m; -var s=d.getUTCSeconds();if(s<10) s='0'+s; -d=yy+'/'+mm+'/'+dd+' '+h+':'+m; -if(sec==1) d+=':'+s; -return d;} - -function FloatToString(f) { -var buffer=new ArrayBuffer(4); -var bytes=new Uint8Array(buffer); -var doubles=new Float32Array(buffer); -bytes[3]='0x'+f.substr(6,2); -bytes[2]='0x'+f.substr(4,2); -bytes[1]='0x'+f.substr(2,2); -bytes[0]='0x'+f.substr(0,2); -return doubles[0];} - -function SndTmr(z) { -body = ''; body2 = ''; -for(i=1;i<9;++i){ -body += GetInterface(i); -if(i<8) body +='&';} -for(i=9;i<17;++i){ -body2 += GetInterface(i); -if(i<16) body2 +='&';} -function GetInterface(n) { -s=''; -rawd=document.getElementById('tdp'+n).value; -date=Date.parse(rawd+':00Z')/1000-z; -s+='tm'+i+'='+date; -s+='%'+((document.getElementsByName('enb'+n)[0].checked)?'1':'0').toString(); -s+='%'+document.getElementsByName('act'+n)[0].value; -s+='%'+document.getElementsByName('prd'+n)[0].value; -return s;} - -var xhr2 = new XMLHttpRequest(); -var xhr = new XMLHttpRequest(); -xhr.open('POST','index42.html',true); -xhr.send(body); -xhr.onreadystatechange = function() { -if (xhr.readyState != 4) return; -if (xhr.status != 200) { -alert(xhr.status + ': ' + xhr.statusText); -} else{ -xhr2.open('POST','index42.html',true); -xhr2.send(body2); -}} - -xhr2.onreadystatechange = function() { -if (xhr2.readyState != 4) return; -if (xhr2.status != 200) { -alert(xhr2.status + ': ' + xhr2.statusText); -} else { -alert('Параметры таймера сохранены') -location.reload(); -}} -} - -function clstmr(){PostData('tmr=rst','index42.html',false,'Таймеры очищены',true);} -function ClsTar(){PostData('tar=rst','index23_5.html',false,'Тарифы очищены',true);} - -function ClickCheckbox(){ -for(i=1;i<17;++i){ -var st = !document.getElementsByName('enb'+i)[0].checked; -document.getElementById('tdp'+i).disabled = st; -document.getElementsByName('prd'+i)[0].disabled = st; -document.getElementsByName('act'+i)[0].disabled = st; -}} - -function GenerateInterface(t, z){ -timers = t; -document.write(""); -document.write(""); -for(i=1;i<17;++i){ -rep = ['once','1m','2m','5m','10m','15m','20m','30m','1h','2h','3h','6h','9h','12h','18h','1d','2d','7d']; -act=['Off','On','Rst','Wrs']; -tm=timers[i-1]; -pos1=tm.indexOf("%",0); -dt=parseInt(tm.substring(0,pos1),16); -en=parseInt(tm.substr(pos1+1,2),16); -ac=parseInt(tm.substr(pos1+4,2),16); -rp=parseInt(tm.substr(pos1+7),16); -document.write("
"); -ch = (en != 0)?'checked':''; -document.write("
"); -date=new Date((dt+z*3600)*1000); -str=date.toISOString(); -val=str.substring(0,16); -document.write(""); -document.write(""); -document.write(""); -document.write("");} -document.write("
 начало повтор
");} - -function GenTarifTable(r){ -document.write(''); -document.write(""); -for(i=1;i<7;++i){ -var rc=(r[i-1]).split("%",4); -document.write("
"); -ch=(rc[0] != 0)?'checked':''; -document.write("
"); -document.write(""); -document.write(""); -document.write("");} -document.write("
 начало конец тариф
");} - -function SaveTar(){ -var d=""; -for(i=1;i<7;++i){ -d+="tpr"+i+"="; -d+=((document.getElementById("tcb"+i).checked) ? "1":"0").toString()+"%"; -d+=StrToTime(document.getElementById("tbgn"+i).value)+"%"; -d+=StrToTime(document.getElementById("tend"+i).value)+"%"; -d+=(document.getElementById("sltar"+i).value).toString()+"&";} -for(i=1;i<4;++i){ -d+="tar"+i+"="+(document.getElementById("tar"+i).value).toString()+"&";} -d+="unt="+(document.getElementById("unt").value).toString()+"&sav=prs"; -PostData(d,"index23_5.html",false,"Параметры тарифов сохранены",true);} - -function ClsTar(){PostData('tarif=rst','index23_5.html',false,'Тарифы очищены',true);} - -function SendSimpTim(btn){ -ts=StrToTimeSec(document.getElementById("stbgn"+btn).value); -ac=document.getElementById("slact"+btn).value; -bt=document.getElementById("simt"+btn);st=bt.value; -if(st=="1"){st="0";bt.innerHTML="Пуск";bt.style.backgroundColor="#FF6633";bt.value="0";} -else {st="1";bt.innerHTML="Стоп";bt.style.backgroundColor="#99CC00";bt.value="1";} -d='tim'+btn+"="+ts+"&act"+btn+"="+ac+"&st"+btn+"="+st+"&sav=prs"; -PostData(d,"index42_2.html",false,"",false);} - -function GenSimpTimers(r){ -document.write(""); -for(i=1;i<4;++i){rc=(r[i-1]).split("%",3); -t=TimeToStrSec(parseInt(rc[0],10)); -document.write(""); -document.write(""); -document.write(""); -if(rc[2]==1) document.write(""); -else document.write("");} -document.write("
Таймер "+i+"
");} - -function RefSimpTimers(){ -function refresh(){ -if (this.status == 200) { -r=JSON.parse(this.responseText); -for(i=1;i<4;++i){ -var rc=(r.tmr2[i-1]).split("%",3); -tt=parseInt(rc[0],10);t=TimeToStrSec(tt); -if(rc[2]=="1" || trpend[i-1]==1){ -document.getElementById("stbgn"+i).value=t; -document.getElementById("slact"+i).value=rc[1]; -bt=document.getElementById("simt"+i); -if(rc[2]=="1"){bt.innerHTML="Стоп";bt.style.backgroundColor="#99CC00";} -else{bt.innerHTML="Пуск";bt.style.backgroundColor="#FF6633";} -if(tt<5&&tt!=0&&rc[2]=="1") trpend[i-1]=1; -else trpend[i-1]=0; -}}}}; -var xhr=new XMLHttpRequest(); -xhr.onload = refresh; -xhr.open('GET','/tmr2.json',true); -xhr.send(); -} - -function GenCntInter(N,curN,pp,tt,unt,tw,tz,ttr){ -var T=parseFloat(ttr),P=0; -document.write(""); -document.write(""); -document.write(""); -document.write(""); -document.write(""); -document.write(""); -document.write(""); -document.write(""); -document.write(""); -document.write(""); -document.write(""); -document.write(""); -document.write(""); -document.write(""); -document.write("
"); -document.write("
"); -document.write(""); -document.write("
Счетчик:№"+N+"
Начало учета:?
Конец учета:?
Действующий тариф:?
Тариф:Пиковый
Потребление:? кВт*ч
Стоимость:?
Тариф:Полупиковый
Потребление:? кВт*ч
Стоимость:?
Тариф:Ночной
Потребление:? кВт*ч
Стоимость:?
Общее потребление:? кВт*ч
Общая стоимость:?
"); -document.getElementById('curt').innerHTML=tds[curN]; -for(i=1;i<4;++i){ -var px = FloatToString(pp[i])*sc; -document.getElementById("pp"+N+i).innerHTML=parseFloat(px).toFixed(4); -document.getElementById("prs"+N+i).innerHTML=(px*T).toFixed(2)+' '+unt; -P+=px;} -document.getElementById("pp"+N).innerHTML=parseFloat(P).toFixed(4); -document.getElementById("tt"+N).innerHTML=UnixToStr(tt,tz,10); -document.getElementById("prs"+N).innerHTML=(P*T).toFixed(2)+' '+unt; -document.getElementsByName('tnow')[0].innerHTML=UnixToStr(tw,tz,10);} - -function configIPBoxes(){e=document.forms.conf; -var ap=document.getElementsByName('netm'); -st=e.dhcp.checked; -function apmode(m){e.wfiap.disabled=m;e.wfpap.disabled=m;e.ipaap.disabled=m;} -function clnmode(m){e.wfi.disabled=m;e.wfp.disabled=m;e.ipa.disabled=m;e.mas.disabled=m;e.gte.disabled=m;} -if(ap[0].checked){apmode(true);clnmode(false); -e.ipa.disabled=st;e.mas.disabled=st;e.gte.disabled=st;} -if(ap[1].checked){apmode(false);clnmode(true);} -} - -function sendtime() {var ut=Date.parse(new Date( Date.parse(document.getElementById('curdt').value)))/1000; -var d='timenow='+ut; -PostData(d,'index23_3.html',false,'Время установлено',false);} - -function WriteChart(log,z){ -var val=[],tst=[],vf=[],scl; -for(i=0;i<32;++i){ -var r=log[i]; -var t=r.substr(0,8); -if (t!='00000000') tst[i]=UnixToStr(t,z,16,0); -else tst[i]=0; -val[i]=FloatToString(r.substr(8,8)); -vf[i]=parseFloat((val[i]*sc).toFixed(4));} -scl=Math.max.apply(null, vf); -document.write("
"); -document.write("
"); -for(i=0;i<32;++i){ -document.write("");} -document.write("
дата     время кВт*ч
"); -if(tst[i]!=0) document.write(tst[i]+" "+(val[i]*sc).toFixed(4)); -else document.write("--/--/-- --:-- -----"); -document.write("
"); -if(tst[i]!=0)document.write("
"); -document.write("
");} - -function setprm(p) { -document.getElementById("vmin").value=Math.round(p[0]*Ku); -document.getElementById("vmax").value=Math.round(p[1]*Ku); -document.getElementById("imin").value=(p[2]*Ki).toFixed(1); -document.getElementById("imax").value=(p[3]*Ki).toFixed(1);} - -function sld(){document.getElementById("vn").innerHTML=document.getElementById("vmin").value+' В'; -document.getElementById("vx").innerHTML=document.getElementById("vmax").value+' В'; -document.getElementById("in").innerHTML=document.getElementById("imin").value+' A'; -document.getElementById("ix").innerHTML=document.getElementById("imax").value+' A';} - -function sendprm(){var d='umin='+Math.round( parseFloat(document.getElementById("vmin").value,10)/Ku); -d+='&umax='+Math.round( parseFloat(document.getElementById("vmax").value,10)/Ku); -d+='&imin='+Math.round( parseFloat(document.getElementById("imin").value,10)/Ki); -d+='&imax='+Math.round( parseFloat(document.getElementById("imax").value,10)/Ki); -d+='&pten='+((document.getElementsByName('pten')[0].checked) ? '1':'0').toString(); -d+='&rstt='+document.getElementById('rstt').value; -d+='&rstn='+document.getElementById('rstn').value; -d+='&sav=prs'; -PostData(d,'index41.html',false,'Параметры установлены',true);} - -function GenTzSel(zn) { -document.write('Time zone:'); -document.getElementById('tz').value = zn;} - - -function PrintIPInput(title,name,value){document.write(""+title+"");} -function PrintMACInput(title,name,value){document.write("MAC:");} -function PrintTextInput(title,name,value,min,max){document.write(""+title+"");} -function PrintTextInputNoReg(title,name,value,min,max){document.write(""+title+"");} -function PrintLabel(title,value){document.write(""+title+""+value+"");} -function PrintCheckBox(title,name,checked,action){document.write(""+title+"");} -function PrintInt(title,name,value,min,max){document.write(""+title+"");} -function PrintIntId(title,id,value,min,max){document.write(""+title+"");} -function PrintSep(){document.write("");} -function PrintTar(title,name,value){document.write(""+title+"");} -function PrintSaveBtn(){document.write("
");} -function PrintSaveFail(isfail){document.write("

Ошибка формата данных!


");} - -function PrintMenu(){ -document.write("
");} - -function saveFile(fileName,urlFile){ -let a = document.createElement("a"); -a.style = "display: none"; -document.body.appendChild(a); -a.href = urlFile; -var D = new Date(); -a.download ='WS10_'+fileName+'_'+((D).toISOString()).substr(0,19)+'.dat'; -a.click(); -window.URL.revokeObjectURL(urlFile); -a.remove(); -} - -function ReadEEPR(v5m,v1h,v1d,z){ -document.getElementById('tmr').innerHTML=0; -var str=document.location.toString(); -var ref=str.substring(0,str.lastIndexOf('/savehist.html')); -let data = {bufm:[],bufh:[],bufd:[],adr:0x1006,isReady:true}; - -function PrcdData(){ -function Iter(item){ -if(item.substr(0,8)!='00000000') -prnt+=UnixToStr(item.substr(0,8),z,16,0)+' '+(FloatToString(item.substr(8,8))*sc).toFixed(4)+' кВт*ч\r\n'} -data.bufm.sort();data.bufh.sort();data.bufd.sort(); -var prnt='5 минут\r\n';data.bufm.forEach(Iter); -prnt+='1 час\r\n';data.bufh.forEach(Iter); -prnt+='1 день\r\n';data.bufd.forEach(Iter); -let blobData = new Blob([prnt], {type: "text/plain"}); -let url = window.URL.createObjectURL(blobData); -saveFile('measures',url); -window.location=ref+'/index23.html'; -} -function ReadChunk(){ -if (this.readyState==4 && this.status==200) { -for(i=0;i<8;++i){ -r=(this.response.mem[i]).substr(5,32); -r1=r.substr(6,2)+r.substr(4,2)+r.substr(2,2)+r.substr(0,2)+r.substr(8,8); -r2=r.substr(22,2)+r.substr(20,2)+r.substr(18,2)+r.substr(16,2)+r.substr(24,8); -if(data.adr<0x1906){data.bufm.push(r1);data.bufm.push(r2);} -else if (data.adr<0x1f06){data.bufh.push(r1);data.bufh.push(r2);} -else{data.bufd.push(r1);data.bufd.push(r2);}} -data.adr+=0x80;data.isReady=true; -document.getElementById('tmr').innerHTML=Math.round((data.adr-0x1006)/(0x2B06-0x1006)*100); -if(data.adr==0x2B06) {clearInterval(timerId); -PrcdData(); -}}else{alert(xhr.status+': '+xhr.statusText);window.location=ref+'/index23.html'}} -let timerId = setInterval(function(){ -if(data.isReady){ -data.isReady=false; -var xhr=new XMLHttpRequest(); -xhr.open('POST',ref+'/mem.json', true); -xhr.responseType='json'; -xhr.onreadystatechange=ReadChunk; -xhr.send('base='+data.adr.toString(16));}},5); -} - -function ReadConf(){ -document.getElementById('tmr').innerHTML=0; -var str=document.location.toString(); -var ref=str.substring(0,str.lastIndexOf('/saveconf.html')); -let data = {buf:[],adr:0x0000,isReady:true}; -function PrcdData(){ -function Iter(item){prnt+=item+'\r\n';} -var prnt='';data.buf.forEach(Iter); -let blobData = new Blob([prnt], {type: "text/plain"}); -let url = window.URL.createObjectURL(blobData); -saveFile('config',url); -window.location=ref+'/index23.html'; -} -function ReadChunk(){ -if (this.readyState==4 && this.status==200) { -for(i=0;i<8;++i){ -r=(this.response.mem[i]).substr(5,32); -data.buf.push(r);} -data.adr+=0x80;data.isReady=true; -document.getElementById('tmr').innerHTML=Math.round((data.adr-0x0000)/(0x0800-0x0000)*100); -if(data.adr==0x0800) {clearInterval(timerId); -PrcdData(); -}}else{alert(xhr.status+': '+xhr.statusText);window.location=ref+'/index23.html'}} -let timerId = setInterval(function(){ -if(data.isReady){ -data.isReady=false; -var xhr=new XMLHttpRequest(); -xhr.open('POST',ref+'/mem.json', true); -xhr.responseType='json'; -xhr.onreadystatechange=ReadChunk; -xhr.send('base='+data.adr.toString(16));}},5); -} - -function WriteConf(input){ -document.getElementById('tmr').innerHTML=0; -var str=document.location.toString(); -var ref=str.substring(0,str.lastIndexOf('/restconf.html')); -let data = {buf:[],adr:0x0000,isReady:true}; -let file = input.files[0]; -let reader = new FileReader(); -reader.readAsText(file); -reader.onload = function() { -data.buf = reader.result.split('\r\n'); - -function ReadChunk(){ -if (this.readyState==4 && this.status==200) { -data.adr+=0x40;data.isReady=true; -document.getElementById('tmr').innerHTML=Math.round((data.adr-0x0000)/(0x0800-0x0000)*100); -if(data.adr==0x0800) { -clearInterval(timerId); -window.location=ref+'/reboot.html'; -}}else{alert(xhr.status+': '+xhr.statusText);window.location=ref+'/index23.html'}} - -let timerId = setInterval(function(){ -if(data.isReady){ -data.isReady=false; -var ind=data.adr/0x10; -var dt='write='+data.adr.toString(16); -dt+='&dt1='+data.buf[ind]; -dt+='&dt2='+data.buf[ind+1]; -dt+='&dt3='+data.buf[ind+2]; -dt+='&dt4='+data.buf[ind+3]; -var xhr=new XMLHttpRequest(); -xhr.open('POST',ref+'/mem.json', true); -xhr.responseType='json'; -xhr.onreadystatechange=ReadChunk; -xhr.send(dt);}},5); - -}; -reader.onerror = function() {}; -} diff --git a/HTML/new/logo.png b/HTML/new/logo.png deleted file mode 100644 index b17ddcef4c2b6d533a97b23045fbd1a4e80b970e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15681 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 diff --git a/HTML/new/main.js b/HTML/new/main.js deleted file mode 100644 index e3ecd63..0000000 --- a/HTML/new/main.js +++ /dev/null @@ -1,27 +0,0 @@ - -/*==================== SHOW NAVBAR ====================*/ -const showMenu = (headerToggle, navbarId) =>{ - const toggleBtn = document.getElementById(headerToggle), - nav = document.getElementById(navbarId) - - // Validate that variables exist - if(headerToggle && navbarId){ - toggleBtn.addEventListener('click', ()=>{ - // We add the show-menu class to the div tag with the nav__menu class - nav.classList.toggle('show-menu') - // change icon - toggleBtn.classList.toggle('bx-x') - }) - } -} -showMenu('header-toggle','navbar') - -/*==================== LINK ACTIVE ====================*/ -const linkColor = document.querySelectorAll('.nav__link') - -function colorLink(){ - linkColor.forEach(l => l.classList.remove('active')) - this.classList.add('active') -} - -linkColor.forEach(l => l.addEventListener('click', colorLink)) diff --git a/HTML/sys/reboot.html b/HTML/reboot.html similarity index 100% rename from HTML/sys/reboot.html rename to HTML/reboot.html diff --git a/HTML/res.js b/HTML/res.js new file mode 100644 index 0000000..ec04689 --- /dev/null +++ b/HTML/res.js @@ -0,0 +1,115 @@ +var hedmen = ` +
+
+ LOGO + +
+ +
+
+
+ +`; + +function PageSurround() +{document.write(hedmen);} + +function PrintIPInput(title,name,value){document.write(""+title+"");} +function PrintMACInput(title,name,value){document.write(""+title+"");} +function PrintTextInput(title,name,value,min,max){document.write(""+title+"");} +function PrintHexInput(title,name,value,min,max){document.write(""+title+"");} +function PrintTextInputNoReg(title,name,value,min,max){document.write(""+title+"");} +function PrintLabel(title,value){document.write(""+title+""+value+"");} +function PrintSpanLabel(title,idx){document.write(""+title+"?");} +function PrintCheckBox(title,name,checked,action){document.write(""+title+"");} +function PrintInt(title,name,value,min,max){document.write(""+title+"");} +function PrintIntId(title,id,value,min,max){document.write(""+title+"");} +function PrintSep(){document.write("");} +function PrintSaveBtn(){document.write("
");} +function PrintSaveFail(isfail){document.write("

Неверный формат данных!


");} diff --git a/HTML/set_eth.html b/HTML/set_eth.html new file mode 100644 index 0000000..1148a1f --- /dev/null +++ b/HTML/set_eth.html @@ -0,0 +1,40 @@ + + + + + + + + + + ~name~ + + + + +
+
+
+ + +

+
+ + + + + + + \ No newline at end of file diff --git a/HTML/set_gprs.html b/HTML/set_gprs.html new file mode 100644 index 0000000..315209d --- /dev/null +++ b/HTML/set_gprs.html @@ -0,0 +1,42 @@ + + + + + + + + + + ~name~ + + + + +
+
+
+ + +

+ + +
+
+
+ + + \ No newline at end of file diff --git a/HTML/set_mqtt.html b/HTML/set_mqtt.html new file mode 100644 index 0000000..4f474a7 --- /dev/null +++ b/HTML/set_mqtt.html @@ -0,0 +1,46 @@ + + + + + + + + + + ~name~ + + + + +
+
+
+ + +
+ + +
+
+
+ + + \ No newline at end of file diff --git a/HTML/set_sys.html b/HTML/set_sys.html new file mode 100644 index 0000000..4ecc268 --- /dev/null +++ b/HTML/set_sys.html @@ -0,0 +1,50 @@ + + + + + + + + + + ~name~ + + + + +
+
+
+
+ + +
URL файла обновления:
+
+ +
+ + Data format error!
+
+ +

+ +
+
+
+
+ + + \ No newline at end of file diff --git a/HTML/set_time.html b/HTML/set_time.html new file mode 100644 index 0000000..249b898 --- /dev/null +++ b/HTML/set_time.html @@ -0,0 +1,49 @@ + + + + + + + + + + ~name~ + + + + +
+
+
+
+ + + + +
Включить SNTP клиент
Адрес SNTP сервера:
+ + + + +
+ Установить текущее время вручную:
+ +


+
+ +
+ +

Ошибка формата данных!


+
+ +
+
+
+
+
+ + + \ No newline at end of file diff --git a/HTML/set_wifi.html b/HTML/set_wifi.html new file mode 100644 index 0000000..c15e199 --- /dev/null +++ b/HTML/set_wifi.html @@ -0,0 +1,48 @@ + + + + + + + + + + ~name~ + + + + +
+
+
+ + + + + +
Включить WiFi
Режим WiFiКлиент(CLN)
Точка доступа(AP)

+ + +
+
+
+ + + \ No newline at end of file diff --git a/HTML/style.css b/HTML/style.css deleted file mode 100644 index e2f970d..0000000 --- a/HTML/style.css +++ /dev/null @@ -1,51 +0,0 @@ -.mono,.mono td,input,.plz td,body,.stg table,.mform {color:#000;font:14px consolas,monospace;padding-left:3px;} -body {background-color:#fff;margin:0px;} -.btn, #bt {color:#fff;font: 14px consolas,monospace;padding:15px 5px;min-width:100px;border-style:none;} -.brd,.mform {margin: 0px; overflow-y: auto; } -.mform {width: 100%; height:auto; margin-top:5px; box-sizing:border-box; padding:0 0 20px 0} -.frm {width:400px; margin:auto;} -.mono input {position:relative; left: 0px;} -.brd,.mform,#bt,.mform input,.mform select {border:solid 1px #CCCCCC;} -.btn, #bt{background-color:#ff0000;} -.wnd, .lwnd {overflow-y:auto;box-sizing:border-box;width:100%;height:410px;font:11px consolas,monospace;text-align:left} -.wnd td{font:11px consolas,monospace;text-align:left} -.lwnd{height:400px;} -#name{margin: 5px; padding:0px; font-size:14px} -.wd,.ctbox,.btbox {font: 11px consolas,monospace;line-height:1.0;margin:-2px 0 -1px 0;} -.btbox{width:100%;text-align:center;margin:5px} -.ctbox{width:80%; height:auto; padding:5px; margin-top:40px; margin-left:10%; box-sizing:border-box;} -.pwrbox{width:60%; height:auto; padding:5px; margin-top:50px; margin-left:20%; box-sizing:border-box;} -.pwrbox td,.ctbox td{font:12px consolas,monospace; width:30%;padding:0;margin:0} -.tmrbox{overflow-y: auto;box-sizing:border-box; width: 100%; height:400px;} -.tmrbox input,.tmrbox select,.tmrbox td {height:21px;margin:-1px 4px;font:12px consolas,monospace;background-color:#FFFFFF;} -.plz {padding:10px;} -.plz input{width:220px;height:40px} -.stg td{width:50%;padding:1px;margin:0} -.stg input, select {height:25px} -input[type="radio"] { margin-top: -1px; vertical-align: middle;} -.stg table{margin: 5px auto} -.rl{text-align:right;} -.resfail{padding:0;margin:auto; } -.btn:active{background-color: #606060;color: #ffffff;} -.btn:focus {outline: none;} -.vspc{margin:30px 0} -.sbtn{font:12px consolas,monospace;padding:5px;width:70px;} - -#cont, #menu1{font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:14px;} -#cont {float: left;text-align: center;list-style-type:none;padding:0 0;margin: 0 0;width: 100%;} -#conteiner{width:auto;height:auto;padding-top:5px;margin-right:0px;} -#menu1{position:relative;display:block;width:100%;height:auto;z-index:10;margin:0px 0px;} -#menu1 ul{position:relative;display:block;margin:0px;padding:0px;width:auto;height:auto;list-style:none;background:#ff0000;} -#menu1 > ul:after{display:block;width:100%;height:0px;clear:both;content:" ";} -#menu1 ul li{position:relative;display:block;float:left;width:25%;height:auto;} -#menu1 ul li a{display:block;padding:15px 5px;color:#ffffff;text-decoration:none; -text-align: center;box-sizing:border-box;user-select: none;} -#menu1 ul li > a:hover, #menu1 ul li:hover > a{background:#606060;color:#ffffff;} -#menu1 ul li ul{position:absolute;top:auto;left:0px;display:none;width:100%;background:#ff0000;} -#menu1 ul li:hover ul{display:block;} -#menu1 ul li ul li{float:none;width:100%;} -#menu1 ul li ul li a{display:block;text-transform:none;} -#menu1 ul li ul li:first-child a{border-top:0px;} -#menu1 ul li ul li a:hover{background:#606060;color:#ffffff;} -.dot {height: 30px;width: 30px;background-color: #d0d0d0;border-radius: 40%;display: inline-block; margin: 7px 20px} - diff --git a/HTML/new/styles.css b/HTML/styles.css similarity index 86% rename from HTML/new/styles.css rename to HTML/styles.css index 0b9a310..a06f880 100644 --- a/HTML/new/styles.css +++ b/HTML/styles.css @@ -4,23 +4,23 @@ /*========== VARIABLES CSS ==========*/ :root { --header-height: 3.5rem; - --nav-width: 200px; + --nav-width: 220px; /*========== Colors ==========*/ --first-color: #FFFFFF; - --first-color-light: #ABEBC6 ; - --title-color: #ABEBC6; + --first-color-light: #D6DBDF ; + --title-color: #85929E; --text-color: #444444; - --text-color-light: #ABEBC6; + --text-color-light: #85929E; --body-color: #FFFFFF; - --container-color: #28B463; + --container-color: #AEB6BF; /*========== Font and typography ==========*/ --body-font: 'Arial', sanf-serif; - --large-font-size: 2.0rem; + --large-font-size: 1.5rem; --normal-font-size: 1.0rem; - --small-font-size: .75rem; - --smaller-font-size: .75rem; + --small-font-size: .9rem; + --smaller-font-size: .8rem; /*========== Font weight ==========*/ --font-medium: 500; @@ -32,9 +32,9 @@ @media screen and (min-width: 1024px) { :root { - --normal-font-size: 1rem; - --small-font-size: .875rem; - --smaller-font-size: .813rem; + --normal-font-size: 1.0rem; + --small-font-size: .9rem; + --smaller-font-size: .8rem; } } @@ -86,7 +86,7 @@ img { .header__img { width: 50px; - height: ; + height: 50px; border-radius: 5%; } @@ -99,25 +99,6 @@ img { display: none; } -.header__search { - display: flex; - padding: .40rem .75rem; - background-color: var(--first-color-light); - border-radius: .25rem; -} - -.header__input { - width: 100%; - border: none; - outline: none; - background-color: var(--first-color-light); -} - -.header__input::placeholder { - font-family: var(--body-font); - color: var(--text-color); -} - .header__icon, .header__toggle { font-size: 1.2rem; @@ -215,7 +196,7 @@ img { .nav__dropdown-collapse { background-color: var(--first-color-light); - border-radius: .25rem; + border-radius: .5rem; margin-top: 1rem; } @@ -335,8 +316,14 @@ img { } } -.cntr { margin-left: 150px; - margin-right: auto; - color:#000; - font:14px consolas,monospace;} +.btn {color:var(--text-color); + font: 14px consolas,monospace;padding:15px 5px; + min-width:100px; + border-style:none; +} + +.cntr { + margin:auto; + color:#000; + font:14px consolas, monospace;} diff --git a/HTML/sys/control.html b/HTML/sys/control.html deleted file mode 100644 index 6ae8261..0000000 --- a/HTML/sys/control.html +++ /dev/null @@ -1,30 +0,0 @@ -~inc:head.inc~ - -
- -
-
-
-Сервис|Управление[~dname~] -
-
-
-
- -

- -

- -

- -

- -

- -

-
-
-
-
- - \ No newline at end of file diff --git a/HTML/sys/set_eth.html b/HTML/sys/set_eth.html deleted file mode 100644 index 15cb77b..0000000 --- a/HTML/sys/set_eth.html +++ /dev/null @@ -1,28 +0,0 @@ -~inc:head.inc~ - -
- -
-
-
-Сеть|Ethernet[~dname~] -
-
- - -

-
- - -
- - \ No newline at end of file diff --git a/HTML/sys/set_gprs.html b/HTML/sys/set_gprs.html deleted file mode 100644 index 1ed21dd..0000000 --- a/HTML/sys/set_gprs.html +++ /dev/null @@ -1,30 +0,0 @@ -~inc:head.inc~ - -
- -
-
-
-Сеть|GPRS[~dname~] -
-
- - -

-
- - -
- - \ No newline at end of file diff --git a/HTML/sys/set_lora.html b/HTML/sys/set_lora.html deleted file mode 100644 index 739d1b0..0000000 --- a/HTML/sys/set_lora.html +++ /dev/null @@ -1,27 +0,0 @@ -~inc:head.inc~ - -
- -
-
-
-Сеть|LoRaWAN[~dname~] -
-
- - -
- - -
Ключ приложения:
-
-
- - -
- - \ No newline at end of file diff --git a/HTML/sys/set_mqtt.html b/HTML/sys/set_mqtt.html deleted file mode 100644 index 9903084..0000000 --- a/HTML/sys/set_mqtt.html +++ /dev/null @@ -1,35 +0,0 @@ -~inc:head.inc~ - -
- -
-
-
-Настройки|Станция[~dname~] -
-
- - -
-
- - -
-
- - \ No newline at end of file diff --git a/HTML/sys/set_sys.html b/HTML/sys/set_sys.html deleted file mode 100644 index 6c0299f..0000000 --- a/HTML/sys/set_sys.html +++ /dev/null @@ -1,40 +0,0 @@ -~inc:head.inc~ - -
- -
-
-
-Настройки|Система[~dname~] -
-

-
-
- - -
URL файла обновления:
-
-
-
- -Data format error!
-
- -

- -
- -
-
- - \ No newline at end of file diff --git a/HTML/sys/set_time.html b/HTML/sys/set_time.html deleted file mode 100644 index 3e7cd88..0000000 --- a/HTML/sys/set_time.html +++ /dev/null @@ -1,41 +0,0 @@ -~inc:head.inc~ - -
- -
-
-Настройки|Время[~dname~] -
-
-
- - - -
Включить SNTP клиент
Адрес SNTP сервера:
-
-
- - -
- Установить текущее время вручную:
- -


-
-
-
- -

Ошибка формата данных!


-
- -
-
-
-
- - - \ No newline at end of file diff --git a/HTML/sys/set_wifi.html b/HTML/sys/set_wifi.html deleted file mode 100644 index fc0ea90..0000000 --- a/HTML/sys/set_wifi.html +++ /dev/null @@ -1,39 +0,0 @@ -~inc:head.inc~ - -
- -
-
-
-Сеть|WiFi[~dname~] -
-
- - - - - -
Включить WiFi
Режим WiFiКлиент(CLN)
Точка доступа(AP)

-
- - -
- - - \ No newline at end of file diff --git a/HTML/sys/stats.html b/HTML/sys/stats.html deleted file mode 100644 index 434d193..0000000 --- a/HTML/sys/stats.html +++ /dev/null @@ -1,51 +0,0 @@ -~inc:head.inc~ - -
- -
-
-
-Статистика[~dname~] -
- - - - - - - - - - - - - -
Ethernet:?
WiFi:?
GPRS:?
LoRaWAN:?
Основной адаптер:?
MQTT соединение 1:?
MQTT соединение 2:?
Свободной памяти:?
Минимум памяти:?
-
-
-
- - - \ No newline at end of file