diff --git a/code/components/jomjol_time_sntp/time_sntp.cpp b/code/components/jomjol_time_sntp/time_sntp.cpp
index 51f9175d..4e7b769f 100644
--- a/code/components/jomjol_time_sntp/time_sntp.cpp
+++ b/code/components/jomjol_time_sntp/time_sntp.cpp
@@ -18,6 +18,7 @@
static const char *TAG = "sntp";
bool setTimeAlwaysOnReboot = true;
+time_t bootTime;
static void obtain_time(void);
static void initialize_sntp(void);
@@ -125,4 +126,9 @@ static void initialize_sntp(void)
sntp_setservername(0, "pool.ntp.org");
// sntp_set_time_sync_notification_cb(time_sync_notification_cb);
sntp_init();
+}
+
+void setBootTime()
+{
+ time(&bootTime);
}
\ No newline at end of file
diff --git a/code/components/jomjol_time_sntp/time_sntp.h b/code/components/jomjol_time_sntp/time_sntp.h
index da37ae0b..975c6056 100644
--- a/code/components/jomjol_time_sntp/time_sntp.h
+++ b/code/components/jomjol_time_sntp/time_sntp.h
@@ -18,4 +18,6 @@ std::string gettimestring(const char * frm);
std::string ConvertTimeToString(time_t _time, const char * frm);
void setTimeZone(std::string _tzstring);
-void reset_servername(std::string _servername);
\ No newline at end of file
+void reset_servername(std::string _servername);
+
+void setBootTime();
diff --git a/code/main/main.cpp b/code/main/main.cpp
index 75dee4f9..fd94cfbe 100644
--- a/code/main/main.cpp
+++ b/code/main/main.cpp
@@ -179,6 +179,7 @@ extern "C" void app_main(void)
vTaskDelay( xDelay );
// LogFile.WriteToFile("Startsequence 07");
setup_time();
+ setBootTime();
LogFile.WriteToFile("=============================================================================================");
LogFile.WriteToFile("=================================== Main Started ============================================");
LogFile.WriteToFile("=============================================================================================");
diff --git a/sd-card/html/edit_config_param.html b/sd-card/html/edit_config_param.html
index 867ba103..259be5de 100644
--- a/sd-card/html/edit_config_param.html
+++ b/sd-card/html/edit_config_param.html
@@ -19,6 +19,19 @@ p {font-size: 1em;}
textarea {
font-size: 14px;
}
+
+.description {
+ color: black;
+ font-size: 80%;
+}
+
+.disabled {
+ color:lightgrey;
+}
+
+.smallSelect {
+ width: 30px;
+}
@@ -69,7 +82,7 @@ textarea {
|
|
-
+ |
Location to store raw images for logging
|
@@ -83,7 +96,7 @@ textarea {
|
-
+ |
Time to keep the raw image (in days -"0" = forever)
|
@@ -97,7 +110,7 @@ textarea {
|
-
+ |
Wait time between illumination switch on and take the picture (in seconds)
|
@@ -110,7 +123,7 @@ textarea {
|
-
+ |
Quality index for picture (default = "5" - "0" high ... "63" low)
|
@@ -126,7 +139,7 @@ textarea {
-
+ |
Picture size camera (default = "VGA")
|
@@ -293,8 +306,8 @@ textarea {
ModelInputSize
- x:
- y:
+ x:
+ y:
|
Size of the input image for the CNN model
@@ -353,8 +366,8 @@ textarea {
| |
ModelInputSize |
- x:
- y:
+ x:
+ y:
|
Size of the input image for the CNN model |
@@ -622,6 +635,41 @@ textarea {
+
+ GPIO Settings |
+
+
+ |
+
+ |
+
+ GPIO 16 state
+ |
+
+
+
+ |
+
+
+ GPIO 16 is usable without restrictions
+ |
+
+
+ |
+
+ GPIO 16 name
+ |
+
+ |
+
+
+ GPIO 16 MQTT topic name (empty = gpio16)
+ |
+
+
Debug |
@@ -638,7 +686,7 @@ textarea {
-
+ |
Turn on/off the extended logging
|
@@ -652,7 +700,7 @@ textarea {
|
-
+ |
Time to keep the log files (in days - "0" = forever)
|
@@ -670,7 +718,7 @@ textarea {
|
-
+ |
Time zone in POSIX syntax (Europe/Berlin = "CET-1CEST,M3.5.0,M10.5.0/3" - incl. daylight saving)
|
@@ -684,7 +732,7 @@ textarea {
|
-
+ |
Time server to synchronize system time (default: "pool.ntp.org" - used if nothing is specified)
|
@@ -698,7 +746,7 @@ textarea {
|
-
+ |
Hostname for server - will be transfered to wlan.ini at next startup)
|
@@ -733,7 +781,7 @@ textarea {
function LoadConfigNeu() {
-
+ console.log("LoadConfigNeu");
var isInitialSetup = getParameterByName('InitialSetup');
if (isInitialSetup === 'true')
{
@@ -744,6 +792,7 @@ function LoadConfigNeu() {
basepath = getbasepath();
if (!loadConfig(basepath)) {
alert("Config.ini could not be loaded!\nPlease reload the page.");
+ console.log("LoadConfigNeu end ret");
return;
}
loadConfig(basepath);
@@ -753,19 +802,25 @@ function LoadConfigNeu() {
UpdateInput();
UpdateExpertModus();
document.getElementById("divall").style.display = '';
- }
+ console.log("LoadConfigNeu end");
+}
function getParameterByName(name, url = window.location.href) {
+ console.log("getParameterByName");
name = name.replace(/[\[\]]/g, '\\$&');
var regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)'),
results = regex.exec(url);
- if (!results) return null;
+
+ console.log("getParameterByName end");
+ if (!results) return null;
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){
+ console.log("InvertEnableItem");
+
if (_param[_cat][_name]["found"]){
if (_optional) {
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;"
- if (_select) {
- var textToFind = _param[_cat][_name]["value1"];
- var dd = document.getElementById(_cat+"_"+_name+"_value1");
- for (var i = 0; i < dd.options.length; i++) {
- if (dd.options[i].text.toLowerCase() === textToFind.toLowerCase()) {
- dd.selectedIndex = i;
- break;
+ setEnabled(_cat+"_"+_name, true);
+
+ for (var j = 1; j <= _anzpara; ++j) {
+ let element = document.getElementById(_cat+"_"+_name+"_value"+j);
+ if (element.tagName == "select") {
+ var textToFind = _param[_cat][_name]["value1"];
+ for (var i = 0; i < element.options.length; i++) {
+ if (element.options[i].text.toLowerCase() === textToFind.toLowerCase()) {
+ element.selectedIndex = i;
+ break;
+ }
}
}
- }
- else {
- for (var j = 1; j <= _anzpara; ++j) {
- document.getElementById(_cat+"_"+_name+"_value"+j).value = _param[_cat][_name]["value"+j];
+ else {
+ element.value = _param[_cat][_name]["value"+j];
}
}
-
}
else {
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+"_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;"
+ setEnabled(_cat+"_"+_name, false);
}
EnDisableItem(_category[_cat]["enabled"], _param, _category, _cat, _name, _optional);
+
+ console.log("InvertEnableItem end");
}
function InvertEnableItem(_cat, _param)
{
+ console.log("InvertEnableItem");
_zw = _cat + "_" + _param + "_enabled";
_isOn = document.getElementById(_zw).checked;
@@ -830,21 +891,42 @@ function InvertEnableItem(_cat, _param)
document.getElementById(_zw).disabled = !_isOn;
document.getElementById(_zw).style = _color;
- if (param[_cat][_param]["anzParam"] == 2) {
- _color = "width: 30px;" + _color;
- }
+ setEnabled(_cat + "_" + _param, _isOn);
for (var j = 1; j <= param[_cat][_param]["anzParam"]; ++j) {
document.getElementById(_cat+"_"+_param+"_value"+j).disabled = !_isOn;
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)
{
+ console.log("EnDisableItem");
_status = _param[_cat][_name]["found"] && _category[_cat]["enabled"];
_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").style = _color;
- if (_param[_cat][_name]["anzParam"] == 2) {
- _color = "width: 30px;" + _color;
- }
+ setEnabled(_cat+"_"+_name, _status);
for (var j = 1; j <= _param[_cat][_name]["anzParam"]; ++j) {
document.getElementById(_cat+"_"+_name+"_value"+j).disabled = !_status;
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 (_optional) {
_param[_cat][_name]["enabled"] = document.getElementById(_cat+"_"+_name+"_enabled").checked;
}
- if (_select) {
- var sel = document.getElementById(_cat+"_"+_name+"_value1");
- _param[_cat][_name]["value1"] = sel.options[sel.selectedIndex].text;
- }
- else {
- for (var j = 1; j <= _param[_cat][_name]["anzParam"]; ++j) {
- _param[_cat][_name]["value"+j] = document.getElementById(_cat+"_"+_name+"_value"+j).value;
+
+ for (var j = 1; j <= _param[_cat][_name]["anzParam"]; ++j) {
+ let element = document.getElementById(_cat+"_"+_name+"_value"+j);
+ if (element.tagName == "select") {
+ _param[_cat][_name]["value1"] = element.options[element.selectedIndex].text;
}
- }
+ else {
+ _param[_cat][_name]["value"+j] = element.value;
+ }
+ }
}
}
function UpdateInput() {
+ console.log("UpdateInput");
document.getElementById("Category_Analog_enabled").checked = category["Analog"]["enabled"];
document.getElementById("Category_Digits_enabled").checked = category["Digits"]["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", "LogfileRetentionInDays", true);
@@ -939,7 +1022,9 @@ function UpdateInput() {
WriteParameter(param, category, "MQTT", "TopicTimeStamp", true);
WriteParameter(param, category, "MQTT", "ClientID", 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", "Intervall", false);
@@ -949,15 +1034,18 @@ function UpdateInput() {
WriteParameter(param, category, "System", "TimeZone", 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()
{
+ console.log("ReadParameterAll");
category["Analog"]["enabled"] = document.getElementById("Category_Analog_enabled").checked;
category["Digits"]["enabled"] = document.getElementById("Category_Digits_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", "LogfileRetentionInDays", true);
ReadParameter(param, "MakeImage", "WaitBeforeTakingPicture", false);
@@ -965,31 +1053,31 @@ function ReadParameterAll()
ReadParameter(param, "MakeImage", "Brightness", false);
// ReadParameter(param, "MakeImage", "Contrast", false);
// ReadParameter(param, "MakeImage", "Saturation", false);
- ReadParameter(param, "MakeImage", "ImageSize", false, true);
- ReadParameter(param, "MakeImage", "FixedExposure", false, true);
+ ReadParameter(param, "MakeImage", "ImageSize", false);
+ ReadParameter(param, "MakeImage", "FixedExposure", false);
ReadParameter(param, "Alignment", "SearchFieldX", 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", "LogImageLocation", 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", "LogImageLocation", true);
ReadParameter(param, "Analog", "LogfileRetentionInDays", true);
- ReadParameter(param, "Analog", "ExtendedResolution", true, true);
- ReadParameter(param, "Analog", "ModelInputSize", false, false, 2);
+ ReadParameter(param, "Analog", "ExtendedResolution", true);
+ ReadParameter(param, "Analog", "ModelInputSize", false);
ReadParameter(param, "PostProcessing", "DecimalShift", true);
- ReadParameter(param, "PostProcessing", "PreValueUse", true, true);
+ ReadParameter(param, "PostProcessing", "PreValueUse", 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", "ErrorMessage", true, true);
- ReadParameter(param, "PostProcessing", "CheckDigitIncreaseConsistency", true, true);
+ ReadParameter(param, "PostProcessing", "ErrorMessage", true);
+ ReadParameter(param, "PostProcessing", "CheckDigitIncreaseConsistency", true);
ReadParameter(param, "MQTT", "Uri", true);
ReadParameter(param, "MQTT", "Topic", true);
@@ -1000,10 +1088,12 @@ function ReadParameterAll()
ReadParameter(param, "MQTT", "user", 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, "Debug", "Logfile", true, true);
+ ReadParameter(param, "Debug", "Logfile", true);
ReadParameter(param, "Debug", "LogfileRetentionInDays", true);
ReadParameter(param, "System", "TimeZone", true);
@@ -1011,30 +1101,38 @@ function ReadParameterAll()
ReadParameter(param, "System", "TimeServer", true);
FormatDecimalValue(param, "PostProcessing", "MaxRateValue");
+ console.log("ReadParameterAll end");
}
function WriteConfig(){
+ console.log("WriteConfig");
ReadParameterAll();
+ console.log("WriteConfig end");
return setConfigParameters(param, category);
}
function FormatDecimalValue(_param, _cat, _name) {
+ console.log("FormatDecimalValue");
for (var j = 1; j <= _param[_cat][_name]["anzParam"]; ++j) {
var _val = _param[_cat][_name]["value"+j];
_val = _val.replace(",", ".");
_param[_cat][_name]["value"+j] = _val;
}
+ console.log("FormatDecimalValue end");
}
function UpdateAfterCategoryCheck() {
+ console.log("UpdateAfterCategoryCheck");
ReadParameterAll();
category["Analog"]["enabled"] = document.getElementById("Category_Analog_enabled").checked;
category["Digits"]["enabled"] = document.getElementById("Category_Digits_enabled").checked;
UpdateInput();
+ console.log("UpdateAfterCategoryCheck end");
}
function UpdateExpertModus()
{
+ console.log("UpdateExpertModus");
var _style = 'display:none;';
if (document.getElementById("ExpertModus_enabled").checked) {
_style = '';
@@ -1049,19 +1147,22 @@ function UpdateExpertModus()
for (var i = 0; i < expert.length; i++) {
document.getElementById(expert[i].id).style = _style;
}
-
+ console.log("UpdateExpertModus end");
}
function saveTextAsFile()
{
+ console.log("saveTextAsFile");
if (confirm("Are you sure you want to update \"config.ini\"?")) {
var textToSave = WriteConfig();
FileDeleteOnServer("/config/config.ini", basepath);
FileSendContent(textToSave, "/config/config.ini", basepath);
}
+ console.log("saveTextAsFile end");
}
function doReboot() {
+ console.log("doReboot");
if (confirm("Are you sure you want to reboot the ESP32?")) {
var stringota = "/reboot";
window.location = stringota;
@@ -1069,9 +1170,11 @@ function doReboot() {
window.location.assign(stringota);
window.location.replace(stringota);
}
+ console.log("doReboot end");
}
function editConfigDirect() {
+ console.log("editConfigDirect");
if (confirm("Did you save your changes?")) {
var stringota = "/edit_config.html";
window.location = stringota;
@@ -1079,6 +1182,7 @@ function editConfigDirect() {
window.location.assign(stringota);
window.location.replace(stringota);
}
+ console.log("editConfigDirect end");
}
LoadConfigNeu();
diff --git a/sd-card/html/readconfigparam.js b/sd-card/html/readconfigparam.js
index af7a0d00..a5a3b857 100644
--- a/sd-card/html/readconfigparam.js
+++ b/sd-card/html/readconfigparam.js
@@ -88,7 +88,14 @@ function ParseConfig() {
ParamAddValue(param, catname, "TopicTimeStamp");
ParamAddValue(param, catname, "ClientID");
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";
category[catname] = new Object();
@@ -177,8 +184,12 @@ function ParamExtractValue(_param, _linesplit, _catname, _paramname, _aktline, _
function ParamExtractValueAll(_param, _linesplit, _catname, _aktline, _iscom){
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]["enabled"] = !_iscom;
_param[_catname][paramname]["line"] = _aktline;