Skip to content

Commit

Permalink
update HTML
Browse files Browse the repository at this point in the history
  • Loading branch information
@vitotai
vitotai committed Sep 3, 2023
1 parent 610d5b7 commit 91b0f83
Show file tree
Hide file tree
Showing 65 changed files with 37,319 additions and 35,911 deletions.
260 changes: 256 additions & 4 deletions htmljs/src/config.tmpl.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<script type="text/javascript" src="js/vendor/bwf.js"></script>
<script type="text/javascript" src="js/shared.js"></script>
<script type="text/javascript" src="js/backup.js"></script>
<script type="text/javascript" src="js/script-config.js"></script>
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
<link rel="stylesheet" href="style-config.css">
Expand Down Expand Up @@ -111,6 +112,8 @@ <h6 class="inline-header">

<div layout horizontal cross-center>
<button class="btn btn--raised" onclick="showsysinfo(); return false;">Sysinfo</button>
<button class="btn btn--raised" onclick="Backup.init(),Q('#backup-diag').style.display = 'block'; return false;">Backup/Restore</button>
<button class="btn btn--raised" onclick="showAdvanced(); return false;">Advanced</button>
</div>

<div class="card-footer">
Expand Down Expand Up @@ -159,23 +162,272 @@ <h6 class="inline-header">
</div>
</div>

<li id="sysinfo" class="modal">
<div id="sysinfo" class="modal">
<div class="modal-content" style="width:320px">
<div class="modal-header">
System Information
</div>
<ul>
<li layout horizontal main-justified>
<h6 class="inline-header"><strong>System Information</strong></h6></li>
<li layout horizontal main-justified><span class="descriptor">MAC Address</span> <span id="mac-address"></span></li>
<li layout horizontal main-justified><span class="descriptor">Flash Chip ID</span> <span id="flash-id"></span></li>
<li layout horizontal main-justified><span class="descriptor">Real Flash Size</span> <span id="real-flash-size"></span></li>
<li layout horizontal main-justified><span class="descriptor">Specified Flash Size</span> <span id="specified-flash-size"></span></li>
<li layout horizontal main-justified><span class="descriptor">File System Size</span> <span id="fs-size"></span></li>
</ul>
<button onclick="hidesysinfo();return false;">Done</button>
<button class="btn btn--raised" onclick="hidesysinfo();return false;">Done</button>

</div>
</div>


<div id="backup-diag" class="modal">
<div class="modal-content">
<div class="modal-header">
<%= config_backup_restore %>
</div>
<ul>
<li layout horizontal main-justified><span class="descriptor"><%= config_backup_time %> </span><span id="backuptime"></span></li>
<li layout horizontal main-justified><span class=""> <%= menu2_setup %></span><span class="device-status"></span></li>
<li layout horizontal main-justified><span class=""> <%= menu2_gravity %></span><span class="gdc-status"></span></li>
<li layout horizontal main-justified><span class=""><%= menu2_logs %></span> <span class="rlog-status"></span> </li>
<li layout horizontal main-justified><span class=""><%= menu2_pressure %></span><span class="pressure-status"></span></li>
<li layout horizontal main-justified><span class="">MQTT</span><span class="mqtt-status"></span></li>
<li layout horizontal main-justified><span class=""><%= menu2_config %></span><span class="syscfg-status"></span></li>
</ul>
<div class="modal" id="processing">
<div class="modal-content hint" id="hint_get"><%= config_getting %></div>
<div class="modal-content hint" id="hint_put"><%= config_putting %></div>
</div>
<button onclick="Backup.save();return false"><%= config_save %> </button>
<%= confg_restore_from %> <input type="file" id="backupfile"></input>
<button onclick="Backup.restore();return false"> <%= config_restore %> </button>
<button onclick=" Q('#backup-diag').style.display = 'none';return false"><%= dlg_cancel %> </button>
</div>
</div>


<div id="advanced" class="modal">
<div class="modal-content">
<div class="modal-header">
Advanced Settings
</div>
<div layout horizontal cross-center>
<h6 class="inline-header">
tempFormat
</h6>
<div>
<select id=tempFormat name=tempFormat>
<option value="C"> &deg;C</option>
<option value="F"> &deg;F </option>
</select>
</div>
</div>
<div layout horizontal cross-center>
<h6 class="inline-header">
tempSettingMin
</h6>
<input type="number" id="tempSetMin" size="4" step="0.001"> &deg;
</div>

