mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-07 12:06:58 +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>
536 lines
17 KiB
C++
536 lines
17 KiB
C++
#pragma once
|
|
|
|
#ifndef SMARTLEDS_H
|
|
#define SMARTLEDS_H
|
|
|
|
/*
|
|
* A C++ driver for the WS2812 LEDs using the RMT peripheral on the ESP32.
|
|
*
|
|
* Jan "yaqwsx" Mrázek <email@honzamrazek.cz>
|
|
*
|
|
* Based on the work by Martin F. Falatic - https://github.com/FozzTexx/ws2812-demo
|
|
*/
|
|
|
|
/*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include <memory>
|
|
#include <cassert>
|
|
#include <cstring>
|
|
|
|
#if defined ( ARDUINO )
|
|
extern "C" { // ...someone forgot to put in the includes...
|
|
#include "esp32-hal.h"
|
|
#include "esp_intr_alloc.h"
|
|
#include "esp_ipc.h"
|
|
#include "driver/gpio.h"
|
|
#include "driver/periph_ctrl.h"
|
|
#include "freertos/semphr.h"
|
|
#include "soc/rmt_struct.h"
|
|
#include <driver/spi_master.h>
|
|
#include "esp_idf_version.h"
|
|
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL( 4, 0, 0 )
|
|
#include "soc/dport_reg.h"
|
|
#endif
|
|
}
|
|
#elif defined ( ESP_PLATFORM )
|
|
extern "C" { // ...someone forgot to put in the includes...
|
|
#include <esp_intr_alloc.h>
|
|
#include <esp_ipc.h>
|
|
#include <driver/gpio.h>
|
|
#include <freertos/FreeRTOS.h>
|
|
#include <freertos/semphr.h>
|
|
#include <soc/dport_reg.h>
|
|
#include <soc/gpio_sig_map.h>
|
|
#include <soc/rmt_struct.h>
|
|
#include <driver/spi_master.h>
|
|
}
|
|
#include <stdio.h>
|
|
#endif
|
|
|
|
#include "Color.h"
|
|
|
|
namespace detail {
|
|
|
|
struct TimingParams {
|
|
uint32_t T0H;
|
|
uint32_t T1H;
|
|
uint32_t T0L;
|
|
uint32_t T1L;
|
|
uint32_t TRS;
|
|
};
|
|
|
|
union RmtPulsePair {
|
|
struct {
|
|
int duration0:15;
|
|
int level0:1;
|
|
int duration1:15;
|
|
int level1:1;
|
|
};
|
|
uint32_t value;
|
|
};
|
|
|
|
static const int DIVIDER = 4; // 8 still seems to work, but timings become marginal
|
|
static const int MAX_PULSES = 32; // A channel has a 64 "pulse" buffer - we use half per pass
|
|
static const double RMT_DURATION_NS = 12.5; // minimum time of a single RMT duration based on clock ns
|
|
|
|
} // namespace detail
|
|
|
|
using LedType = detail::TimingParams;
|
|
|
|
static const LedType LED_WS2812 = { 350, 700, 800, 600, 50000 };
|
|
static const LedType LED_WS2812B = { 400, 850, 850, 400, 50100 };
|
|
static const LedType LED_SK6812 = { 300, 600, 900, 600, 80000 };
|
|
static const LedType LED_WS2813 = { 350, 800, 350, 350, 300000 };
|
|
|
|
enum BufferType { SingleBuffer = 0, DoubleBuffer };
|
|
|
|
enum IsrCore { CoreFirst = 0, CoreSecond = 1, CoreCurrent = 2};
|
|
|
|
class SmartLed {
|
|
public:
|
|
// The RMT interrupt must not run on the same core as WiFi interrupts, otherwise SmartLeds
|
|
// can't fill the RMT buffer fast enough, resulting in rendering artifacts.
|
|
// Usually, that means you have to set isrCore == CoreSecond.
|
|
//
|
|
// If you use anything other than CoreCurrent, the FreeRTOS scheduler MUST be already running,
|
|
// so you can't use it if you define SmartLed as global variable.
|
|
SmartLed( const LedType& type, int count, int pin, int channel = 0, BufferType doubleBuffer = SingleBuffer, IsrCore isrCore = CoreCurrent)
|
|
: _timing( type ),
|
|
_channel( channel ),
|
|
_count( count ),
|
|
_firstBuffer( new Rgb[ count ] ),
|
|
_secondBuffer( doubleBuffer ? new Rgb[ count ] : nullptr ),
|
|
_finishedFlag( xSemaphoreCreateBinary() )
|
|
{
|
|
assert( channel >= 0 && channel < 8 );
|
|
assert( ledForChannel( channel ) == nullptr );
|
|
|
|
xSemaphoreGive( _finishedFlag );
|
|
|
|
DPORT_SET_PERI_REG_MASK( DPORT_PERIP_CLK_EN_REG, DPORT_RMT_CLK_EN );
|
|
DPORT_CLEAR_PERI_REG_MASK( DPORT_PERIP_RST_EN_REG, DPORT_RMT_RST );
|
|
|
|
PIN_FUNC_SELECT( GPIO_PIN_MUX_REG[ pin ], 2 );
|
|
gpio_set_direction( static_cast< gpio_num_t >( pin ), GPIO_MODE_OUTPUT );
|
|
gpio_matrix_out( static_cast< gpio_num_t >( pin ), RMT_SIG_OUT0_IDX + _channel, 0, 0 );
|
|
initChannel( _channel );
|
|
|
|
RMT.tx_lim_ch[ _channel ].limit = detail::MAX_PULSES;
|
|
RMT.int_ena.val |= 1 << ( 24 + _channel );
|
|
RMT.int_ena.val |= 1 << ( 3 * _channel );
|
|
|
|
_bitToRmt[ 0 ].level0 = 1;
|
|
_bitToRmt[ 0 ].level1 = 0;
|
|
_bitToRmt[ 0 ].duration0 = _timing.T0H / ( detail::RMT_DURATION_NS * detail::DIVIDER );
|
|
_bitToRmt[ 0 ].duration1 = _timing.T0L / ( detail::RMT_DURATION_NS * detail::DIVIDER );
|
|
|
|
_bitToRmt[ 1 ].level0 = 1;
|
|
_bitToRmt[ 1 ].level1 = 0;
|
|
_bitToRmt[ 1 ].duration0 = _timing.T1H / ( detail::RMT_DURATION_NS * detail::DIVIDER );
|
|
_bitToRmt[ 1 ].duration1 = _timing.T1L / ( detail::RMT_DURATION_NS * detail::DIVIDER );
|
|
|
|
if ( !anyAlive() ) {
|
|
_interruptCore = isrCore;
|
|
if(isrCore != CoreCurrent) {
|
|
ESP_ERROR_CHECK(esp_ipc_call_blocking(isrCore, registerInterrupt, NULL));
|
|
} else {
|
|
registerInterrupt(NULL);
|
|
}
|
|
}
|
|
|
|
ledForChannel( channel ) = this;
|
|
}
|
|
|
|
~SmartLed() {
|
|
ledForChannel( _channel ) = nullptr;
|
|
if ( !anyAlive() ) {
|
|
if(_interruptCore != CoreCurrent) {
|
|
ESP_ERROR_CHECK(esp_ipc_call_blocking(_interruptCore, unregisterInterrupt, NULL));
|
|
} else {
|
|
unregisterInterrupt(NULL);
|
|
}
|
|
}
|
|
vSemaphoreDelete( _finishedFlag );
|
|
}
|
|
|
|
Rgb& operator[]( int idx ) {
|
|
return _firstBuffer[ idx ];
|
|
}
|
|
|
|
const Rgb& operator[]( int idx ) const {
|
|
return _firstBuffer[ idx ];
|
|
}
|
|
|
|
void show() {
|
|
_buffer = _firstBuffer.get();
|
|
startTransmission();
|
|
swapBuffers();
|
|
}
|
|
|
|
bool wait( TickType_t timeout = portMAX_DELAY ) {
|
|
if( xSemaphoreTake( _finishedFlag, timeout ) == pdTRUE ) {
|
|
xSemaphoreGive( _finishedFlag );
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
int size() const {
|
|
return _count;
|
|
}
|
|
|
|
Rgb *begin() { return _firstBuffer.get(); }
|
|
const Rgb *begin() const { return _firstBuffer.get(); }
|
|
const Rgb *cbegin() const { return _firstBuffer.get(); }
|
|
|
|
Rgb *end() { return _firstBuffer.get() + _count; }
|
|
const Rgb *end() const { return _firstBuffer.get() + _count; }
|
|
const Rgb *cend() const { return _firstBuffer.get() + _count; }
|
|
|
|
private:
|
|
static intr_handle_t _interruptHandle;
|
|
static IsrCore _interruptCore;
|
|
|
|
static void initChannel( int channel ) {
|
|
RMT.apb_conf.fifo_mask = 1; //enable memory access, instead of FIFO mode.
|
|
RMT.apb_conf.mem_tx_wrap_en = 1; //wrap around when hitting end of buffer
|
|
RMT.conf_ch[ channel ].conf0.div_cnt = detail::DIVIDER;
|
|
RMT.conf_ch[ channel ].conf0.mem_size = 1;
|
|
RMT.conf_ch[ channel ].conf0.carrier_en = 0;
|
|
RMT.conf_ch[ channel ].conf0.carrier_out_lv = 1;
|
|
RMT.conf_ch[ channel ].conf0.mem_pd = 0;
|
|
|
|
RMT.conf_ch[ channel ].conf1.rx_en = 0;
|
|
RMT.conf_ch[ channel ].conf1.mem_owner = 0;
|
|
RMT.conf_ch[ channel ].conf1.tx_conti_mode = 0; //loop back mode.
|
|
RMT.conf_ch[ channel ].conf1.ref_always_on = 1; // use apb clock: 80M
|
|
RMT.conf_ch[ channel ].conf1.idle_out_en = 1;
|
|
RMT.conf_ch[ channel ].conf1.idle_out_lv = 0;
|
|
}
|
|
|
|
static void registerInterrupt(void *) {
|
|
ESP_ERROR_CHECK(esp_intr_alloc( ETS_RMT_INTR_SOURCE, 0, interruptHandler, nullptr, &_interruptHandle));
|
|
}
|
|
|
|
static void unregisterInterrupt(void*) {
|
|
esp_intr_free( _interruptHandle );
|
|
}
|
|
|
|
static SmartLed*& IRAM_ATTR ledForChannel( int channel );
|
|
static void IRAM_ATTR interruptHandler( void* );
|
|
|
|
void IRAM_ATTR copyRmtHalfBlock();
|
|
|
|
void swapBuffers() {
|
|
if ( _secondBuffer )
|
|
_firstBuffer.swap( _secondBuffer );
|
|
}
|
|
|
|
void startTransmission() {
|
|
// Invalid use of the library
|
|
if( xSemaphoreTake( _finishedFlag, 0 ) != pdTRUE )
|
|
abort();
|
|
|
|
_pixelPosition = _componentPosition = _halfIdx = 0;
|
|
copyRmtHalfBlock();
|
|
if ( _pixelPosition < _count )
|
|
copyRmtHalfBlock();
|
|
|
|
RMT.conf_ch[ _channel ].conf1.mem_rd_rst = 1;
|
|
RMT.conf_ch[ _channel ].conf1.tx_start = 1;
|
|
}
|
|
|
|
static bool anyAlive() {
|
|
for ( int i = 0; i != 8; i++ )
|
|
if ( ledForChannel( i ) != nullptr ) return true;
|
|
return false;
|
|
}
|
|
|
|
const LedType& _timing;
|
|
int _channel;
|
|
detail::RmtPulsePair _bitToRmt[ 2 ];
|
|
int _count;
|
|
std::unique_ptr< Rgb[] > _firstBuffer;
|
|
std::unique_ptr< Rgb[] > _secondBuffer;
|
|
Rgb *_buffer;
|
|
|
|
xSemaphoreHandle _finishedFlag;
|
|
|
|
int _pixelPosition;
|
|
int _componentPosition;
|
|
int _halfIdx;
|
|
};
|
|
|
|
class Apa102 {
|
|
public:
|
|
struct ApaRgb {
|
|
ApaRgb( uint8_t r = 0, uint8_t g = 0, uint32_t b = 0, uint32_t v = 0xFF )
|
|
: v( 0xE0 | v ), b( b ), g( g ), r( r )
|
|
{}
|
|
|
|
ApaRgb& operator=( const Rgb& o ) {
|
|
r = o.r;
|
|
g = o.g;
|
|
b = o.b;
|
|
return *this;
|
|
}
|
|
|
|
ApaRgb& operator=( const Hsv& o ) {
|
|
*this = Rgb{ o };
|
|
return *this;
|
|
}
|
|
|
|
uint8_t v, b, g, r;
|
|
};
|
|
|
|
static const int FINAL_FRAME_SIZE = 4;
|
|
static const int TRANS_COUNT = 2 + 8;
|
|
|
|
Apa102( int count, int clkpin, int datapin, BufferType doubleBuffer = SingleBuffer )
|
|
: _count( count ),
|
|
_firstBuffer( new ApaRgb[ count ] ),
|
|
_secondBuffer( doubleBuffer ? new ApaRgb[ count ] : nullptr ),
|
|
_initFrame( 0 )
|
|
{
|
|
spi_bus_config_t buscfg;
|
|
memset( &buscfg, 0, sizeof( buscfg ) );
|
|
buscfg.mosi_io_num = datapin;
|
|
buscfg.miso_io_num = -1;
|
|
buscfg.sclk_io_num = clkpin;
|
|
buscfg.quadwp_io_num = -1;
|
|
buscfg.quadhd_io_num = -1;
|
|
buscfg.max_transfer_sz = 65535;
|
|
|
|
spi_device_interface_config_t devcfg;
|
|
memset( &devcfg, 0, sizeof( devcfg ) );
|
|
devcfg.clock_speed_hz = 1000000;
|
|
devcfg.mode = 0;
|
|
devcfg.spics_io_num = -1;
|
|
devcfg.queue_size = TRANS_COUNT;
|
|
devcfg.pre_cb = nullptr;
|
|
|
|
auto ret = spi_bus_initialize( HSPI_HOST, &buscfg, 1 );
|
|
assert( ret == ESP_OK );
|
|
|
|
ret = spi_bus_add_device( HSPI_HOST, &devcfg, &_spi );
|
|
assert( ret == ESP_OK );
|
|
|
|
std::fill_n( _finalFrame, FINAL_FRAME_SIZE, 0xFFFFFFFF );
|
|
}
|
|
|
|
~Apa102() {
|
|
// ToDo
|
|
}
|
|
|
|
ApaRgb& operator[]( int idx ) {
|
|
return _firstBuffer[ idx ];
|
|
}
|
|
|
|
const ApaRgb& operator[]( int idx ) const {
|
|
return _firstBuffer[ idx ];
|
|
}
|
|
|
|
void show() {
|
|
_buffer = _firstBuffer.get();
|
|
startTransmission();
|
|
swapBuffers();
|
|
}
|
|
|
|
void wait() {
|
|
for ( int i = 0; i != _transCount; i++ ) {
|
|
spi_transaction_t *t;
|
|
spi_device_get_trans_result( _spi, &t, portMAX_DELAY );
|
|
}
|
|
}
|
|
private:
|
|
void swapBuffers() {
|
|
if ( _secondBuffer )
|
|
_firstBuffer.swap( _secondBuffer );
|
|
}
|
|
|
|
void startTransmission() {
|
|
for ( int i = 0; i != TRANS_COUNT; i++ ) {
|
|
_transactions[ i ].cmd = 0;
|
|
_transactions[ i ].addr = 0;
|
|
_transactions[ i ].flags = 0;
|
|
_transactions[ i ].rxlength = 0;
|
|
_transactions[ i ].rx_buffer = nullptr;
|
|
}
|
|
// Init frame
|
|
_transactions[ 0 ].length = 32;
|
|
_transactions[ 0 ].tx_buffer = &_initFrame;
|
|
spi_device_queue_trans( _spi, _transactions + 0, portMAX_DELAY );
|
|
// Data
|
|
_transactions[ 1 ].length = 32 * _count;
|
|
_transactions[ 1 ].tx_buffer = _buffer;
|
|
spi_device_queue_trans( _spi, _transactions + 1, portMAX_DELAY );
|
|
_transCount = 2;
|
|
// End frame
|
|
for ( int i = 0; i != 1 + _count / 32 / FINAL_FRAME_SIZE; i++ ) {
|
|
_transactions[ 2 + i ].length = 32 * FINAL_FRAME_SIZE;
|
|
_transactions[ 2 + i ].tx_buffer = _finalFrame;
|
|
spi_device_queue_trans( _spi, _transactions + 2 + i, portMAX_DELAY );
|
|
_transCount++;
|
|
}
|
|
}
|
|
|
|
spi_device_handle_t _spi;
|
|
int _count;
|
|
std::unique_ptr< ApaRgb[] > _firstBuffer, _secondBuffer;
|
|
ApaRgb *_buffer;
|
|
|
|
spi_transaction_t _transactions[ TRANS_COUNT ];
|
|
int _transCount;
|
|
|
|
uint32_t _initFrame;
|
|
uint32_t _finalFrame[ FINAL_FRAME_SIZE ];
|
|
};
|
|
|
|
class LDP8806 {
|
|
public:
|
|
struct LDP8806_GRB {
|
|
|
|
LDP8806_GRB( uint8_t g_7bit = 0, uint8_t r_7bit = 0, uint32_t b_7bit = 0 )
|
|
: g( g_7bit ), r( r_7bit ), b( b_7bit )
|
|
{
|
|
}
|
|
|
|
LDP8806_GRB& operator=( const Rgb& o ) {
|
|
//Convert 8->7bit colour
|
|
r = ( o.r * 127 / 256 ) | 0x80;
|
|
g = ( o.g * 127 / 256 ) | 0x80;
|
|
b = ( o.b * 127 / 256 ) | 0x80;
|
|
return *this;
|
|
}
|
|
|
|
LDP8806_GRB& operator=( const Hsv& o ) {
|
|
*this = Rgb{ o };
|
|
return *this;
|
|
}
|
|
|
|
uint8_t g, r, b;
|
|
};
|
|
|
|
static const int LED_FRAME_SIZE_BYTES = sizeof( LDP8806_GRB );
|
|
static const int LATCH_FRAME_SIZE_BYTES = 3;
|
|
static const int TRANS_COUNT_MAX = 20;//Arbitrary, supports up to 600 LED
|
|
|
|
LDP8806( int count, int clkpin, int datapin, BufferType doubleBuffer = SingleBuffer, uint32_t clock_speed_hz = 2000000 )
|
|
: _count( count ),
|
|
_firstBuffer( new LDP8806_GRB[ count ] ),
|
|
_secondBuffer( doubleBuffer ? new LDP8806_GRB[ count ] : nullptr ),
|
|
// one 'latch'/start-of-data mark frame for every 32 leds
|
|
_latchFrames( ( count + 31 ) / 32 )
|
|
{
|
|
spi_bus_config_t buscfg;
|
|
memset( &buscfg, 0, sizeof( buscfg ) );
|
|
buscfg.mosi_io_num = datapin;
|
|
buscfg.miso_io_num = -1;
|
|
buscfg.sclk_io_num = clkpin;
|
|
buscfg.quadwp_io_num = -1;
|
|
buscfg.quadhd_io_num = -1;
|
|
buscfg.max_transfer_sz = 65535;
|
|
|
|
spi_device_interface_config_t devcfg;
|
|
memset( &devcfg, 0, sizeof( devcfg ) );
|
|
devcfg.clock_speed_hz = clock_speed_hz;
|
|
devcfg.mode = 0;
|
|
devcfg.spics_io_num = -1;
|
|
devcfg.queue_size = TRANS_COUNT_MAX;
|
|
devcfg.pre_cb = nullptr;
|
|
|
|
auto ret = spi_bus_initialize( HSPI_HOST, &buscfg, 1 );
|
|
assert( ret == ESP_OK );
|
|
|
|
ret = spi_bus_add_device( HSPI_HOST, &devcfg, &_spi );
|
|
assert( ret == ESP_OK );
|
|
|
|
std::fill_n( _latchBuffer, LATCH_FRAME_SIZE_BYTES, 0x0 );
|
|
}
|
|
|
|
~LDP8806() {
|
|
// noop
|
|
}
|
|
|
|
LDP8806_GRB& operator[]( int idx ) {
|
|
return _firstBuffer[ idx ];
|
|
}
|
|
|
|
const LDP8806_GRB& operator[]( int idx ) const {
|
|
return _firstBuffer[ idx ];
|
|
}
|
|
|
|
void show() {
|
|
_buffer = _firstBuffer.get();
|
|
startTransmission();
|
|
swapBuffers();
|
|
}
|
|
|
|
void wait() {
|
|
while ( _transCount-- ) {
|
|
spi_transaction_t *t;
|
|
spi_device_get_trans_result( _spi, &t, portMAX_DELAY );
|
|
}
|
|
}
|
|
private:
|
|
void swapBuffers() {
|
|
if ( _secondBuffer )
|
|
_firstBuffer.swap( _secondBuffer );
|
|
}
|
|
|
|
void startTransmission() {
|
|
_transCount = 0;
|
|
for ( int i = 0; i != TRANS_COUNT_MAX; i++ ) {
|
|
_transactions[ i ].cmd = 0;
|
|
_transactions[ i ].addr = 0;
|
|
_transactions[ i ].flags = 0;
|
|
_transactions[ i ].rxlength = 0;
|
|
_transactions[ i ].rx_buffer = nullptr;
|
|
}
|
|
// LED Data
|
|
_transactions[ 0 ].length = ( LED_FRAME_SIZE_BYTES * 8 ) * _count;
|
|
_transactions[ 0 ].tx_buffer = _buffer;
|
|
spi_device_queue_trans( _spi, _transactions + _transCount, portMAX_DELAY );
|
|
_transCount++;
|
|
|
|
// 'latch'/start-of-data marker frames
|
|
for ( int i = 0; i < _latchFrames; i++ ) {
|
|
_transactions[ _transCount ].length = ( LATCH_FRAME_SIZE_BYTES * 8 );
|
|
_transactions[ _transCount ].tx_buffer = _latchBuffer;
|
|
spi_device_queue_trans( _spi, _transactions + _transCount, portMAX_DELAY );
|
|
_transCount++;
|
|
}
|
|
}
|
|
|
|
spi_device_handle_t _spi;
|
|
int _count;
|
|
std::unique_ptr< LDP8806_GRB[] > _firstBuffer, _secondBuffer;
|
|
LDP8806_GRB *_buffer;
|
|
|
|
spi_transaction_t _transactions[ TRANS_COUNT_MAX ];
|
|
int _transCount;
|
|
|
|
int _latchFrames;
|
|
uint8_t _latchBuffer[ LATCH_FRAME_SIZE_BYTES ];
|
|
};
|
|
|
|
#endif //SMARTLEDS_H
|