Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2025-12-07 12:06:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Loading alignment page faster (#2868)

Browse Source 
Da es Probleme mit param_temp gab (mal ging es, mal nicht), habe ich extra Parameter angelegt (_rotate_temp, _mirror_temp, _isize_temp, _grayscale_temp, _negative_temp, _aec2_temp, _FixedExposure_temp, _zoom_temp, _zm_temp, _x_temp, _y_temp, _intensity_temp, _brightness_temp, _contrast_temp, _saturation_temp, _sharpness_temp, _ae_temp).
Bei den bisherigen Tests, hat alles so funktioniert wie es soll.
This commit is contained in:
michael
2024-02-14 16:24:29 +01:00
committed by GitHub
parent 141aea7fa7
commit 6b38e44d7f
7 changed files with 1330 additions and 1295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

491
code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp
View File

File diff suppressed because it is too large Load Diff

349
code/components/jomjol_flowcontroll/MainFlowControl.cpp
View File

@@ -48,51 +48,45 @@ bool isPlannedReboot = false;
static const char *TAG = "MAINCTRL"; static const char *TAG = "MAINCTRL";
//#define DEBUG_DETAIL_ON //#define DEBUG_DETAIL_ON
void CheckIsPlannedReboot() void CheckIsPlannedReboot() {
{ FILE *pfile;
FILE *pfile;
if ((pfile = fopen("/sdcard/reboot.txt", "r")) == NULL) { if ((pfile = fopen("/sdcard/reboot.txt", "r")) == NULL) {
//LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Initial boot or not a planned reboot"); //LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Initial boot or not a planned reboot");
isPlannedReboot = false; isPlannedReboot = false;
} }
else { else {
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Planned reboot"); LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Planned reboot");
DeleteFile("/sdcard/reboot.txt"); // Prevent Boot Loop!!! DeleteFile("/sdcard/reboot.txt"); // Prevent Boot Loop!!!
isPlannedReboot = true; isPlannedReboot = true;
} }
} }
bool getIsPlannedReboot() bool getIsPlannedReboot() {
{
return isPlannedReboot; return isPlannedReboot;
} }
int getCountFlowRounds() int getCountFlowRounds() {
{
return countRounds; return countRounds;
} }
esp_err_t GetJPG(std::string _filename, httpd_req_t *req) esp_err_t GetJPG(std::string _filename, httpd_req_t *req) {
{
return flowctrl.GetJPGStream(_filename, req); return flowctrl.GetJPGStream(_filename, req);
} }
esp_err_t GetRawJPG(httpd_req_t *req) esp_err_t GetRawJPG(httpd_req_t *req) {
{
return flowctrl.SendRawJPG(req); return flowctrl.SendRawJPG(req);
} }
bool isSetupModusActive() bool isSetupModusActive() {
{
return flowctrl.getStatusSetupModus(); return flowctrl.getStatusSetupModus();
} }
@@ -102,19 +96,19 @@ void DeleteMainFlowTask()
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
ESP_LOGD(TAG, "DeleteMainFlowTask: xHandletask_autodoFlow: %ld", (long) xHandletask_autodoFlow); ESP_LOGD(TAG, "DeleteMainFlowTask: xHandletask_autodoFlow: %ld", (long) xHandletask_autodoFlow);
#endif #endif
if( xHandletask_autodoFlow != NULL )
{ if( xHandletask_autodoFlow != NULL ) {
vTaskDelete(xHandletask_autodoFlow); vTaskDelete(xHandletask_autodoFlow);
xHandletask_autodoFlow = NULL; xHandletask_autodoFlow = NULL;
} }
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
ESP_LOGD(TAG, "Killed: xHandletask_autodoFlow"); ESP_LOGD(TAG, "Killed: xHandletask_autodoFlow");
#endif #endif
} }
void doInit(void) void doInit() {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
ESP_LOGD(TAG, "Start flowctrl.InitFlow(config);"); ESP_LOGD(TAG, "Start flowctrl.InitFlow(config);");
#endif #endif
@@ -132,8 +126,7 @@ void doInit(void)
} }
bool doflow(void) bool doflow() {
{
std::string zw_time = getCurrentTimeString(LOGFILE_TIME_FORMAT); std::string zw_time = getCurrentTimeString(LOGFILE_TIME_FORMAT);
ESP_LOGD(TAG, "doflow - start %s", zw_time.c_str()); ESP_LOGD(TAG, "doflow - start %s", zw_time.c_str());
flowisrunning = true; flowisrunning = true;
@@ -148,8 +141,7 @@ bool doflow(void)
} }
esp_err_t handler_get_heap(httpd_req_t *req) esp_err_t handler_get_heap(httpd_req_t *req) {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
LogFile.WriteHeapInfo("handler_get_heap - Start"); LogFile.WriteHeapInfo("handler_get_heap - Start");
ESP_LOGD(TAG, "handler_get_heap uri: %s", req->uri); ESP_LOGD(TAG, "handler_get_heap uri: %s", req->uri);
@@ -172,12 +164,10 @@ esp_err_t handler_get_heap(httpd_req_t *req)
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*"); httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
if (zw.length() > 0) if (zw.length() > 0) {
{
httpd_resp_send(req, zw.c_str(), zw.length()); httpd_resp_send(req, zw.c_str(), zw.length());
} }
else else {
{
httpd_resp_send(req, NULL, 0); httpd_resp_send(req, NULL, 0);
} }
@@ -189,8 +179,7 @@ esp_err_t handler_get_heap(httpd_req_t *req)
} }
esp_err_t handler_init(httpd_req_t *req) esp_err_t handler_init(httpd_req_t *req) {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
LogFile.WriteHeapInfo("handler_init - Start"); LogFile.WriteHeapInfo("handler_init - Start");
ESP_LOGD(TAG, "handler_doinit uri: %s", req->uri); ESP_LOGD(TAG, "handler_doinit uri: %s", req->uri);
@@ -213,8 +202,7 @@ esp_err_t handler_init(httpd_req_t *req)
} }
esp_err_t handler_stream(httpd_req_t *req) esp_err_t handler_stream(httpd_req_t *req) {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
LogFile.WriteHeapInfo("handler_stream - Start"); LogFile.WriteHeapInfo("handler_stream - Start");
ESP_LOGD(TAG, "handler_stream uri: %s", req->uri); ESP_LOGD(TAG, "handler_stream uri: %s", req->uri);
@@ -224,16 +212,15 @@ esp_err_t handler_stream(httpd_req_t *req)
char _value[10]; char _value[10];
bool flashlightOn = false; bool flashlightOn = false;
if (httpd_req_get_url_query_str(req, _query, 50) == ESP_OK) if (httpd_req_get_url_query_str(req, _query, 50) == ESP_OK) {
{
// ESP_LOGD(TAG, "Query: %s", _query); // ESP_LOGD(TAG, "Query: %s", _query);
if (httpd_query_key_value(_query, "flashlight", _value, 10) == ESP_OK) if (httpd_query_key_value(_query, "flashlight", _value, 10) == ESP_OK) {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
ESP_LOGD(TAG, "flashlight is found%s", _value); ESP_LOGD(TAG, "flashlight is found%s", _value);
#endif #endif
if (strlen(_value) > 0) if (strlen(_value) > 0) {
flashlightOn = true; flashlightOn = true;
}
} }
} }
@@ -279,20 +266,17 @@ esp_err_t handler_flow_start(httpd_req_t *req) {
#ifdef ENABLE_MQTT #ifdef ENABLE_MQTT
esp_err_t MQTTCtrlFlowStart(std::string _topic) { esp_err_t MQTTCtrlFlowStart(std::string _topic) {
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
LogFile.WriteHeapInfo("MQTTCtrlFlowStart - Start"); LogFile.WriteHeapInfo("MQTTCtrlFlowStart - Start");
#endif #endif
ESP_LOGD(TAG, "MQTTCtrlFlowStart: topic %s", _topic.c_str()); ESP_LOGD(TAG, "MQTTCtrlFlowStart: topic %s", _topic.c_str());
if (autostartIsEnabled) if (autostartIsEnabled) {
{
xTaskAbortDelay(xHandletask_autodoFlow); // Delay will be aborted if task is in blocked (waiting) state. If task is already running, no action xTaskAbortDelay(xHandletask_autodoFlow); // Delay will be aborted if task is in blocked (waiting) state. If task is already running, no action
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Flow start triggered by MQTT topic " + _topic); LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Flow start triggered by MQTT topic " + _topic);
} }
else else {
{
LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Flow start triggered by MQTT topic " + _topic + ", but flow is not active!"); LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Flow start triggered by MQTT topic " + _topic + ", but flow is not active!");
} }
@@ -305,31 +289,26 @@ esp_err_t MQTTCtrlFlowStart(std::string _topic) {
#endif //ENABLE_MQTT #endif //ENABLE_MQTT
esp_err_t handler_json(httpd_req_t *req) esp_err_t handler_json(httpd_req_t *req) {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
LogFile.WriteHeapInfo("handler_json - Start"); LogFile.WriteHeapInfo("handler_json - Start");
#endif #endif
ESP_LOGD(TAG, "handler_JSON uri: %s", req->uri); ESP_LOGD(TAG, "handler_JSON uri: %s", req->uri);
if (bTaskAutoFlowCreated) if (bTaskAutoFlowCreated) {
{
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*"); httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
httpd_resp_set_type(req, "application/json"); httpd_resp_set_type(req, "application/json");
std::string zw = flowctrl.getJSON(); std::string zw = flowctrl.getJSON();
if (zw.length() > 0) if (zw.length() > 0) {
{
httpd_resp_send(req, zw.c_str(), zw.length()); httpd_resp_send(req, zw.c_str(), zw.length());
} }
else else {
{
httpd_resp_send(req, NULL, 0); httpd_resp_send(req, NULL, 0);
} }
} }
else else {
{
httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "Flow not (yet) started: REST API /json not yet available!"); httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "Flow not (yet) started: REST API /json not yet available!");
return ESP_ERR_NOT_FOUND; return ESP_ERR_NOT_FOUND;
} }
@@ -342,14 +321,12 @@ esp_err_t handler_json(httpd_req_t *req)
} }
esp_err_t handler_wasserzaehler(httpd_req_t *req) esp_err_t handler_wasserzaehler(httpd_req_t *req) {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
LogFile.WriteHeapInfo("handler water counter - Start"); LogFile.WriteHeapInfo("handler water counter - Start");
#endif #endif
if (bTaskAutoFlowCreated) if (bTaskAutoFlowCreated) {
{
bool _rawValue = false; bool _rawValue = false;
bool _noerror = false; bool _noerror = false;
bool _all = false; bool _all = false;
@@ -361,34 +338,30 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
char _query[100]; char _query[100];
char _size[10]; char _size[10];
if (httpd_req_get_url_query_str(req, _query, 100) == ESP_OK) if (httpd_req_get_url_query_str(req, _query, 100) == ESP_OK) {
{
// ESP_LOGD(TAG, "Query: %s", _query); // ESP_LOGD(TAG, "Query: %s", _query);
if (httpd_query_key_value(_query, "all", _size, 10) == ESP_OK) if (httpd_query_key_value(_query, "all", _size, 10) == ESP_OK) {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
ESP_LOGD(TAG, "all is found%s", _size); ESP_LOGD(TAG, "all is found%s", _size);
#endif #endif
_all = true; _all = true;
} }
if (httpd_query_key_value(_query, "type", _size, 10) == ESP_OK) if (httpd_query_key_value(_query, "type", _size, 10) == ESP_OK) {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
ESP_LOGD(TAG, "all is found: %s", _size); ESP_LOGD(TAG, "all is found: %s", _size);
#endif #endif
_type = std::string(_size); _type = std::string(_size);
} }
if (httpd_query_key_value(_query, "rawvalue", _size, 10) == ESP_OK) if (httpd_query_key_value(_query, "rawvalue", _size, 10) == ESP_OK) {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
ESP_LOGD(TAG, "rawvalue is found: %s", _size); ESP_LOGD(TAG, "rawvalue is found: %s", _size);
#endif #endif
_rawValue = true; _rawValue = true;
} }
if (httpd_query_key_value(_query, "noerror", _size, 10) == ESP_OK)
{ if (httpd_query_key_value(_query, "noerror", _size, 10) == ESP_OK) {
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
ESP_LOGD(TAG, "noerror is found: %s", _size); ESP_LOGD(TAG, "noerror is found: %s", _size);
#endif #endif
@@ -398,37 +371,42 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*"); httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
if (_all) if (_all) {
{
httpd_resp_set_type(req, "text/plain"); httpd_resp_set_type(req, "text/plain");
ESP_LOGD(TAG, "TYPE: %s", _type.c_str()); ESP_LOGD(TAG, "TYPE: %s", _type.c_str());
int _intype = READOUT_TYPE_VALUE; int _intype = READOUT_TYPE_VALUE;
if (_type == "prevalue")
if (_type == "prevalue") {
_intype = READOUT_TYPE_PREVALUE; _intype = READOUT_TYPE_PREVALUE;
if (_type == "raw") }
if (_type == "raw") {
_intype = READOUT_TYPE_RAWVALUE; _intype = READOUT_TYPE_RAWVALUE;
if (_type == "error") }
if (_type == "error") {
_intype = READOUT_TYPE_ERROR; _intype = READOUT_TYPE_ERROR;
}
zw = flowctrl.getReadoutAll(_intype); zw = flowctrl.getReadoutAll(_intype);
ESP_LOGD(TAG, "ZW: %s", zw.c_str()); ESP_LOGD(TAG, "ZW: %s", zw.c_str());
if (zw.length() > 0)
httpd_resp_send(req, zw.c_str(), zw.length()); if (zw.length() > 0) {
httpd_resp_send(req, zw.c_str(), zw.length());
}
return ESP_OK; return ESP_OK;
} }
std::string *status = flowctrl.getActStatus(); std::string *status = flowctrl.getActStatus();
string query = std::string(_query); string query = std::string(_query);
// ESP_LOGD(TAG, "Query: %s, query.c_str()); // ESP_LOGD(TAG, "Query: %s, query.c_str());
if (query.find("full") != std::string::npos) if (query.find("full") != std::string::npos) {
{
string txt; string txt;
txt = "<body style=\"font-family: arial\">"; txt = "<body style=\"font-family: arial\">";
if ((countRounds <= 1) && (*status != std::string("Flow finished"))) { // First round not completed yet if ((countRounds <= 1) && (*status != std::string("Flow finished"))) {
// First round not completed yet
txt += "<h3>Please wait for the first round to complete!</h3><h3>Current state: " + *status + "</h3>\n"; txt += "<h3>Please wait for the first round to complete!</h3><h3>Current state: " + *status + "</h3>\n";
} }
else { else {
@@ -439,15 +417,16 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
} }
zw = flowctrl.getReadout(_rawValue, _noerror, 0); zw = flowctrl.getReadout(_rawValue, _noerror, 0);
if (zw.length() > 0)
if (zw.length() > 0) {
httpd_resp_sendstr_chunk(req, zw.c_str()); httpd_resp_sendstr_chunk(req, zw.c_str());
}
if (query.find("full") != std::string::npos) {
if (query.find("full") != std::string::npos)
{
string txt, zw; string txt, zw;
if ((countRounds <= 1) && (*status != std::string("Flow finished"))) { // First round not completed yet if ((countRounds <= 1) && (*status != std::string("Flow finished"))) {
// First round not completed yet
// Nothing to do // Nothing to do
} }
else { else {
@@ -459,23 +438,26 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
std::vector<HTMLInfo*> htmlinfodig; std::vector<HTMLInfo*> htmlinfodig;
htmlinfodig = flowctrl.GetAllDigital(); htmlinfodig = flowctrl.GetAllDigital();
for (int i = 0; i < htmlinfodig.size(); ++i) for (int i = 0; i < htmlinfodig.size(); ++i) {
{ if (flowctrl.GetTypeDigital() == Digital) {
if (flowctrl.GetTypeDigital() == Digital) if (htmlinfodig[i]->val >= 10) {
{
if (htmlinfodig[i]->val == 10)
zw = "NaN"; zw = "NaN";
else }
else {
zw = to_string((int) htmlinfodig[i]->val); zw = to_string((int) htmlinfodig[i]->val);
}
txt += "<td style=\"width: 100px\"><h4>" + zw + "</h4><p><img src=\"/img_tmp/" + htmlinfodig[i]->filename + "\"></p></td>\n"; txt += "<td style=\"width: 100px\"><h4>" + zw + "</h4><p><img src=\"/img_tmp/" + htmlinfodig[i]->filename + "\"></p></td>\n";
} }
else else {
{
std::stringstream stream; std::stringstream stream;
stream << std::fixed << std::setprecision(1) << htmlinfodig[i]->val; stream << std::fixed << std::setprecision(1) << htmlinfodig[i]->val;
zw = stream.str(); zw = stream.str();
if (std::stod(zw) >= 10) {
zw = "NaN";
}
txt += "<td style=\"width: 100px\"><h4>" + zw + "</h4><p><img src=\"/img_tmp/" + htmlinfodig[i]->filename + "\"></p></td>\n"; txt += "<td style=\"width: 100px\"><h4>" + zw + "</h4><p><img src=\"/img_tmp/" + htmlinfodig[i]->filename + "\"></p></td>\n";
} }
delete htmlinfodig[i]; delete htmlinfodig[i];
@@ -486,31 +468,35 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
txt += "</tr></table>\n"; txt += "</tr></table>\n";
httpd_resp_sendstr_chunk(req, txt.c_str()); httpd_resp_sendstr_chunk(req, txt.c_str());
/* Analog ROIs */ /* Analog ROIs */
txt = "<hr><h3>Recognized Analog ROIs (previous round)</h3>\n"; txt = "<hr><h3>Recognized Analog ROIs (previous round)</h3>\n";
txt += "<table style=\"border-spacing: 5px\"><tr style=\"text-align: center; vertical-align: top;\">\n"; txt += "<table style=\"border-spacing: 5px\"><tr style=\"text-align: center; vertical-align: top;\">\n";
std::vector<HTMLInfo*> htmlinfoana; std::vector<HTMLInfo*> htmlinfoana;
htmlinfoana = flowctrl.GetAllAnalog(); htmlinfoana = flowctrl.GetAllAnalog();
for (int i = 0; i < htmlinfoana.size(); ++i)
{ for (int i = 0; i < htmlinfoana.size(); ++i) {
std::stringstream stream; std::stringstream stream;
stream << std::fixed << std::setprecision(1) << htmlinfoana[i]->val; stream << std::fixed << std::setprecision(1) << htmlinfoana[i]->val;
zw = stream.str(); zw = stream.str();
if (std::stod(zw) >= 10) {
zw = "NaN";
}
txt += "<td style=\"width: 150px;\"><h4>" + zw + "</h4><p><img src=\"/img_tmp/" + htmlinfoana[i]->filename + "\"></p></td>\n"; txt += "<td style=\"width: 150px;\"><h4>" + zw + "</h4><p><img src=\"/img_tmp/" + htmlinfoana[i]->filename + "\"></p></td>\n";
delete htmlinfoana[i]; delete htmlinfoana[i];
} }
htmlinfoana.clear(); htmlinfoana.clear();
txt += "</tr>\n</table>\n"; txt += "</tr>\n</table>\n";
httpd_resp_sendstr_chunk(req, txt.c_str()); httpd_resp_sendstr_chunk(req, txt.c_str());
/* Full Image /* Full Image
* Only show it after the image got taken and aligned */ * Only show it after the image got taken and aligned */
txt = "<hr><h3>Aligned Image (current round)</h3>\n"; txt = "<hr><h3>Aligned Image (current round)</h3>\n";
if ((*status == std::string("Initialization")) || if ((*status == std::string("Initialization")) ||
(*status == std::string("Initialization (delayed)")) || (*status == std::string("Initialization (delayed)")) ||
(*status == std::string("Take Image"))) { (*status == std::string("Take Image"))) {
@@ -526,8 +512,7 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
/* Respond with an empty chunk to signal HTTP response completion */ /* Respond with an empty chunk to signal HTTP response completion */
httpd_resp_sendstr_chunk(req, NULL); httpd_resp_sendstr_chunk(req, NULL);
} }
else else {
{
httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "Flow not (yet) started: REST API /value not available!"); httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "Flow not (yet) started: REST API /value not available!");
return ESP_ERR_NOT_FOUND; return ESP_ERR_NOT_FOUND;
} }
@@ -540,8 +525,7 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
} }
esp_err_t handler_editflow(httpd_req_t *req) esp_err_t handler_editflow(httpd_req_t *req) {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
LogFile.WriteHeapInfo("handler_editflow - Start"); LogFile.WriteHeapInfo("handler_editflow - Start");
#endif #endif
@@ -552,10 +536,8 @@ esp_err_t handler_editflow(httpd_req_t *req)
char _valuechar[30]; char _valuechar[30];
string _task; string _task;
if (httpd_req_get_url_query_str(req, _query, 200) == ESP_OK) if (httpd_req_get_url_query_str(req, _query, 200) == ESP_OK) {
{ if (httpd_query_key_value(_query, "task", _valuechar, 30) == ESP_OK) {
if (httpd_query_key_value(_query, "task", _valuechar, 30) == ESP_OK)
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
ESP_LOGD(TAG, "task is found: %s", _valuechar); ESP_LOGD(TAG, "task is found: %s", _valuechar);
#endif #endif
@@ -563,27 +545,22 @@ esp_err_t handler_editflow(httpd_req_t *req)
} }
} }
if (_task.compare("namenumbers") == 0) if (_task.compare("namenumbers") == 0) {
{
ESP_LOGD(TAG, "Get NUMBER list"); ESP_LOGD(TAG, "Get NUMBER list");
return get_numbers_file_handler(req); return get_numbers_file_handler(req);
} }
if (_task.compare("data") == 0) if (_task.compare("data") == 0) {
{
ESP_LOGD(TAG, "Get data list"); ESP_LOGD(TAG, "Get data list");
return get_data_file_handler(req); return get_data_file_handler(req);
} }
if (_task.compare("tflite") == 0) if (_task.compare("tflite") == 0) {
{
ESP_LOGD(TAG, "Get tflite list"); ESP_LOGD(TAG, "Get tflite list");
return get_tflite_file_handler(req); return get_tflite_file_handler(req);
} }
if (_task.compare("copy") == 0) {
if (_task.compare("copy") == 0)
{
string in, out, zw; string in, out, zw;
httpd_query_key_value(_query, "in", _valuechar, 30); httpd_query_key_value(_query, "in", _valuechar, 30);
@@ -605,9 +582,7 @@ esp_err_t handler_editflow(httpd_req_t *req)
httpd_resp_send(req, zw.c_str(), zw.length()); httpd_resp_send(req, zw.c_str(), zw.length());
} }
if (_task.compare("cutref") == 0) {
if (_task.compare("cutref") == 0)
{
string in, out, zw; string in, out, zw;
int x, y, dx, dy; int x, y, dx, dy;
bool enhance = false; bool enhance = false;
@@ -643,11 +618,9 @@ esp_err_t handler_editflow(httpd_req_t *req)
ESP_LOGD(TAG, "dy: %s", zw.c_str()); ESP_LOGD(TAG, "dy: %s", zw.c_str());
#endif #endif
if (httpd_query_key_value(_query, "enhance", _valuechar, 10) == ESP_OK) if (httpd_query_key_value(_query, "enhance", _valuechar, 10) == ESP_OK) {
{
zw = string(_valuechar); zw = string(_valuechar);
if (zw.compare("true") == 0) if (zw.compare("true") == 0) {
{
enhance = true; enhance = true;
} }
} }
@@ -665,8 +638,7 @@ esp_err_t handler_editflow(httpd_req_t *req)
delete caic; delete caic;
CImageBasis *cim = new CImageBasis("cutref", out2); CImageBasis *cim = new CImageBasis("cutref", out2);
if (enhance) if (enhance) {
{
cim->Contrast(90); cim->Contrast(90);
} }
@@ -674,8 +646,6 @@ esp_err_t handler_editflow(httpd_req_t *req)
delete cim; delete cim;
psram_deinit_shared_memory_for_take_image_step(); psram_deinit_shared_memory_for_take_image_step();
zw = "CutImage Done"; zw = "CutImage Done";
} }
else { else {
@@ -686,11 +656,10 @@ esp_err_t handler_editflow(httpd_req_t *req)
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*"); httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
httpd_resp_send(req, zw.c_str(), zw.length()); httpd_resp_send(req, zw.c_str(), zw.length());
} }
if (_task.compare("test_take") == 0) if ((_task.compare("test_take") == 0) || (_task.compare("cam_settings") == 0)) {
{ std::string _zw = "";
std::string _host = ""; std::string _host = "";
int bri = -100; int bri = -100;
int sat = -100; int sat = -100;
@@ -739,31 +708,39 @@ esp_err_t handler_editflow(httpd_req_t *req)
} }
if (httpd_query_key_value(_query, "gs", _valuechar, 30) == ESP_OK) { if (httpd_query_key_value(_query, "gs", _valuechar, 30) == ESP_OK) {
std::string _gr = std::string(_valuechar); std::string _gr = std::string(_valuechar);
if (stoi(_gr) != 0) if (stoi(_gr) != 0) {
grayscale = true; grayscale = true;
else }
else {
grayscale = false; grayscale = false;
}
} }
if (httpd_query_key_value(_query, "ne", _valuechar, 30) == ESP_OK) { if (httpd_query_key_value(_query, "ne", _valuechar, 30) == ESP_OK) {
std::string _ne = std::string(_valuechar); std::string _ne = std::string(_valuechar);
if (stoi(_ne) != 0) if (stoi(_ne) != 0) {
negative = true; negative = true;
else }
else {
negative = false; negative = false;
}
} }
if (httpd_query_key_value(_query, "a2", _valuechar, 30) == ESP_OK) { if (httpd_query_key_value(_query, "a2", _valuechar, 30) == ESP_OK) {
std::string _a2 = std::string(_valuechar); std::string _a2 = std::string(_valuechar);
if (stoi(_a2) != 0) if (stoi(_a2) != 0) {
aec2 = true; aec2 = true;
else }
else {
aec2 = false; aec2 = false;
}
} }
if (httpd_query_key_value(_query, "z", _valuechar, 30) == ESP_OK) { if (httpd_query_key_value(_query, "z", _valuechar, 30) == ESP_OK) {
std::string _zoom = std::string(_valuechar); std::string _zoom = std::string(_valuechar);
if (stoi(_zoom) != 0) if (stoi(_zoom) != 0) {
zoom = true; zoom = true;
else }
else {
zoom = false; zoom = false;
}
} }
if (httpd_query_key_value(_query, "zm", _valuechar, 30) == ESP_OK) { if (httpd_query_key_value(_query, "zm", _valuechar, 30) == ESP_OK) {
std::string _zm = std::string(_valuechar); std::string _zm = std::string(_valuechar);
@@ -783,15 +760,24 @@ esp_err_t handler_editflow(httpd_req_t *req)
Camera.SetZoom(zoom, zoommode, zoomoffsetx, zoomoffsety); Camera.SetZoom(zoom, zoommode, zoomoffsetx, zoomoffsety);
Camera.SetBrightnessContrastSaturation(bri, con, sat, aelevel, grayscale, negative, aec2, sharpnessLevel); Camera.SetBrightnessContrastSaturation(bri, con, sat, aelevel, grayscale, negative, aec2, sharpnessLevel);
Camera.SetLEDIntensity(intens); Camera.SetLEDIntensity(intens);
ESP_LOGD(TAG, "test_take - vor TakeImage");
std::string zw = flowctrl.doSingleStep("[TakeImage]", _host); if (_task.compare("cam_settings") == 0)
{
ESP_LOGD(TAG, "Cam Settings set");
_zw = "Cam Settings set";
}
else
{
ESP_LOGD(TAG, "test_take - vor TakeImage");
_zw = flowctrl.doSingleStep("[TakeImage]", _host);
}
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*"); httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
httpd_resp_send(req, zw.c_str(), zw.length()); httpd_resp_send(req, _zw.c_str(), _zw.length());
} }
if (_task.compare("test_align") == 0) {
if (_task.compare("test_align") == 0)
{
std::string _host = ""; std::string _host = "";
if (httpd_query_key_value(_query, "host", _valuechar, 30) == ESP_OK) { if (httpd_query_key_value(_query, "host", _valuechar, 30) == ESP_OK) {
_host = std::string(_valuechar); _host = std::string(_valuechar);
@@ -812,8 +798,7 @@ esp_err_t handler_editflow(httpd_req_t *req)
} }
esp_err_t handler_statusflow(httpd_req_t *req) esp_err_t handler_statusflow(httpd_req_t *req) {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
LogFile.WriteHeapInfo("handler_statusflow - Start"); LogFile.WriteHeapInfo("handler_statusflow - Start");
#endif #endif
@@ -821,8 +806,7 @@ esp_err_t handler_statusflow(httpd_req_t *req)
const char* resp_str; const char* resp_str;
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*"); httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
if (bTaskAutoFlowCreated) if (bTaskAutoFlowCreated) {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
ESP_LOGD(TAG, "handler_statusflow: %s", req->uri); ESP_LOGD(TAG, "handler_statusflow: %s", req->uri);
#endif #endif
@@ -832,8 +816,7 @@ esp_err_t handler_statusflow(httpd_req_t *req)
httpd_resp_send(req, resp_str, HTTPD_RESP_USE_STRLEN); httpd_resp_send(req, resp_str, HTTPD_RESP_USE_STRLEN);
} }
else else {
{
resp_str = "Flow task not yet created"; resp_str = "Flow task not yet created";
httpd_resp_send(req, resp_str, HTTPD_RESP_USE_STRLEN); httpd_resp_send(req, resp_str, HTTPD_RESP_USE_STRLEN);
} }
@@ -846,8 +829,7 @@ esp_err_t handler_statusflow(httpd_req_t *req)
} }
esp_err_t handler_cputemp(httpd_req_t *req) esp_err_t handler_cputemp(httpd_req_t *req) {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
LogFile.WriteHeapInfo("handler_cputemp - Start"); LogFile.WriteHeapInfo("handler_cputemp - Start");
#endif #endif
@@ -863,19 +845,16 @@ esp_err_t handler_cputemp(httpd_req_t *req)
} }
esp_err_t handler_rssi(httpd_req_t *req) esp_err_t handler_rssi(httpd_req_t *req) {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
LogFile.WriteHeapInfo("handler_rssi - Start"); LogFile.WriteHeapInfo("handler_rssi - Start");
#endif #endif
if (getWIFIisConnected()) if (getWIFIisConnected()) {
{
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*"); httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
httpd_resp_send(req, std::to_string(get_WIFI_RSSI()).c_str(), HTTPD_RESP_USE_STRLEN); httpd_resp_send(req, std::to_string(get_WIFI_RSSI()).c_str(), HTTPD_RESP_USE_STRLEN);
} }
else else {
{
httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "WIFI not (yet) connected: REST API /rssi not available!"); httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "WIFI not (yet) connected: REST API /rssi not available!");
return ESP_ERR_NOT_FOUND; return ESP_ERR_NOT_FOUND;
} }
@@ -888,9 +867,7 @@ esp_err_t handler_rssi(httpd_req_t *req)
} }
esp_err_t handler_uptime(httpd_req_t *req) esp_err_t handler_uptime(httpd_req_t *req) {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
LogFile.WriteHeapInfo("handler_uptime - Start"); LogFile.WriteHeapInfo("handler_uptime - Start");
#endif #endif
@@ -908,8 +885,7 @@ esp_err_t handler_uptime(httpd_req_t *req)
} }
esp_err_t handler_prevalue(httpd_req_t *req) esp_err_t handler_prevalue(httpd_req_t *req) {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
LogFile.WriteHeapInfo("handler_prevalue - Start"); LogFile.WriteHeapInfo("handler_prevalue - Start");
ESP_LOGD(TAG, "handler_prevalue: %s", req->uri); ESP_LOGD(TAG, "handler_prevalue: %s", req->uri);
@@ -938,7 +914,8 @@ esp_err_t handler_prevalue(httpd_req_t *req)
ESP_LOGD(TAG, "Query: %s", _query); ESP_LOGD(TAG, "Query: %s", _query);
#endif #endif
if (httpd_query_key_value(_query, "numbers", _numbersname, 50) != ESP_OK) { // If request is incomplete if (httpd_query_key_value(_query, "numbers", _numbersname, 50) != ESP_OK) {
// If request is incomplete
sReturnMessage = "E91: Query parameter incomplete or not valid!<br> " sReturnMessage = "E91: Query parameter incomplete or not valid!<br> "
"Call /setPreValue to show REST API usage info and/or check documentation"; "Call /setPreValue to show REST API usage info and/or check documentation";
httpd_resp_send(req, sReturnMessage.c_str(), sReturnMessage.length()); httpd_resp_send(req, sReturnMessage.c_str(), sReturnMessage.length());
@@ -951,12 +928,14 @@ esp_err_t handler_prevalue(httpd_req_t *req)
#endif #endif
} }
} }
else { // if no parameter is provided, print handler usage else {
// if no parameter is provided, print handler usage
httpd_resp_send(req, RESTUsageInfo.c_str(), RESTUsageInfo.length()); httpd_resp_send(req, RESTUsageInfo.c_str(), RESTUsageInfo.length());
return ESP_OK; return ESP_OK;
} }
if (strlen(_value) == 0) { // If no value is povided --> return actual PreValue if (strlen(_value) == 0) {
// If no value is povided --> return actual PreValue
sReturnMessage = flowctrl.GetPrevalue(std::string(_numbersname)); sReturnMessage = flowctrl.GetPrevalue(std::string(_numbersname));
if (sReturnMessage.empty()) { if (sReturnMessage.empty()) {
@@ -995,14 +974,12 @@ esp_err_t handler_prevalue(httpd_req_t *req)
} }
void task_autodoFlow(void *pvParameter) void task_autodoFlow(void *pvParameter) {
{
int64_t fr_start, fr_delta_ms; int64_t fr_start, fr_delta_ms;
bTaskAutoFlowCreated = true; bTaskAutoFlowCreated = true;
if (!isPlannedReboot && (esp_reset_reason() == ESP_RST_PANIC)) if (!isPlannedReboot && (esp_reset_reason() == ESP_RST_PANIC)) {
{
flowctrl.setActStatus("Initialization (delayed)"); flowctrl.setActStatus("Initialization (delayed)");
//#ifdef ENABLE_MQTT //#ifdef ENABLE_MQTT
//MQTTPublish(mqttServer_getMainTopic() + "/" + "status", "Initialization (delayed)", false); // Right now, not possible -> MQTT Service is going to be started later //MQTTPublish(mqttServer_getMainTopic() + "/" + "status", "Initialization (delayed)", false); // Right now, not possible -> MQTT Service is going to be started later
@@ -1016,8 +993,7 @@ void task_autodoFlow(void *pvParameter)
flowctrl.setAutoStartInterval(auto_interval); flowctrl.setAutoStartInterval(auto_interval);
autostartIsEnabled = flowctrl.getIsAutoStart(); autostartIsEnabled = flowctrl.getIsAutoStart();
if (isSetupModusActive()) if (isSetupModusActive()) {
{
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "We are in Setup Mode -> Not starting Auto Flow!"); LogFile.WriteToFile(ESP_LOG_INFO, TAG, "We are in Setup Mode -> Not starting Auto Flow!");
autostartIsEnabled = false; autostartIsEnabled = false;
std::string zw_time = getCurrentTimeString(LOGFILE_TIME_FORMAT); std::string zw_time = getCurrentTimeString(LOGFILE_TIME_FORMAT);
@@ -1031,22 +1007,19 @@ void task_autodoFlow(void *pvParameter)
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Autostart is not enabled -> Not starting Flow"); LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Autostart is not enabled -> Not starting Flow");
} }
while (autostartIsEnabled) while (autostartIsEnabled) {
{
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "----------------------------------------------------------------"); // Clear separation between runs LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "----------------------------------------------------------------"); // Clear separation between runs
std::string _zw = "Round #" + std::to_string(++countRounds) + " started"; std::string _zw = "Round #" + std::to_string(++countRounds) + " started";
time_t roundStartTime = getUpTime(); time_t roundStartTime = getUpTime();
LogFile.WriteToFile(ESP_LOG_INFO, TAG, _zw); LogFile.WriteToFile(ESP_LOG_INFO, TAG, _zw);
fr_start = esp_timer_get_time(); fr_start = esp_timer_get_time();
if (flowisrunning) if (flowisrunning) {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
ESP_LOGD(TAG, "Autoflow: doFlow is already running!"); ESP_LOGD(TAG, "Autoflow: doFlow is already running!");
#endif #endif
} }
else else {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
ESP_LOGD(TAG, "Autoflow: doFlow is started"); ESP_LOGD(TAG, "Autoflow: doFlow is started");
#endif #endif
@@ -1086,16 +1059,16 @@ void task_autodoFlow(void *pvParameter)
#endif #endif
fr_delta_ms = (esp_timer_get_time() - fr_start) / 1000; fr_delta_ms = (esp_timer_get_time() - fr_start) / 1000;
if (auto_interval > fr_delta_ms)
{ if (auto_interval > fr_delta_ms) {
const TickType_t xDelay = (auto_interval - fr_delta_ms) / portTICK_PERIOD_MS; const TickType_t xDelay = (auto_interval - fr_delta_ms) / portTICK_PERIOD_MS;
ESP_LOGD(TAG, "Autoflow: sleep for: %ldms", (long) xDelay); ESP_LOGD(TAG, "Autoflow: sleep for: %ldms", (long) xDelay);
vTaskDelay( xDelay ); vTaskDelay( xDelay );
} }
} }
while(1) // Keep flow task running to handle necessary sub tasks like reboot handler, etc.. while(1) {
{ // Keep flow task running to handle necessary sub tasks like reboot handler, etc..
vTaskDelay(2000 / portTICK_PERIOD_MS); vTaskDelay(2000 / portTICK_PERIOD_MS);
} }
@@ -1105,25 +1078,24 @@ void task_autodoFlow(void *pvParameter)
} }
void InitializeFlowTask() void InitializeFlowTask() {
{
BaseType_t xReturned; BaseType_t xReturned;
ESP_LOGD(TAG, "getESPHeapInfo: %s", getESPHeapInfo().c_str()); ESP_LOGD(TAG, "getESPHeapInfo: %s", getESPHeapInfo().c_str());
uint32_t stackSize = 16 * 1024; uint32_t stackSize = 16 * 1024;
xReturned = xTaskCreatePinnedToCore(&task_autodoFlow, "task_autodoFlow", stackSize, NULL, tskIDLE_PRIORITY+2, &xHandletask_autodoFlow, 0); xReturned = xTaskCreatePinnedToCore(&task_autodoFlow, "task_autodoFlow", stackSize, NULL, tskIDLE_PRIORITY+2, &xHandletask_autodoFlow, 0);
if( xReturned != pdPASS )
{ if( xReturned != pdPASS ) {
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Creation task_autodoFlow failed. Requested stack size:" + std::to_string(stackSize)); LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Creation task_autodoFlow failed. Requested stack size:" + std::to_string(stackSize));
LogFile.WriteHeapInfo("Creation task_autodoFlow failed"); LogFile.WriteHeapInfo("Creation task_autodoFlow failed");
} }
ESP_LOGD(TAG, "getESPHeapInfo: %s", getESPHeapInfo().c_str()); ESP_LOGD(TAG, "getESPHeapInfo: %s", getESPHeapInfo().c_str());
} }
void register_server_main_flow_task_uri(httpd_handle_t server) void register_server_main_flow_task_uri(httpd_handle_t server) {
{
ESP_LOGI(TAG, "server_main_flow_task - Registering URI handlers"); ESP_LOGI(TAG, "server_main_flow_task - Registering URI handlers");
httpd_uri_t camuri = { }; httpd_uri_t camuri = { };
@@ -1223,5 +1195,4 @@ void register_server_main_flow_task_uri(httpd_handle_t server)
camuri.handler = handler_stream; camuri.handler = handler_stream;
camuri.user_ctx = (void*) "stream"; camuri.user_ctx = (void*) "stream";
httpd_register_uri_handler(server, &camuri); httpd_register_uri_handler(server, &camuri);
} }