<div layout horizontal cross-center>
<h6 class="inline-header">
tempSettingMax
</h6>
<input type="number" id="tempSetMax" size="4" step="0.001"> &deg;
</div>
<div layout horizontal cross-center>
<h6 class="inline-header">
pidMax
</h6>
<input type="number" id="pidMax" size="4" step="0.001"> &deg;
</div>

<div layout horizontal cross-center>
<h6 class="inline-header">
Kp
</h6>
<input type="number" id="Kp" size="4" step="0.001">
</div>
<div layout horizontal cross-center>
<h6 class="inline-header">
Ki
</h6>
<input type="number" id="Ki" size="4" step="0.001">
</div>

<div layout horizontal cross-center>
<h6 class="inline-header">
Kd
</h6>
<input type="number" id="Kd" size="4" step="0.001">
</div>

<div layout horizontal cross-center>
<h6 class="inline-header">
iMaxErr
</h6>
<input type="number" id="iMaxErr" size="4" step="0.001">
</div>

<div layout horizontal cross-center>
<h6 class="inline-header">
idleRangeH
</h6>
<input type="number" id="idleRangeH" size="4" step="0.001"> &deg;
</div>

<div layout horizontal cross-center>
<h6 class="inline-header">
idleRangeL
</h6>
<input type="number" id="idleRangeL" size="4" step="0.001"> &deg;
</div>


<div layout horizontal cross-center>
<h6 class="inline-header">
heatTargetH
</h6>
<input type="number" id="heatTargetH" size="4" step="0.001"> &deg;
</div>
<div layout horizontal cross-center>
<h6 class="inline-header">
heatTargetL
</h6>
<input type="number" id="heatTargetL" size="4" step="0.001"> &deg;
</div>
<div layout horizontal cross-center>
<h6 class="inline-header">
coolTargetH
</h6>
<input type="number" id="coolTargetH" size="4" step="0.001"> &deg;
</div>
<div layout horizontal cross-center>
<h6 class="inline-header">
coolTargetL
</h6>
<input type="number" id="coolTargetL" size="4" step="0.001"> &deg;
</div>


<div layout horizontal cross-center>
<h6 class="inline-header">
maxHeatTimeForEst
</h6>
<input type="number" id="maxHeatTimeForEst" size="4"> Seconds
</div>
<div layout horizontal cross-center>
<h6 class="inline-header">
maxCoolTimeForEst
</h6>
<input type="number" id="maxCoolTimeForEst" size="4"> Seconds
</div>

<div layout horizontal cross-center>
<h6 class="inline-header">
fridgeFastFilt
</h6>
<input type="number" id="fridgeFastFilt" size="4" step="0.001">
</div>
<div layout horizontal cross-center>
<h6 class="inline-header">
fridgeSlowFilt
</h6>
<input type="number" id="fridgeSlowFilt" size="4" step="0.001">
</div>
<div layout horizontal cross-center>
<h6 class="inline-header">
fridgeSlopeFilt
</h6>
<input type="number" id="fridgeSlopeFilt" size="4" step="0.001">
</div>
<div layout horizontal cross-center>
<h6 class="inline-header">
beerFastFilt
</h6>
<input type="number" id="beerFastFilt" size="4" step="0.001">
</div>
<div layout horizontal cross-center>
<h6 class="inline-header">
beerSlowFilt
</h6>
<input type="number" id="beerSlowFilt" size="4" step="0.001">
</div>
<div layout horizontal cross-center>
<h6 class="inline-header">
beerSlopeFilt
</h6>
<input type="number" id="beerSlopeFilt" size="4" step="0.001">
</div>

<div layout horizontal cross-center>
<h6 class="inline-header">
lightAsHeater
</h6>
<div>
<select id=lah name=lah>
<option value="0"> NO</option>
<option value="1"> YES </option>
</select>
</div>
</div>

<div layout horizontal cross-center>
<h6 class="inline-header">
RotaryHalfStep
</h6>
<div>
<select id=hs name=hs>
<option value="0"> NO</option>
<option value="1"> YES </option>
</select>
</div>
</div>

<div layout horizontal cross-center>
<h6 class="inline-header">
minCoolTime
</h6>
<input type="number" id="minCoolTime" size="4"> Seconds
</div>
<div layout horizontal cross-center>
<h6 class="inline-header">
minCoolIdleTime
</h6>
<input type="number" id="minCoolIdleTime" size="4"> Seconds
</div>
<div layout horizontal cross-center>
<h6 class="inline-header">
minHeatTime
</h6>
<input type="number" id="minHeatTime" size="4"> Seconds
</div>
<div layout horizontal cross-center>
<h6 class="inline-header">
minHeatIdleTime
</h6>
<input type="number" id="minHeatIdleTime" size="4"> Seconds
</div>
<div layout horizontal cross-center>
<h6 class="inline-header">
deadTime
</h6>
<input type="number" id="deadTime" size="4"> Seconds
</div>
<hr>
<div>
<input type="checkbox" id="warning" name="warning">
<label for="warning" style="min-width: 0;">I understand the risk of modifying these values.</label>
</div>

