mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-12 14:37:06 +03:00
* Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * fix frozen time in datafile on error (#1534) Co-authored-by: CaCO3 <caco@ruinelli.ch> * log NTP server name (#1497) * log NTP server name * . * . * replace calls to /wasserzaehler.html with calls to /value (#1469) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix cookie usage, use correct http response codes, add 404 page (#1495) * replaced some HTTP response code with better matching codes * add custom 404 page, add log entry for debugging * fix cookie * replace non-necessary whitespace * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Don't autofail if NTP server can't be reached during initalization (#1498) This fixes an issue with a restricted network without internet access, where the hardcoded ntp server can't be reached and thus the esp resets, as it's not able to finish initalization. * Update Changelog.md * Update Changelog.md for release * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * only use sntp_getservername() after init sntp * set default NTP server on dnew installations Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> * Renamed variables and added debug log (#1537) * add debug logs * renamed variables * renamed TAGs, added flow status logging * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * replaced printf usage in LogFile.WriteToFile() * ENABLE_MQTT c++ macro definition (#1546) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition (#1547) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition * Update Changelog.md * Update Changelog.md * Rearange task to CPU (http, camera, mqtt) (#1557) * Streamlined MQTT interlock when not activated & interlock MQTT when WIFI is not connected (#1556) * streamlined mqtt interlock when disabled * Disconnect mqtt client before reboot * Interlock MQTT with WIFI * Update * loglevel to DEBUG * Update * mqtt msg id incremental * new ENABLE_MQTT includes * Loglevel to DEBUG * Loglevel * Update interface_mqtt.cpp * show uptime on overview page, moved labels from firmware to Web UI (#1543) * show uptime on overview page, moved labels from firmware to Web UI * show uptime on info page * also use formated time in log Co-authored-by: CaCO3 <caco@ruinelli.ch> * Continue boot on bad PSRAM (#1558) * add sensor status, show special index/setup page in case of a critical error * continue booting on PSRAM error * Update main.cpp added log messages * init PSRAM and add more log messages * cleanup of init checks * . * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * add sensor status, show special index/setup page in case of a critical error (#1560) * add sensor status, show special index/setup page in case of a critical error * Added Reboot * . * added more buttons Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * Update Webinstaller to v13.0.7 * remove html-from-11.3.1 in release (#1565) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 * only initial_esp32_setup and update.zip as artefacts * remove unneeded cache * rename step ota-v2 to ota * rename ota-v2 to ota Co-authored-by: github-actions <github-actions@github.com> * make the sidebar on the overviw page wider and show the round counter (#1570) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Create reply-bot.yml * Update ClassFlowPostProcessing.cpp * Add bot (#1581) * Update reply-bot.yml * Create label-commenter-config.yml * added missing html change * extended instructions (#1583) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix Rate Problem * removed redundant "Status:" * Bugfix Double Extract ZIP-Files * Update FeatureRequest.md (#1591) in case of position change between the measurments set this state to true, if there is no change set it back to false. In a defined time window this movement can lead into an alarm state / water leak.. haveing this state in the mqtt broker can trigger functions like closing the ater pipe walve and so on... * Update manifest.json * Delete .gitignore * Delete .gitmodules * Delete firmware.bin * Add files via upload * Block REST API calls till resource is ready (#1609) * Block REST API call till ressource is ready * Update * Update * Update * replace relative include of gethost.js with absolute one. This is needed as that file gets incuded on dynamically generated content which can be on different path levels (#1610) Co-authored-by: CaCO3 <caco@ruinelli.ch> * esp_spiram.h has been replaced by esp32/spiram.h (#1605) * esp_spiram.h has been replaced by esp32/spiram.h * Preparations for next Bugfix Release (#1615) * Merge branch 'rolling' (#1559) * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * fix frozen time in datafile on error (#1534) Co-authored-by: CaCO3 <caco@ruinelli.ch> * log NTP server name (#1497) * log NTP server name * . * . * replace calls to /wasserzaehler.html with calls to /value (#1469) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix cookie usage, use correct http response codes, add 404 page (#1495) * replaced some HTTP response code with better matching codes * add custom 404 page, add log entry for debugging * fix cookie * replace non-necessary whitespace * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Don't autofail if NTP server can't be reached during initalization (#1498) This fixes an issue with a restricted network without internet access, where the hardcoded ntp server can't be reached and thus the esp resets, as it's not able to finish initalization. * Update Changelog.md * Update Changelog.md for release * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * only use sntp_getservername() after init sntp * set default NTP server on dnew installations Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> * Renamed variables and added debug log (#1537) * add debug logs * renamed variables * renamed TAGs, added flow status logging * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * replaced printf usage in LogFile.WriteToFile() * ENABLE_MQTT c++ macro definition (#1546) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition (#1547) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition * Update Changelog.md Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com> * Update Changelog.md for release Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com> * new model version (#1619) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 * only initial_esp32_setup and update.zip as artefacts * remove unneeded cache * rename step ota-v2 to ota * rename ota-v2 to ota * new models - ana-class100 v1.5.4 - ana-cont-11.0.4 - dig-class100 v1.5.0 Co-authored-by: github-actions <github-actions@github.com> * Update Changelog.md (#1630) * Correct RenameNumber * Update Changelog.md * Fix reloading of data file (#1635) * Update data.html * fixed * show link to graph Co-authored-by: CaCO3 <caco@ruinelli.ch> * Centralizing the defines (#1624) * defines changes * Finish #define move + #define STBI_ONLY_JPEGsave 2% of Flash * remove the defines on the old places * ClassFlowCNNGeneral in define.h * revert to origin * fix translation not ready * Update defines.h * Update WebInstaller * Code translation (#1626) * comment translation * translation part #2 * code translation from DE to ENG #part3 * translation #4 * dismantled =>splitted * bereich => range * Update defines.h Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * Update manifest.json * Add files via upload * #ifndef in *.h + #pragma once (#1639) * Update defines.h (#1640) comment #define STBI_ONLY_JPEG as you do no want it in rolling but in rolling-minimize-firmware-size delete old reference to DE ''' #define AnalogFehler 3 #define AnalogToDigtalFehler 0.8 #define DigitalUnschaerfe 0.2 #define DigitalBand 3 #define DigitalAnalogerVorgaengerUebergangsbereich 2 #define DigitalUebergangsbereichVorgaenger 0.7 // 9.3 - 0.7 #define DigitalUebergangsbereichVorlauf 9.7 ''' * Trigger a flow start by REST API or MQTT (#1648) * Trigger flow start by Rest API * Increase handlers * Update * Update * Update * Change max handlers * Add debug message * Trigger flow start by MQTT * Update * Remove unused function * Remove handler_doflow + routines * Cleanup * MergeCheck * Optimize logfile write (#1652) * remove no longer needed OpenFileAndWait() * remove WriteToDedicatedFile * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * show release in log instead of branch (#1660) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update sdkconfig.defaults (#1661) Reverting changes of `sdkconfig.defaults` falsly added within https://github.com/jomjol/AI-on-the-edge-device/pull/1626 * Init GPIO handler before MQTT init (#1663) * Update HTML & Firmware (#1671) * Remove unnecessary null pointer checks #1649 (#1673) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 * only initial_esp32_setup and update.zip as artefacts * remove unneeded cache * rename step ota-v2 to ota * rename ota-v2 to ota * new models - ana-class100 v1.5.4 - ana-cont-11.0.4 - dig-class100 v1.5.0 * Remove unnecessary null pointer checks #1649 Co-authored-by: github-actions <github-actions@github.com> * Improve NTP handling (#1676) * fix special case where number is named "default" (keep all topics in top level instead of in a sub-group) * re-implemented SNTP usage, added way to disable NTP client, added timezone table * minor fixes Co-authored-by: CaCO3 <caco@ruinelli.ch> * fix special case where number is named "default" (keep all topics in top level instead of in a sub-group) (#1664) Co-authored-by: CaCO3 <caco@ruinelli.ch> * prepare docs for deployment through actions (#1688) Co-authored-by: CaCO3 <caco@ruinelli.ch> * make more robust, add log (#1690) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Extend Github Actions (#1680) * Update build.yaml * Update build.yaml * Update build.yaml * Update build.yaml * Update build.yaml * Update build.yaml * Update build.yaml * Update build.yaml * Update build.yaml * automate manifest update * Update build.yaml * revert changes to docs folder * Update build.yaml * Update build.yaml * Update build.yaml * Update build.yaml * Update build.yaml * Update build.yaml * Update build.yaml * Add files via upload * prepare docs for deployment through actions (#1688) Co-authored-by: CaCO3 <caco@ruinelli.ch> * automate manifest update # Conflicts: # docs/binary/firmware.bin # docs/binary/v12.0.1/firmware.bin # docs/binary/v12.0.5/firmware.bin # docs/binary/v13.0.5/firmware.bin # docs/binary/v13.0.7/firmware.bin * revert changes to docs folder * revert changes to docs folder # Conflicts: # docs/releases/download/firmware.bin * Update build.yaml Co-authored-by: CaCO3 <caco@ruinelli.ch> * Improve initial setup proc (#1692) * Initial Test * Initial functional version. * Add Bot Replies (#1701) * Update label-commenter-config.yml * Update reply-bot.yml * Update label-commenter-config.yml * disable remove-labels because they no longer work * delete img_convert.h as included in code\components\tflite-micro-esp-… (#1695) * delete img_convert.h as included in code\components\tflite-micro-esp-examples\components\esp32-camera\conversions\include\img_converters.h * macro definition #ifdef ENABLE_SOFTAP * macro definition #ifdef ENABLE_SOFTAP (#1698) * macro definition #ifdef ENABLE_SOFTAP * Update platformio.ini * softap define in define.h * Update platformio.ini * #define WLAN_CONFIG_FILE "/sdcard/wlan.ini" Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * Deinit components before reboot (#1704) * Deinit all components before reboot * Update * Update * fetch index.html after reboot -> less 404 (#1705) * Safe optimizations (#1706) * safe optimizations * Merge branch 'rolling' of https://github.com/nliaudat/AI-on-the-edge-device into rolling * Enable SoftAP * Update defines * add a define to configure the logfile handling (#1709) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Move Logfile Switch to define.h * Update Reboot Algo * Update server_ota.cpp * Avoid loading of status infos twice (#1711) * Force a reboot even reboot task cannot be created due to lack of heap (#1713) * Deinit all components before reboot * Update * Update * Force reboot when reboot task cannot be created * Improve log message when web UI is incomplete (#1716) * improve warning if version.txt is missing * typo * show round duration in log Co-authored-by: CaCO3 <caco@ruinelli.ch> * fix static IP in UP, improve explanation for HA (#1719) * fix static IP in UP, improve explanation for HA * Update edit_config_param.html Co-authored-by: CaCO3 <caco@ruinelli.ch> * Create demo folder at startup (if not present) * Update defines.h (#1726) * improve explanations,added example (#1729) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Add demo mode (#1720) * move main part to cam file * added demo mode * . * add a define to configure the logfile handling (#1709) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Move Logfile Switch to define.h * Update Reboot Algo * Update server_ota.cpp * Avoid loading of status infos twice (#1711) * Force a reboot even reboot task cannot be created due to lack of heap (#1713) * Deinit all components before reboot * Update * Update * Force reboot when reboot task cannot be created * Improve log message when web UI is incomplete (#1716) * improve warning if version.txt is missing * typo * show round duration in log Co-authored-by: CaCO3 <caco@ruinelli.ch> * . * . * . * creade demo dir * fix static IP in UP, improve explanation for HA (#1719) * fix static IP in UP, improve explanation for HA * Update edit_config_param.html Co-authored-by: CaCO3 <caco@ruinelli.ch> * Create demo folder at startup (if not present) * move demo files * Update defines.h (#1726) * updated description * moved to expert section * fixed broken enabled state Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> * Fix regression of reboot handler / reboot waiting script (#1725) * Reboot after OTA: Avoid exeception * Overview - optimize reload behaviour after reboot * Update * Update * Moved softAP to the very first checks * Update SoftAP * Update build.yaml (#1737) * Update build.yaml * Update build.yaml * #1649 unnecessary np check (#1736) * consolidate test-ip definition, added missing Access-Control-Allow-Origin, * Revert "consolidate test-ip definition, added missing Access-Control-Allow-Origin," This reverts commit56cfeb732e. * consolidate test-ip definition, added missing Access-Control-Allow-Origin (#1741) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Replace alert boxes with overlay info boxes (#1742) * consolidate test-ip definition, added missing Access-Control-Allow-Origin * replace alert boxes with overlay info boxes * . * . * . * . * . * . * . * . * . * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * compiler optimization (#1749) compiler optimization for tflite-micro-esp-examples * Modify stack sizes + max open files (SD) , add REST handler for heap/(stack) infos (#1751) * Modify stack sizes+max open files,add rest handler * Update * Optimized CImageBasis * Update feature.yaml * cache static files (#1755) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Implemented Reboot for "firmware.bin" as well * new OTA page with progressbar (#1756) * new OTA page with progress bar * improve error message on missing demo files * . * Implemented Reboot for "firmware.bin" as well * Update feature.yaml * cache static files (#1755) Co-authored-by: CaCO3 <caco@ruinelli.ch> * . * . * added filename validation * . * . * . * move * added missing dash to regex * restrict file type * . * . * . * . * cleanup no longer needed mode * only start restart counter if restart is required Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * Rolling-bot: Only show jomjol repo rollings (#1783) * Update platfromio.ini * Add option to disable brownout detector (#1784) * Update defines.h * Update main.cpp * Improve file server (#1785) * . * . * . * . * . * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Ignore cache on GIT hash change (new commit or release) (#1787) * Add hash to all html, css, and js URLs * Update build.yaml * Update build.yaml * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * fix overview.html * GPIO handler: Deinit before delete (#1795) * Rest handler: Use none chunked transfer (#1797) * Resthandler info,sysinfo,starttime: no chunk trans * flowstart,statusflow,cputemp,rssi,uptime,prevalue * Renamed error messages * STBI_ONLY_JPEG (#1789) * Add error handling for memory intensive tasks (#1798) * tflite model loading: error handling * FlowAlignment: error handling * CImageBasis+GetJPGStream : error handling * Update graph.html (#1802) * Delete demo-images directory Data is now provided in the documentation * REST handler sysinfo + MQTT topic: Free heap memory not reporting (#1815) * REST handler sysinfo: Fix reporting of free memory * MQTT topic freemem: Fix reporting of free memory * Refactor getEspHeapInfo routine (#1816) * Refactor getEspHeapInfo * ClassLogfile: Remove redundandent one * DataGraph: datafiles sorted -> newest on top (#1817) * plaformio [env:esp32cam-dev] : Add task analysis & test for 8m spiram real support (#1818) add support of TASK_ANALYSIS_ON test full support of 8mb spiram board (https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/system/himem.html) * Improve html roi disablement (#1825) * Improve ROI-Problem * Update * Update common.js * Update links * Store preprocessed image with ROI to RAM (#1809) * tflite model loading: error handling * FlowAlignment: error handling * CImageBasis+GetJPGStream : error handling * store preprocessed ALG_ROI.jpg to memory * Update * Create clean-branch-cache-after-pull-request-got-closed.yml * Clean sdkconfig (not default) (#1828) * Delete sdkconfig - Kopie.defaults * Delete sdkconfig.esp32cam-testing * Delete sdkconfig - Kopie.esp32cam * Update platformio.ini * Delete clean-branch-cache-after-pull-request-got-closed.yml * Update README.md * Esp32 sys info (#1829) * Add files via upload * Update defines.h * Update main.cpp * git ignore + sdkconfig.esp32cam-dev (#1830) * update build actions/cache@v3.2.3 (#1831) * actions/cache@v3.2.3 * Create clear _all_cache.yml * fix typo naming workflow clear_cache.yml * Update tflite * Initial Implementation (#1834) * Fix pointer call in ClassControllCamera.cpp:310 (#1833) ClassControllCamera.cpp:310:67: error: request for member 'rgb_image' in '_zwImage', which is of pointer type 'CImageBasis*' ClassControllCamera.cpp:310:117: error: request for member 'width' in '_zwImage', which is of pointer type 'CImageBasis*' ClassControllCamera.cpp:310:157: error: request for member 'height' in '_zwImage', which is of pointer type 'CImageBasis*' * Initial Implementation (#1835) * improve caching (#1836) * improve caching See https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache * Update build.yaml * Update build.yaml * Update build.yaml * Update README.md * Update build.yaml * Update build.yaml * Update README.md * Update build.yaml * Update label-commenter-config.yml * Fix uninitialized filename (#1838) * fix the uninitialized filename. It only got used for the logging in case the file exists but failed to get loaded (eg. /sdcard/log/data/data_2023-01-14.csv) * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Show ways to get notified about new releases * update wiki references * enhance development environment (#1841) * add sdkconfig.defaults per environment https://github.com/platformio/platform-espressif32/issues/638 * add env to platformio * add sdkconfig.<pioenv>.defaults * Update platformio.ini * Update .gitignore * Delete sdkconfig.esp32cam-cpu-freq-240.defaults * Delete sdkconfig.esp32cam-dev-himem.defaults * Delete sdkconfig.esp32cam-dev.defaults * Delete sdkconfig.esp32cam-no-softap.defaults * Add files via upload * Update sdkconfig.esp32cam-cpu-freq-240.defaults * Update platformio.ini * Update platformio.ini * Update CMakeLists.txt * Update sdkconfig.esp32cam-dev.defaults * Update platformio.ini * add HIMEM debugging tools (check free size, and memory test) (#1852) * Update defines.h * Update esp_sys.h * Update esp_sys.cpp * Add files via upload * Update perfmon.c * Update main.cpp * Update main.cpp * Delete himem_memory_check.c * Add files via upload * Update defines.h * Update himem_memory_check.cpp * Update main.cpp * Update himem_memory_check.cpp * Update himem_memory_check.h * Update main.cpp * fix define * Avoid multiple Access-Control-Allow-Origin * (#1859) * Avoid multiple Access-Control-Allow-Origin * * Adapt loglevel to debug * Update build.yaml * Improve data logging on errors (#1839) * use error level for log if "Rate to High" or "Negative Rate" * remove redundant data logging * . * . * update time also in case of an error * move calculation of difference to the top as discussed in PR 1839 Co-authored-by: CaCO3 <caco@ruinelli.ch> * Heap tracing (#1861) * Update sdkconfig.esp32cam-dev-task-analysis.defaults * Update defines.h * Update platformio.ini * Update main.cpp * Update defines.h * Update ClassFlowCNNGeneral.cpp * Update platformio.ini * disable HIMEM (external > 4mb ram) not used (#1864) #force disable HIMEM as not used in default config, can be enabled with [env:esp32cam-dev-himem] #free 256kb of internal memory : #I (2112) esp_himem: Initialized. Using last 8 32KB address blocks for bank switching on 4352 KB of physical memory. CONFIG_SPIRAM_BANKSWITCH_ENABLE=n #CONFIG_SPIRAM_BANKSWITCH_RESERVE is not set * Update ota_page.html (#1866) Fixed the firework to match the actual button text. Fixed other random typos. * add AlignmentAlgo=off option (#1867) * Replace outdated wiki links, wording (#1871) * Revert "add AlignmentAlgo=off option (#1867)" (#1876) This reverts commit3de4cc7c56. * fixed typo (#1881) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Show WIFI signal text labels / Log RSSI value to logfile (#1877) * Overview: WIFI RSSI strength text labels * Log RSSI value (debug level) * Typo * Update config.ini (#1880) * Update Changelog.md for release (#1892) Co-authored-by: github-actions <github-actions@github.com> * Update Changelog.md * Remove newline in version (#1891) * remove newline in version * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Show alternative images for states "Initialization" and "Take Image" (#1858) * Show image for flow not started + take image * Update * Adding new images * . * Avoid multiple Access-Control-Allow-Origin * (#1859) * Avoid multiple Access-Control-Allow-Origin * * Adapt loglevel to debug * Update build.yaml * . * New state "initialization (delayed)", renaming * Overview: Renamed "Status" + switched position * Improve data logging on errors (#1839) * use error level for log if "Rate to High" or "Negative Rate" * remove redundant data logging * . * . * update time also in case of an error * move calculation of difference to the top as discussed in PR 1839 Co-authored-by: CaCO3 <caco@ruinelli.ch> * Heap tracing (#1861) * Update sdkconfig.esp32cam-dev-task-analysis.defaults * Update defines.h * Update platformio.ini * Update main.cpp * Update defines.h * Update ClassFlowCNNGeneral.cpp * Update platformio.ini * disable HIMEM (external > 4mb ram) not used (#1864) #force disable HIMEM as not used in default config, can be enabled with [env:esp32cam-dev-himem] #free 256kb of internal memory : #I (2112) esp_himem: Initialized. Using last 8 32KB address blocks for bank switching on 4352 KB of physical memory. CONFIG_SPIRAM_BANKSWITCH_ENABLE=n #CONFIG_SPIRAM_BANKSWITCH_RESERVE is not set * Update ota_page.html (#1866) Fixed the firework to match the actual button text. Fixed other random typos. * add AlignmentAlgo=off option (#1867) * Replace outdated wiki links, wording (#1871) * Revert "add AlignmentAlgo=off option (#1867)" (#1876) This reverts commit3de4cc7c56. * fixed typo (#1881) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Show WIFI signal text labels / Log RSSI value to logfile (#1877) * Overview: WIFI RSSI strength text labels * Log RSSI value (debug level) * Typo * Update config.ini (#1880) * Update Changelog.md for release (#1892) Co-authored-by: github-actions <github-actions@github.com> * Update Changelog.md * Remove newline in version (#1891) * remove newline in version * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: CaCO3 <caco3@ruinelli.ch> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com> Co-authored-by: AngryApostrophe <89547888+AngryApostrophe@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> * restructure manual setup zip (#1897) * Update build.yaml * Update build.yaml * Update build.yaml * fix typos and wording on config page (#1898) * Update label-commenter-config.yml * Update label-commenter-config.yml * remove external Web UI dependencies (#1896) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Remove excessive whitespaces and newlines in json (#1904) * . * . * . * . * . * remove newlines in json as it is not needed * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * REST handler CPU temp / RSSI: Remove units (#1908) * REST CPU temp: escape special character * REST CPUTemp+RSSI: remove units, output as int * REST handler sysinfo: CPU tempature as integer * Update Changelog.md (#1893) * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Index & Index.html * Move Update description to online docu * Update index.html * Update Changelog.md * Update Changelog.md --------- Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * Update Changelog.md --------- Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com> Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> Co-authored-by: smartboart <38385805+smartboart@users.noreply.github.com> Co-authored-by: AngryApostrophe <89547888+AngryApostrophe@users.noreply.github.com> Co-authored-by: Dave <43378003+dkneisz@users.noreply.github.com>
776 lines
25 KiB
HTML
776 lines
25 KiB
HTML
<!DOCTYPE html>
|
|
<html>
|
|
<head>
|
|
<link rel="icon" href="favicon.ico?v=$COMMIT_HASH" type="image/x-icon">
|
|
<meta charset="utf-8"/>
|
|
<title>Make Digital Alignment</title>
|
|
|
|
<style>
|
|
h1 {font-size: 2em;}
|
|
h2 {font-size: 1.5em; margin-block-start: 0.0em; margin-block-end: 0.2em;}
|
|
h3 {font-size: 1.2em;}
|
|
p {font-size: 1em;}
|
|
|
|
input[type=number] {
|
|
width: 100px;
|
|
margin-right: 10px;
|
|
padding: 3px 5px;
|
|
display: inline-block;
|
|
border: 1px solid #ccc;
|
|
font-size: 16px;
|
|
}
|
|
|
|
input[type=text] {
|
|
padding: 3px 5px;
|
|
display: inline-block;
|
|
border: 1px solid #ccc;
|
|
font-size: 16px;
|
|
}
|
|
|
|
select {
|
|
padding: 3px 5px;
|
|
display: inline-block;
|
|
border: 1px solid #ccc;
|
|
font-size: 16px;
|
|
margin-right: 10px;
|
|
}
|
|
|
|
.button {
|
|
padding: 5px 10px;
|
|
width: 210px;
|
|
font-size: 16px;
|
|
}
|
|
|
|
.move {
|
|
padding: 4px 4px;
|
|
width: 100px;
|
|
font-size: 12px;
|
|
}
|
|
|
|
th, td {
|
|
padding: 5px 5px 5px 0px;
|
|
}
|
|
</style>
|
|
<link href="firework.css?v=$COMMIT_HASH" rel="stylesheet">
|
|
<script type="text/javascript" src="jquery-3.6.0.min.js?v=$COMMIT_HASH"></script>
|
|
<script type="text/javascript" src="firework.js?v=$COMMIT_HASH"></script>
|
|
</head>
|
|
|
|
<body style="font-family: arial; padding: 0px 10px;">
|
|
|
|
<h2><input type="checkbox" id="Category_Digits_enabled" value="1" onclick = 'EnDisableDigits()' checked >
|
|
Edit Digits</h2>
|
|
|
|
<div id="div1">
|
|
|
|
<table>
|
|
<tr>
|
|
<canvas id="canvas" crossorigin></canvas>
|
|
</tr>
|
|
</table>
|
|
|
|
<p>
|
|
<table>
|
|
<tr>
|
|
<class id="Numbers_text" style="color:black;"><b>Number:</b> </class>
|
|
<select id="Numbers_value1" onchange="numberChanged()">
|
|
<option value="0" selected>default</option>
|
|
<option value="1" >NT</option>
|
|
<option value="2" >HT</option>
|
|
</select>
|
|
<input class="move" type="submit" id="renameNumber" name="renameNumber" onclick="renameNumber()" value="Rename">
|
|
<input class="move" type="submit" id="newNumber" name="newNumber" onclick="newNumber()" value="New">
|
|
<input class="move" type="submit" id="removeNumber" name="removeNumber" onclick="removeNumber()" value="Remove">
|
|
</tr>
|
|
</table>
|
|
</p>
|
|
|
|
<table>
|
|
<tr>
|
|
<td><input class="button" type="submit" id="newROI" name="newROI" onclick="newROI()" value="New ROI (after current)"></td>
|
|
<td><input class="button" type="submit" id="deleteROI" name="deleteROI" onclick="deleteROI()" value="Delete ROI"></td>
|
|
<td></td>
|
|
</tr>
|
|
<tr>
|
|
<td>
|
|
<select id="index" name="index" onchange="ChangeSelection()" tabindex=1>
|
|
<option value="0" selected>ROI 0</option>
|
|
<option value="1" >ROI 1</option>
|
|
</select>
|
|
</td>
|
|
<td>
|
|
<input class="button" type="submit" id="renameROI" name="renameROI" onclick="renameROI()" value="Rename">
|
|
<td>
|
|
<input class="move" type="submit" id="moveNext" onclick="moveNext()" value="move Next">
|
|
<input class="move" type="submit" id="movePrevious" onclick="movePrevious()" value="move Previous">
|
|
</td>
|
|
</tr>
|
|
<tr>
|
|
<td>x: <input type="number" name="refx" id="refx" step=1 onchange="valuemanualchanged()" tabindex=2></td>
|
|
<td>Δx: <input type="number" name="refdx" id="refdx" step=1 onchange="valuemanualchangeddx()" tabindex=4></td>
|
|
<td><input type="checkbox" id="lockAR" name="lockAR" value="1" onclick="changelockAR()" checked tabindex=6><label for="lockAR"> Lock aspect ratio </label></td>
|
|
</tr>
|
|
<tr>
|
|
<td>y: <input type="number" name="refy" id="refy" step=1 onchange="valuemanualchanged()" tabindex=3></td>
|
|
<td>Δy: <input type="number" name="refdy" id="refdy" step=1 onchange="valuemanualchanged()" tabindex=5></td>
|
|
<td><input type="checkbox" id="lockSizes" name="lockSizes" value="1" onclick="changelockSizes()" checked tabindex=7><label for="lockSizes"> Synchronize y, Δx and Δy between ROIs</label></td>
|
|
</tr>
|
|
<tr>
|
|
<td colspan="2"></td>
|
|
<td ><input type="checkbox" id="lockSpaceEquidistant" name="lockSpaceEquidistant" value="1" onclick="changeLockSpaceEquidistant()" checked tabindex=9>
|
|
<label for="lockSpaceEquidistant">Keep equidistance of <input type="number" name="space" id="space" step=1 onchange="valuemanualchangedspace()" tabindex=8> between all ROIs</label></td>
|
|
</tr>
|
|
</table>
|
|
|
|
</div>
|
|
|
|
<table>
|
|
<tr>
|
|
<td><input class="button" type="submit" id="saveroi" name="saveroi" onclick="SaveToConfig()" value="Save" tabindex=10></td>
|
|
</tr>
|
|
<tr>
|
|
<td><button class="button" id="reboot" type="button" onclick="doReboot()">Reboot to activate changes</button></td>
|
|
</tr>
|
|
</table>
|
|
|
|
<script type="text/javascript" src="common.js?v=$COMMIT_HASH"></script>
|
|
<script type="text/javascript" src="readconfigcommon.js?v=$COMMIT_HASH"></script>
|
|
<script type="text/javascript" src="readconfigparam.js?v=$COMMIT_HASH"></script>
|
|
|
|
<script type="text/javascript" src="jquery-3.6.0.min.js?v=$COMMIT_HASH"></script>
|
|
|
|
<script language="JavaScript">
|
|
var canvas = document.getElementById('canvas'),
|
|
imageObj = new Image(),
|
|
rect = {},
|
|
drag = false,
|
|
aktindex = 0,
|
|
ROIInfo,
|
|
cofcat,
|
|
param,
|
|
enhanceCon = false;
|
|
lockAR = true;
|
|
lockSizes = true;
|
|
lockSpaceEquidistant = true;
|
|
space = 3;
|
|
domainname = getDomainname();
|
|
|
|
function doReboot() {
|
|
if (confirm("Are you sure you want to reboot? Did you save the config?")) {
|
|
var stringota = getDomainname() + "/reboot";
|
|
window.location = stringota;
|
|
window.location.href = stringota;
|
|
window.location.assign(stringota);
|
|
window.location.replace(stringota);
|
|
}
|
|
}
|
|
|
|
function EnDisableDigits() {
|
|
isEnabled = document.getElementById("Category_Digits_enabled").checked;
|
|
|
|
$("#div2").attr("disabled", "disabled").off('click');
|
|
var x1=$("#div2").hasClass("disabledDiv");
|
|
|
|
if (isEnabled)
|
|
{
|
|
$("#div2").removeClass("disabledDiv");
|
|
}
|
|
else
|
|
{
|
|
$("#div2").addClass("disabledDiv");
|
|
}
|
|
|
|
sah1(document.getElementById("div1"), !isEnabled);
|
|
|
|
cofcat["Digits"]["enabled"] = isEnabled;
|
|
|
|
if (isEnabled)
|
|
{
|
|
UpdateROIs();
|
|
}
|
|
}
|
|
|
|
function sah1(el, _target) {
|
|
try {
|
|
el.disabled = _target;
|
|
} catch (E) {}
|
|
if (el.childNodes && el.childNodes.length > 0) {
|
|
for (var x = 0; x < el.childNodes.length; x++) {
|
|
sah1(el.childNodes[x], _target);
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
function onNameChange(){
|
|
ROIInfo[aktindex]["name"] = document.getElementById("name").value;
|
|
UpdateROIs();
|
|
}
|
|
|
|
function deleteROI(){
|
|
ROIInfo.splice(aktindex, 1);
|
|
if (aktindex > ROIInfo.length - 1){
|
|
aktindex = ROIInfo.length - 1;
|
|
}
|
|
UpdateROIs();
|
|
draw();
|
|
}
|
|
|
|
function newROI() {
|
|
var sel = document.getElementById("Numbers_value1");
|
|
var _number= sel.options[sel.selectedIndex].text;
|
|
sel = document.getElementById("index");
|
|
var _roialt= sel.options[sel.selectedIndex].text;
|
|
|
|
var _roinew = prompt("Please enter name of new ROI", "name");
|
|
|
|
if (ROIInfo.length > 0) {
|
|
if (ROIInfo.length > 1) {
|
|
space = ROIInfo[1].x - parseInt(ROIInfo[0].x) - parseInt(ROIInfo[0].dx);
|
|
}
|
|
erg = CreateROI(_number, "digit", sel.selectedIndex, _roinew, parseInt(ROIInfo[sel.selectedIndex].x) + parseInt(ROIInfo[sel.selectedIndex].dx) + space,
|
|
parseInt(ROIInfo[sel.selectedIndex].y), ROIInfo[aktindex]["dx"], ROIInfo[aktindex]["dy"], 0);
|
|
}
|
|
else
|
|
erg = CreateROI(_number, "digit", sel.selectedIndex, _roinew, 1, 1, 30, 51, 0);
|
|
|
|
if (erg != "")
|
|
firework.launch(erg, 'danger', 30000);
|
|
else {
|
|
UpdateROIs(_roinew);
|
|
// Shift all ROIs on right side to the right
|
|
for (var _nb = sel.selectedIndex + 1; _nb < ROIInfo.length; _nb++) {
|
|
ROIInfo[_nb].x = parseInt(ROIInfo[_nb].x) + parseInt(ROIInfo[_nb].dx) + space;
|
|
}
|
|
draw();
|
|
}
|
|
}
|
|
|
|
function movePrevious(){
|
|
var zw = ROIInfo[aktindex];
|
|
ROIInfo[aktindex] = ROIInfo[aktindex-1];
|
|
ROIInfo[aktindex-1] = zw;
|
|
aktindex--;
|
|
UpdateROIs();
|
|
valuemanualchanged();
|
|
}
|
|
|
|
function moveNext(){
|
|
var zw = ROIInfo[aktindex];
|
|
ROIInfo[aktindex] = ROIInfo[aktindex+1];
|
|
ROIInfo[aktindex+1] = zw;
|
|
aktindex++;
|
|
UpdateROIs();
|
|
valuemanualchanged();
|
|
}
|
|
|
|
function changelockAR(){
|
|
lockAR = document.getElementById("lockAR").checked;
|
|
}
|
|
|
|
function changelockSizes(){
|
|
lockSizes = document.getElementById("lockSizes").checked;
|
|
|
|
if (!lockSizes) {
|
|
firework.launch("For best results it is in most cases advised to keep the y, Δx and Δy identical!", 'warning', 10000);
|
|
}
|
|
}
|
|
|
|
function changeLockSpaceEquidistant(){
|
|
lockSpaceEquidistant = document.getElementById("lockSpaceEquidistant").checked;
|
|
}
|
|
|
|
function ChangeSelection(){
|
|
aktindex = parseInt(document.getElementById("index").value);
|
|
// lockAR = true;
|
|
UpdateROIs();
|
|
}
|
|
|
|
function SaveToConfig(){
|
|
// _zwcat = getConfigCategory();
|
|
cofcat["Digits"]["enabled"] = document.getElementById("Category_Digits_enabled").checked;
|
|
WriteConfigININew();
|
|
SaveConfigToServer(domainname);
|
|
firework.launch('Configuration got updated. Please reboot to activate changes!', 'success', 5000);
|
|
}
|
|
|
|
|
|
function UpdateROIs(_sel){
|
|
document.getElementById("Category_Digits_enabled").checked = true;
|
|
var sel = document.getElementById("Numbers_value1");
|
|
var _number = sel.options[sel.selectedIndex].text;
|
|
|
|
ROIInfo = getROIInfo("digit", _number);
|
|
// _catzw = getConfigCategory();
|
|
|
|
if (cofcat["Digits"]["enabled"] == false)
|
|
{
|
|
document.getElementById("Category_Digits_enabled").checked = false;
|
|
EnDisableDigits();
|
|
firework.launch('Digital ROIs are disabled - please enable first (Check box top left)', 'warning', 10000);
|
|
return;
|
|
}
|
|
|
|
if (ROIInfo.length == 0){
|
|
firework.launch('There are no ROIs defined. Please first create a new ROI ("New ROIs ...")', 'danger', 10000);
|
|
document.getElementById("newROI").disabled = false;
|
|
document.getElementById("deleteROI").disabled = true;
|
|
document.getElementById("index").disabled = true;
|
|
document.getElementById("saveroi").disabled = true;
|
|
document.getElementById("renameROI").disabled = true;
|
|
document.getElementById("moveNext").disabled = true;
|
|
document.getElementById("movePrevious").disabled = true;
|
|
return;
|
|
}
|
|
else
|
|
{
|
|
document.getElementById("newROI").disabled = false;
|
|
document.getElementById("deleteROI").disabled = false;
|
|
document.getElementById("renameROI").disabled = false;
|
|
document.getElementById("index").disabled = false;
|
|
document.getElementById("saveroi").disabled = false;
|
|
}
|
|
|
|
var _index = document.getElementById("index");
|
|
while (_index.length){
|
|
_index.remove(0);
|
|
}
|
|
|
|
if (aktindex > ROIInfo.length)
|
|
aktindex = ROIInfo.length;
|
|
|
|
for (var i = 0; i < ROIInfo.length; ++i){
|
|
var option = document.createElement("option");
|
|
option.text = ROIInfo[i]["name"];
|
|
option.value = i;
|
|
_index.add(option);
|
|
if (typeof _sel !== 'undefined') {
|
|
if (option.text == _sel)
|
|
aktindex = i;
|
|
}
|
|
}
|
|
_index.selectedIndex = aktindex;
|
|
|
|
|
|
document.getElementById("movePrevious").disabled = false;
|
|
if (aktindex == 0){
|
|
document.getElementById("movePrevious").disabled = true;
|
|
}
|
|
|
|
document.getElementById("moveNext").disabled = false;
|
|
if (aktindex == (ROIInfo.length-1)){
|
|
document.getElementById("moveNext").disabled = true;
|
|
}
|
|
|
|
document.getElementById("lockAR").checked = lockAR;
|
|
document.getElementById("lockSizes").checked = lockSizes;
|
|
document.getElementById("lockSpaceEquidistant").checked = lockSpaceEquidistant;
|
|
document.getElementById("space").value = space;
|
|
|
|
document.getElementById("refx").value = ROIInfo[aktindex]["x"];
|
|
document.getElementById("refy").value = ROIInfo[aktindex]["y"];
|
|
document.getElementById("refdx").value = ROIInfo[aktindex]["dx"];
|
|
document.getElementById("refdy").value = ROIInfo[aktindex]["dy"];
|
|
rect.startX = ROIInfo[aktindex]["x"];
|
|
rect.startY = ROIInfo[aktindex]["y"];
|
|
rect.w = ROIInfo[aktindex]["dx"];
|
|
rect.h = ROIInfo[aktindex]["dy"];
|
|
draw();
|
|
}
|
|
|
|
function loadCanvas(dataURL) {
|
|
var canvas = document.getElementById('canvas');
|
|
var context = canvas.getContext('2d');
|
|
|
|
imageObj.onload = function() {
|
|
canvas.width = this.width;
|
|
canvas.height = this.height;
|
|
drawImage();
|
|
draw();
|
|
};
|
|
|
|
imageObj.src = dataURL;
|
|
}
|
|
|
|
|
|
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) };
|
|
}
|
|
|
|
function init() {
|
|
domainname = getDomainname();
|
|
canvas.addEventListener('mousedown', mouseDown, false);
|
|
canvas.addEventListener('mouseup', mouseUp, false);
|
|
canvas.addEventListener('mousemove', mouseMove, false);
|
|
loadCanvas(domainname + "/fileserver/config/reference.jpg");
|
|
loadConfig(domainname);
|
|
ParseConfig();
|
|
param = getConfigParameters();
|
|
cofcat = getConfigCategory();
|
|
UpdateNUMBERS();
|
|
|
|
space = ROIInfo[1].x - parseInt(ROIInfo[0].x) - parseInt(ROIInfo[0].dx);
|
|
document.getElementById("space").value = space;
|
|
|
|
drawImage();
|
|
draw();
|
|
}
|
|
|
|
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 UpdateNUMBERS(_sel){
|
|
zw = getNUMBERInfo();
|
|
|
|
index = 0;
|
|
|
|
var _index = document.getElementById("Numbers_value1");
|
|
while (_index.length){
|
|
_index.remove(0);
|
|
}
|
|
|
|
for (var i = 0; i < zw.length; ++i){
|
|
var option = document.createElement("option");
|
|
option.text = zw[i]["name"];
|
|
option.value = i;
|
|
_index.add(option);
|
|
|
|
if (typeof _sel !== 'undefined') {
|
|
if (zw[i]["name"] == _sel)
|
|
index = i
|
|
}
|
|
}
|
|
_index.selectedIndex = index;
|
|
|
|
UpdateROIs();
|
|
}
|
|
|
|
function renameNumber(){
|
|
var sel = document.getElementById("Numbers_value1");
|
|
var _delte= sel.options[sel.selectedIndex].text;
|
|
var _numbernew = prompt("Please enter new name", _delte);
|
|
|
|
erg = RenameNUMBER(_delte, _numbernew);
|
|
if (erg != "")
|
|
firework.launch(erg, 'danger', 30000);
|
|
else
|
|
UpdateNUMBERS(_numbernew);
|
|
}
|
|
|
|
function newNumber(){
|
|
var _numbernew = prompt("Please enter name of new number", "name");
|
|
|
|
erg = CreateNUMBER(_numbernew);
|
|
if (erg != "")
|
|
firework.launch(erg, 'danger', 30000);
|
|
else
|
|
UpdateNUMBERS(_numbernew);
|
|
}
|
|
|
|
|
|
function removeNumber(){
|
|
if (confirm("This will remove the number complete (analog and digital).\nIf you only want to remove the digital ROIs, please use \"Delete ROIs\".\nDo you want to proceed?")) {
|
|
var sel = document.getElementById("Numbers_value1");
|
|
var _delte= sel.options[sel.selectedIndex].text;
|
|
erg = DeleteNUMBER(_delte);
|
|
if (erg != "")
|
|
firework.launch(erg, 'danger', 30000);
|
|
UpdateNUMBERS();
|
|
}
|
|
}
|
|
|
|
|
|
function drawTextBG(context, txt, x, y, padding) {
|
|
context.font = "15px Arial";
|
|
context.textAlign = "center";
|
|
|
|
context.fillStyle = 'rgba(255, 0, 0, 0.5)';
|
|
var width = context.measureText(txt).width;
|
|
context.fillRect(x-(width+padding)/2, y-12, width + padding*2, parseInt(context.font, 10) + padding);
|
|
|
|
context.fillStyle = "black";
|
|
context.fillText(txt, x + padding / 2, y + padding / 2);
|
|
}
|
|
|
|
|
|
function draw() {
|
|
if (typeof ROIInfo === 'undefined') { // During init, ROIInfo is not defined yet
|
|
return;
|
|
}
|
|
|
|
var canvas = document.getElementById('canvas');
|
|
var context = canvas.getContext('2d');
|
|
context.drawImage(imageObj, 0, 0);
|
|
|
|
if (ROIInfo.length == 0) {
|
|
return;
|
|
}
|
|
|
|
if (document.getElementById("Category_Digits_enabled").checked)
|
|
{
|
|
var sel = document.getElementById("index");
|
|
var _number = sel.selectedIndex;
|
|
|
|
if (lockSizes) {
|
|
// Synchronize Y, dx and dy
|
|
for (var _nb = 0; _nb < ROIInfo.length; _nb++)
|
|
{
|
|
if (_nb != _number)
|
|
{
|
|
ROIInfo[_nb].y = rect.startY;
|
|
ROIInfo[_nb].dy = rect.h;
|
|
ROIInfo[_nb].dx = rect.w;
|
|
}
|
|
}
|
|
}
|
|
|
|
for (var _nb = 0; _nb < ROIInfo.length; _nb++)
|
|
{
|
|
if (_nb != _number)
|
|
{
|
|
lw = 2;
|
|
context.lineWidth = lw;
|
|
context.strokeStyle = "#990000";
|
|
var x0 = parseInt(ROIInfo[_nb].x) - parseInt(lw/2);
|
|
var y0 = parseInt(ROIInfo[_nb].y) - parseInt(lw/2);
|
|
var dx = parseInt(ROIInfo[_nb].dx) + parseInt(lw);
|
|
var dy = parseInt(ROIInfo[_nb].dy) + parseInt(lw);
|
|
context.strokeRect(x0, y0, dx, dy);
|
|
drawTextBG(context, ROIInfo[_nb]["name"], x0+dx/2, y0-12, 5);
|
|
}
|
|
|
|
}
|
|
|
|
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);
|
|
drawTextBG(context, ROIInfo[aktindex]["name"], x0+dx/2, y0-11, 5);
|
|
context.lineWidth = 1;
|
|
context.strokeRect(x0+dx*0.2, y0+dy*0.2, dx*0.6, dy*0.6);
|
|
|
|
|
|
context.lineWidth = 2;
|
|
context.beginPath();
|
|
context.moveTo(x0, y0+dy/2);
|
|
context.lineTo(x0+dx, y0+dy/2);
|
|
context.stroke();
|
|
|
|
ROIInfo[aktindex]["x"] = rect.startX;
|
|
ROIInfo[aktindex]["y"] = rect.startY;
|
|
ROIInfo[aktindex]["dx"] = rect.w;
|
|
ROIInfo[aktindex]["dy"] = rect.h;
|
|
|
|
}
|
|
}
|
|
|
|
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) };
|
|
}
|
|
|
|
function mouseDown(e) {
|
|
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) {
|
|
zw = getCoords(this)
|
|
|
|
if (ROIInfo.length == 0) {
|
|
return;
|
|
}
|
|
|
|
if (lockAR) {
|
|
rect.h = (e.pageY - zw.top) - rect.startY;
|
|
rect.w = Math.round(rect.h * ROIInfo[aktindex]["ar"]); }
|
|
else {
|
|
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.strokeStyle = "#00FF00";
|
|
context.beginPath();
|
|
context.moveTo(0,y);
|
|
context.lineTo(canvas.width, y);
|
|
context.moveTo(x, 0);
|
|
context.lineTo(x, canvas.height);
|
|
context.stroke();
|
|
}
|
|
}
|
|
|
|
function valuemanualchanged(){
|
|
if (ROIInfo.length == 0) {
|
|
return;
|
|
}
|
|
|
|
if (!drag) {
|
|
rect.w = document.getElementById("refdx").value;
|
|
rect.h = document.getElementById("refdy").value;
|
|
|
|
if (lockAR) {
|
|
rect.w = Math.round(rect.h * ROIInfo[aktindex]["ar"]);
|
|
document.getElementById("refdx").value = rect.w;
|
|
}
|
|
|
|
rect.startX = document.getElementById("refx").value;
|
|
rect.startY = document.getElementById("refy").value;
|
|
|
|
draw();
|
|
if (lockSpaceEquidistant) {
|
|
makeX_SpaceEquidistant();
|
|
}
|
|
draw();
|
|
}
|
|
}
|
|
|
|
function valuemanualchangeddx(){
|
|
if (ROIInfo.length == 0) {
|
|
return;
|
|
}
|
|
|
|
if (!drag) {
|
|
rect.w = document.getElementById("refdx").value;
|
|
rect.h = document.getElementById("refdy").value;
|
|
|
|
if (lockAR) {
|
|
rect.h = Math.round(rect.w / ROIInfo[aktindex]["ar"]);
|
|
document.getElementById("refdy").value = rect.h;
|
|
}
|
|
|
|
rect.startX = document.getElementById("refx").value;
|
|
rect.startY = document.getElementById("refy").value;
|
|
|
|
if (lockSpaceEquidistant) {
|
|
makeX_SpaceEquidistant();
|
|
}
|
|
|
|
draw();
|
|
}
|
|
}
|
|
|
|
function valuemanualchangedspace(){
|
|
if (!drag) {
|
|
space = document.getElementById("space").value;
|
|
valuemanualchanged();
|
|
draw();
|
|
}
|
|
}
|
|
|
|
// Make all X spaces equidistant
|
|
function makeX_SpaceEquidistant() {
|
|
if (ROIInfo.length <= 1) { // Only one or no number
|
|
return;
|
|
}
|
|
|
|
var sel = document.getElementById("index");
|
|
var _number = sel.selectedIndex;
|
|
|
|
if (_number == 0) { // First number
|
|
for (var _nb = 1; _nb < ROIInfo.length; _nb++) {
|
|
ROIInfo[_nb].x = parseInt(ROIInfo[_nb-1].x) + parseInt(ROIInfo[_nb-1].dx) + parseInt(space);
|
|
}
|
|
}
|
|
else { // In between
|
|
for (var _nb = _number - 1; _nb >= 0 ; _nb--) { // left side
|
|
ROIInfo[_nb].x = parseInt(ROIInfo[_nb+1].x) - parseInt(ROIInfo[_nb].dx) - parseInt(space);
|
|
}
|
|
|
|
for (var _nb = _number + 1; _nb < ROIInfo.length; _nb++) { // right side
|
|
ROIInfo[_nb].x = parseInt(ROIInfo[_nb-1].x) + parseInt(ROIInfo[_nb-1].dx) + parseInt(space);
|
|
}
|
|
}
|
|
}
|
|
|
|
function renameROI(){
|
|
var sel = document.getElementById("Numbers_value1");
|
|
var _number= sel.options[sel.selectedIndex].text;
|
|
sel = document.getElementById("index");
|
|
var _roialt= sel.options[sel.selectedIndex].text;
|
|
|
|
|
|
var _roinew = prompt("Please enter new name", _roialt);
|
|
|
|
erg = RenameROI(_number, "digit", _roialt, _roinew);
|
|
if (erg != "")
|
|
firework.launch(erg, 'danger', 30000);
|
|
else
|
|
UpdateROIs(_roinew);
|
|
}
|
|
|
|
function numberChanged()
|
|
{
|
|
UpdateROIs();
|
|
}
|
|
|
|
|
|
|
|
init();
|
|
|
|
</script>
|
|
|
|
</body>
|
|
</html>
|