558
sd-card/html/edit_alignment.html
View File

@@ -162,37 +162,63 @@
<script type="text/javascript" src="readconfigparam.js?v=$COMMIT_HASH"></script> <script type="text/javascript" src="readconfigparam.js?v=$COMMIT_HASH"></script>
<script language="JavaScript"> <script language="JavaScript">
var canvas = document.getElementById('canvas'), var canvas = document.getElementById('canvas'),
ctx = canvas.getContext('2d'), ctx = canvas.getContext('2d'),
imageObj = new Image(), imageObj = new Image(),
rect = {}, rect = {},
drag = false, drag = false,
aktindex = 0, aktindex = 0,
refInfo, refInfo,
enhanceCon = false, enhanceCon = false,
param; domainname = getDomainname(),
domainname = getDomainname(); neueref1,
param; neueref2,
param;
function doReboot() { function doReboot() {
if (confirm("Are you sure you want to reboot? Did you save your changes?")) { if (confirm("Are you sure you want to reboot? Did you save your changes?")) {
var stringota = getDomainname() + "/reboot"; var stringota = getDomainname() + "/reboot";
window.location = stringota; window.location = stringota;
window.location.href = stringota; window.location.href = stringota;
window.location.assign(stringota); window.location.assign(stringota);
window.location.replace(stringota); window.location.replace(stringota);
} }
} }
function ChangeSelection(){ function ChangeSelection(){
aktindex = parseInt(document.getElementById("index").value); aktindex = parseInt(document.getElementById("index").value);
UpdateReference();
if (aktindex == 0 && neueref1 == 1) {
UpdateReference();
}
else if (aktindex == 1 && neueref2 == 1) {
UpdateReference();
}
else
{
LoadReference();
}
} }
function SaveToConfig(){ function SaveToConfig(){
if (confirm("Are you sure you want to save the new alignment marker configuration?")) { if (confirm("Are you sure you want to save the new alignment marker configuration?")) {
WriteConfigININew(); WriteConfigININew();
UpdateConfigReference(domainname)
if (neueref1 == 1 && neueref2 == 1) {
UpdateConfigReferences(domainname);
}
else if (neueref1 == 1) {
var anzneueref = 1;
UpdateConfigReference(anzneueref, domainname);
}
else if (neueref2 == 1) {
var anzneueref = 2;
UpdateConfigReference(anzneueref, domainname);
}
//UpdateConfigReference(domainname)
SaveConfigToServer(domainname); SaveConfigToServer(domainname);
document.getElementById("savemarker").disabled = true; document.getElementById("savemarker").disabled = true;
document.getElementById("enhancecontrast").disabled = true; document.getElementById("enhancecontrast").disabled = true;
@@ -208,7 +234,7 @@ function EnhanceContrast(){
refInfo[aktindex]["dx"] = document.getElementById("refdx").value; refInfo[aktindex]["dx"] = document.getElementById("refdx").value;
refInfo[aktindex]["dy"] = document.getElementById("refdy").value; refInfo[aktindex]["dy"] = document.getElementById("refdy").value;
enhanceCon = true; var enhanceCon = true;
document.getElementById("overlay").style.display = "block"; document.getElementById("overlay").style.display = "block";
document.getElementById("overlaytext").innerHTML = "Enhancing Image Contrast..."; document.getElementById("overlaytext").innerHTML = "Enhancing Image Contrast...";
@@ -219,11 +245,17 @@ function EnhanceContrast(){
async function task() { async function task() {
while (true) { while (true) {
var ret = MakeContrastImageZW(refInfo[aktindex], enhanceCon, domainname); var ret = MakeRefImageZW(refInfo[aktindex], enhanceCon, domainname);
if (ret) { if (ret) {
UpdateReference(); UpdateReference();
//document.getElementById("enhancecontrast").disabled = true; //document.getElementById("enhancecontrast").disabled = true;
document.getElementById("overlay").style.display = "none"; document.getElementById("overlay").style.display = "none";
if (aktindex == 0) {
neueref1 = 1;
}
else if (aktindex == 1) {
neueref2 = 1;
}
return; return;
} }
else { else {
@@ -276,260 +308,284 @@ function UpdateReference(){
} }
function dataURLtoBlob(dataurl) { function dataURLtoBlob(dataurl) {
var arr = dataurl.split(','), mime = arr[0].match(/:(.*?);/)[1], var arr = dataurl.split(',');
bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n); var mime = arr[0].match(/:(.*?);/)[1];
var bstr = atob(arr[1]);
var n = bstr.length;
var u8arr = new Uint8Array(n);
while(n--){ while(n--){
u8arr[n] = bstr.charCodeAt(n); u8arr[n] = bstr.charCodeAt(n);
} }
return new Blob([u8arr], {type:mime}); return new Blob([u8arr], {type:mime});
} }
function loadCanvas(dataURL) {
var canvas = document.getElementById('canvas');
var context = canvas.getContext('2d');
function loadCanvas(dataURL) { imageObj.onload = function() {
var canvas = document.getElementById('canvas'); canvas.width = this.width;
var context = canvas.getContext('2d'); canvas.height = this.height;
drawImage();
};
imageObj.onload = function() { imageObj.src = dataURL;
canvas.width = this.width; }
canvas.height = this.height;
drawImage();
};
imageObj.src = dataURL; function getCoords(elem) { // crossbrowser version
} var box = elem.getBoundingClientRect();
var body = document.body;
var docEl = document.documentElement;
function getCoords(elem) { // crossbrowser version var scrollTop = window.pageYOffset || docEl.scrollTop || body.scrollTop;
var box = elem.getBoundingClientRect(); var scrollLeft = window.pageXOffset || docEl.scrollLeft || body.scrollLeft;
var body = document.body; var clientTop = docEl.clientTop || body.clientTop || 0;
var docEl = document.documentElement; var clientLeft = docEl.clientLeft || body.clientLeft || 0;
var scrollTop = window.pageYOffset || docEl.scrollTop || body.scrollTop; var top = box.top + scrollTop - clientTop;
var scrollLeft = window.pageXOffset || docEl.scrollLeft || body.scrollLeft; var left = box.left + scrollLeft - clientLeft;
var clientTop = docEl.clientTop || body.clientTop || 0;
var clientLeft = docEl.clientLeft || body.clientLeft || 0;
var top = box.top + scrollTop - clientTop;
var left = box.left + scrollLeft - clientLeft;
return { top: Math.round(top), left: Math.round(left) };
}
/* hash #description open the details part of the page */
function openDescription() {
if(window.location.hash) {
var hash = window.location.hash.substring(1); //Puts hash in variable, and removes the # character
if(hash == 'description')
document.getElementById("desc_details").open = true;
}
}
function init() {
openDescription();
domainname = getDomainname();
loadConfig(domainname);
ParseConfig();
param = getConfigParameters();
document.getElementById("savemarker").disabled = true;
document.getElementById("enhancecontrast").disabled = true;
canvas.addEventListener('mousedown', mouseDown, false);
canvas.addEventListener('mouseup', mouseUp, false);
canvas.addEventListener('mousemove', mouseMove, false);
loadCanvas(domainname + "/fileserver/config/reference.jpg");
CopyReferenceToImgTmp(domainname);
refInfo = GetReferencesInfo();
UpdateReference();
drawImage();
}
function drawImage(){
var canvas = document.getElementById('canvas');
var context = canvas.getContext('2d');
context.clearRect(0,0,imageObj.width,imageObj.height);
context.save();
context.drawImage(imageObj, 0, 0);
// context.restore();
}
function CutOutReference(){
refInfo[aktindex]["x"] = document.getElementById("refx").value;
refInfo[aktindex]["y"] = document.getElementById("refy").value;
refInfo[aktindex]["dx"] = document.getElementById("refdx").value;
refInfo[aktindex]["dy"] = document.getElementById("refdy").value;
document.getElementById("overlay").style.display = "block";
document.getElementById("overlaytext").innerHTML = "Updating marker...";
function sleep(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
}
async function task() {
while (true) {
var ret = MakeRefZW(refInfo[aktindex], domainname);
if (ret) {
UpdateReference();
document.getElementById("enhancecontrast").disabled = false;
document.getElementById("savemarker").disabled = false;
document.getElementById("overlay").style.display = "none";
return;
}
else {
// Get status
var xhttp = new XMLHttpRequest();
try {
xhttp.open("GET", domainname + "/statusflow", false);
xhttp.send();
}
catch (error){}
document.getElementById("overlaytext").innerHTML = "Device is busy, waiting until the Digitalization Round got completed (this can take several minutes)...<br><br>Current step: " + xhttp.responseText;
console.log("Device is busy, waiting 5s then checking again...");
await sleep(5000);
}
}
}
setTimeout(function() { // Delay so the overlay gets shown
task();
}, 1);
}
function drawGrid(){
var canvas = document.getElementById('canvas');
var ctx = canvas.getContext('2d');
w = canvas.width;
h = canvas.height;
ctx.save();
ctx.strokeStyle = '#00FF00';
for (i = h/2; i < h; i += 100)
{
ctx.moveTo(0, i);
ctx.lineTo(w, i);
ctx.stroke();
ctx.moveTo(0, h-i);
ctx.lineTo(w, h-i);
ctx.stroke();
}
for (i = w/2; i < w; i += 100)
{
ctx.moveTo(i, 0);
ctx.lineTo(i, h);
ctx.stroke();
ctx.moveTo(w-i, 0);
ctx.lineTo(w-i, h);
ctx.stroke(); }
// ctx.restore();
}
function draw() {
var canvas = document.getElementById('canvas');
var context = canvas.getContext('2d');
context.drawImage(imageObj, 0, 0);
lw = 4
context.lineWidth = lw;
context.strokeStyle = "#FF0000";
var x0 = parseInt(rect.startX) - parseInt(lw/2);
var y0 = parseInt(rect.startY) - parseInt(lw/2);
var dx = parseInt(rect.w) + parseInt(lw);
var dy = parseInt(rect.h) + parseInt(lw);
context.strokeRect(x0, y0, dx, dy);
}
function getCoords(elem) { // crossbrowser version
var box = elem.getBoundingClientRect();
var body = document.body;
var docEl = document.documentElement;
var scrollTop = window.pageYOffset || docEl.scrollTop || body.scrollTop;
var scrollLeft = window.pageXOffset || docEl.scrollLeft || body.scrollLeft;
var clientTop = docEl.clientTop || body.clientTop || 0;
var clientLeft = docEl.clientLeft || body.clientLeft || 0;
var top = box.top + scrollTop - clientTop;
var left = box.left + scrollLeft - clientLeft;
return { top: Math.round(top), left: Math.round(left) }; return { top: Math.round(top), left: Math.round(left) };
} }
/* hash #description open the details part of the page */
function openDescription() {
if(window.location.hash) {
var hash = window.location.hash.substring(1); //Puts hash in variable, and removes the # character
if(hash == 'description') {
document.getElementById("desc_details").open = true;
}
}
}
function mouseDown(e) { function LoadReference(){
zw = getCoords(this) document.getElementById("img_ref").onload = function () {
rect.startX = e.pageX - zw.left; document.getElementById("refdx").value = this.width;
rect.startY = e.pageY - zw.top; document.getElementById("refdy").value = this.height;
document.getElementById("refx").value = rect.startX; refInfo[aktindex]["dx"] = this.width;
document.getElementById("refy").value = rect.startY; refInfo[aktindex]["dy"] = this.height;
drag = true; rect.w = document.getElementById("refdx").value;
rect.h = document.getElementById("refdy").value;
draw();
} }
function mouseUp() { _filenameurl = refInfo[aktindex]["name"];
drag = false; var url = domainname + "/fileserver" + _filenameurl + "?" + Date.now();
if (rect.w < 0) { document.getElementById("img_ref").src = url;
rect.w = -rect.w
rect.startX-=rect.w _filenameurl = _filenameurl.replace(".jpg", "_org.jpg");
var url = domainname + "/fileserver" + _filenameurl + "?" + Date.now();
document.getElementById("img_ref_org").src = url;
document.getElementById("name").value = refInfo[aktindex]["name"];
document.getElementById("refx").value = refInfo[aktindex]["x"];
document.getElementById("refy").value = refInfo[aktindex]["y"];
rect.startX = document.getElementById("refx").value;
rect.startY = document.getElementById("refy").value;
draw();
}
function init() {
openDescription();
domainname = getDomainname();
loadConfig(domainname);
ParseConfig();
param = getConfigParameters();
document.getElementById("savemarker").disabled = true;
document.getElementById("enhancecontrast").disabled = true;
canvas.addEventListener('mousedown', mouseDown, false);
canvas.addEventListener('mouseup', mouseUp, false);
canvas.addEventListener('mousemove', mouseMove, false);
loadCanvas(domainname + "/fileserver/config/reference.jpg");
//CopyReferenceToImgTmp(domainname);
refInfo = GetReferencesInfo();
//UpdateReference();
LoadReference();
drawImage();
}
function drawImage(){
var canvas = document.getElementById('canvas');
var context = canvas.getContext('2d');
context.clearRect(0,0,imageObj.width,imageObj.height);
context.save();
context.drawImage(imageObj, 0, 0);
// context.restore();
}
function CutOutReference(){
refInfo[aktindex]["x"] = document.getElementById("refx").value;
refInfo[aktindex]["y"] = document.getElementById("refy").value;
refInfo[aktindex]["dx"] = document.getElementById("refdx").value;
refInfo[aktindex]["dy"] = document.getElementById("refdy").value;
var enhanceCon = false;
document.getElementById("overlay").style.display = "block";
document.getElementById("overlaytext").innerHTML = "Updating marker...";
function sleep(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
}
async function task() {
while (true) {
var ret = MakeRefImageZW(refInfo[aktindex], enhanceCon, domainname);
if (ret) {
UpdateReference();
document.getElementById("enhancecontrast").disabled = false;
document.getElementById("savemarker").disabled = false;
document.getElementById("overlay").style.display = "none";
if (aktindex == 0) {
neueref1 = 1;
}
else if (aktindex == 1) {
neueref2 = 1;
}
return;
} }
if (rect.h < 0) { else {
rect.h = -rect.h // Get status
rect.startY-=rect.h var xhttp = new XMLHttpRequest();
try {
xhttp.open("GET", domainname + "/statusflow", false);
xhttp.send();
}
catch (error){}
document.getElementById("overlaytext").innerHTML = "Device is busy, waiting until the Digitalization Round got completed (this can take several minutes)...<br><br>Current step: " + xhttp.responseText;
console.log("Device is busy, waiting 5s then checking again...");
await sleep(5000);
} }
}
}
setTimeout(function() { // Delay so the overlay gets shown
task();
}, 1);
}
function drawGrid(){
var canvas = document.getElementById('canvas');
var ctx = canvas.getContext('2d');
var w = canvas.width;
var h = canvas.height;
ctx.save();
ctx.strokeStyle = '#00FF00';
for (i = h/2; i < h; i += 100) {
ctx.moveTo(0, i);
ctx.lineTo(w, i);
ctx.stroke();
ctx.moveTo(0, h-i);
ctx.lineTo(w, h-i);
ctx.stroke();
}
for (i = w/2; i < w; i += 100) {
ctx.moveTo(i, 0);
ctx.lineTo(i, h);
ctx.stroke();
ctx.moveTo(w-i, 0);
ctx.lineTo(w-i, h);
ctx.stroke();
}
// ctx.restore();
}
function draw() {
var canvas = document.getElementById('canvas');
var context = canvas.getContext('2d');
context.drawImage(imageObj, 0, 0);
var lw = 4
context.lineWidth = lw;
context.strokeStyle = "#FF0000";
var x0 = parseInt(rect.startX) - parseInt(lw/2);
var y0 = parseInt(rect.startY) - parseInt(lw/2);
var dx = parseInt(rect.w) + parseInt(lw);
var dy = parseInt(rect.h) + parseInt(lw);
context.strokeRect(x0, y0, dx, dy);
}
function mouseDown(e) {
var zw = getCoords(this)
rect.startX = e.pageX - zw.left;
rect.startY = e.pageY - zw.top;
document.getElementById("refx").value = rect.startX;
document.getElementById("refy").value = rect.startY;
drag = true;
}
function mouseUp() {
drag = false;
if (rect.w < 0) {
rect.w = -rect.w
rect.startX-=rect.w
}
if (rect.h < 0) {
rect.h = -rect.h
rect.startY-=rect.h
}
document.getElementById("refdx").value = rect.w;
document.getElementById("refdy").value = rect.h;
document.getElementById("refx").value = rect.startX;
document.getElementById("refy").value = rect.startY;
}
function mouseMove(e) {
if (drag) {
var zw = getCoords(this)
rect.w = (e.pageX - zw.left) - rect.startX;
rect.h = (e.pageY - zw.top) - rect.startY ;
document.getElementById("refdx").value = rect.w; document.getElementById("refdx").value = rect.w;
document.getElementById("refdy").value = rect.h; document.getElementById("refdy").value = rect.h;
document.getElementById("refx").value = rect.startX; draw();
document.getElementById("refy").value = rect.startY;
} }
else {
draw();
var canvas = document.getElementById('canvas');
var context = canvas.getContext('2d');
function mouseMove(e) { var zw = getCoords(this);
if (drag) { var x = e.pageX - zw.left;
zw = getCoords(this) var y = e.pageY - zw.top;
rect.w = (e.pageX - zw.left) - rect.startX;
rect.h = (e.pageY - zw.top) - rect.startY ;
document.getElementById("refdx").value = rect.w;
document.getElementById("refdy").value = rect.h;
draw();
}
else {
draw();
var canvas = document.getElementById('canvas');
var context = canvas.getContext('2d');
zw = getCoords(this);
x = e.pageX - zw.left;
y = e.pageY - zw.top;
context.lineWidth = 2; context.lineWidth = 2;
context.strokeStyle = "#00FF00"; context.strokeStyle = "#00FF00";
context.beginPath(); context.beginPath();
context.moveTo(0,y); context.moveTo(0,y);
context.lineTo(canvas.width, y); context.lineTo(canvas.width, y);
context.moveTo(x, 0); context.moveTo(x, 0);
context.lineTo(x, canvas.height); context.lineTo(x, canvas.height);
context.stroke(); context.stroke();
}
} }
}
function namechanged() function namechanged() {
{ _name = document.getElementById("name").value;
_name = document.getElementById("name").value; refInfo[aktindex]["name"] = _name;
refInfo[aktindex]["name"] = _name; }
function valuemanualchanged(){
if (!drag) {
rect.w = document.getElementById("refdx").value;
rect.h = document.getElementById("refdy").value;
rect.startX = document.getElementById("refx").value;
rect.startY = document.getElementById("refy").value;
draw();
} }
}
function valuemanualchanged(){
if (!drag) {
rect.w = document.getElementById("refdx").value;
rect.h = document.getElementById("refdy").value;
rect.startX = document.getElementById("refx").value;
rect.startY = document.getElementById("refy").value;
draw();
}
}
init(); init();
</script> </script>
</body> </body>
</html> </html>

276
sd-card/html/edit_config_param_template.html
View File

@@ -1794,50 +1794,52 @@
<script type="text/javascript" src="readconfigparam.js?v=$COMMIT_HASH"></script> <script type="text/javascript" src="readconfigparam.js?v=$COMMIT_HASH"></script>
<script type="text/javascript"> <script type="text/javascript">
var canvas = document.getElementById('canvas'), var canvas = document.getElementById('canvas'),
domainname = getDomainname(); domainname = getDomainname(),
param; param,
category; category,
NUNBERSAkt = -1; NUNBERSAkt = -1,
NUMBERS; NUMBERS;
function LoadConfigNeu() { function LoadConfigNeu() {
domainname = getDomainname(); domainname = getDomainname();
if (!loadConfig(domainname)) { if (!loadConfig(domainname)) {
firework.launch('Configuration could not be loaded! Please reload the page!', 'danger', 30000); firework.launch('Configuration could not be loaded! Please reload the page!', 'danger', 30000);
return; return;
} }
ParseConfig(); ParseConfig();
param = getConfigParameters(); param = getConfigParameters();
category = getConfigCategory(); category = getConfigCategory();
InitIndivParameter(); InitIndivParameter();
UpdateInput(); UpdateInput();
var sel = document.getElementById("Numbers_value1"); var sel = document.getElementById("Numbers_value1");
UpdateInputIndividual(sel); UpdateInputIndividual(sel);
UpdateExpertModus(); UpdateExpertModus();
document.getElementById("divall").style.display = ''; document.getElementById("divall").style.display = '';
} }
function InitIndivParameter() function InitIndivParameter() {
{
NUMBERS = getNUMBERInfo(); NUMBERS = getNUMBERInfo();
var _index = document.getElementById("Numbers_value1"); var _index = document.getElementById("Numbers_value1");
while (_index.length) while (_index.length) {
_index.remove(0); _index.remove(0);
}
var _indexInflux = document.getElementById("NumbersInfluxDBv2_value1"); var _indexInflux = document.getElementById("NumbersInfluxDBv2_value1");
while (_indexInflux.length) while (_indexInflux.length) {
_indexInflux.remove(0); _indexInflux.remove(0);
}
var _indexInfluxv1 = document.getElementById("NumbersInfluxDB_value1"); var _indexInfluxv1 = document.getElementById("NumbersInfluxDB_value1");
while (_indexInflux.length) while (_indexInfluxv1.length) {
_indexInfluxv1.remove(0); _indexInfluxv1.remove(0);
}
for (var i = 0; i < NUMBERS.length; ++i){ for (var i = 0; i < NUMBERS.length; ++i) {
var option = document.createElement("option"); var option = document.createElement("option");
option.text = NUMBERS[i]["name"]; option.text = NUMBERS[i]["name"];
option.value = i; option.value = i;
@@ -1852,8 +1854,8 @@ function InitIndivParameter()
optionInfluxv1.text = NUMBERS[i]["name"]; optionInfluxv1.text = NUMBERS[i]["name"];
optionInfluxv1.value = i; optionInfluxv1.value = i;
_indexInfluxv1.add(optionInfluxv1); _indexInfluxv1.add(optionInfluxv1);
} }
_index.selectedIndex = 0; _index.selectedIndex = 0;
_indexInflux.selectedIndex = 0; _indexInflux.selectedIndex = 0;
_indexInfluxv1.selectedIndex = 0; _indexInfluxv1.selectedIndex = 0;
@@ -1863,15 +1865,16 @@ function InitIndivParameter()
function getParameterByName(name, url = window.location.href) { function getParameterByName(name, url = window.location.href) {
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; 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, _number = -1){ function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1) {
let anzpara; let anzpara;
try { try {
anzpara = _param[_cat][_name].anzParam; anzpara = _param[_cat][_name].anzParam;
@@ -1882,8 +1885,9 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1)
} }
if (_number > -1) { if (_number > -1) {
if ((NUMBERS[_number] == undefined) || (NUMBERS[_number][_cat] == undefined) || (NUMBERS[_number][_cat][_name] == undefined)) if ((NUMBERS[_number] == undefined) || (NUMBERS[_number][_cat] == undefined) || (NUMBERS[_number][_cat][_name] == undefined)) {
return; return;
}
if (_optional) { if (_optional) {
document.getElementById(_cat+"_"+_name+"_enabled").checked = NUMBERS[_number][_cat][_name]["enabled"]; document.getElementById(_cat+"_"+_name+"_enabled").checked = NUMBERS[_number][_cat][_name]["enabled"];
@@ -1891,6 +1895,7 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1)
document.getElementById(_cat+"_"+_name+"_value"+j).disabled = !NUMBERS[_number][_cat][_name]["enabled"]; document.getElementById(_cat+"_"+_name+"_value"+j).disabled = !NUMBERS[_number][_cat][_name]["enabled"];
} }
} }
document.getElementById(_cat+"_"+_name+"_text").style.color = "black" document.getElementById(_cat+"_"+_name+"_text").style.color = "black"
setEnabled(_cat+"_"+_name, true); setEnabled(_cat+"_"+_name, true);
@@ -1898,8 +1903,9 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1)
let element = document.getElementById(_cat+"_"+_name+"_value"+j); let element = document.getElementById(_cat+"_"+_name+"_value"+j);
if (element.tagName.toLowerCase() == "select") { if (element.tagName.toLowerCase() == "select") {
var textToFind = NUMBERS[_number][_cat][_name]["value"+j]; var textToFind = NUMBERS[_number][_cat][_name]["value"+j];
if (textToFind == undefined) if (textToFind == undefined) {
continue; continue;
}
_isFound = false; _isFound = false;
element.selectedIndex = -1; element.selectedIndex = -1;
@@ -1910,8 +1916,7 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1)
break; break;
} }
} }
if (!_isFound) if (!_isFound) {
{
_zw_txt = "In the selected field the value '" + textToFind + "' in the parameter '"; _zw_txt = "In the selected field the value '" + textToFind + "' in the parameter '";
_zw_txt = _zw_txt + _cat + "' in the field '" + _name + "' is invalid. PLEASE CHECK BEFORE SAVING!"; _zw_txt = _zw_txt + _cat + "' in the field '" + _name + "' is invalid. PLEASE CHECK BEFORE SAVING!";
firework.launch(_zw_txt, 'warning', 10000); firework.launch(_zw_txt, 'warning', 10000);
@@ -1939,8 +1944,9 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1)
let element = document.getElementById(_cat+"_"+_name+"_value"+j); let element = document.getElementById(_cat+"_"+_name+"_value"+j);
if (element.tagName.toLowerCase() == "select") { if (element.tagName.toLowerCase() == "select") {
var textToFind = _param[_cat][_name]["value"+j]; var textToFind = _param[_cat][_name]["value"+j];
if (textToFind == undefined) if (textToFind == undefined) {
continue; continue;
}
_isFound = false; _isFound = false;
element.selectedIndex = -1; element.selectedIndex = -1;
@@ -1951,8 +1957,7 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1)
break; break;
} }
} }
if (!_isFound) if (!_isFound) {
{
_zw_txt = "In the selected field the value '" + textToFind + "' in the section '"; _zw_txt = "In the selected field the value '" + textToFind + "' in the section '";
_zw_txt = _zw_txt + _cat + "' in the field '" + _name + "' is invalid. PLEASE CHECK BEFORE SAVING!"; _zw_txt = _zw_txt + _cat + "' in the field '" + _name + "' is invalid. PLEASE CHECK BEFORE SAVING!";
firework.launch(_zw_txt, 'warning', 10000); firework.launch(_zw_txt, 'warning', 10000);
@@ -1969,8 +1974,7 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1)
} }
///////////////// am Ende, falls Kategorie als gesamtes nicht ausgewählt --> deaktivieren ///////////////// am Ende, falls Kategorie als gesamtes nicht ausgewählt --> deaktivieren
if (_category[_cat]["enabled"] == false) if (_category[_cat]["enabled"] == false) {
{
if (_optional) { if (_optional) {
document.getElementById(_cat+"_"+_name+"_enabled").disabled = true; document.getElementById(_cat+"_"+_name+"_enabled").disabled = true;
for (var j = 1; j <= anzpara; ++j) { for (var j = 1; j <= anzpara; ++j) {
@@ -1985,12 +1989,12 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1)
} }
function InvertEnableItem(_cat, _param) function InvertEnableItem(_cat, _param) {
{
_zw = _cat + "_" + _param + "_enabled"; _zw = _cat + "_" + _param + "_enabled";
_isOn = document.getElementById(_zw).checked; _isOn = document.getElementById(_zw).checked;
_color = "rgb(122, 122, 122)"; _color = "rgb(122, 122, 122)";
if (_isOn) { if (_isOn) {
_color = "black"; _color = "black";
} }
@@ -2002,8 +2006,8 @@ function InvertEnableItem(_cat, _param)
setEnabled(_cat + "_" + _param, _isOn); setEnabled(_cat + "_" + _param, _isOn);
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 = _color; document.getElementById(_cat+"_"+_param+"_value"+j).style.color = _color;
} }
} }
@@ -2018,19 +2022,22 @@ function setEnabled(className, enabled) {
for (i = 0; i < elements.length; i++) { for (i = 0; i < elements.length; i++) {
if (enabled) { if (enabled) {
elements[i].classList.remove("disabled"); elements[i].classList.remove("disabled");
} else { }
else {
elements[i].classList.add("disabled"); elements[i].classList.add("disabled");
} }
let inputs = elements[i].getElementsByTagName("input"); let inputs = elements[i].getElementsByTagName("input");
for (j = 0; j < inputs.length; j++) { for (j = 0; j < inputs.length; j++) {
if (inputs[j].id.endsWith("_enabled")) if (inputs[j].id.endsWith("_enabled")) {
continue; continue;
}
inputs[j].style.color = _color; inputs[j].style.color = _color;
if (enabled) { if (enabled) {
inputs[j].removeAttribute("disabled"); inputs[j].removeAttribute("disabled");
} else { }
else {
inputs[j].setAttribute("disabled", "disabled"); inputs[j].setAttribute("disabled", "disabled");
} }
} }
@@ -2043,15 +2050,15 @@ function setVisible(className, visible) {
for (i = 0; i < elements.length; i++) { for (i = 0; i < elements.length; i++) {
if (visible) { if (visible) {
elements[i].classList.remove("hidden"); elements[i].classList.remove("hidden");
} else { }
else {
elements[i].classList.add("hidden"); elements[i].classList.add("hidden");
} }
} }
} }
function EnDisableItem(_status, _param, _category, _cat, _name, _optional, _number = -1) function EnDisableItem(_status, _param, _category, _cat, _name, _optional, _number = -1) {
{
_status = _category[_cat]["enabled"]; _status = _category[_cat]["enabled"];
_color = "rgb(122, 122, 122)"; _color = "rgb(122, 122, 122)";
@@ -2064,18 +2071,18 @@ function EnDisableItem(_status, _param, _category, _cat, _name, _optional, _numb
document.getElementById(_cat+"_"+_name+"_enabled").style.color = _color; document.getElementById(_cat+"_"+_name+"_enabled").style.color = _color;
} }
if (_number == -1){ if (_number == -1) {
if (!_param[_cat][_name]["enabled"]) { if (!_param[_cat][_name]["enabled"]) {
_status = false; _status = false;
_color = "rgb(122, 122, 122)"; _color = "rgb(122, 122, 122)";
} }
} }
else else {
if (!NUMBERS[_number][_cat][_name]["enabled"]) { if (!NUMBERS[_number][_cat][_name]["enabled"]) {
_status = false; _status = false;
_color = "rgb(122, 122, 122)"; _color = "rgb(122, 122, 122)";
} }
}
document.getElementById(_cat+"_"+_name+"_text").disabled = !_status; document.getElementById(_cat+"_"+_name+"_text").disabled = !_status;
document.getElementById(_cat+"_"+_name+"_text").style.color = _color; document.getElementById(_cat+"_"+_name+"_text").style.color = _color;
@@ -2083,22 +2090,25 @@ function EnDisableItem(_status, _param, _category, _cat, _name, _optional, _numb
setEnabled(_cat+"_"+_name, _status); setEnabled(_cat+"_"+_name, _status);
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 = _color; document.getElementById(_cat+"_"+_name+"_value"+j).style.color = _color;
} }
} }
function ReadParameter(_param, _cat, _name, _optional, _number = -1){ function ReadParameter(_param, _cat, _name, _optional, _number = -1) {
if (_number > -1) { if (_number > -1) {
if (_cat == "Digits") if (_cat == "Digits") {
_cat = "digit"; _cat = "digit";
if (_cat == "Analog") }
if (_cat == "Analog") {
_cat = "analog"; _cat = "analog";
}
if ((NUMBERS[_number] == undefined) || (NUMBERS[_number][_cat] == undefined) || (NUMBERS[_number][_cat][_name] == undefined)) if ((NUMBERS[_number] == undefined) || (NUMBERS[_number][_cat] == undefined) || (NUMBERS[_number][_cat][_name] == undefined)) {
return; return;
}
if (_optional) { if (_optional) {
NUMBERS[_number][_cat][_name]["enabled"] = document.getElementById(_cat+"_"+_name+"_enabled").checked; NUMBERS[_number][_cat][_name]["enabled"] = document.getElementById(_cat+"_"+_name+"_enabled").checked;
@@ -2116,7 +2126,8 @@ function ReadParameter(_param, _cat, _name, _optional, _number = -1){
if ((NUMBERS[_number][_cat][_name].checkRegExList != null) && (NUMBERS[_number][_cat][_name].checkRegExList[j-1] != null)) { if ((NUMBERS[_number][_cat][_name].checkRegExList != null) && (NUMBERS[_number][_cat][_name].checkRegExList[j-1] != null)) {
if (!element.value.match(NUMBERS[_cat][_name].checkRegExList[j-1])) { if (!element.value.match(NUMBERS[_cat][_name].checkRegExList[j-1])) {
element.classList.add("invalid-input"); element.classList.add("invalid-input");
} else { }
else {
element.classList.remove("invalid-input"); element.classList.remove("invalid-input");
} }
} }
@@ -2142,7 +2153,8 @@ function ReadParameter(_param, _cat, _name, _optional, _number = -1){
if ((_param[_cat][_name].checkRegExList != null) && (_param[_cat][_name].checkRegExList[j-1] != null)) { if ((_param[_cat][_name].checkRegExList != null) && (_param[_cat][_name].checkRegExList[j-1] != null)) {
if (!element.value.match(_param[_cat][_name].checkRegExList[j-1])) { if (!element.value.match(_param[_cat][_name].checkRegExList[j-1])) {
element.classList.add("invalid-input"); element.classList.add("invalid-input");
} else { }
else {
element.classList.remove("invalid-input"); element.classList.remove("invalid-input");
} }
} }
@@ -2153,10 +2165,8 @@ function ReadParameter(_param, _cat, _name, _optional, _number = -1){
} }
function UpdateInputIndividual(sel) function UpdateInputIndividual(sel) {
{ if (NUNBERSAkt != -1) {
if (NUNBERSAkt != -1)
{
ReadParameter(param, "PostProcessing", "DecimalShift", true, NUNBERSAkt); ReadParameter(param, "PostProcessing", "DecimalShift", true, NUNBERSAkt);
ReadParameter(param, "PostProcessing", "AnalogDigitalTransitionStart", true, NUNBERSAkt); ReadParameter(param, "PostProcessing", "AnalogDigitalTransitionStart", true, NUNBERSAkt);
ReadParameter(param, "PostProcessing", "MaxRateValue", true, NUNBERSAkt); ReadParameter(param, "PostProcessing", "MaxRateValue", true, NUNBERSAkt);
@@ -2170,7 +2180,7 @@ function UpdateInputIndividual(sel)
ReadParameter(param, "InfluxDBv2", "Measurement", true, NUNBERSAkt); ReadParameter(param, "InfluxDBv2", "Measurement", true, NUNBERSAkt);
} }
// var sel = document.getElementById("Numbers_value1"); // var sel = document.getElementById("Numbers_value1");
NUNBERSAkt = sel.selectedIndex; NUNBERSAkt = sel.selectedIndex;
WriteParameter(param, category, "PostProcessing", "DecimalShift", true, NUNBERSAkt); WriteParameter(param, category, "PostProcessing", "DecimalShift", true, NUNBERSAkt);
WriteParameter(param, category, "PostProcessing", "AnalogDigitalTransitionStart", true, NUNBERSAkt); WriteParameter(param, category, "PostProcessing", "AnalogDigitalTransitionStart", true, NUNBERSAkt);
@@ -2242,7 +2252,7 @@ function UpdateInput() {
WriteParameter(param, category, "PostProcessing", "PreValueUse", false); WriteParameter(param, category, "PostProcessing", "PreValueUse", false);
WriteParameter(param, category, "PostProcessing", "PreValueAgeStartup", true); WriteParameter(param, category, "PostProcessing", "PreValueAgeStartup", true);
// WriteParameter(param, category, "PostProcessing", "AllowNegativeRates", true); // WriteParameter(param, category, "PostProcessing", "AllowNegativeRates", true);
WriteParameter(param, category, "PostProcessing", "ErrorMessage", false); WriteParameter(param, category, "PostProcessing", "ErrorMessage", false);
WriteParameter(param, category, "PostProcessing", "CheckDigitIncreaseConsistency", false); WriteParameter(param, category, "PostProcessing", "CheckDigitIncreaseConsistency", false);
@@ -2254,23 +2264,23 @@ function UpdateInput() {
WriteParameter(param, category, "MQTT", "RetainMessages", false); WriteParameter(param, category, "MQTT", "RetainMessages", false);
WriteParameter(param, category, "MQTT", "HomeassistantDiscovery", false); WriteParameter(param, category, "MQTT", "HomeassistantDiscovery", false);
WriteParameter(param, category, "MQTT", "MeterType", true); WriteParameter(param, category, "MQTT", "MeterType", true);
WriteParameter(param, category, "MQTT", "CACert", true); WriteParameter(param, category, "MQTT", "CACert", true);
WriteParameter(param, category, "MQTT", "ClientCert", true); WriteParameter(param, category, "MQTT", "ClientCert", true);
WriteParameter(param, category, "MQTT", "ClientKey", true); WriteParameter(param, category, "MQTT", "ClientKey", true);
WriteParameter(param, category, "InfluxDB", "Uri", true); WriteParameter(param, category, "InfluxDB", "Uri", true);
WriteParameter(param, category, "InfluxDB", "Database", true); WriteParameter(param, category, "InfluxDB", "Database", true);
// WriteParameter(param, category, "InfluxDB", "Measurement", true); // WriteParameter(param, category, "InfluxDB", "Measurement", true);
WriteParameter(param, category, "InfluxDB", "user", true); WriteParameter(param, category, "InfluxDB", "user", true);
WriteParameter(param, category, "InfluxDB", "password", true); WriteParameter(param, category, "InfluxDB", "password", true);
// WriteParameter(param, category, "InfluxDB", "Field", true); // WriteParameter(param, category, "InfluxDB", "Field", true);
WriteParameter(param, category, "InfluxDBv2", "Uri", true); WriteParameter(param, category, "InfluxDBv2", "Uri", true);
WriteParameter(param, category, "InfluxDBv2", "Bucket", true); WriteParameter(param, category, "InfluxDBv2", "Bucket", true);
// WriteParameter(param, category, "InfluxDBv2", "Measurement", true); // WriteParameter(param, category, "InfluxDBv2", "Measurement", true);
WriteParameter(param, category, "InfluxDBv2", "Org", true); WriteParameter(param, category, "InfluxDBv2", "Org", true);
WriteParameter(param, category, "InfluxDBv2", "Token", true); WriteParameter(param, category, "InfluxDBv2", "Token", true);
// WriteParameter(param, category, "InfluxDBv2", "Field", true); // WriteParameter(param, category, "InfluxDBv2", "Field", true);
WriteParameter(param, category, "GPIO", "IO0", true); WriteParameter(param, category, "GPIO", "IO0", true);
WriteParameter(param, category, "GPIO", "IO1", true); WriteParameter(param, category, "GPIO", "IO1", true);
@@ -2301,41 +2311,44 @@ function UpdateInput() {
} }
function WriteModelFiles() function WriteModelFiles() {
{
list_tflite = getTFLITEList(); list_tflite = getTFLITEList();
var _indexDig = document.getElementById("Digits_Model_value1"); var _indexDig = document.getElementById("Digits_Model_value1");
var _indexAna = document.getElementById("Analog_Model_value1"); var _indexAna = document.getElementById("Analog_Model_value1");
while (_indexDig.length)
while (_indexDig.length) {
_indexDig.remove(0); _indexDig.remove(0);
while (_indexAna.length) }
while (_indexAna.length) {
_indexAna.remove(0); _indexAna.remove(0);
}
for (var i = 0; i < list_tflite.length; ++i){ for (var i = 0; i < list_tflite.length; ++i) {
var optionDig = document.createElement("option"); var optionDig = document.createElement("option");
var optionAna = document.createElement("option"); var optionAna = document.createElement("option");
var text = list_tflite[i].replace("/config/", ""); var text = list_tflite[i].replace("/config/", "");
if (list_tflite[i].includes("/dig")) { // Its a digital file, only show in the digital list box if (list_tflite[i].includes("/dig")) { // Its a digital file, only show in the digital list box
optionDig.text = text; optionDig.text = text;
optionDig.value = list_tflite[i]; optionDig.value = list_tflite[i];
_indexDig.add(optionDig); _indexDig.add(optionDig);
} }
else if (list_tflite[i].includes("/ana")) { // Its a digital file, only show in the analog list box else if (list_tflite[i].includes("/ana")) { // Its a digital file, only show in the analog list box
optionAna.text = text; optionAna.text = text;
optionAna.value = list_tflite[i]; optionAna.value = list_tflite[i];
_indexAna.add(optionAna); _indexAna.add(optionAna);
} }
else { // all other files, show in both list boxes else { // all other files, show in both list boxes
optionDig.text = text; optionDig.text = text;
optionDig.value = list_tflite[i]; optionDig.value = list_tflite[i];
_indexDig.add(optionDig); _indexDig.add(optionDig);
optionAna.text = text; optionAna.text = text;
optionAna.value = list_tflite[i]; optionAna.value = list_tflite[i];
_indexAna.add(optionAna); _indexAna.add(optionAna);
} }
} }
@@ -2344,8 +2357,7 @@ function WriteModelFiles()
} }
function ReadParameterAll() function 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;
@@ -2403,9 +2415,9 @@ function ReadParameterAll()
ReadParameter(param, "MQTT", "RetainMessages", false); ReadParameter(param, "MQTT", "RetainMessages", false);
ReadParameter(param, "MQTT", "HomeassistantDiscovery", false); ReadParameter(param, "MQTT", "HomeassistantDiscovery", false);
ReadParameter(param, "MQTT", "MeterType", true); ReadParameter(param, "MQTT", "MeterType", true);
ReadParameter(param, "MQTT", "CACert", true); ReadParameter(param, "MQTT", "CACert", true);
ReadParameter(param, "MQTT", "ClientCert", true); ReadParameter(param, "MQTT", "ClientCert", true);
ReadParameter(param, "MQTT", "ClientKey", true); ReadParameter(param, "MQTT", "ClientKey", true);
ReadParameter(param, "InfluxDB", "Uri", true); ReadParameter(param, "InfluxDB", "Uri", true);
ReadParameter(param, "InfluxDB", "Database", true); ReadParameter(param, "InfluxDB", "Database", true);
@@ -2418,7 +2430,7 @@ function ReadParameterAll()
ReadParameter(param, "InfluxDBv2", "Measurement", true); ReadParameter(param, "InfluxDBv2", "Measurement", true);
ReadParameter(param, "InfluxDBv2", "Org", true); ReadParameter(param, "InfluxDBv2", "Org", true);
ReadParameter(param, "InfluxDBv2", "Token", true); ReadParameter(param, "InfluxDBv2", "Token", true);
// ReadParameter(param, "InfluxDB", "Field", true); // ReadParameter(param, "InfluxDB", "Field", true);
ReadParameter(param, "GPIO", "IO0", true); ReadParameter(param, "GPIO", "IO0", true);
ReadParameter(param, "GPIO", "IO1", true); ReadParameter(param, "GPIO", "IO1", true);
@@ -2455,7 +2467,7 @@ function ReadParameterAll()
var sel = document.getElementById("Numbers_value1"); var sel = document.getElementById("Numbers_value1");
UpdateInputIndividual(sel); UpdateInputIndividual(sel);
// FormatDecimalValue(param, "PostProcessing", "MaxRateValue"); // FormatDecimalValue(param, "PostProcessing", "MaxRateValue");
} }
@@ -2483,44 +2495,43 @@ function UpdateAfterCategoryCheck() {
} }
function UpdateExpertModus() function UpdateExpertModus() {
{ // var _style = 'display:none;';
// var _style = 'display:none;';
var _style_pur = 'none'; var _style_pur = 'none';
var _hidden = true; var _hidden = true;
if (document.getElementById("ExpertModus_enabled").checked) { if (document.getElementById("ExpertModus_enabled").checked) {
// _style = ''; // _style = '';
_style_pur = ''; _style_pur = '';
_hidden = false; _hidden = false;
document.getElementById("Edit_Config_Direct").style.display = ""; document.getElementById("Edit_Config_Direct").style.display = "";
firework.launch("Expert view activated. Please use carefully", 'warning', 5000); firework.launch("Expert view activated. Please use carefully", 'warning', 5000);
} }
else else {
{
document.getElementById("Edit_Config_Direct").style.display = "none"; document.getElementById("Edit_Config_Direct").style.display = "none";
} }
const expert = document.querySelectorAll(".expert"); const expert = document.querySelectorAll(".expert");
for (var i = 0; i < expert.length; i++) { for (var i = 0; i < expert.length; i++) {
expert[i].style.display = _style_pur; expert[i].style.display = _style_pur;
// document.getElementById(expert[i].id).style = _style; // document.getElementById(expert[i].id).style = _style;
} }
// Enable / Disable die Optionen in den Menues für die Auswahl. Falls kein Expertenmodus soll nur ein Wert (built-in-led oder externan-flash-ws281x) möglich sein // Enable / Disable die Optionen in den Menues für die Auswahl. Falls kein Expertenmodus soll nur ein Wert (built-in-led oder externan-flash-ws281x) möglich sein
Array.from(document.querySelector("#GPIO_IO4_value1").options).forEach(function(option_element) { Array.from(document.querySelector("#GPIO_IO4_value1").options).forEach(function(option_element) {
if (option_element.value != "built-in-led") if (option_element.value != "built-in-led") {
option_element.hidden = _hidden; option_element.hidden = _hidden;
}
}); });
Array.from(document.querySelector("#GPIO_IO12_value1").options).forEach(function(option_element) { Array.from(document.querySelector("#GPIO_IO12_value1").options).forEach(function(option_element) {
if (option_element.value != "external-flash-ws281x") if (option_element.value != "external-flash-ws281x") {
option_element.hidden = _hidden; option_element.hidden = _hidden;
}
}); });
} }
function saveTextAsFile() function saveTextAsFile() {
{
ReadParameterAll(); ReadParameterAll();
if (document.getElementsByClassName("invalid-input").length > 0) { if (document.getElementsByClassName("invalid-input").length > 0) {
firework.launch("Settings cannot be saved. Please check your entries!", 'danger', 30000); firework.launch("Settings cannot be saved. Please check your entries!", 'danger', 30000);
@@ -2559,58 +2570,61 @@ function editConfigDirect() {
} }
function numberChanged() function numberChanged() {
{
var sel = document.getElementById("Numbers_value1"); var sel = document.getElementById("Numbers_value1");
_neu = sel.selectedIndex; _neu = sel.selectedIndex;
UpdateInputIndividual(sel); UpdateInputIndividual(sel);
var _selInflux = document.getElementById("NumbersInfluxDBv2_value1"); var _selInflux = document.getElementById("NumbersInfluxDBv2_value1");
if (_selInflux.selectedIndex != _neu) if (_selInflux.selectedIndex != _neu) {
_selInflux.selectedIndex = _neu _selInflux.selectedIndex = _neu
}
} }
function numberInfluxDBv2Changed() function numberInfluxDBv2Changed() {
{
var sel = document.getElementById("NumbersInfluxDBv2_value1"); var sel = document.getElementById("NumbersInfluxDBv2_value1");
_neu = sel.selectedIndex; _neu = sel.selectedIndex;
UpdateInputIndividual(sel); UpdateInputIndividual(sel);
var _sel2 = document.getElementById("Numbers_value1"); var _sel2 = document.getElementById("Numbers_value1");
if (_sel2.selectedIndex != _neu) if (_sel2.selectedIndex != _neu) {
_sel2.selectedIndex = _neu _sel2.selectedIndex = _neu
}
var _sel3 = document.getElementById("NumbersInfluxDB_value1"); var _sel3 = document.getElementById("NumbersInfluxDB_value1");
if (_sel3.selectedIndex != _neu) if (_sel3.selectedIndex != _neu) {
_sel3.selectedIndex = _neu _sel3.selectedIndex = _neu
}
} }
function numberInfluxDBChanged() function numberInfluxDBChanged() {
{
var sel = document.getElementById("NumbersInfluxDB_value1"); var sel = document.getElementById("NumbersInfluxDB_value1");
_neu = sel.selectedIndex; _neu = sel.selectedIndex;
UpdateInputIndividual(sel); UpdateInputIndividual(sel);
var _sel2 = document.getElementById("Numbers_value1"); var _sel2 = document.getElementById("Numbers_value1");
if (_sel2.selectedIndex != _neu) if (_sel2.selectedIndex != _neu) {
_sel2.selectedIndex = _neu _sel2.selectedIndex = _neu
}
var _sel3 = document.getElementById("NumbersInfluxDBv2_value1"); var _sel3 = document.getElementById("NumbersInfluxDBv2_value1");
if (_sel3.selectedIndex != _neu) if (_sel3.selectedIndex != _neu) {
_sel3.selectedIndex = _neu _sel3.selectedIndex = _neu
}
} }
/* hash #description open the details part of the page */
function openDescription() /* hash #description open the details part of the page */
{ function openDescription() {
if(window.location.hash) { if(window.location.hash) {
var hash = window.location.hash.substring(1); //Puts hash in variable, and removes the # character var hash = window.location.hash.substring(1); //Puts hash in variable, and removes the # character
if(hash == 'description') if(hash == 'description') {
document.getElementById("desc_details").open = true; document.getElementById("desc_details").open = true;
document.getElementById("reboot").style.display = "none"; document.getElementById("reboot").style.display = "none";
document.getElementById("reboot_text").style.display = "none"; document.getElementById("reboot_text").style.display = "none";
}
} }
} }

877
sd-card/html/edit_reference.html
View File

File diff suppressed because it is too large Load Diff

41
sd-card/html/readconfigcommon.js
View File

@@ -39,13 +39,11 @@ function createReader(file) {
} }
function ZerlegeZeile(input, delimiter = " =\t\r") function ZerlegeZeile(input, delimiter = " =\t\r")
{ {
var Output = Array(0); var Output = Array(0);
// delimiter = " =,\t"; // delimiter = " =,\t";
/* The input can have multiple formats: /* The input can have multiple formats:
* - key = value * - key = value
* - key = value1 value2 value3 ... * - key = value1 value2 value3 ...
@@ -82,7 +80,6 @@ function ZerlegeZeile(input, delimiter = " =\t\r")
} }
return Output; return Output;
} }
@@ -110,7 +107,6 @@ function findDelimiterPos(input, delimiter)
return pos; return pos;
} }
function trim(istring, adddelimiter) function trim(istring, adddelimiter)
{ {
@@ -247,19 +243,21 @@ function SaveCanvasToImage(_canvas, _filename, _delete = true, _domainname = "")
} }
function MakeContrastImageZW(zw, _enhance, _domainname){ function MakeRefImageZW(zw, _enhance, _domainname){
_filename = zw["name"].replace("/config/", "/img_tmp/"); var _filename = zw["name"].replace("/config/", "/img_tmp/");
url = _domainname + "/editflow?task=cutref&in=/config/reference.jpg&out=" + _filename + "&x=" + zw["x"] + "&y=" + zw["y"] + "&dx=" + zw["dx"] + "&dy=" + zw["dy"];
var url = _domainname + "/editflow?task=cutref&in=/config/reference.jpg&out=" + _filename + "&x=" + zw["x"] + "&y=" + zw["y"] + "&dx=" + zw["dx"] + "&dy=" + zw["dy"];
if (_enhance == true){ if (_enhance == true){
url = url + "&enhance=true"; url = url + "&enhance=true";
} }
var xhttp = new XMLHttpRequest(); var xhttp = new XMLHttpRequest();
try { try {
xhttp.open("GET", url, false); xhttp.open("GET", url, false);
xhttp.send(); xhttp.send();
} } catch (error){}
catch (error){}
if (xhttp.responseText == "CutImage Done") { if (xhttp.responseText == "CutImage Done") {
firework.launch('Image Contrast got enhanced', 'success', 5000); firework.launch('Image Contrast got enhanced', 'success', 5000);
@@ -269,28 +267,3 @@ function MakeContrastImageZW(zw, _enhance, _domainname){
return false; return false;
} }
} }
function MakeRefZW(zw, _domainname){
_filetarget = zw["name"].replace("/config/", "/img_tmp/");
_filetarget = _filetarget.replace(".jpg", "_org.jpg");
url = _domainname + "/editflow?task=cutref&in=/config/reference.jpg&out="+_filetarget+"&x=" + zw["x"] + "&y=" + zw["y"] + "&dx=" + zw["dx"] + "&dy=" + zw["dy"];
var xhttp = new XMLHttpRequest();
try {
xhttp.open("GET", url, false);
xhttp.send();
}
catch (error){}
if (xhttp.responseText == "CutImage Done") {
_filetarget2 = zw["name"].replace("/config/", "/img_tmp/");
// _filetarget2 = _filetarget2.replace(".jpg", "_org.jpg");
FileCopyOnServer(_filetarget, _filetarget2, _domainname);
firework.launch('Marker got updated', 'success', 5000);
return true;
}
else {
return false;
}
}

33
sd-card/html/readconfigparam.js
View File

@@ -467,8 +467,6 @@ function WriteConfigININew()
} }
} }
config_split = new Array(0); config_split = new Array(0);
for (var cat in param) { for (var cat in param) {
@@ -565,7 +563,6 @@ function WriteConfigININew()
} }
function isCommented(input) function isCommented(input)
{ {
let isComment = false; let isComment = false;
@@ -602,7 +599,6 @@ function getConfigCategory() {
} }
function ExtractROIs(_aktline, _type){ function ExtractROIs(_aktline, _type){
var linesplit = ZerlegeZeile(_aktline); var linesplit = ZerlegeZeile(_aktline);
abc = getNUMBERS(linesplit[0], _type); abc = getNUMBERS(linesplit[0], _type);
@@ -678,7 +674,6 @@ function getNUMBERS(_name, _type, _create = true)
} }
function CopyReferenceToImgTmp(_domainname) function CopyReferenceToImgTmp(_domainname)
{ {
for (index = 0; index < 2; ++index) for (index = 0; index < 2; ++index)
@@ -700,7 +695,7 @@ function GetReferencesInfo(){
} }
function UpdateConfigReference(_domainname){ function UpdateConfigReferences(_domainname){
for (var index = 0; index < 2; ++index) for (var index = 0; index < 2; ++index)
{ {
_filenamenach = REFERENCES[index]["name"]; _filenamenach = REFERENCES[index]["name"];
@@ -712,11 +707,35 @@ function UpdateConfigReference(_domainname){
_filenamevon = _filenamevon.replace(".jpg", "_org.jpg"); _filenamevon = _filenamevon.replace(".jpg", "_org.jpg");
FileDeleteOnServer(_filenamenach, _domainname); FileDeleteOnServer(_filenamenach, _domainname);
FileCopyOnServer(_filenamevon, _filenamenach, _domainname); FileCopyOnServer(_filenamevon, _filenamenach, _domainname);
} }
} }
function UpdateConfigReference(_anzneueref, _domainname){
var index = 0;
if (_anzneueref == 1) {
index = 0;
}
else if (_anzneueref == 2) {
index = 1;
}
_filenamenach = REFERENCES[index]["name"];
_filenamevon = _filenamenach.replace("/config/", "/img_tmp/");
FileDeleteOnServer(_filenamenach, _domainname);
FileCopyOnServer(_filenamevon, _filenamenach, _domainname);
_filenamenach = _filenamenach.replace(".jpg", "_org.jpg");
_filenamevon = _filenamevon.replace(".jpg", "_org.jpg");
FileDeleteOnServer(_filenamenach, _domainname);
FileCopyOnServer(_filenamevon, _filenamenach, _domainname);
}
function getNUMBERInfo(){ function getNUMBERInfo(){
return NUMBERS; return NUMBERS;
} }