<div style="text-align: center;">
<button class="btn btn--raised" onclick="setAdvancedOptions()" id="adv-update">Update</button>
<button class="btn btn--raised" onclick="hideAdvanced();">Close</button>
</div>
</div>
</div>


</body>

</html>
73 changes: 72 additions & 1 deletion htmljs/src/js/script-config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function save() {
var div = Q("select[name=wifi]");
json["wifi"] = div.value;
json["dis"] = Q("select[name=dis]").value;
console.log(JSON.stringify(json));
//console.log(JSON.stringify(json));
var url = "config" + (reboot ? "" : "?nb");
s_ajax({
url: url,
Expand Down Expand Up @@ -227,4 +227,75 @@ function savewifi(){
window.oridata.wifi=3;
}
}
}
function initAdvanced(){
var inputs = document.querySelectorAll('#advanced input,select'), i;

for (i = 0; i < inputs.length; ++i) {
inputs[i].onchange = function(){
// console.log("item:"+ this.id +" value:" + this.value);
window.ccModified[this.id]=this.value;
checkModify();

}
}

Q("#warning").onchange=function(){
checkModify();
}
}


function checkModify(){
var dirty=false;
Object.keys(window.ccModified).forEach(key => {
if(window.ccModified[key] != window.ccConstants[key])
//console.log("modified:" + key +" value:" + window.ccModified[key]);
dirty = true;
});


Q("#adv-update").disabled= ! Q("#warning").checked || !dirty;
}

function cResponse(cc){
window.ccModified={};
window.ccConstants=cc;
Q("#adv-update").disabled=true;
Object.keys(cc).forEach(key => {
// console.log(key, cc[key]);

Q("#" + key).value = cc[key];
});
}
var testConfig={"tempFormat":"C","tempSetMin": 1.0,"tempSetMax": 30.0,"pidMax": 10.000,"Kp": 5.000,"Ki": 0.250,"Kd":-1.500,"iMaxErr": 0.500,"idleRangeH": 1.000,"idleRangeL":-1.000,"heatTargetH": 0.299,"heatTargetL":-0.199,"coolTargetH": 0.199,"coolTargetL":-0.299,"maxHeatTimeForEst":600,"maxCoolTimeForEst":1200,"minCoolTime":180,"minCoolIdleTime":300,"minHeatTime":180,"minHeatIdleTime":300,"deadTime":600,"fridgeFastFilt":1,"fridgeSlowFilt":4,"fridgeSlopeFilt":3,"beerFastFilt":3,"beerSlowFilt":4,"beerSlopeFilt":4,"lah":0,"hs":0};

function showAdvanced(){
Q("#advanced").style.display = "block";
if(typeof BWF.handlers['C'] == "undefined"){
BWF.on('C',cResponse);
initAdvanced();
}
window.ccModified={};
Q("#adv-update").disabled=true;
//Test code
//BWF.handlers.C(testConfig);
BWF.send("c");
}

function hideAdvanced(){
Q("#advanced").style.display = "none";
}


function setAdvancedOptions(){
var cmd={};
Object.keys(window.ccModified).forEach(key => {
if(window.ccModified[key] != window.ccConstants[key])
//console.log("modified:" + key +" value:" + window.ccModified[key]);
cmd[key] = window.ccModified[key];
});

//console.log("j" +JSON.stringify(cmd));
BWF.send("j" + JSON.stringify(cmd));
}
1 change: 1 addition & 0 deletions htmljs/src/js/script-setup.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ function init(classic) {
},
N:function(a){
window.board= a.b;
list();
}
}
})
Expand Down
4 changes: 3 additions & 1 deletion htmljs/src/styles/import/_vars.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ $carbonation-color: #AAAAAA;
$humidity-color: #2222DD;
$humidity-set-color: #EE1111;
$room-humidity-color: #AAAAAA;

$gravity-change-1-color: #DD33DD;
$gravity-change-2-color: #3333DD;
$gravity-change-3-color: #33DD33;
// Media Query Ranges
$small-screen-up: 601px !default;
$medium-screen-up: 993px !default;
Expand Down
Loading

0 comments on commit 91b0f83

Please sign in to comment.