diff --git a/FeatureRequest.md b/FeatureRequest.md index e8bf3391..cf14a29b 100644 --- a/FeatureRequest.md +++ b/FeatureRequest.md @@ -11,6 +11,14 @@ ____ +#### #17 Direct InfluxDB connection + +* https://github.com/jomjol/AI-on-the-edge-device/issues/534 +* Direct interface to a InfluxDB data base +* Integrate InfluxDB interface in firmware +* Adapt html web page for configuration + + #### #16 Serial Communication * https://github.com/jomjol/AI-on-the-edge-device/issues/512 diff --git a/README.md b/README.md index 830b1a38..edcf0402 100644 --- a/README.md +++ b/README.md @@ -52,19 +52,21 @@ In other cases you can contact the developer via email: +#include +#include + +using namespace std; + +static esp_err_t get_tflite_file_handler(httpd_req_t *req){ + DIR *verzeichnis; + struct dirent *files; + + std::string _filename, _fileext, _result = ""; + std::string _delimiter = "."; + size_t pos = 0; + + verzeichnis=opendir("/sdcard/config"); + + printf("Suche TFLITE in /sdcard/config\n"); + + while((files = readdir(verzeichnis))) + { + _filename = files->d_name; + _fileext = _filename; + printf("File: %s\t", _filename.c_str()); + + while ((pos = _fileext.find(_delimiter))) { + _fileext.erase(0, pos + _delimiter.length()); + } + + printf(" Extension: %s\n", _fileext.c_str()); + + if ((_fileext == "tfl") || (_fileext == "tflite")) + { + _result = _result + _filename + "\t"; + } + } + closedir(verzeichnis); + + httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*"); + httpd_resp_set_type(req, "text/plain"); + httpd_resp_sendstr_chunk(req, _result.c_str()); + httpd_resp_sendstr_chunk(req, NULL); + return ESP_OK; +} + + /* Handler to redirect incoming GET request for /index.html to / * This can be overridden by uploading file with same name */ // static esp_err_t index_html_get_handler(httpd_req_t *req) @@ -804,4 +850,15 @@ void register_server_file_uri(httpd_handle_t server, const char *base_path) }; httpd_register_uri_handler(server, &file_delete); + + /* URI handler for getting tflite files from server */ +/* + httpd_uri_t file_tflite = { + .uri = "/tflite", // Match all URIs of type /delete/path/to/file + .method = HTTP_GET, + .handler = get_tflite_file_handler, + .user_ctx = server_data // Pass server data as context + }; + httpd_register_uri_handler(server, &file_tflite); +*/ } diff --git a/code/main/server_main.cpp b/code/main/server_main.cpp index a180aa03..4f2f0ce4 100644 --- a/code/main/server_main.cpp +++ b/code/main/server_main.cpp @@ -378,7 +378,7 @@ httpd_handle_t start_webserver(void) config.server_port = 80; config.ctrl_port = 32768; config.max_open_sockets = 5; //20210921 --> vorher 7 - config.max_uri_handlers = 24; + config.max_uri_handlers = 30; // vorher 24 config.max_resp_headers = 8; config.backlog_conn = 5; config.lru_purge_enable = true; // dadurch werden alte Verbindungen gekappt, falls neue benögt werden. diff --git a/code/main/version.cpp b/code/main/version.cpp index 9405857c..e6902d77 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="8dd3a92"; +const char* GIT_REV="63d336b"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2022-01-04 21:10"; \ No newline at end of file +const char* BUILD_TIME="2022-01-09 09:39"; \ No newline at end of file diff --git a/code/main/version.h b/code/main/version.h index 6b83203d..5411f815 100644 --- a/code/main/version.h +++ b/code/main/version.h @@ -13,7 +13,7 @@ extern "C" #include "Helper.h" #include -const char* GIT_BASE_BRANCH = "master - v10.0.2 - 2022-01-01"; +const char* GIT_BASE_BRANCH = "master - v10.1.0 - 2022-01-09"; const char* git_base_branch(void) diff --git a/code/version.cpp b/code/version.cpp index 9405857c..e6902d77 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="8dd3a92"; +const char* GIT_REV="63d336b"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2022-01-04 21:10"; \ No newline at end of file +const char* BUILD_TIME="2022-01-09 09:39"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 928935bb..3867cbb2 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/dig-s2-q-20220104.tflite b/firmware/dig-s2-q-20220104.tflite deleted file mode 100644 index 638a0bbe..00000000 Binary files a/firmware/dig-s2-q-20220104.tflite and /dev/null differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 4dfc6117..909666f7 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/sd-card/config/ana-s3-q-20220105.tflite b/sd-card/config/ana-s3-q-20220105.tflite new file mode 100644 index 00000000..5718b1ec Binary files /dev/null and b/sd-card/config/ana-s3-q-20220105.tflite differ diff --git a/sd-card/config/ana0700s1lq.tflite b/sd-card/config/ana0700s1lq.tflite deleted file mode 100644 index 531c1a2d..00000000 Binary files a/sd-card/config/ana0700s1lq.tflite and /dev/null differ diff --git a/sd-card/config/config.ini b/sd-card/config/config.ini index a67ee2d5..6f359636 100644 --- a/sd-card/config/config.ini +++ b/sd-card/config/config.ini @@ -29,7 +29,7 @@ main.dig2 343 126 30 54 main.dig3 391 126 30 54 [Analog] -Model = /config/ana0910s3_longq.tflite +Model = /config/ana-s3-q-20220105.tflite ;LogImageLocation = /log/analog ;LogfileRetentionInDays = 3 ModelInputSize = 32 32 @@ -44,7 +44,7 @@ main.DecimalShift = 0 PreValueUse = true PreValueAgeStartup = 720 AllowNegativeRates = false -main.MaxRateValue = 0.1 +main.MaxRateValue = 0.05 ErrorMessage = true CheckDigitIncreaseConsistency = false diff --git a/sd-card/config/dig-s1-q-20220102.tflite b/sd-card/config/dig-s1-q-20220102.tflite deleted file mode 100644 index 19a515b8..00000000 Binary files a/sd-card/config/dig-s1-q-20220102.tflite and /dev/null differ diff --git a/sd-card/config/dig-s1-q-20220102.zip b/sd-card/config/dig-s1-q-20220102.zip deleted file mode 100644 index 13861d21..00000000 Binary files a/sd-card/config/dig-s1-q-20220102.zip and /dev/null differ