extend config.ini handler for GPIO settings

add BootTime incode
This commit is contained in:
Zwer2k
2021-06-08 00:59:28 +02:00
parent 21a59fbd35
commit c48b44d06a
5 changed files with 191 additions and 67 deletions

View File

@@ -18,6 +18,7 @@
static const char *TAG = "sntp"; static const char *TAG = "sntp";
bool setTimeAlwaysOnReboot = true; bool setTimeAlwaysOnReboot = true;
time_t bootTime;
static void obtain_time(void); static void obtain_time(void);
static void initialize_sntp(void); static void initialize_sntp(void);
@@ -125,4 +126,9 @@ static void initialize_sntp(void)
sntp_setservername(0, "pool.ntp.org"); sntp_setservername(0, "pool.ntp.org");
// sntp_set_time_sync_notification_cb(time_sync_notification_cb); // sntp_set_time_sync_notification_cb(time_sync_notification_cb);
sntp_init(); sntp_init();
}
void setBootTime()
{
time(&bootTime);
} }

View File

@@ -18,4 +18,6 @@ std::string gettimestring(const char * frm);
std::string ConvertTimeToString(time_t _time, const char * frm); std::string ConvertTimeToString(time_t _time, const char * frm);
void setTimeZone(std::string _tzstring); void setTimeZone(std::string _tzstring);
void reset_servername(std::string _servername); void reset_servername(std::string _servername);
void setBootTime();

View File

@@ -179,6 +179,7 @@ extern "C" void app_main(void)
vTaskDelay( xDelay ); vTaskDelay( xDelay );
// LogFile.WriteToFile("Startsequence 07"); // LogFile.WriteToFile("Startsequence 07");
setup_time(); setup_time();
setBootTime();
LogFile.WriteToFile("============================================================================================="); LogFile.WriteToFile("=============================================================================================");
LogFile.WriteToFile("=================================== Main Started ============================================"); LogFile.WriteToFile("=================================== Main Started ============================================");
LogFile.WriteToFile("============================================================================================="); LogFile.WriteToFile("=============================================================================================");

View File

