From 331e3533ccb93e45c753d02141661b53710e8b37 Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Mon, 1 May 2023 22:54:10 +0200 Subject: [PATCH] v15.2.2 (#2379) * Testcase for #2145 and debug-log (#2151) * new models ana-cont-11.0.5, ana-class100-1.5.7, dig-class100-1.6.0 * Testcase for #2145 Added debug log, if allowNegativeRates is handeled * Fix timezone config parser (#2169) * make sure to parse the whole config line * fix crash on empty timezone parameter --------- Co-authored-by: CaCO3 * Enhance ROI pages (#2161) * Check if the ROIs are equidistant. Only if not, untick the checkbox * renaming * Check if the ROIs have same y, dy and dx. If so, tick the sync checkbox * only allow editing space when box is checked * fix sync check * show inner frame on all ROIs * cleanup * Check if the ROIs have same dy and dx. If so, tick the sync checkbox * checkbox position * renaming * renaming * show inner frame and cross hairs on all ROIs * update ROIs on ticking checkboxes * show timezone hint * fix deleting last ROI * cleanup --------- Co-authored-by: CaCO3 * restart timeout on progress, catch error (#2170) * restart timeout on progress, catch error * . --------- Co-authored-by: CaCO3 * BugFix #2167 * Release 15.1 preparations (#2171) * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update changelog * Fix links to PR * Formating * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md --------- Co-authored-by: Slider0007 Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> * fix typo * Replace relative documentation links with absolute ones pointing to the external documentation (#2180) Co-authored-by: CaCO3 * Sort model files in configuration combobox (#2189) * new models ana-cont-11.0.5, ana-class100-1.5.7, dig-class100-1.6.0 * Testcase for #2145 Added debug log, if allowNegativeRates is handeled * Sort model files in combobox * reboot task - increase stack size (#2201) Avoid stack overflow * Update interface_influxdb.cpp * Update Changelog.md * Show PSRAM usage (#2206) * centralize PSRAM usage (application code only) * update logging * update logging * fix use after free * initialize buffer * free rgb_image before ussing it for new allocation * use wrapper function * switch log level to debug * . * undo adding free() calls * . * add names to all CImage instances * . * . * . * revert changes of stbi_image_free() with free_psram_heap() on the places where is is not in PSRAM * . * typos * typo * Added MQTT Outbox explanation/warning * added CONFIG_SPIRAM_USE_MEMMAP explanation --------- Co-authored-by: CaCO3 * Disable custom MQTT Outbox. This also moves the MQTT Publishing memory usage back to the internal RAM! * log MQTT connection refused reasons (#2216) * Revert PSRAM usage as it lead to memory fragmentation. See https://github.com/jomjol/AI-on-the-edge-device/issues/2200 for details * fix missing value data * Revert PSRAM usage as it lead to memory fragmentation. (#2224) See https://github.com/jomjol/AI-on-the-edge-device/issues/2200 for details Co-authored-by: CaCO3 * Fix missing value data in graph (#2230) * fix missing value data --------- Co-authored-by: CaCO3 * Update Changelog.md (#2231) * Update interface_influxdb.cpp (#2233) * update copyright year * Cleanup * Set prevalue using MQTT + set prevalue to RAW value (REST+MQTT) (#2252) * Use double instead of float * Error handling + set to RAW if newvalue < 0 * REST SetPrevalue: Set to RAW if newvalue < 0 * set prevalue with MQTT * removed the stb_image files and re-add them as a submodule. (#2223) - stb_image.h: Version update 2.25 -> 2.28 - stb_resize.h: Version update 0.96 -> 0.97 - stb_write.h: Version update 1.14 -> 1.16 Co-authored-by: CaCO3 * Remove obsolete ClassFlowWriteList (#2264) * Renaming & cleanup of some modules / functions in source code (#2265) * Rename module tag name * Rename server_tflite.cpp -> MainFlowControl.cpp * Remove redundandant MQTTMainTopic function * Update * Remove obsolete GetMQTTMainTopic * Fix last element missing in digit model drop down (#2282) * Debug influxdb (#2283) * Fix time offset issues in InfluxDB component. (#2278) Closes #2273 Closes #2150 * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Improve Logging * Implement TimeSync at beginning * Update time_sntp.cpp * Update time_sntp.cpp * Set Time After WLAN Init --------- Co-authored-by: Antonin Delpeuch * Implement a camera livestream handler (#2286) * fix leading NaN (#2310) * analogROI: Activate save button after ROI creation (#2326) * Migration of PlatformIO 5.2.0 to 6.1.0 (resp. ESP IDF from 4.4.2 to 5.0.1) (#2305) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * fix leading NaN (#2310) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * Task watchdog has new config name * Fix return value check. It must be something else than ESP_FAIL, but it does not need to be ESP_OK! * add missing strucures to work around new RMTMEM restriction (untested) --------- Co-authored-by: CaCO3 * Keep MainFlowTask alive to handle reboot (#2325) * Shared PSRAM memory (#2285) * enable PSRAM logging * add extra functions for psram shared memroy handling * CImageBasis objects still should used dynamic memory (eg. rawImage), haw ever tmpImage must be placed inside the shared memory * Place all STBI allocs inside the shared memory * The models are placed in the shared PSRAM reagion and must be allocated through the dedicated functions * . * renaming * fix cast warning * add flag to switch STBI PSRAM usage * improve PSRAM shared handling * reserve shared PSRAM as early as possible * init logging eralier so we can use it in PSRAM shared alloc * move Wifi_LWIP, BSS_SEG and MQTT Outbox into PSRAM to ffree internal memory * Check if model fits into reserved shared memory * Update code/components/jomjol_tfliteclass/CTfLiteClass.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_flowcontroll/ClassFlowControll.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_image_proc/CImageBasis.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * . * . * . * . * Korrektur Merge Conflict in main.cpp --------- Co-authored-by: CaCO3 Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * fix PSRAM init return value check * Extend InfluxDBv1 with individual topic names (#2319) * Implement individual influx topic * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Update FieldName * analogROI: Activate save button after ROI creation (#2326) * Migration of PlatformIO 5.2.0 to 6.1.0 (resp. ESP IDF from 4.4.2 to 5.0.1) (#2305) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * fix leading NaN (#2310) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * Task watchdog has new config name * Fix return value check. It must be something else than ESP_FAIL, but it does not need to be ESP_OK! * add missing strucures to work around new RMTMEM restriction (untested) --------- Co-authored-by: CaCO3 * Keep MainFlowTask alive to handle reboot (#2325) * Shared PSRAM memory (#2285) * enable PSRAM logging * add extra functions for psram shared memroy handling * CImageBasis objects still should used dynamic memory (eg. rawImage), haw ever tmpImage must be placed inside the shared memory * Place all STBI allocs inside the shared memory * The models are placed in the shared PSRAM reagion and must be allocated through the dedicated functions * . * renaming * fix cast warning * add flag to switch STBI PSRAM usage * improve PSRAM shared handling * reserve shared PSRAM as early as possible * init logging eralier so we can use it in PSRAM shared alloc * move Wifi_LWIP, BSS_SEG and MQTT Outbox into PSRAM to ffree internal memory * Check if model fits into reserved shared memory * Update code/components/jomjol_tfliteclass/CTfLiteClass.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_flowcontroll/ClassFlowControll.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_image_proc/CImageBasis.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * . * . * . * . * Korrektur Merge Conflict in main.cpp --------- Co-authored-by: CaCO3 Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * fix PSRAM init return value check * Extend incl. indiv. Measurement * Implement UX * Update ClassFlowInfluxDBv2.cpp * Implement individual influx topic * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Update FieldName * Extend incl. indiv. Measurement * Implement UX * Update ClassFlowInfluxDBv2.cpp * Update main.cpp --------- Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> Co-authored-by: CaCO3 Co-authored-by: CaCO3 * Update Changelog.md (#2344) * Update Changelog.md * Update Changelog.md * merge conflicts * merge conflicts * update changelog * Update Changelog.md * Fix alignment mark PSRAM issue (#2357) * Add lock for shared PSRAM memory, use it for the relevant round steps and the Alignment Mark Task * only allow taking a new image for the Alignment Mark while round got completed * show success/denial of Alignment Mark Update Request * . --------- Co-authored-by: CaCO3 * Update Changelog.md (#2360) * Update platformio.ini (#2368) * Allow the Alignment Mark step while status is "Initializing" or "Initialization (delayed)" or while in setup mode (#2373) Co-authored-by: CaCO3 * Improve logging if Autostart is not enabled. Renamed/splitted functions (#2376) Co-authored-by: CaCO3 * Cleanup web UI (#2378) * fix wrong index on backup log * remove no longer used files/functions * improve logging on Alignment Mark Update --------- Co-authored-by: CaCO3 * Update Changelog.md --------- Co-authored-by: Frank Haverland Co-authored-by: CaCO3 Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Slider0007 Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> Co-authored-by: Antonin Delpeuch --- Changelog.md | 19 +++++++++ .../jomjol_flowcontroll/ClassFlowControll.cpp | 9 +++- .../jomjol_flowcontroll/ClassFlowControll.h | 3 +- .../jomjol_flowcontroll/MainFlowControl.cpp | 35 ++++++++++++---- .../jomjol_flowcontroll/MainFlowControl.h | 2 +- code/main/main.cpp | 8 ++-- code/platformio.ini | 2 +- sd-card/html/backup.html | 2 +- sd-card/html/common.js | 6 --- sd-card/html/gethost.js | 41 ------------------- sd-card/html/readconfigcommon.js | 4 +- sd-card/html/wlan_config.html | 1 + 12 files changed, 64 insertions(+), 68 deletions(-) delete mode 100644 sd-card/html/gethost.js diff --git a/Changelog.md b/Changelog.md index d96f6652..1df180d1 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,23 @@ +## [15.2.2] - 2023-05-01 + +### Changes + +For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.2.1...v15.2.2) + +#### Changed + - Updated PlatformIO to `6.2.0` + - [#2376](https://github.com/jomjol/AI-on-the-edge-device/pull/2376) Improve logging if Autostart is not enabled + +#### Fixed + - [#2373](https://github.com/jomjol/AI-on-the-edge-device/pull/2373) Allow the Alignment Mark step while status is "Initializing" or "Initialization (delayed)" or while in setup mode + + ## [15.2.1] - 2023-04-27 +### Changes + +For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.2.0...v15.2.1) + #### Fixed - [#2357](https://github.com/jomjol/AI-on-the-edge-device/pull/2357) Fix Alignment Mark issue @@ -966,6 +984,7 @@ External Illumination - Initial Version +[15.2.2]: https://github.com/jomjol/AI-on-the-edge-device/compare/v15.2.1...v15.2.2 [15.2.1]: https://github.com/jomjol/AI-on-the-edge-device/compare/v15.2.0...v15.2.1 [15.2.0]: https://github.com/jomjol/AI-on-the-edge-device/compare/v15.1.1...v15.2.0 [15.1.1]: https://github.com/jomjol/AI-on-the-edge-device/compare/v15.1.0...v15.1.1 diff --git a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp index 4068e9c4..f54df869 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp @@ -190,10 +190,15 @@ void ClassFlowControll::SetInitialParameter(void) } -bool ClassFlowControll::isAutoStart(long &_interval) +bool ClassFlowControll::getIsAutoStart(void) +{ + return AutoStart; +} + + +void ClassFlowControll::setAutoStartInterval(long &_interval) { _interval = AutoInterval * 60 * 1000; // AutoInterval: minutes -> ms - return AutoStart; } diff --git a/code/components/jomjol_flowcontroll/ClassFlowControll.h b/code/components/jomjol_flowcontroll/ClassFlowControll.h index 48a72fcc..dc09555a 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowControll.h +++ b/code/components/jomjol_flowcontroll/ClassFlowControll.h @@ -65,7 +65,8 @@ public: std::string doSingleStep(std::string _stepname, std::string _host); - bool isAutoStart(long &_interval); + bool getIsAutoStart(); + void setAutoStartInterval(long &_interval); std::string* getActStatusWithTime(); std::string* getActStatus(); diff --git a/code/components/jomjol_flowcontroll/MainFlowControl.cpp b/code/components/jomjol_flowcontroll/MainFlowControl.cpp index 46883d8f..26084fb2 100644 --- a/code/components/jomjol_flowcontroll/MainFlowControl.cpp +++ b/code/components/jomjol_flowcontroll/MainFlowControl.cpp @@ -41,7 +41,7 @@ bool bTaskAutoFlowCreated = false; bool flowisrunning = false; long auto_interval = 0; -bool auto_isrunning = false; +bool autostartIsEnabled = false; int countRounds = 0; bool isPlannedReboot = false; @@ -257,7 +257,7 @@ esp_err_t handler_flow_start(httpd_req_t *req) { httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*"); - if (auto_isrunning) { + if (autostartIsEnabled) { 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 REST API /flow_start"); const char* resp_str = "The flow is going to be started immediately or is already running"; @@ -286,7 +286,7 @@ esp_err_t MQTTCtrlFlowStart(std::string _topic) { ESP_LOGD(TAG, "MQTTCtrlFlowStart: topic %s", _topic.c_str()); - if (auto_isrunning) + if (autostartIsEnabled) { 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); @@ -657,7 +657,14 @@ esp_err_t handler_editflow(httpd_req_t *req) string out2 = out.substr(0, out.length() - 4) + "_org.jpg"; - if ((*flowctrl.getActStatus() == "Flow finished") && psram_init_shared_memory_for_take_image_step()) { + std::string state = *flowctrl.getActStatus(); + + /* To be able to provide the image, several conditions must be met due to the shared PSRAM usage: + - Ether the round most be completed or not started yet + - Or we must be in Setup Mode + - Additionally, the initialization of the shared PSRAM must be successful */ + if (((state == "Flow finished") || (state == "Initialization") || (state == "Initialization (delayed)") || isSetupModusActive()) && + psram_init_shared_memory_for_take_image_step()) { LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Taking image for Alignment Mark Update..."); CAlignAndCutImage *caic = new CAlignAndCutImage("cutref", in); @@ -679,7 +686,8 @@ esp_err_t handler_editflow(httpd_req_t *req) zw = "CutImage Done"; } else { - LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Taking image for Alignment Mark not possible while device is busy with a round!"); + LogFile.WriteToFile(ESP_LOG_WARN, TAG, std::string("Taking image for Alignment Mark not possible while device") + + " is busy with a round (Current State: '" + state + "')!"); zw = "Device Busy"; } @@ -955,16 +963,25 @@ void task_autodoFlow(void *pvParameter) ESP_LOGD(TAG, "task_autodoFlow: start"); doInit(); - auto_isrunning = flowctrl.isAutoStart(auto_interval); + flowctrl.setAutoStartInterval(auto_interval); + autostartIsEnabled = flowctrl.getIsAutoStart(); if (isSetupModusActive()) { - auto_isrunning = false; + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "We are in Setup Mode -> Not starting Auto Flow!"); + autostartIsEnabled = false; std::string zw_time = getCurrentTimeString(LOGFILE_TIME_FORMAT); flowctrl.doFlowTakeImageOnly(zw_time); } + + if (autostartIsEnabled) { + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Starting Flow..."); + } + else { + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Autostart is not enabled -> Not starting Flow"); + } - while (auto_isrunning) + while (autostartIsEnabled) { LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "----------------------------------------------------------------"); // Clear separation between runs std::string _zw = "Round #" + std::to_string(++countRounds) + " started"; @@ -1038,7 +1055,7 @@ void task_autodoFlow(void *pvParameter) } -void StartMainFlowTask() +void InitializeFlowTask() { BaseType_t xReturned; diff --git a/code/components/jomjol_flowcontroll/MainFlowControl.h b/code/components/jomjol_flowcontroll/MainFlowControl.h index a667132a..8ede3be0 100644 --- a/code/components/jomjol_flowcontroll/MainFlowControl.h +++ b/code/components/jomjol_flowcontroll/MainFlowControl.h @@ -18,7 +18,7 @@ void register_server_main_flow_task_uri(httpd_handle_t server); void CheckIsPlannedReboot(); bool getIsPlannedReboot(); -void StartMainFlowTask(); +void InitializeFlowTask(); void DeleteMainFlowTask(); bool isSetupModusActive(); diff --git a/code/main/main.cpp b/code/main/main.cpp index 50b20c5e..1e12c0ac 100644 --- a/code/main/main.cpp +++ b/code/main/main.cpp @@ -512,13 +512,13 @@ extern "C" void app_main(void) // Check main init + start TFlite task // ******************************************** if (getSystemStatus() == 0) { // No error flag is set - LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Initialization completed successfully! Starting flow task ..."); - StartMainFlowTask(); + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Initialization completed successfully"); + InitializeFlowTask(); } else if (isSetSystemStatusFlag(SYSTEM_STATUS_CAM_FB_BAD) || // Non critical errors occured, we try to continue... isSetSystemStatusFlag(SYSTEM_STATUS_NTP_BAD)) { - LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Initialization completed with errors! Starting flow task ..."); - StartMainFlowTask(); + LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Initialization completed with non-critical errors!"); + InitializeFlowTask(); } else { // Any other error is critical and makes running the flow impossible. Init is going to abort. LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Initialization failed. Flow task start aborted. Loading reduced web interface..."); diff --git a/code/platformio.ini b/code/platformio.ini index d26f4e10..c5a40aca 100644 --- a/code/platformio.ini +++ b/code/platformio.ini @@ -19,7 +19,7 @@ [common:esp32-idf] extends = common:idf - platform = platformio/espressif32 @ 6.1.0 + platform = platformio/espressif32 @ 6.2.0 framework = espidf lib_deps = ${common:idf.lib_deps} diff --git a/sd-card/html/backup.html b/sd-card/html/backup.html index c55c3d3d..8e04bc5f 100644 --- a/sd-card/html/backup.html +++ b/sd-card/html/backup.html @@ -105,7 +105,7 @@ function fetchFiles(urls, filesData, index, retry, zipFilename) { // console.log(url + " started (" + index + "/" + urls.length + ")"); if (retry == 0) { - setStatus(" - " + getFilenameFromUrl(urls[index]) + " (" + index + "/" + urls.length + ")..."); + setStatus(" - " + getFilenameFromUrl(urls[index]) + " (" + (index+1) + "/" + urls.length + ")..."); } else { setStatus("   Retrying (" + retry + ")..."); diff --git a/sd-card/html/common.js b/sd-card/html/common.js index bd0eea35..66b3992c 100644 --- a/sd-card/html/common.js +++ b/sd-card/html/common.js @@ -4,12 +4,6 @@ var domainname_for_testing = "192.168.178.23"; - -function gethost_Version(){ - return "1.0.0 - 20200910"; -} - - /* Returns the domainname with prepended protocol. Eg. http://watermeter.fritz.box or http://192.168.1.5 */ function getDomainname(){ diff --git a/sd-card/html/gethost.js b/sd-card/html/gethost.js deleted file mode 100644 index d838b629..00000000 --- a/sd-card/html/gethost.js +++ /dev/null @@ -1,41 +0,0 @@ - -function gethost_Version(){ - return "1.0.0 - 20200910"; -} - - -function getbasepath(){ - var host = window.location.hostname; - if (((host == "127.0.0.1") || (host == "localhost") || (host == "")) -// && ((window.location.port == "80") || (window.location.port == "")) - ) - - { -// host = "http://192.168.2.219"; // jomjol interner test -// host = "http://192.168.178.46"; // jomjol interner test - host = "http://192.168.178.44"; // jomjol interner Real -// host = "http://192.168.43.191"; -// host = "."; // jomjol interner localhost - - } - else - { - host = window.location.protocol + "//" + host; - if (window.location.port != "") { - host = host + ":" + window.location.port; - } - } - - return host; -} - -function UpdatePage(_dosession = true){ - var zw = location.href; - zw = zw.substr(0, zw.indexOf("?")); - if (_dosession) { - window.location = zw + '?session=' + Math.floor((Math.random() * 1000000) + 1); - } - else { - window.location = zw; - } -} diff --git a/sd-card/html/readconfigcommon.js b/sd-card/html/readconfigcommon.js index f256df8e..ff74c7a6 100644 --- a/sd-card/html/readconfigcommon.js +++ b/sd-card/html/readconfigcommon.js @@ -264,7 +264,7 @@ function MakeContrastImageZW(zw, _enhance, _domainname){ return true; } else { - firework.launch("Device is busy, please try again when the round got completed!", 'warning', 10000); + firework.launch("Device is busy, please try again when the Digitalization Round got completed!", 'warning', 10000); return false; } } @@ -293,7 +293,7 @@ function MakeRefZW(zw, _domainname){ return true; } else { - firework.launch("Device is busy, please try again when the round got completed!", 'warning', 10000); + firework.launch("Device is busy, please try again when the Digitalization Round got completed!", 'warning', 10000); return false; } } diff --git a/sd-card/html/wlan_config.html b/sd-card/html/wlan_config.html index f49828ae..5ac570f9 100644 --- a/sd-card/html/wlan_config.html +++ b/sd-card/html/wlan_config.html @@ -3,6 +3,7 @@ +