mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-06 11:36:51 +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>
706 lines
22 KiB
C++
706 lines
22 KiB
C++
#include <string>
|
|
#include <functional>
|
|
#include "string.h"
|
|
|
|
#include <string.h>
|
|
#include "freertos/FreeRTOS.h"
|
|
#include "freertos/task.h"
|
|
#include "esp_system.h"
|
|
#include "esp_event.h"
|
|
|
|
#include "server_tflite.h"
|
|
|
|
#include "esp_log.h"
|
|
|
|
#include <sys/stat.h>
|
|
#include <vector>
|
|
|
|
#include "../../include/defines.h"
|
|
|
|
#include "server_GPIO.h"
|
|
|
|
#include "ClassLogFile.h"
|
|
#include "configFile.h"
|
|
#include "Helper.h"
|
|
#ifdef ENABLE_MQTT
|
|
#include "interface_mqtt.h"
|
|
#endif //ENABLE_MQTT
|
|
|
|
|
|
static const char *TAG = "GPIO";
|
|
QueueHandle_t gpio_queue_handle = NULL;
|
|
|
|
GpioPin::GpioPin(gpio_num_t gpio, const char* name, gpio_pin_mode_t mode, gpio_int_type_t interruptType, uint8_t dutyResolution, std::string mqttTopic, bool httpEnable)
|
|
{
|
|
_gpio = gpio;
|
|
_name = name;
|
|
_mode = mode;
|
|
_interruptType = interruptType;
|
|
_mqttTopic = mqttTopic;
|
|
}
|
|
|
|
GpioPin::~GpioPin()
|
|
{
|
|
ESP_LOGD(TAG,"reset GPIO pin %d", _gpio);
|
|
if (_interruptType != GPIO_INTR_DISABLE) {
|
|
//hook isr handler for specific gpio pin
|
|
gpio_isr_handler_remove(_gpio);
|
|
}
|
|
gpio_reset_pin(_gpio);
|
|
}
|
|
|
|
static void IRAM_ATTR gpio_isr_handler(void* arg)
|
|
{
|
|
GpioResult gpioResult;
|
|
gpioResult.gpio = *(gpio_num_t*) arg;
|
|
gpioResult.value = gpio_get_level(gpioResult.gpio);
|
|
BaseType_t ContextSwitchRequest = pdFALSE;
|
|
|
|
xQueueSendToBackFromISR(gpio_queue_handle,(void*)&gpioResult,&ContextSwitchRequest);
|
|
|
|
if(ContextSwitchRequest){
|
|
taskYIELD();
|
|
}
|
|
}
|
|
|
|
static void gpioHandlerTask(void *arg) {
|
|
ESP_LOGD(TAG,"start interrupt task");
|
|
while(1){
|
|
if(uxQueueMessagesWaiting(gpio_queue_handle)){
|
|
while(uxQueueMessagesWaiting(gpio_queue_handle)){
|
|
GpioResult gpioResult;
|
|
xQueueReceive(gpio_queue_handle,(void*)&gpioResult,10);
|
|
ESP_LOGD(TAG,"gpio: %d state: %d", gpioResult.gpio, gpioResult.value);
|
|
((GpioHandler*)arg)->gpioInterrupt(&gpioResult);
|
|
}
|
|
}
|
|
|
|
((GpioHandler*)arg)->taskHandler();
|
|
vTaskDelay(pdMS_TO_TICKS(1000));
|
|
}
|
|
}
|
|
|
|
void GpioPin::gpioInterrupt(int value) {
|
|
#ifdef ENABLE_MQTT
|
|
if (_mqttTopic != "") {
|
|
ESP_LOGD(TAG, "gpioInterrupt %s %d", _mqttTopic.c_str(), value);
|
|
|
|
MQTTPublish(_mqttTopic, value ? "true" : "false");
|
|
}
|
|
#endif //ENABLE_MQTT
|
|
currentState = value;
|
|
}
|
|
|
|
void GpioPin::init()
|
|
{
|
|
gpio_config_t io_conf;
|
|
//set interrupt
|
|
io_conf.intr_type = _interruptType;
|
|
//set as output mode
|
|
io_conf.mode = (_mode == GPIO_PIN_MODE_OUTPUT) || (_mode == GPIO_PIN_MODE_BUILT_IN_FLASH_LED) ? gpio_mode_t::GPIO_MODE_OUTPUT : gpio_mode_t::GPIO_MODE_INPUT;
|
|
//bit mask of the pins that you want to set,e.g.GPIO18/19
|
|
io_conf.pin_bit_mask = (1ULL << _gpio);
|
|
//set pull-down mode
|
|
io_conf.pull_down_en = _mode == GPIO_PIN_MODE_INPUT_PULLDOWN ? gpio_pulldown_t::GPIO_PULLDOWN_ENABLE : gpio_pulldown_t::GPIO_PULLDOWN_DISABLE;
|
|
//set pull-up mode
|
|
io_conf.pull_up_en = _mode == GPIO_PIN_MODE_INPUT_PULLDOWN ? gpio_pullup_t::GPIO_PULLUP_ENABLE : gpio_pullup_t::GPIO_PULLUP_DISABLE;
|
|
//configure GPIO with the given settings
|
|
gpio_config(&io_conf);
|
|
|
|
// if (_interruptType != GPIO_INTR_DISABLE) { // ohne GPIO_PIN_MODE_EXTERNAL_FLASH_WS281X, wenn das genutzt wird, dann soll auch der Handler hier nicht initialisiert werden, da das dann über SmartLED erfolgt.
|
|
if ((_interruptType != GPIO_INTR_DISABLE) && (_interruptType != GPIO_PIN_MODE_EXTERNAL_FLASH_WS281X)) {
|
|
//hook isr handler for specific gpio pin
|
|
ESP_LOGD(TAG, "GpioPin::init add isr handler for GPIO %d", _gpio);
|
|
gpio_isr_handler_add(_gpio, gpio_isr_handler, (void*)&_gpio);
|
|
}
|
|
|
|
#ifdef ENABLE_MQTT
|
|
if ((_mqttTopic != "") && ((_mode == GPIO_PIN_MODE_OUTPUT) || (_mode == GPIO_PIN_MODE_OUTPUT_PWM) || (_mode == GPIO_PIN_MODE_BUILT_IN_FLASH_LED))) {
|
|
std::function<bool(std::string, char*, int)> f = std::bind(&GpioPin::handleMQTT, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3);
|
|
MQTTregisterSubscribeFunction(_mqttTopic, f);
|
|
}
|
|
#endif //ENABLE_MQTT
|
|
}
|
|
|
|
bool GpioPin::getValue(std::string* errorText)
|
|
{
|
|
if ((_mode != GPIO_PIN_MODE_INPUT) && (_mode != GPIO_PIN_MODE_INPUT_PULLUP) && (_mode != GPIO_PIN_MODE_INPUT_PULLDOWN)) {
|
|
(*errorText) = "GPIO is not in input mode";
|
|
}
|
|
|
|
return gpio_get_level(_gpio) == 1;
|
|
}
|
|
|
|
void GpioPin::setValue(bool value, gpio_set_source setSource, std::string* errorText)
|
|
{
|
|
ESP_LOGD(TAG, "GpioPin::setValue %d", value);
|
|
|
|
if ((_mode != GPIO_PIN_MODE_OUTPUT) && (_mode != GPIO_PIN_MODE_OUTPUT_PWM) && (_mode != GPIO_PIN_MODE_BUILT_IN_FLASH_LED)) {
|
|
(*errorText) = "GPIO is not in output mode";
|
|
} else {
|
|
gpio_set_level(_gpio, value);
|
|
|
|
#ifdef ENABLE_MQTT
|
|
if ((_mqttTopic != "") && (setSource != GPIO_SET_SOURCE_MQTT)) {
|
|
MQTTPublish(_mqttTopic, value ? "true" : "false");
|
|
}
|
|
#endif //ENABLE_MQTT
|
|
}
|
|
}
|
|
|
|
void GpioPin::publishState() {
|
|
int newState = gpio_get_level(_gpio);
|
|
if (newState != currentState) {
|
|
ESP_LOGD(TAG,"publish state of GPIO %d new state %d", _gpio, newState);
|
|
#ifdef ENABLE_MQTT
|
|
MQTTPublish(_mqttTopic, newState ? "true" : "false");
|
|
#endif //ENABLE_MQTT
|
|
currentState = newState;
|
|
}
|
|
}
|
|
|
|
#ifdef ENABLE_MQTT
|
|
bool GpioPin::handleMQTT(std::string, char* data, int data_len) {
|
|
ESP_LOGD(TAG, "GpioPin::handleMQTT data %.*s", data_len, data);
|
|
|
|
std::string dataStr(data, data_len);
|
|
dataStr = toLower(dataStr);
|
|
std::string errorText = "";
|
|
if ((dataStr == "true") || (dataStr == "1")) {
|
|
setValue(true, GPIO_SET_SOURCE_MQTT, &errorText);
|
|
} else if ((dataStr == "false") || (dataStr == "0")) {
|
|
setValue(false, GPIO_SET_SOURCE_MQTT, &errorText);
|
|
} else {
|
|
errorText = "wrong value ";
|
|
errorText.append(data, data_len);
|
|
}
|
|
|
|
if (errorText != "") {
|
|
ESP_LOGE(TAG, "%s", errorText.c_str());
|
|
}
|
|
|
|
return (errorText == "");
|
|
}
|
|
#endif //ENABLE_MQTT
|
|
|
|
esp_err_t callHandleHttpRequest(httpd_req_t *req)
|
|
{
|
|
ESP_LOGD(TAG,"callHandleHttpRequest");
|
|
|
|
GpioHandler *gpioHandler = (GpioHandler*)req->user_ctx;
|
|
return gpioHandler->handleHttpRequest(req);
|
|
}
|
|
|
|
void taskGpioHandler(void *pvParameter)
|
|
{
|
|
ESP_LOGD(TAG,"taskGpioHandler");
|
|
((GpioHandler*)pvParameter)->init();
|
|
}
|
|
|
|
GpioHandler::GpioHandler(std::string configFile, httpd_handle_t httpServer)
|
|
{
|
|
ESP_LOGI(TAG,"start GpioHandler");
|
|
_configFile = configFile;
|
|
_httpServer = httpServer;
|
|
|
|
ESP_LOGI(TAG, "register GPIO Uri");
|
|
registerGpioUri();
|
|
}
|
|
|
|
GpioHandler::~GpioHandler() {
|
|
if (gpioMap != NULL) {
|
|
clear();
|
|
delete gpioMap;
|
|
}
|
|
}
|
|
|
|
void GpioHandler::init()
|
|
{
|
|
// TickType_t xDelay = 60000 / portTICK_PERIOD_MS;
|
|
// ESP_LOGD(TAG, "wait before start %ldms", (long) xDelay);
|
|
// vTaskDelay( xDelay );
|
|
|
|
ESP_LOGD(TAG, "*************** Start GPIOHandler_Init *****************");
|
|
|
|
if (gpioMap == NULL) {
|
|
gpioMap = new std::map<gpio_num_t, GpioPin*>();
|
|
} else {
|
|
clear();
|
|
}
|
|
|
|
|
|
ESP_LOGI(TAG, "read GPIO config and init GPIO");
|
|
if (!readConfig()) {
|
|
clear();
|
|
delete gpioMap;
|
|
gpioMap = NULL;
|
|
ESP_LOGI(TAG, "GPIO init completed, handler is disabled");
|
|
return;
|
|
}
|
|
|
|
|
|
for(std::map<gpio_num_t, GpioPin*>::iterator it = gpioMap->begin(); it != gpioMap->end(); ++it) {
|
|
it->second->init();
|
|
}
|
|
|
|
#ifdef ENABLE_MQTT
|
|
std::function<void()> f = std::bind(&GpioHandler::handleMQTTconnect, this);
|
|
MQTTregisterConnectFunction("gpio-handler", f);
|
|
#endif //ENABLE_MQTT
|
|
|
|
if (xHandleTaskGpio == NULL) {
|
|
gpio_queue_handle = xQueueCreate(10,sizeof(GpioResult));
|
|
BaseType_t xReturned = xTaskCreate(&gpioHandlerTask, "gpio_int", 3 * 1024, (void *)this, tskIDLE_PRIORITY + 4, &xHandleTaskGpio);
|
|
if(xReturned == pdPASS ) {
|
|
ESP_LOGD(TAG, "xHandletaskGpioHandler started");
|
|
} else {
|
|
ESP_LOGD(TAG, "xHandletaskGpioHandler not started %d ", (int)xHandleTaskGpio);
|
|
}
|
|
}
|
|
|
|
ESP_LOGI(TAG, "GPIO init completed, is enabled");
|
|
}
|
|
|
|
void GpioHandler::taskHandler() {
|
|
if (gpioMap != NULL) {
|
|
for(std::map<gpio_num_t, GpioPin*>::iterator it = gpioMap->begin(); it != gpioMap->end(); ++it) {
|
|
if ((it->second->getInterruptType() == GPIO_INTR_DISABLE))
|
|
it->second->publishState();
|
|
}
|
|
}
|
|
}
|
|
|
|
#ifdef ENABLE_MQTT
|
|
void GpioHandler::handleMQTTconnect()
|
|
{
|
|
if (gpioMap != NULL) {
|
|
for(std::map<gpio_num_t, GpioPin*>::iterator it = gpioMap->begin(); it != gpioMap->end(); ++it) {
|
|
if ((it->second->getMode() == GPIO_PIN_MODE_INPUT) || (it->second->getMode() == GPIO_PIN_MODE_INPUT_PULLDOWN) || (it->second->getMode() == GPIO_PIN_MODE_INPUT_PULLUP))
|
|
it->second->publishState();
|
|
}
|
|
}
|
|
}
|
|
#endif //ENABLE_MQTT
|
|
|
|
void GpioHandler::deinit() {
|
|
#ifdef ENABLE_MQTT
|
|
MQTTunregisterConnectFunction("gpio-handler");
|
|
#endif //ENABLE_MQTT
|
|
clear();
|
|
if (xHandleTaskGpio != NULL) {
|
|
vTaskDelete(xHandleTaskGpio);
|
|
xHandleTaskGpio = NULL;
|
|
}
|
|
}
|
|
|
|
void GpioHandler::gpioInterrupt(GpioResult* gpioResult) {
|
|
if ((gpioMap != NULL) && (gpioMap->find(gpioResult->gpio) != gpioMap->end())) {
|
|
(*gpioMap)[gpioResult->gpio]->gpioInterrupt(gpioResult->value);
|
|
}
|
|
}
|
|
|
|
bool GpioHandler::readConfig()
|
|
{
|
|
if (!gpioMap->empty())
|
|
clear();
|
|
|
|
ConfigFile configFile = ConfigFile(_configFile);
|
|
|
|
std::vector<std::string> splitted;
|
|
std::string line = "";
|
|
bool disabledLine = false;
|
|
bool eof = false;
|
|
gpio_num_t gpioExtLED = (gpio_num_t) 0;
|
|
|
|
// ESP_LOGD(TAG, "readConfig - Start 1");
|
|
|
|
while ((!configFile.GetNextParagraph(line, disabledLine, eof) || (line.compare("[GPIO]") != 0)) && !eof) {}
|
|
if (eof)
|
|
return false;
|
|
|
|
// ESP_LOGD(TAG, "readConfig - Start 2 line: %s, disabbledLine: %d", line.c_str(), (int) disabledLine);
|
|
|
|
|
|
_isEnabled = !disabledLine;
|
|
|
|
if (!_isEnabled)
|
|
return false;
|
|
|
|
// ESP_LOGD(TAG, "readConfig - Start 3");
|
|
|
|
#ifdef ENABLE_MQTT
|
|
// std::string mainTopicMQTT = "";
|
|
std::string mainTopicMQTT = GetMQTTMainTopic();
|
|
if (mainTopicMQTT.length() > 0)
|
|
{
|
|
mainTopicMQTT = mainTopicMQTT + "/GPIO";
|
|
ESP_LOGD(TAG, "MAINTOPICMQTT found");
|
|
}
|
|
#endif // ENABLE_MQTT
|
|
bool registerISR = false;
|
|
while (configFile.getNextLine(&line, disabledLine, eof) && !configFile.isNewParagraph(line))
|
|
{
|
|
splitted = ZerlegeZeile(line);
|
|
// const std::regex pieces_regex("IO([0-9]{1,2})");
|
|
// std::smatch pieces_match;
|
|
// if (std::regex_match(splitted[0], pieces_match, pieces_regex) && (pieces_match.size() == 2))
|
|
// {
|
|
// std::string gpioStr = pieces_match[1];
|
|
ESP_LOGD(TAG, "conf param %s", toUpper(splitted[0]).c_str());
|
|
if (toUpper(splitted[0]) == "MAINTOPICMQTT") {
|
|
// ESP_LOGD(TAG, "MAINTOPICMQTT found");
|
|
// mainTopicMQTT = splitted[1];
|
|
} else if ((splitted[0].rfind("IO", 0) == 0) && (splitted.size() >= 6))
|
|
{
|
|
ESP_LOGI(TAG,"Enable GP%s in %s mode", splitted[0].c_str(), splitted[1].c_str());
|
|
std::string gpioStr = splitted[0].substr(2, 2);
|
|
gpio_num_t gpioNr = (gpio_num_t)atoi(gpioStr.c_str());
|
|
gpio_pin_mode_t pinMode = resolvePinMode(toLower(splitted[1]));
|
|
gpio_int_type_t intType = resolveIntType(toLower(splitted[2]));
|
|
uint16_t dutyResolution = (uint8_t)atoi(splitted[3].c_str());
|
|
#ifdef ENABLE_MQTT
|
|
bool mqttEnabled = toLower(splitted[4]) == "true";
|
|
#endif // ENABLE_MQTT
|
|
bool httpEnabled = toLower(splitted[5]) == "true";
|
|
char gpioName[100];
|
|
if (splitted.size() >= 7) {
|
|
strcpy(gpioName, trim(splitted[6]).c_str());
|
|
} else {
|
|
sprintf(gpioName, "GPIO%d", gpioNr);
|
|
}
|
|
#ifdef ENABLE_MQTT
|
|
std::string mqttTopic = mqttEnabled ? (mainTopicMQTT + "/" + gpioName) : "";
|
|
#else // ENABLE_MQTT
|
|
std::string mqttTopic = "";
|
|
#endif // ENABLE_MQTT
|
|
GpioPin* gpioPin = new GpioPin(gpioNr, gpioName, pinMode, intType,dutyResolution, mqttTopic, httpEnabled);
|
|
(*gpioMap)[gpioNr] = gpioPin;
|
|
|
|
if (pinMode == GPIO_PIN_MODE_EXTERNAL_FLASH_WS281X)
|
|
{
|
|
ESP_LOGD(TAG, "Set WS2812 to GPIO %d", gpioNr);
|
|
gpioExtLED = gpioNr;
|
|
}
|
|
|
|
if (intType != GPIO_INTR_DISABLE) {
|
|
registerISR = true;
|
|
}
|
|
}
|
|
if (toUpper(splitted[0]) == "LEDNUMBERS")
|
|
{
|
|
LEDNumbers = stoi(splitted[1]);
|
|
}
|
|
if (toUpper(splitted[0]) == "LEDCOLOR")
|
|
{
|
|
uint8_t _r, _g, _b;
|
|
_r = stoi(splitted[1]);
|
|
_g = stoi(splitted[2]);
|
|
_b = stoi(splitted[3]);
|
|
|
|
LEDColor = Rgb{_r, _g, _b};
|
|
}
|
|
if (toUpper(splitted[0]) == "LEDTYPE")
|
|
{
|
|
if (splitted[1] == "WS2812")
|
|
LEDType = LED_WS2812;
|
|
if (splitted[1] == "WS2812B")
|
|
LEDType = LED_WS2812B;
|
|
if (splitted[1] == "SK6812")
|
|
LEDType = LED_SK6812;
|
|
if (splitted[1] == "WS2813")
|
|
LEDType = LED_WS2813;
|
|
}
|
|
}
|
|
|
|
if (registerISR) {
|
|
//install gpio isr service
|
|
gpio_install_isr_service(ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM);
|
|
}
|
|
|
|
if (gpioExtLED > 0)
|
|
{
|
|
// LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Startsequence 06"); // Nremove
|
|
// vTaskDelay( xDelay );
|
|
// xDelay = 5000 / portTICK_PERIOD_MS;
|
|
// ESP_LOGD(TAG, "main: sleep for: %ldms", (long) xDelay);
|
|
|
|
// SmartLed leds( LED_WS2812, 2, GPIO_NUM_12, 0, DoubleBuffer );
|
|
|
|
|
|
// leds[ 0 ] = Rgb{ 255, 0, 0 };
|
|
// leds[ 1 ] = Rgb{ 255, 255, 255 };
|
|
// leds.show();
|
|
// SmartLed leds = new SmartLed(LEDType, LEDNumbers, gpioExtLED, 0, DoubleBuffer);
|
|
// _SmartLED = new SmartLed( LED_WS2812, 2, GPIO_NUM_12, 0, DoubleBuffer );
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void GpioHandler::clear()
|
|
{
|
|
ESP_LOGD(TAG, "GpioHandler::clear");
|
|
|
|
if (gpioMap != NULL) {
|
|
for(std::map<gpio_num_t, GpioPin*>::iterator it = gpioMap->begin(); it != gpioMap->end(); ++it) {
|
|
delete it->second;
|
|
}
|
|
gpioMap->clear();
|
|
}
|
|
|
|
// gpio_uninstall_isr_service(); can't uninstall, isr service is used by camera
|
|
}
|
|
|
|
void GpioHandler::registerGpioUri()
|
|
{
|
|
ESP_LOGI(TAG, "server_GPIO - Registering URI handlers");
|
|
|
|
httpd_uri_t camuri = { };
|
|
camuri.method = HTTP_GET;
|
|
camuri.uri = "/GPIO";
|
|
camuri.handler = callHandleHttpRequest;
|
|
camuri.user_ctx = (void*)this;
|
|
httpd_register_uri_handler(_httpServer, &camuri);
|
|
}
|
|
|
|
esp_err_t GpioHandler::handleHttpRequest(httpd_req_t *req)
|
|
{
|
|
ESP_LOGD(TAG, "handleHttpRequest");
|
|
|
|
if (gpioMap == NULL) {
|
|
std::string resp_str = "GPIO handler not initialized";
|
|
httpd_resp_send(req, resp_str.c_str(), resp_str.length());
|
|
return ESP_OK;
|
|
}
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("handler_switch_GPIO - Start");
|
|
#endif
|
|
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "handler_switch_GPIO");
|
|
char _query[200];
|
|
char _valueGPIO[30];
|
|
char _valueStatus[30];
|
|
std::string gpio, status;
|
|
|
|
if (httpd_req_get_url_query_str(req, _query, 200) == ESP_OK) {
|
|
ESP_LOGD(TAG, "Query: %s", _query);
|
|
|
|
if (httpd_query_key_value(_query, "GPIO", _valueGPIO, 30) == ESP_OK)
|
|
{
|
|
ESP_LOGD(TAG, "GPIO is found %s", _valueGPIO);
|
|
gpio = std::string(_valueGPIO);
|
|
} else {
|
|
std::string resp_str = "GPIO No is not defined";
|
|
httpd_resp_send(req, resp_str.c_str(), resp_str.length());
|
|
return ESP_OK;
|
|
}
|
|
if (httpd_query_key_value(_query, "Status", _valueStatus, 30) == ESP_OK)
|
|
{
|
|
ESP_LOGD(TAG, "Status is found %s", _valueStatus);
|
|
status = std::string(_valueStatus);
|
|
}
|
|
} else {
|
|
const char* resp_str = "Error in call. Use /GPIO?GPIO=12&Status=high";
|
|
httpd_resp_send(req, resp_str, strlen(resp_str));
|
|
return ESP_OK;
|
|
}
|
|
|
|
status = toUpper(status);
|
|
if ((status != "HIGH") && (status != "LOW") && (status != "TRUE") && (status != "FALSE") && (status != "0") && (status != "1") && (status != ""))
|
|
{
|
|
std::string zw = "Status not valid: " + status;
|
|
httpd_resp_sendstr_chunk(req, zw.c_str());
|
|
httpd_resp_sendstr_chunk(req, NULL);
|
|
return ESP_OK;
|
|
}
|
|
|
|
int gpionum = stoi(gpio);
|
|
|
|
// frei: 16; 12-15; 2; 4 // nur 12 und 13 funktionieren 2: reboot, 4: BlitzLED, 15: PSRAM, 14/15: DMA für SDKarte ???
|
|
gpio_num_t gpio_num = resolvePinNr(gpionum);
|
|
if (gpio_num == GPIO_NUM_NC)
|
|
{
|
|
std::string zw = "GPIO" + std::to_string(gpionum) + " unsupported - only 12 & 13 free";
|
|
httpd_resp_sendstr_chunk(req, zw.c_str());
|
|
httpd_resp_sendstr_chunk(req, NULL);
|
|
return ESP_OK;
|
|
}
|
|
|
|
if (gpioMap->count(gpio_num) == 0) {
|
|
char resp_str [30];
|
|
sprintf(resp_str, "GPIO%d is not registred", gpio_num);
|
|
httpd_resp_send(req, resp_str, strlen(resp_str));
|
|
return ESP_OK;
|
|
}
|
|
|
|
if (status == "")
|
|
{
|
|
std::string resp_str = "";
|
|
status = (*gpioMap)[gpio_num]->getValue(&resp_str) ? "HIGH" : "LOW";
|
|
if (resp_str == "") {
|
|
resp_str = status;
|
|
}
|
|
httpd_resp_sendstr_chunk(req, resp_str.c_str());
|
|
httpd_resp_sendstr_chunk(req, NULL);
|
|
}
|
|
else
|
|
{
|
|
std::string resp_str = "";
|
|
(*gpioMap)[gpio_num]->setValue((status == "HIGH") || (status == "TRUE") || (status == "1"), GPIO_SET_SOURCE_HTTP, &resp_str);
|
|
if (resp_str == "") {
|
|
resp_str = "GPIO" + std::to_string(gpionum) + " switched to " + status;
|
|
}
|
|
httpd_resp_sendstr_chunk(req, resp_str.c_str());
|
|
httpd_resp_sendstr_chunk(req, NULL);
|
|
}
|
|
|
|
return ESP_OK;
|
|
};
|
|
|
|
void GpioHandler::flashLightEnable(bool value)
|
|
{
|
|
ESP_LOGD(TAG, "GpioHandler::flashLightEnable %s", value ? "true" : "false");
|
|
|
|
if (gpioMap != NULL) {
|
|
for(std::map<gpio_num_t, GpioPin*>::iterator it = gpioMap->begin(); it != gpioMap->end(); ++it)
|
|
{
|
|
if (it->second->getMode() == GPIO_PIN_MODE_BUILT_IN_FLASH_LED) //|| (it->second->getMode() == GPIO_PIN_MODE_EXTERNAL_FLASH_PWM) || (it->second->getMode() == GPIO_PIN_MODE_EXTERNAL_FLASH_WS281X))
|
|
{
|
|
std::string resp_str = "";
|
|
it->second->setValue(value, GPIO_SET_SOURCE_INTERNAL, &resp_str);
|
|
|
|
if (resp_str == "") {
|
|
ESP_LOGD(TAG, "Flash light pin GPIO %d switched to %s", (int)it->first, (value ? "on" : "off"));
|
|
} else {
|
|
ESP_LOGE(TAG, "Can't set flash light pin GPIO %d. Error: %s", (int)it->first, resp_str.c_str());
|
|
}
|
|
} else
|
|
{
|
|
if (it->second->getMode() == GPIO_PIN_MODE_EXTERNAL_FLASH_WS281X)
|
|
{
|
|
#ifdef __LEDGLOBAL
|
|
if (leds_global == NULL) {
|
|
ESP_LOGI(TAG, "init SmartLed: LEDNumber=%d, GPIO=%d", LEDNumbers, (int)it->second->getGPIO());
|
|
leds_global = new SmartLed( LEDType, LEDNumbers, it->second->getGPIO(), 0, DoubleBuffer );
|
|
} else {
|
|
// wait until we can update: https://github.com/RoboticsBrno/SmartLeds/issues/10#issuecomment-386921623
|
|
leds_global->wait();
|
|
}
|
|
#else
|
|
SmartLed leds( LEDType, LEDNumbers, it->second->getGPIO(), 0, DoubleBuffer );
|
|
#endif
|
|
|
|
if (value)
|
|
{
|
|
for (int i = 0; i < LEDNumbers; ++i)
|
|
#ifdef __LEDGLOBAL
|
|
(*leds_global)[i] = LEDColor;
|
|
#else
|
|
leds[i] = LEDColor;
|
|
#endif
|
|
}
|
|
else
|
|
{
|
|
for (int i = 0; i < LEDNumbers; ++i)
|
|
#ifdef __LEDGLOBAL
|
|
(*leds_global)[i] = Rgb{0, 0, 0};
|
|
#else
|
|
leds[i] = Rgb{0, 0, 0};
|
|
#endif
|
|
}
|
|
#ifdef __LEDGLOBAL
|
|
leds_global->show();
|
|
#else
|
|
leds.show();
|
|
#endif
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
gpio_num_t GpioHandler::resolvePinNr(uint8_t pinNr)
|
|
{
|
|
switch(pinNr) {
|
|
case 0:
|
|
return GPIO_NUM_0;
|
|
case 1:
|
|
return GPIO_NUM_1;
|
|
case 3:
|
|
return GPIO_NUM_3;
|
|
case 4:
|
|
return GPIO_NUM_4;
|
|
case 12:
|
|
return GPIO_NUM_12;
|
|
case 13:
|
|
return GPIO_NUM_13;
|
|
default:
|
|
return GPIO_NUM_NC;
|
|
}
|
|
}
|
|
|
|
gpio_pin_mode_t GpioHandler::resolvePinMode(std::string input)
|
|
{
|
|
if( input == "disabled" ) return GPIO_PIN_MODE_DISABLED;
|
|
if( input == "input" ) return GPIO_PIN_MODE_INPUT;
|
|
if( input == "input-pullup" ) return GPIO_PIN_MODE_INPUT_PULLUP;
|
|
if( input == "input-pulldown" ) return GPIO_PIN_MODE_INPUT_PULLDOWN;
|
|
if( input == "output" ) return GPIO_PIN_MODE_OUTPUT;
|
|
if( input == "built-in-led" ) return GPIO_PIN_MODE_BUILT_IN_FLASH_LED;
|
|
if( input == "output-pwm" ) return GPIO_PIN_MODE_OUTPUT_PWM;
|
|
if( input == "external-flash-pwm" ) return GPIO_PIN_MODE_EXTERNAL_FLASH_PWM;
|
|
if( input == "external-flash-ws281x" ) return GPIO_PIN_MODE_EXTERNAL_FLASH_WS281X;
|
|
|
|
return GPIO_PIN_MODE_DISABLED;
|
|
}
|
|
|
|
gpio_int_type_t GpioHandler::resolveIntType(std::string input)
|
|
{
|
|
if( input == "disabled" ) return GPIO_INTR_DISABLE;
|
|
if( input == "rising-edge" ) return GPIO_INTR_POSEDGE;
|
|
if( input == "falling-edge" ) return GPIO_INTR_NEGEDGE;
|
|
if( input == "rising-and-falling" ) return GPIO_INTR_ANYEDGE ;
|
|
if( input == "low-level-trigger" ) return GPIO_INTR_LOW_LEVEL;
|
|
if( input == "high-level-trigger" ) return GPIO_INTR_HIGH_LEVEL;
|
|
|
|
|
|
return GPIO_INTR_DISABLE;
|
|
}
|
|
|
|
static GpioHandler *gpioHandler = NULL;
|
|
|
|
void gpio_handler_create(httpd_handle_t server)
|
|
{
|
|
if (gpioHandler == NULL)
|
|
gpioHandler = new GpioHandler(CONFIG_FILE, server);
|
|
}
|
|
|
|
void gpio_handler_init()
|
|
{
|
|
if (gpioHandler != NULL) {
|
|
gpioHandler->init();
|
|
}
|
|
}
|
|
|
|
void gpio_handler_deinit() {
|
|
if (gpioHandler != NULL) {
|
|
gpioHandler->deinit();
|
|
}
|
|
}
|
|
|
|
void gpio_handler_destroy()
|
|
{
|
|
if (gpioHandler != NULL) {
|
|
gpio_handler_deinit();
|
|
delete gpioHandler;
|
|
gpioHandler = NULL;
|
|
}
|
|
}
|
|
|
|
GpioHandler* gpio_handler_get()
|
|
{
|
|
return gpioHandler;
|
|
}
|
|
|