@@ -19,6 +19,19 @@ p {font-size: 1em;}
textarea { textarea {
font-size: 14px; font-size: 14px;
} }
.description {
color: black;
font-size: 80%;
}
.disabled {
color:lightgrey;
}
.smallSelect {
width: 30px;
}
</style> </style>
</head> </head>
@@ -69,7 +82,7 @@ textarea {
<td> <td>
<input type="text" name="name" id="MakeImage_LogImageLocation_value1"> <input type="text" name="name" id="MakeImage_LogImageLocation_value1">
</td> </td>
<td style="font-size: 80%;"> <td class="description">
Location to store raw images for logging Location to store raw images for logging
</td> </td>
</tr> </tr>
@@ -83,7 +96,7 @@ textarea {
<td> <td>
<input type="number" id="MakeImage_LogfileRetentionInDays_value1" size="13" min="0" step="1"> <input type="number" id="MakeImage_LogfileRetentionInDays_value1" size="13" min="0" step="1">
</td> </td>
<td style="font-size: 80%;"> <td class="description">
Time to keep the raw image (in days -"0" = forever) Time to keep the raw image (in days -"0" = forever)
</td> </td>
</tr> </tr>
@@ -97,7 +110,7 @@ textarea {
<td> <td>
<input type="number" id="MakeImage_WaitBeforeTakingPicture_value1" size="13" min="0" step="any"> <input type="number" id="MakeImage_WaitBeforeTakingPicture_value1" size="13" min="0" step="any">
</td> </td>
<td style="font-size: 80%;"> <td class="description">
Wait time between illumination switch on and take the picture (in seconds) Wait time between illumination switch on and take the picture (in seconds)
</td> </td>
</tr> </tr>
@@ -110,7 +123,7 @@ textarea {
<td> <td>
<input type="number" id="MakeImage_ImageQuality_value1" size="13" min="0" max="63"> <input type="number" id="MakeImage_ImageQuality_value1" size="13" min="0" max="63">
</td> </td>
<td style="font-size: 80%;"> <td class="description">
Quality index for picture (default = "5" - "0" high ... "63" low) Quality index for picture (default = "5" - "0" high ... "63" low)
</td> </td>
</tr> </tr>
@@ -126,7 +139,7 @@ textarea {
<option value="1" >QVGA</option> <option value="1" >QVGA</option>
</select> </select>
</td> </td>
<td style="font-size: 80%;"> <td class="description">
Picture size camera (default = "VGA") Picture size camera (default = "VGA")
</td> </td>
</tr> </tr>
@@ -293,8 +306,8 @@ textarea {
<class id="Digits_ModelInputSize_text" style="color:black;">ModelInputSize</class> <class id="Digits_ModelInputSize_text" style="color:black;">ModelInputSize</class>
</td> </td>
<td> <td>
x: <input type="number" id="Digits_ModelInputSize_value1" style="width: 30px;" min="1" step="1"> x: <input type="number" id="Digits_ModelInputSize_value1" class="smallSelect" min="1" step="1">
y: <input type="number" id="Digits_ModelInputSize_value2" style="width: 30px;" min="1" step="1"> y: <input type="number" id="Digits_ModelInputSize_value2" class="smallSelect" min="1" step="1">
</td> </td>
<td style="font-size: 80%;"> <td style="font-size: 80%;">
Size of the input image for the CNN model Size of the input image for the CNN model
@@ -353,8 +366,8 @@ textarea {
<td width="20px" style="padding-left: 40px;"> </td> <td width="20px" style="padding-left: 40px;"> </td>
<td> <class id="Analog_ModelInputSize_text" style="color:black;">ModelInputSize</class> </td> <td> <class id="Analog_ModelInputSize_text" style="color:black;">ModelInputSize</class> </td>
<td> <td>
x: <input type="number" id="Analog_ModelInputSize_value1" style="width: 30px;" min="1" step="1"> x: <input type="number" id="Analog_ModelInputSize_value1" class="smallSelect" min="1" step="1">
y: <input type="number" id="Analog_ModelInputSize_value2" style="width: 30px;" min="1" step="1"> y: <input type="number" id="Analog_ModelInputSize_value2" class="smallSelect" min="1" step="1">
</td> </td>
<td style="font-size: 80%;"> Size of the input image for the CNN model </td> <td style="font-size: 80%;"> Size of the input image for the CNN model </td>
</tr> </tr>
@@ -622,6 +635,41 @@ textarea {
</td> </td>
</tr> </tr>
<tr>
<td colspan="4" style="padding-left: 20px;"><h4><input type="checkbox" id="Category_GPIO_enabled" value="1" onclick='UpdateAfterCategoryCheck()' unchecked > GPIO Settings</h4></td>
</tr>
<tr class="GPIO_IO16">
<td width="20px" style="padding-left: 40px;">
<input type="checkbox" id="GPIO_IO16_enabled" value="1" onclick = 'InvertEnableItem("GPIO", "IO16")' unchecked>
</td>
<td>
<span id="GPIO_IO16_text">GPIO 16 state</span>
</td>
<td>
<td">
<select id="GPIO_IO16_value1">
<option value="input" >input</option>
<option value="output" >output</option>
</select>
</td>
</td>
<td class="description">
GPIO 16 is usable without restrictions
</td>
</tr>
<tr class="GPIO_IO16">
<td width="20px" style="padding-left: 40px;"></td>
<td>
<span>GPIO 16 name</span>
</td>
<td>
<td"><input type="text" id="GPIO_IO16_value2"></td>
</td>
<td class="description">
GPIO 16 MQTT topic name (empty = gpio16)
</td>
</tr>
<tr> <tr>
<td colspan="4" style="padding-left: 20px;"><h4>Debug</h4></td> <td colspan="4" style="padding-left: 20px;"><h4>Debug</h4></td>
</tr> </tr>
@@ -638,7 +686,7 @@ textarea {
<option value="1" >false</option> <option value="1" >false</option>
</select> </select>
</td> </td>
<td style="font-size: 80%;"> <td class="description">
Turn on/off the extended logging Turn on/off the extended logging
</td> </td>
</tr> </tr>
@@ -652,7 +700,7 @@ textarea {
<td> <td>
<input type="number" id="Debug_LogfileRetentionInDays_value1" size="13" min="0" step="1"> <input type="number" id="Debug_LogfileRetentionInDays_value1" size="13" min="0" step="1">
</td> </td>
<td style="font-size: 80%;"> <td class="description">
Time to keep the log files (in days - "0" = forever) Time to keep the log files (in days - "0" = forever)
</td> </td>
</tr> </tr>
@@ -670,7 +718,7 @@ textarea {
<td> <td>
<input type="text" id="System_TimeZone_value1"> <input type="text" id="System_TimeZone_value1">
</td> </td>
<td style="font-size: 80%;"> <td class="description">
Time zone in POSIX syntax (Europe/Berlin = "CET-1CEST,M3.5.0,M10.5.0/3" - incl. daylight saving) Time zone in POSIX syntax (Europe/Berlin = "CET-1CEST,M3.5.0,M10.5.0/3" - incl. daylight saving)
</td> </td>
</tr> </tr>
@@ -684,7 +732,7 @@ textarea {
<td> <td>
<input type="text" id="System_TimeServer_value1"> <input type="text" id="System_TimeServer_value1">
</td> </td>
<td style="font-size: 80%;"> <td class="description">
Time server to synchronize system time (default: "pool.ntp.org" - used if nothing is specified) Time server to synchronize system time (default: "pool.ntp.org" - used if nothing is specified)
</td> </td>
</tr> </tr>
@@ -698,7 +746,7 @@ textarea {
<td> <td>
<input type="text" id="System_Hostname_value1"> <input type="text" id="System_Hostname_value1">
</td> </td>
<td style="font-size: 80%;"> <td class="description">
Hostname for server - will be transfered to wlan.ini at next startup) Hostname for server - will be transfered to wlan.ini at next startup)
</td> </td>
</tr> </tr>
@@ -733,7 +781,7 @@ textarea {
function LoadConfigNeu() { function LoadConfigNeu() {
console.log("LoadConfigNeu");
var isInitialSetup = getParameterByName('InitialSetup'); var isInitialSetup = getParameterByName('InitialSetup');
if (isInitialSetup === 'true') if (isInitialSetup === 'true')
{ {
@@ -744,6 +792,7 @@ function LoadConfigNeu() {
basepath = getbasepath(); basepath = getbasepath();
if (!loadConfig(basepath)) { if (!loadConfig(basepath)) {
alert("Config.ini could not be loaded!\nPlease reload the page."); alert("Config.ini could not be loaded!\nPlease reload the page.");
console.log("LoadConfigNeu end ret");
return; return;
} }
loadConfig(basepath); loadConfig(basepath);
@@ -753,19 +802,25 @@ function LoadConfigNeu() {
UpdateInput(); UpdateInput();
UpdateExpertModus(); UpdateExpertModus();
document.getElementById("divall").style.display = ''; document.getElementById("divall").style.display = '';
} console.log("LoadConfigNeu end");
}
function getParameterByName(name, url = window.location.href) { function getParameterByName(name, url = window.location.href) {
console.log("getParameterByName");
name = name.replace(/[\[\]]/g, '\\$&'); name = name.replace(/[\[\]]/g, '\\$&');
var regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)'), var regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)'),
results = regex.exec(url); results = regex.exec(url);
if (!results) return null;
console.log("getParameterByName end");
if (!results) return null;
if (!results[2]) return ''; if (!results[2]) return '';
return decodeURIComponent(results[2].replace(/\+/g, ' ')); return decodeURIComponent(results[2].replace(/\+/g, ' '));
} }
function WriteParameter(_param, _category, _cat, _name, _optional, _select = false, _anzpara = 1){ function WriteParameter(_param, _category, _cat, _name, _optional, _select = false, _anzpara = 1){
console.log("InvertEnableItem");
if (_param[_cat][_name]["found"]){ if (_param[_cat][_name]["found"]){
if (_optional) { if (_optional) {
document.getElementById(_cat+"_"+_name+"_enabled").checked = _param[_cat][_name]["enabled"]; document.getElementById(_cat+"_"+_name+"_enabled").checked = _param[_cat][_name]["enabled"];
@@ -774,22 +829,23 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _select = fal
} }
} }
document.getElementById(_cat+"_"+_name+"_text").style="color:black;" document.getElementById(_cat+"_"+_name+"_text").style="color:black;"
if (_select) { setEnabled(_cat+"_"+_name, true);
var textToFind = _param[_cat][_name]["value1"];
var dd = document.getElementById(_cat+"_"+_name+"_value1"); for (var j = 1; j <= _anzpara; ++j) {
for (var i = 0; i < dd.options.length; i++) { let element = document.getElementById(_cat+"_"+_name+"_value"+j);
if (dd.options[i].text.toLowerCase() === textToFind.toLowerCase()) { if (element.tagName == "select") {
dd.selectedIndex = i; var textToFind = _param[_cat][_name]["value1"];
break; for (var i = 0; i < element.options.length; i++) {
if (element.options[i].text.toLowerCase() === textToFind.toLowerCase()) {
element.selectedIndex = i;
break;
}
} }
} }
} else {
else { element.value = _param[_cat][_name]["value"+j];
for (var j = 1; j <= _anzpara; ++j) {
document.getElementById(_cat+"_"+_name+"_value"+j).value = _param[_cat][_name]["value"+j];
} }
} }
} }
else { else {
if (_optional) { if (_optional) {
@@ -798,7 +854,8 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _select = fal
document.getElementById(_cat+"_"+_name+"_value"+j).disabled = true; document.getElementById(_cat+"_"+_name+"_value"+j).disabled = true;
} }
} }
document.getElementById(_cat+"_"+_name+"_text").style="color:lightgrey;" document.getElementById(_cat+"_"+_name+"_text").style="color:lightgrey;"
setEnabled(_cat+"_"+_name, false);
} }
@@ -812,12 +869,16 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _select = fal
} }
} }
document.getElementById(_cat+"_"+_name+"_text").style="color:lightgrey;" document.getElementById(_cat+"_"+_name+"_text").style="color:lightgrey;"
setEnabled(_cat+"_"+_name, false);
} }
EnDisableItem(_category[_cat]["enabled"], _param, _category, _cat, _name, _optional); EnDisableItem(_category[_cat]["enabled"], _param, _category, _cat, _name, _optional);
console.log("InvertEnableItem end");
} }
function InvertEnableItem(_cat, _param) function InvertEnableItem(_cat, _param)
{ {
console.log("InvertEnableItem");
_zw = _cat + "_" + _param + "_enabled"; _zw = _cat + "_" + _param + "_enabled";
_isOn = document.getElementById(_zw).checked; _isOn = document.getElementById(_zw).checked;
@@ -830,21 +891,42 @@ function InvertEnableItem(_cat, _param)
document.getElementById(_zw).disabled = !_isOn; document.getElementById(_zw).disabled = !_isOn;
document.getElementById(_zw).style = _color; document.getElementById(_zw).style = _color;
if (param[_cat][_param]["anzParam"] == 2) { setEnabled(_cat + "_" + _param, _isOn);
_color = "width: 30px;" + _color;
}
for (var j = 1; j <= param[_cat][_param]["anzParam"]; ++j) { for (var j = 1; j <= param[_cat][_param]["anzParam"]; ++j) {
document.getElementById(_cat+"_"+_param+"_value"+j).disabled = !_isOn; document.getElementById(_cat+"_"+_param+"_value"+j).disabled = !_isOn;
document.getElementById(_cat+"_"+_param+"_value"+j).style=_color; document.getElementById(_cat+"_"+_param+"_value"+j).style=_color;
} }
console.log("InvertEnableItem end");
}
function setEnabled(className, enabled) {
let elements = document.getElementsByClassName(className);
for (i = 0; i < elements.length; i++) {
if (enabled) {
elements[i].classList.remove("disabled");
} else {
elements[i].classList.add("disabled");
}
let inputs = elements[i].getElementsByTagName("input");
for (j = 0; j < inputs.length; j++) {
if (inputs[j].id.endsWith("_enabled"))
continue;
if (enabled) {
inputs[j].removeAttribute("disabled");
} else {
inputs[j].setAttribute("disabled", "disabled");
}
}
}
} }
function EnDisableItem(_status, _param, _category, _cat, _name, _optional) function EnDisableItem(_status, _param, _category, _cat, _name, _optional)
{ {
console.log("EnDisableItem");
_status = _param[_cat][_name]["found"] && _category[_cat]["enabled"]; _status = _param[_cat][_name]["found"] && _category[_cat]["enabled"];
_color = "color:lightgrey;"; _color = "color:lightgrey;";
@@ -865,39 +947,40 @@ function EnDisableItem(_status, _param, _category, _cat, _name, _optional)
document.getElementById(_cat+"_"+_name+"_text").disabled = !_status; document.getElementById(_cat+"_"+_name+"_text").disabled = !_status;
document.getElementById(_cat+"_"+_name+"_text").style = _color; document.getElementById(_cat+"_"+_name+"_text").style = _color;
if (_param[_cat][_name]["anzParam"] == 2) { setEnabled(_cat+"_"+_name, _status);
_color = "width: 30px;" + _color;
}
for (var j = 1; j <= _param[_cat][_name]["anzParam"]; ++j) { for (var j = 1; j <= _param[_cat][_name]["anzParam"]; ++j) {
document.getElementById(_cat+"_"+_name+"_value"+j).disabled = !_status; document.getElementById(_cat+"_"+_name+"_value"+j).disabled = !_status;
document.getElementById(_cat+"_"+_name+"_value"+j).style=_color; document.getElementById(_cat+"_"+_name+"_value"+j).style=_color;
} }
console.log("EnDisableItem end");
} }
function ReadParameter(_param, _cat, _name, _optional, _select = false){ function ReadParameter(_param, _cat, _name, _optional){
if (_param[_cat][_name]["found"]){ if (_param[_cat][_name]["found"]){
if (_optional) { if (_optional) {
_param[_cat][_name]["enabled"] = document.getElementById(_cat+"_"+_name+"_enabled").checked; _param[_cat][_name]["enabled"] = document.getElementById(_cat+"_"+_name+"_enabled").checked;
} }
if (_select) {
var sel = document.getElementById(_cat+"_"+_name+"_value1"); for (var j = 1; j <= _param[_cat][_name]["anzParam"]; ++j) {
_param[_cat][_name]["value1"] = sel.options[sel.selectedIndex].text; let element = document.getElementById(_cat+"_"+_name+"_value"+j);
} if (element.tagName == "select") {
else { _param[_cat][_name]["value1"] = element.options[element.selectedIndex].text;
for (var j = 1; j <= _param[_cat][_name]["anzParam"]; ++j) {
_param[_cat][_name]["value"+j] = document.getElementById(_cat+"_"+_name+"_value"+j).value;
} }
} else {
_param[_cat][_name]["value"+j] = element.value;
}
}
} }
} }
function UpdateInput() { function UpdateInput() {
console.log("UpdateInput");
document.getElementById("Category_Analog_enabled").checked = category["Analog"]["enabled"]; document.getElementById("Category_Analog_enabled").checked = category["Analog"]["enabled"];
document.getElementById("Category_Digits_enabled").checked = category["Digits"]["enabled"]; document.getElementById("Category_Digits_enabled").checked = category["Digits"]["enabled"];
document.getElementById("Category_MQTT_enabled").checked = category["MQTT"]["enabled"]; document.getElementById("Category_MQTT_enabled").checked = category["MQTT"]["enabled"];
document.getElementById("Category_GPIO_enabled").checked = category["GPIO"]["enabled"];
WriteParameter(param, category, "MakeImage", "LogImageLocation", true); WriteParameter(param, category, "MakeImage", "LogImageLocation", true);
WriteParameter(param, category, "MakeImage", "LogfileRetentionInDays", true); WriteParameter(param, category, "MakeImage", "LogfileRetentionInDays", true);
@@ -939,7 +1022,9 @@ function UpdateInput() {
WriteParameter(param, category, "MQTT", "TopicTimeStamp", true); WriteParameter(param, category, "MQTT", "TopicTimeStamp", true);
WriteParameter(param, category, "MQTT", "ClientID", true); WriteParameter(param, category, "MQTT", "ClientID", true);
WriteParameter(param, category, "MQTT", "user", true); WriteParameter(param, category, "MQTT", "user", true);
WriteParameter(param, category, "MQTT", "password", true); WriteParameter(param, category, "MQTT", "password", true);
WriteParameter(param, category, "GPIO", "IO16", true, true, 2);
WriteParameter(param, category, "AutoTimer", "AutoStart", false, true); WriteParameter(param, category, "AutoTimer", "AutoStart", false, true);
WriteParameter(param, category, "AutoTimer", "Intervall", false); WriteParameter(param, category, "AutoTimer", "Intervall", false);
@@ -949,15 +1034,18 @@ function UpdateInput() {
WriteParameter(param, category, "System", "TimeZone", true); WriteParameter(param, category, "System", "TimeZone", true);
WriteParameter(param, category, "System", "Hostname", true); WriteParameter(param, category, "System", "Hostname", true);
WriteParameter(param, category, "System", "TimeServer", true); WriteParameter(param, category, "System", "TimeServer", true);
console.log("UpdateInput end");
} }
function ReadParameterAll() function ReadParameterAll()
{ {
console.log("ReadParameterAll");
category["Analog"]["enabled"] = document.getElementById("Category_Analog_enabled").checked; category["Analog"]["enabled"] = document.getElementById("Category_Analog_enabled").checked;
category["Digits"]["enabled"] = document.getElementById("Category_Digits_enabled").checked; category["Digits"]["enabled"] = document.getElementById("Category_Digits_enabled").checked;
category["MQTT"]["enabled"] = document.getElementById("Category_MQTT_enabled").checked; category["MQTT"]["enabled"] = document.getElementById("Category_MQTT_enabled").checked;
category["GPIO"]["enabled"] = document.getElementById("Category_GPIO_enabled").checked;
ReadParameter(param, "MakeImage", "LogImageLocation", true); ReadParameter(param, "MakeImage", "LogImageLocation", true);
ReadParameter(param, "MakeImage", "LogfileRetentionInDays", true); ReadParameter(param, "MakeImage", "LogfileRetentionInDays", true);
ReadParameter(param, "MakeImage", "WaitBeforeTakingPicture", false); ReadParameter(param, "MakeImage", "WaitBeforeTakingPicture", false);
@@ -965,31 +1053,31 @@ function ReadParameterAll()
ReadParameter(param, "MakeImage", "Brightness", false); ReadParameter(param, "MakeImage", "Brightness", false);
// ReadParameter(param, "MakeImage", "Contrast", false); // ReadParameter(param, "MakeImage", "Contrast", false);
// ReadParameter(param, "MakeImage", "Saturation", false); // ReadParameter(param, "MakeImage", "Saturation", false);
ReadParameter(param, "MakeImage", "ImageSize", false, true); ReadParameter(param, "MakeImage", "ImageSize", false);
ReadParameter(param, "MakeImage", "FixedExposure", false, true); ReadParameter(param, "MakeImage", "FixedExposure", false);
ReadParameter(param, "Alignment", "SearchFieldX", false); ReadParameter(param, "Alignment", "SearchFieldX", false);
ReadParameter(param, "Alignment", "SearchFieldY", false); ReadParameter(param, "Alignment", "SearchFieldY", false);
ReadParameter(param, "Alignment", "AlignmentAlgo", true, true); ReadParameter(param, "Alignment", "AlignmentAlgo", true);
ReadParameter(param, "Digits", "Model", false); ReadParameter(param, "Digits", "Model", false);
ReadParameter(param, "Digits", "LogImageLocation", true); ReadParameter(param, "Digits", "LogImageLocation", true);
ReadParameter(param, "Digits", "LogfileRetentionInDays", true); ReadParameter(param, "Digits", "LogfileRetentionInDays", true);
ReadParameter(param, "Digits", "ModelInputSize", false, false, 2); ReadParameter(param, "Digits", "ModelInputSize", false);
ReadParameter(param, "Analog", "Model", false); ReadParameter(param, "Analog", "Model", false);
ReadParameter(param, "Analog", "LogImageLocation", true); ReadParameter(param, "Analog", "LogImageLocation", true);
ReadParameter(param, "Analog", "LogfileRetentionInDays", true); ReadParameter(param, "Analog", "LogfileRetentionInDays", true);
ReadParameter(param, "Analog", "ExtendedResolution", true, true); ReadParameter(param, "Analog", "ExtendedResolution", true);
ReadParameter(param, "Analog", "ModelInputSize", false, false, 2); ReadParameter(param, "Analog", "ModelInputSize", false);
ReadParameter(param, "PostProcessing", "DecimalShift", true); ReadParameter(param, "PostProcessing", "DecimalShift", true);
ReadParameter(param, "PostProcessing", "PreValueUse", true, true); ReadParameter(param, "PostProcessing", "PreValueUse", true);
ReadParameter(param, "PostProcessing", "PreValueAgeStartup", true); ReadParameter(param, "PostProcessing", "PreValueAgeStartup", true);
ReadParameter(param, "PostProcessing", "AllowNegativeRates", true, true); ReadParameter(param, "PostProcessing", "AllowNegativeRates", true);
ReadParameter(param, "PostProcessing", "MaxRateValue", true); ReadParameter(param, "PostProcessing", "MaxRateValue", true);
ReadParameter(param, "PostProcessing", "ErrorMessage", true, true); ReadParameter(param, "PostProcessing", "ErrorMessage", true);
ReadParameter(param, "PostProcessing", "CheckDigitIncreaseConsistency", true, true); ReadParameter(param, "PostProcessing", "CheckDigitIncreaseConsistency", true);
ReadParameter(param, "MQTT", "Uri", true); ReadParameter(param, "MQTT", "Uri", true);
ReadParameter(param, "MQTT", "Topic", true); ReadParameter(param, "MQTT", "Topic", true);
@@ -1000,10 +1088,12 @@ function ReadParameterAll()
ReadParameter(param, "MQTT", "user", true); ReadParameter(param, "MQTT", "user", true);
ReadParameter(param, "MQTT", "password", true); ReadParameter(param, "MQTT", "password", true);
ReadParameter(param, "AutoTimer", "AutoStart", false, true); ReadParameter(param, "GPIO", "IO16", true);
ReadParameter(param, "AutoTimer", "AutoStart", false);
ReadParameter(param, "AutoTimer", "Intervall", false); ReadParameter(param, "AutoTimer", "Intervall", false);
ReadParameter(param, "Debug", "Logfile", true, true); ReadParameter(param, "Debug", "Logfile", true);
ReadParameter(param, "Debug", "LogfileRetentionInDays", true); ReadParameter(param, "Debug", "LogfileRetentionInDays", true);
ReadParameter(param, "System", "TimeZone", true); ReadParameter(param, "System", "TimeZone", true);
@@ -1011,30 +1101,38 @@ function ReadParameterAll()
ReadParameter(param, "System", "TimeServer", true); ReadParameter(param, "System", "TimeServer", true);
FormatDecimalValue(param, "PostProcessing", "MaxRateValue"); FormatDecimalValue(param, "PostProcessing", "MaxRateValue");
console.log("ReadParameterAll end");
} }
function WriteConfig(){ function WriteConfig(){
console.log("WriteConfig");
ReadParameterAll(); ReadParameterAll();
console.log("WriteConfig end");
return setConfigParameters(param, category); return setConfigParameters(param, category);
} }
function FormatDecimalValue(_param, _cat, _name) { function FormatDecimalValue(_param, _cat, _name) {
console.log("FormatDecimalValue");
for (var j = 1; j <= _param[_cat][_name]["anzParam"]; ++j) { for (var j = 1; j <= _param[_cat][_name]["anzParam"]; ++j) {
var _val = _param[_cat][_name]["value"+j]; var _val = _param[_cat][_name]["value"+j];
_val = _val.replace(",", "."); _val = _val.replace(",", ".");
_param[_cat][_name]["value"+j] = _val; _param[_cat][_name]["value"+j] = _val;
} }
console.log("FormatDecimalValue end");
} }
function UpdateAfterCategoryCheck() { function UpdateAfterCategoryCheck() {
console.log("UpdateAfterCategoryCheck");
ReadParameterAll(); ReadParameterAll();
category["Analog"]["enabled"] = document.getElementById("Category_Analog_enabled").checked; category["Analog"]["enabled"] = document.getElementById("Category_Analog_enabled").checked;
category["Digits"]["enabled"] = document.getElementById("Category_Digits_enabled").checked; category["Digits"]["enabled"] = document.getElementById("Category_Digits_enabled").checked;
UpdateInput(); UpdateInput();
console.log("UpdateAfterCategoryCheck end");
} }
function UpdateExpertModus() function UpdateExpertModus()
{ {
console.log("UpdateExpertModus");
var _style = 'display:none;'; var _style = 'display:none;';
if (document.getElementById("ExpertModus_enabled").checked) { if (document.getElementById("ExpertModus_enabled").checked) {
_style = ''; _style = '';
@@ -1049,19 +1147,22 @@ function UpdateExpertModus()
for (var i = 0; i < expert.length; i++) { for (var i = 0; i < expert.length; i++) {
document.getElementById(expert[i].id).style = _style; document.getElementById(expert[i].id).style = _style;
} }
console.log("UpdateExpertModus end");
} }
function saveTextAsFile() function saveTextAsFile()
{ {
console.log("saveTextAsFile");
if (confirm("Are you sure you want to update \"config.ini\"?")) { if (confirm("Are you sure you want to update \"config.ini\"?")) {
var textToSave = WriteConfig(); var textToSave = WriteConfig();
FileDeleteOnServer("/config/config.ini", basepath); FileDeleteOnServer("/config/config.ini", basepath);
FileSendContent(textToSave, "/config/config.ini", basepath); FileSendContent(textToSave, "/config/config.ini", basepath);
} }
console.log("saveTextAsFile end");
} }
function doReboot() { function doReboot() {
console.log("doReboot");
if (confirm("Are you sure you want to reboot the ESP32?")) { if (confirm("Are you sure you want to reboot the ESP32?")) {
var stringota = "/reboot"; var stringota = "/reboot";
window.location = stringota; window.location = stringota;
@@ -1069,9 +1170,11 @@ function doReboot() {
window.location.assign(stringota); window.location.assign(stringota);
window.location.replace(stringota); window.location.replace(stringota);
} }
console.log("doReboot end");
} }
function editConfigDirect() { function editConfigDirect() {
console.log("editConfigDirect");
if (confirm("Did you save your changes?")) { if (confirm("Did you save your changes?")) {
var stringota = "/edit_config.html"; var stringota = "/edit_config.html";
window.location = stringota; window.location = stringota;
@@ -1079,6 +1182,7 @@ function editConfigDirect() {
window.location.assign(stringota); window.location.assign(stringota);
window.location.replace(stringota); window.location.replace(stringota);
} }
console.log("editConfigDirect end");
} }
LoadConfigNeu(); LoadConfigNeu();

View File

@@ -88,7 +88,14 @@ function ParseConfig() {
ParamAddValue(param, catname, "TopicTimeStamp"); ParamAddValue(param, catname, "TopicTimeStamp");
ParamAddValue(param, catname, "ClientID"); ParamAddValue(param, catname, "ClientID");
ParamAddValue(param, catname, "user"); ParamAddValue(param, catname, "user");
ParamAddValue(param, catname, "password"); ParamAddValue(param, catname, "password");
var catname = "GPIO";
category[catname] = new Object();
category[catname]["enabled"] = false;
category[catname]["found"] = false;
param[catname] = new Object();
ParamAddValue(param, catname, "IO16", 2);
var catname = "AutoTimer"; var catname = "AutoTimer";
category[catname] = new Object(); category[catname] = new Object();
@@ -177,8 +184,12 @@ function ParamExtractValue(_param, _linesplit, _catname, _paramname, _aktline, _
function ParamExtractValueAll(_param, _linesplit, _catname, _aktline, _iscom){ function ParamExtractValueAll(_param, _linesplit, _catname, _aktline, _iscom){
for (var paramname in _param[_catname]) { for (var paramname in _param[_catname]) {
if ((_linesplit[0].toUpperCase() == paramname.toUpperCase()) && (_linesplit.length > _param[_catname][paramname]["anzParam"])) if (_linesplit[0].toUpperCase() == paramname.toUpperCase())
{ {
while (_linesplit.length <= _param[_catname][paramname]["anzParam"]) {
_linesplit.push("");
}
_param[_catname][paramname]["found"] = true; _param[_catname][paramname]["found"] = true;
_param[_catname][paramname]["enabled"] = !_iscom; _param[_catname][paramname]["enabled"] = !_iscom;
_param[_catname][paramname]["line"] = _aktline; _param[_catname][paramname]["line"] = _aktline;