diff --git a/README.md b/README.md
index f52cbb53..94cdc706 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,8 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571
##### Rolling - (2020-09-10)
+* Optimization of "DELETE ALL" - Autoreload of directory after delete, protection of wlan.ini
+* Internal Optimization (removal of unnessary error messages, restructure CTfLiteClass)
* additional parameter in `wasserzahler.html?noerror=true` to suppress an potential error message in case of consitency check (is equal to `ErrorMessage` = False in `config.ini`)
* update ROI-configurator, in case of no ROIs defined
diff --git a/code/lib/jomjol_fileserver_ota/server_file.cpp b/code/lib/jomjol_fileserver_ota/server_file.cpp
index 7109d7dd..e00f6b84 100644
--- a/code/lib/jomjol_fileserver_ota/server_file.cpp
+++ b/code/lib/jomjol_fileserver_ota/server_file.cpp
@@ -140,13 +140,21 @@ static esp_err_t http_resp_dir_html(httpd_req_t *req, const char *dirpath)
///////////////////////////////
+ std::string _zw = std::string(dirpath);
+ _zw = _zw.substr(8, _zw.length() - 8);
+ _zw = "/delete/" + _zw + "?task=deldircontent";
+
/* Send file-list table definition and column labels */
httpd_resp_sendstr_chunk(req,
"
"
""
- "| Name | Type | Size (Bytes) | Delete
|
"
- "");
+ "| Name | Type | Size (Bytes) | Delete "
+ ""
+ " |
\n");
/* Iterate over all files / folders and fetch their names and sizes */
while ((entry = readdir(dir)) != NULL) {
@@ -460,12 +468,19 @@ static esp_err_t delete_post_handler(httpd_req_t *req)
}
zw = std::string(filename);
zw = zw.substr(0, zw.length()-1);
+ directory = "/fileserver" + zw + "/";
zw = "/sdcard" + zw;
printf("Directory to delete: %s\n", zw.c_str());
delete_all_in_directory(zw);
- directory = std::string(filepath);
+// directory = std::string(filepath);
+// directory = "/fileserver" + directory;
printf("Location after delete directory content: %s\n", directory.c_str());
+ /* Redirect onto root to see the updated file list */
+// httpd_resp_set_status(req, "303 See Other");
+// httpd_resp_set_hdr(req, "Location", directory.c_str());
+// httpd_resp_sendstr(req, "File deleted successfully");
+// return ESP_OK;
}
else
{
@@ -544,10 +559,12 @@ void delete_all_in_directory(std::string _directory)
/* Iterate over all files / folders and fetch their names and sizes */
while ((entry = readdir(dir)) != NULL) {
if (!(entry->d_type == DT_DIR)){
- filename = _directory + "/" + std::string(entry->d_name);
- ESP_LOGI(TAG, "Deleting file : %s", filename.c_str());
- /* Delete file */
- unlink(filename.c_str());
+ if (strcmp("wlan.ini", entry->d_name) != 0){ // auf wlan.ini soll nicht zugegriffen werden !!!
+ filename = _directory + "/" + std::string(entry->d_name);
+ ESP_LOGI(TAG, "Deleting file : %s", filename.c_str());
+ /* Delete file */
+ unlink(filename.c_str());
+ }
};
}
closedir(dir);
diff --git a/code/lib/jomjol_image_proc/CFindTemplate._h_ b/code/lib/jomjol_image_proc/CFindTemplate._h_
deleted file mode 100644
index 2f58e38d..00000000
--- a/code/lib/jomjol_image_proc/CFindTemplate._h_
+++ /dev/null
@@ -1,87 +0,0 @@
-#pragma once
-
-
-#ifndef __CFINDTEMPLATE
-#define __CFINGTEMPLATE
-
-#include
-#include
-
-#define _USE_MATH_DEFINES
-#include
-
-#include
-
-#include "stb_image.h"
-#include "stb_image_write.h"
-#include "stb_image_resize.h"
-
-
-
-class CImageBasis
-{
- protected:
- uint8_t* rgb_image;
- int channels;
- int width, height, bpp;
- bool externalImage;
- std::string filename;
-
- void memCopy(uint8_t* _source, uint8_t* _target, int _size);
- public:
- int getWidth(){return this->width;};
- int getHeight(){return this->width;};
- int getChannels(){return this->channels;};
-
- CImageBasis();
- CImageBasis(std::string _image);
- CImageBasis(uint8_t* _rgb_image, int _channels, int _width, int _height, int _bpp);
- uint8_t GetPixelColor(int x, int y, int ch);
-
- ~CImageBasis();
-
- void SaveToFile(std::string _imageout);
-};
-
-class CFindTemplate : public CImageBasis
-{
- public:
- CFindTemplate(std::string _image);
-
- void FindTemplate(std::string _template, int* found_x, int* found_y, std::string _imageout);
- void FindTemplate(std::string _template, int* found_x, int* found_y, int _dx, int _dy, std::string _imageout);
- void FindTemplate(std::string _template, int* found_x, int* found_y);
- void FindTemplate(std::string _template, int* found_x, int* found_y, int _dx, int _dy);
-};
-
-class CRotate: public CImageBasis
-{
- public:
- CRotate(std::string _image) : CImageBasis(_image) {};
- CRotate(uint8_t* _rgb_image, int _channels, int _width, int _height, int _bpp) : CImageBasis(_rgb_image, _channels, _width, _height, _bpp) {};
-
- void Rotate(float _angle);
- void Rotate(float _angle, int _centerx, int _centery);
- void Translate(int _dx, int _dy);
-};
-
-
-class CAlignAndCutImage : public CImageBasis
-{
- public:
- CAlignAndCutImage(std::string _image) : CImageBasis(_image) {};
-
- void Align(std::string _template0, int ref0_x, int ref0_y, std::string _template1, int ref1_x, int ref1_y, int deltax, int deltay);
- void CutAndSave(std::string _template1, int x1, int y1, int dx, int dy);
-};
-
-
-class CResizeImage : public CImageBasis
-{
-public:
- CResizeImage(std::string _image) : CImageBasis(_image) {};
- void Resize(int _new_dx, int _new_dy);
-};
-
-#endif
-
diff --git a/code/lib/jomjol_image_proc/CFindTemplate.cp__p b/code/lib/jomjol_image_proc/CFindTemplate.cp__p
deleted file mode 100644
index 106e2568..00000000
--- a/code/lib/jomjol_image_proc/CFindTemplate.cp__p
+++ /dev/null
@@ -1,366 +0,0 @@
-#include "CFindTemplate.h"
-#include "Helper.h"
-
-#define _USE_MATH_DEFINES
-#include
-#include
-
-#define _ESP32_PSRAM
-
-using namespace std;
-
-#define GET_MEMORY malloc
-
-
-uint8_t CImageBasis::GetPixelColor(int x, int y, int ch)
-{
- stbi_uc* p_source;
- p_source = this->rgb_image + (this->channels * (y * this->width + x));
- return p_source[channels];
-}
-
-void CResizeImage::Resize(int _new_dx, int _new_dy)
-{
- int memsize = _new_dx * _new_dy * this->channels;
- uint8_t* odata = (unsigned char*)GET_MEMORY(memsize);
-
- stbir_resize_uint8(this->rgb_image, this->width, this->height, 0, odata, _new_dx, _new_dy, 0, this->channels);
-
- stbi_image_free(this->rgb_image);
- this->rgb_image = (unsigned char*)GET_MEMORY(memsize);
-
- this->memCopy(odata, this->rgb_image, memsize);
- this->width = _new_dx;
- this->height = _new_dy;
- stbi_image_free(odata);
-}
-
-void CRotate::Rotate(float _angle, int _centerx, int _centery)
-{
- float m[2][3];
-
- float x_center = _centerx;
- float y_center = _centery;
- _angle = _angle / 180 * M_PI;
-
- m[0][0] = cos(_angle);
- m[0][1] = sin(_angle);
- m[0][2] = (1 - m[0][0]) * x_center - m[0][1] * y_center;
-
- m[1][0] = -m[0][1];
- m[1][1] = m[0][0];
- m[1][2] = m[0][1] * x_center + (1 - m[0][0]) * y_center;
-
- int memsize = this->width * this->height * this->channels;
- uint8_t* odata = (unsigned char*)GET_MEMORY(memsize);
-
- int x_source, y_source;
- stbi_uc* p_target;
- stbi_uc* p_source;
-
- for (int x = 0; x < this->width; ++x)
- for (int y = 0; y < this->height; ++y)
- {
- p_target = odata + (this->channels * (y * this->width + x));
-
- x_source = int(m[0][0] * x + m[0][1] * y);
- y_source = int(m[1][0] * x + m[1][1] * y);
-
- x_source += int(m[0][2]);
- y_source += int(m[1][2]);
-
- if ((x_source >= 0) && (x_source < this->width) && (y_source >= 0) && (y_source < this->height))
- {
- p_source = this->rgb_image + (this->channels * (y_source * this->width + x_source));
- for (int channels = 0; channels < this->channels; ++channels)
- p_target[channels] = p_source[channels];
- }
- else
- {
- for (int channels = 0; channels < this->channels; ++channels)
- p_target[channels] = 255;
- }
- }
-
- // memcpy(this->rgb_image, odata, memsize);
- this->memCopy(odata, this->rgb_image, memsize);
- stbi_image_free(odata);
-}
-
-void CRotate::Rotate(float _angle)
-{
- this->Rotate(_angle, this->width / 2, this->height / 2);
-}
-
-void CRotate::Translate(int _dx, int _dy)
-{
- int memsize = this->width * this->height * this->channels;
- uint8_t* odata = (unsigned char*)GET_MEMORY(memsize);
-
-
- int x_source, y_source;
- stbi_uc* p_target;
- stbi_uc* p_source;
-
- for (int x = 0; x < this->width; ++x)
- for (int y = 0; y < this->height; ++y)
- {
- p_target = odata + (this->channels * (y * this->width + x));
-
- x_source = x - _dx;
- y_source = y - _dy;
-
- if ((x_source >= 0) && (x_source < this->width) && (y_source >= 0) && (y_source < this->height))
- {
- p_source = this->rgb_image + (this->channels * (y_source * this->width + x_source));
- for (int channels = 0; channels < this->channels; ++channels)
- p_target[channels] = p_source[channels];
- }
- else
- {
- for (int channels = 0; channels < this->channels; ++channels)
- p_target[channels] = 255;
- }
- }
-
- // memcpy(this->rgb_image, odata, memsize);
- this->memCopy(odata, this->rgb_image, memsize);
- stbi_image_free(odata);
-}
-
-
-
-CFindTemplate::CFindTemplate(std::string _image)
-{
- this->channels = 1;
- this->rgb_image = stbi_load(_image.c_str(), &(this->width), &(this->height), &(this->bpp), this->channels);
-}
-
-void CFindTemplate::FindTemplate(std::string _template, int* found_x, int* found_y)
-{
- this->FindTemplate(_template, found_x, found_y, 0, 0);
-}
-
-void CFindTemplate::FindTemplate(std::string _template, int* found_x, int* found_y, int _dx, int _dy)
-{
- int tpl_width, tpl_height, tpl_bpp;
- uint8_t* rgb_template = stbi_load(_template.c_str(), &tpl_width, &tpl_height, &tpl_bpp, this->channels);
-
- int ow, ow_start, ow_stop;
- int oh, oh_start, oh_stop;
-
- if (_dx == 0)
- {
- _dx = this->width;
- *found_x = 0;
- }
-
- if (_dy == 0)
- {
- _dy = this->height;
- *found_y = 0;
- }
-
-
- ow_start = *found_x - _dx;
- ow_start = std::max(ow_start, 0);
- ow_stop = *found_x + _dx;
- if ((ow_stop + tpl_width) > this->width)
- ow_stop = this->width - tpl_width;
- ow = ow_stop - ow_start + 1;
-
- oh_start = *found_y - _dy;
- oh_start = std::max(oh_start, 0);
- oh_stop = *found_y + _dy;
- if ((oh_stop + tpl_height) > this->height)
- oh_stop = this->height - tpl_height;
- oh = oh_stop - oh_start + 1;
-
- uint8_t* odata = (unsigned char*)GET_MEMORY(ow * oh * this->channels);
-
- double aktSAD;
- double minSAD = pow(tpl_width * tpl_height * 255, 2);
-
- for (int xouter = ow_start; xouter <= ow_stop; xouter++)
- for (int youter = oh_start; youter <= oh_stop; ++youter)
- {
- aktSAD = 0;
- for (int tpl_x = 0; tpl_x < tpl_width; tpl_x++)
- for (int tpl_y = 0; tpl_y < tpl_height; tpl_y++)
- {
- stbi_uc* p_org = this->rgb_image + (this->channels * ((youter + tpl_y) * this->width + (xouter + tpl_x)));
- stbi_uc* p_tpl = rgb_template + (this->channels * (tpl_y * tpl_width + tpl_x));
- aktSAD += pow(p_tpl[0] - p_org[0], 2);
- }
- stbi_uc* p_out = odata + (this->channels * ((youter - oh_start) * ow + (xouter - ow_start)));
-
- p_out[0] = int(sqrt(aktSAD / (tpl_width * tpl_height)));
- if (aktSAD < minSAD)
- {
- minSAD = aktSAD;
- *found_x = xouter;
- *found_y = youter;
- }
- }
-
- stbi_image_free(odata);
- stbi_image_free(rgb_template);
-}
-
-void CFindTemplate::FindTemplate(std::string _template, int* found_x, int* found_y, std::string _imageout)
-{
- this->FindTemplate(_template, found_x, found_y);
- this->SaveToFile(_imageout);
-}
-
-void CFindTemplate::FindTemplate(std::string _template, int* found_x, int* found_y, int _dx, int _dy, std::string _imageout)
-{
- this->FindTemplate(_template, found_x, found_y, _dx, _dy);
- this->SaveToFile(_imageout);
-}
-
-
-
-void CImageBasis::memCopy(uint8_t* _source, uint8_t* _target, int _size)
-{
-#ifdef _ESP32_PSRAM
- for (int i = 0; i < _size; ++i)
- *(_target + i) = *(_source + i);
-#else
- memcpy(_target, _source, _size);
-#endif
-}
-
-CImageBasis::CImageBasis()
-{
- this->externalImage = false;
-}
-
-CImageBasis::CImageBasis(std::string _image)
-{
-// printf("Start CImageBasis\n");
- channels = 3;
- externalImage = false;
- filename = _image;
-// printf("CImageBasis before load\n");
-// printf(_image.c_str()); printf("\n");
- rgb_image = stbi_load(_image.c_str(), &width, &height, &bpp, channels);
- if (!rgb_image)
- {
- printf("Datei konnte nicht geoeffnet werden\n");
- return;
- }
-// printf("CImageBasis after load\n");
-// printf("w %d, h %d, b %d, c %d\n", width, height, bpp, channels);
-}
-
-CImageBasis::CImageBasis(uint8_t* _rgb_image, int _channels, int _width, int _height, int _bpp)
-{
- rgb_image = _rgb_image;
- channels = _channels;
- width = _width;
- height = _height;
- bpp = _bpp;
- externalImage = true;
-}
-
-CImageBasis::~CImageBasis()
-{
- if (!externalImage)
- stbi_image_free(rgb_image);
-}
-
-void CImageBasis::SaveToFile(std::string _imageout)
-{
- string typ = getFileType(_imageout);
-
- if ((typ == "jpg") || (typ == "JPG")) // ACHTUNG PROBLEMATISCH IM ESP32
- {
- stbi_write_jpg(_imageout.c_str(), this->width, this->height, this->channels, this->rgb_image, 0);
- }
-
- if ((typ == "bmp") || (typ == "BMP"))
- {
- stbi_write_bmp(_imageout.c_str(), this->width, this->height, this->channels, this->rgb_image);
- }
- // stbi_write_jpg(_imageout.c_str(), this->width, this->height, this->channels, this->rgb_image, 0);
- // stbi_write_bmp(_imageout.c_str(), this->width, this->height, this->channels, this->rgb_image);
-}
-
-
-
-void CAlignAndCutImage::Align(std::string _template0, int ref0_x, int ref0_y, std::string _template1, int ref1_x, int ref1_y, int deltax = 40, int deltay = 40)
-{
- int dx, dy;
- int r0_x, r0_y, r1_x, r1_y;
-
- CFindTemplate* ft = new CFindTemplate(this->filename);
-
- r0_x = ref0_x;
- r0_y = ref0_y;
- ft->FindTemplate(_template0, &r0_x, &r0_y, deltax, deltay);
-
- r1_x = ref1_x;
- r1_y = ref1_y;
- ft->FindTemplate(_template1, &r1_x, &r1_y, deltax, deltay);
-
- delete ft;
-
-
- dx = ref0_x - r0_x;
- dy = ref0_y - r0_y;
-
- r0_x += dx;
- r0_y += dy;
-
- r1_x += dx;
- r1_y += dy;
-
- float w_org, w_ist, d_winkel;
-
- w_org = atan2(ref1_y - ref0_y, ref1_x - ref0_x);
- w_ist = atan2(r1_y - r0_y, r1_x - r0_x);
-
- d_winkel = -(w_org - w_ist) * 180 / M_PI;
-
- CRotate rt(this->rgb_image, this->channels, this->width, this->height, this->bpp);
- rt.Translate(dx, dy);
- rt.Rotate(d_winkel, ref0_x, ref0_y);
- printf("Alignment: dx %d - dy %d - rot %f\n", dx, dy, d_winkel);
-}
-
-void CAlignAndCutImage::CutAndSave(std::string _template1, int x1, int y1, int dx, int dy)
-{
-
- int x2, y2;
-
- x2 = x1 + dx;
- y2 = y1 + dy;
- x2 = min(x2, this->width - 1);
- y2 = min(y2, this->height - 1);
-
- dx = x2 - x1;
- dy = y2 - y1;
-
- int memsize = dx * dy * this->channels;
- uint8_t* odata = (unsigned char*)GET_MEMORY(memsize);
-
-
- int x_source, y_source;
- stbi_uc* p_target;
- stbi_uc* p_source;
-
- for (int x = x1; x < x2; ++x)
- for (int y = y1; y < y2; ++y)
- {
- p_target = odata + (this->channels * ((y - y1) * dx + (x - x1)));
- p_source = this->rgb_image + (this->channels * (y * this->width + x));
- for (int channels = 0; channels < this->channels; ++channels)
- p_target[channels] = p_source[channels];
- }
-
- // stbi_write_jpg(_template1.c_str(), dx, dy, this->channels, odata, 0);
- stbi_write_bmp(_template1.c_str(), dx, dy, this->channels, odata);
-
- stbi_image_free(odata);
-}
diff --git a/code/lib/jomjol_tfliteclass/CTfLiteClass._cpp_old b/code/lib/jomjol_tfliteclass/CTfLiteClass._cpp_old
new file mode 100644
index 00000000..dcd56ce0
--- /dev/null
+++ b/code/lib/jomjol_tfliteclass/CTfLiteClass._cpp_old
@@ -0,0 +1,254 @@
+#include "CTfLiteClass.h"
+
+#include "bitmap_image.hpp"
+
+#include
+
+float CTfLiteClass::GetOutputValue(int nr)
+{
+ TfLiteTensor* output2 = this->interpreter->output(0);
+
+ int numeroutput = output2->dims->data[1];
+ if ((nr+1) > numeroutput)
+ return -1000;
+
+ return output2->data.f[nr];
+}
+
+
+int CTfLiteClass::GetClassFromImage(std::string _fn)
+{
+// printf("Before Load image %s\n", _fn.c_str());
+ if (!LoadInputImage(_fn))
+ return -1000;
+// printf("After Load image %s\n", _fn.c_str());
+
+ Invoke();
+ printf("After Invoke %s\n", _fn.c_str());
+
+ return GetOutClassification();
+// return 0;
+}
+
+int CTfLiteClass::GetOutClassification()
+{
+ TfLiteTensor* output2 = interpreter->output(0);
+
+ float zw_max = 0;
+ float zw;
+ int zw_class = -1;
+
+ if (output2 == NULL)
+ return -1;
+
+ int numeroutput = output2->dims->data[1];
+ for (int i = 0; i < numeroutput; ++i)
+ {
+ zw = output2->data.f[i];
+ if (zw > zw_max)
+ {
+ zw_max = zw;
+ zw_class = i;
+ }
+ }
+// printf("Result Ziffer: %d\n", zw_class);
+ return zw_class;
+}
+
+void CTfLiteClass::GetInputDimension(bool silent = false)
+{
+ TfLiteTensor* input2 = this->interpreter->input(0);
+
+ int numdim = input2->dims->size;
+ if (!silent) printf("NumDimension: %d\n", numdim);
+
+ int sizeofdim;
+ for (int j = 0; j < numdim; ++j)
+ {
+ sizeofdim = input2->dims->data[j];
+ if (!silent) printf("SizeOfDimension %d: %d\n", j, sizeofdim);
+ if (j == 1) im_height = sizeofdim;
+ if (j == 2) im_width = sizeofdim;
+ if (j == 3) im_channel = sizeofdim;
+ }
+}
+
+
+void CTfLiteClass::GetOutPut()
+{
+ TfLiteTensor* output2 = this->interpreter->output(0);
+
+ int numdim = output2->dims->size;
+ printf("NumDimension: %d\n", numdim);
+
+ int sizeofdim;
+ for (int j = 0; j < numdim; ++j)
+ {
+ sizeofdim = output2->dims->data[j];
+ printf("SizeOfDimension %d: %d\n", j, sizeofdim);
+ }
+
+
+ float fo;
+
+ // Process the inference results.
+ int numeroutput = output2->dims->data[1];
+ for (int i = 0; i < numeroutput; ++i)
+ {
+ fo = output2->data.f[i];
+ printf("Result %d: %f\n", i, fo);
+ }
+}
+
+void CTfLiteClass::Invoke()
+{
+ interpreter->Invoke();
+// printf("Invoke Done.\n");
+}
+
+
+bool CTfLiteClass::LoadInputImage(std::string _fn)
+{
+ bitmap_image image(_fn);
+ unsigned int w = image.width();
+ unsigned int h = image.height();
+ unsigned char red, green, blue;
+
+ input_i = 0;
+ float* input_data_ptr = (interpreter->input(0))->data.f;
+
+ for (int y = 0; y < h; ++y)
+ for (int x = 0; x < w; ++x)
+ {
+ red = image.red_channel(x, y);
+ green = image.green_channel(x, y);
+ blue = image.blue_channel(x, y);
+ *(input_data_ptr) = (float) red;
+ input_data_ptr++;
+ *(input_data_ptr) = (float) green;
+ input_data_ptr++;
+ *(input_data_ptr) = (float) blue;
+ input_data_ptr++;
+
+// printf("BMP: %f %f %f\n", (float) red, (float) green, (float) blue);
+
+ }
+ return true;
+}
+
+
+void CTfLiteClass::MakeAllocate()
+{
+/*
+ this->micro_op_resolver.AddBuiltin(
+ tflite::BuiltinOperator_RESHAPE,
+ tflite::ops::micro::Register_RESHAPE());
+ this->micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_CONV_2D,
+ tflite::ops::micro::Register_CONV_2D());
+ this->micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_FULLY_CONNECTED,
+ tflite::ops::micro::Register_FULLY_CONNECTED());
+ this->micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_SOFTMAX,
+ tflite::ops::micro::Register_SOFTMAX());
+ this->micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_DEPTHWISE_CONV_2D,
+ tflite::ops::micro::Register_DEPTHWISE_CONV_2D());
+
+
+ this->interpreter = new tflite::MicroInterpreter(this->model, this->micro_op_resolver, this->tensor_arena, this->kTensorArenaSize, this->error_reporter);
+*/
+
+
+ static tflite::ops::micro::AllOpsResolver resolver;
+ this->interpreter = new tflite::MicroInterpreter(this->model, resolver, this->tensor_arena, this->kTensorArenaSize, this->error_reporter);
+
+ TfLiteStatus allocate_status = this->interpreter->AllocateTensors();
+ if (allocate_status != kTfLiteOk) {
+ TF_LITE_REPORT_ERROR(error_reporter, "AllocateTensors() failed");
+ this->GetInputDimension();
+ return;
+ }
+
+ printf("Allocate Done.\n");
+}
+
+void CTfLiteClass::GetInputTensorSize(){
+ float *zw = this->input;
+ int test = sizeof(zw);
+ printf("Input Tensor Dimension: %d\n", test);
+
+ printf("Input Tensor Dimension: %d\n", test);
+}
+
+long CTfLiteClass::GetFileSize(std::string filename)
+{
+ struct stat stat_buf;
+ long rc = stat(filename.c_str(), &stat_buf);
+ return rc == 0 ? stat_buf.st_size : -1;
+}
+
+
+unsigned char* CTfLiteClass::ReadFileToCharArray(std::string _fn)
+{
+ long size;
+
+ size = this->GetFileSize(_fn);
+
+ if (size == -1)
+ {
+ printf("\nFile existiert nicht.\n");
+ return NULL;
+ }
+
+
+ unsigned char *result = (unsigned char*) malloc(size);
+
+ if(result != NULL) {
+// printf("\nSpeicher ist reserviert\n");
+ FILE* f = fopen(_fn.c_str(), "rb"); // vorher nur "r"
+ fread(result, 1, size, f);
+ fclose(f);
+ }else {
+ printf("\nKein freier Speicher vorhanden.\n");
+ }
+
+
+ return result;
+}
+
+void CTfLiteClass::LoadModel(std::string _fn){
+
+
+ this->error_reporter = new tflite::MicroErrorReporter;
+
+ unsigned char *rd;
+ rd = this->ReadFileToCharArray(_fn.c_str());
+// printf("loadedfile: %d", (int) rd);
+
+ this->model = tflite::GetModel(rd);
+ free(rd);
+ TFLITE_MINIMAL_CHECK(model != nullptr);
+ printf("tfile Loaded.\n");
+
+}
+
+
+
+CTfLiteClass::CTfLiteClass()
+{
+// this->accessSD = _accessSD;
+ this->model = nullptr;
+ this->interpreter = nullptr;
+ this->input = nullptr;
+ this->output = nullptr;
+ this->kTensorArenaSize = 600 * 1024;
+ this->tensor_arena = new uint8_t[kTensorArenaSize];
+
+// micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_CONV_2D,
+// tflite::ops::micro::Register_CONV_2D());
+}
+
+CTfLiteClass::~CTfLiteClass()
+{
+ delete this->tensor_arena;
+}
+
+
diff --git a/code/lib/jomjol_tfliteclass/CTfLiteClass._h_old b/code/lib/jomjol_tfliteclass/CTfLiteClass._h_old
new file mode 100644
index 00000000..01d972bf
--- /dev/null
+++ b/code/lib/jomjol_tfliteclass/CTfLiteClass._h_old
@@ -0,0 +1,72 @@
+#pragma once
+
+#ifndef __CFINDTEMPLATE
+#define __CFINGTEMPLATE
+
+#define TFLITE_MINIMAL_CHECK(x) \
+ if (!(x)) { \
+ fprintf(stderr, "Error at %s:%d\n", __FILE__, __LINE__); \
+ exit(1); \
+ }
+
+//#include "CAccessSD.h"
+#include "CFindTemplate.h"
+
+#include "tensorflow/lite/micro/kernels/all_ops_resolver.h"
+#include "tensorflow/lite/micro/micro_error_reporter.h"
+#include "tensorflow/lite/micro/micro_interpreter.h"
+#include "tensorflow/lite/schema/schema_generated.h"
+#include "tensorflow/lite/version.h"
+#include "tensorflow/lite/micro/kernels/micro_ops.h"
+#include "esp_err.h"
+#include "esp_log.h"
+
+//extern CAccessSDClass accessSD;
+
+class CTfLiteClass
+{
+ protected:
+// CAccessSDClass *accessSD;
+
+ tflite::ErrorReporter* error_reporter;
+
+ const tflite::Model* model;
+ tflite::MicroInterpreter* interpreter;
+// TfLiteTensor* input = nullptr;
+ TfLiteTensor* output = nullptr;
+ static tflite::ops::micro::AllOpsResolver *resolver;
+
+ tflite::MicroOpResolver<5> micro_op_resolver;
+
+
+ int kTensorArenaSize;
+ uint8_t *tensor_arena;
+
+ float* input;
+ int input_i;
+
+ int im_height, im_width, im_channel;
+
+ long GetFileSize(std::string filename);
+ unsigned char* ReadFileToCharArray(std::string _fn);
+
+ public:
+// CTfLiteClass(CAccessSDClass *_accessSD);
+ CTfLiteClass();
+ ~CTfLiteClass();
+ void LoadModel(std::string _fn);
+ void MakeAllocate();
+ void GetInputTensorSize();
+ bool LoadInputImage(std::string _fn);
+ void Invoke();
+ void GetOutPut();
+ int GetOutClassification();
+ int GetClassFromImage(std::string _fn);
+
+ float GetOutputValue(int nr);
+ void GetInputDimension(bool silent);
+
+};
+
+
+#endif
\ No newline at end of file
diff --git a/code/lib/jomjol_tfliteclass/CTfLiteClass.cpp b/code/lib/jomjol_tfliteclass/CTfLiteClass.cpp
index dcd56ce0..5887436f 100644
--- a/code/lib/jomjol_tfliteclass/CTfLiteClass.cpp
+++ b/code/lib/jomjol_tfliteclass/CTfLiteClass.cpp
@@ -114,6 +114,8 @@ bool CTfLiteClass::LoadInputImage(std::string _fn)
unsigned int h = image.height();
unsigned char red, green, blue;
+// printf("Image: %s size: %d x %d\n", _fn.c_str(), w, h);
+
input_i = 0;
float* input_data_ptr = (interpreter->input(0))->data.f;
@@ -139,24 +141,6 @@ bool CTfLiteClass::LoadInputImage(std::string _fn)
void CTfLiteClass::MakeAllocate()
{
-/*
- this->micro_op_resolver.AddBuiltin(
- tflite::BuiltinOperator_RESHAPE,
- tflite::ops::micro::Register_RESHAPE());
- this->micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_CONV_2D,
- tflite::ops::micro::Register_CONV_2D());
- this->micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_FULLY_CONNECTED,
- tflite::ops::micro::Register_FULLY_CONNECTED());
- this->micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_SOFTMAX,
- tflite::ops::micro::Register_SOFTMAX());
- this->micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_DEPTHWISE_CONV_2D,
- tflite::ops::micro::Register_DEPTHWISE_CONV_2D());
-
-
- this->interpreter = new tflite::MicroInterpreter(this->model, this->micro_op_resolver, this->tensor_arena, this->kTensorArenaSize, this->error_reporter);
-*/
-
-
static tflite::ops::micro::AllOpsResolver resolver;
this->interpreter = new tflite::MicroInterpreter(this->model, resolver, this->tensor_arena, this->kTensorArenaSize, this->error_reporter);
@@ -167,7 +151,7 @@ void CTfLiteClass::MakeAllocate()
return;
}
- printf("Allocate Done.\n");
+// printf("Allocate Done.\n");
}
void CTfLiteClass::GetInputTensorSize(){
@@ -216,8 +200,11 @@ unsigned char* CTfLiteClass::ReadFileToCharArray(std::string _fn)
void CTfLiteClass::LoadModel(std::string _fn){
-
+#ifdef SUPRESS_TFLITE_ERRORS
+ this->error_reporter = new tflite::OwnMicroErrorReporter;
+#else
this->error_reporter = new tflite::MicroErrorReporter;
+#endif
unsigned char *rd;
rd = this->ReadFileToCharArray(_fn.c_str());
@@ -226,7 +213,7 @@ void CTfLiteClass::LoadModel(std::string _fn){
this->model = tflite::GetModel(rd);
free(rd);
TFLITE_MINIMAL_CHECK(model != nullptr);
- printf("tfile Loaded.\n");
+// printf("tfile Loaded.\n");
}
@@ -234,16 +221,12 @@ void CTfLiteClass::LoadModel(std::string _fn){
CTfLiteClass::CTfLiteClass()
{
-// this->accessSD = _accessSD;
this->model = nullptr;
this->interpreter = nullptr;
this->input = nullptr;
this->output = nullptr;
this->kTensorArenaSize = 600 * 1024;
- this->tensor_arena = new uint8_t[kTensorArenaSize];
-
-// micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_CONV_2D,
-// tflite::ops::micro::Register_CONV_2D());
+ this->tensor_arena = new uint8_t[kTensorArenaSize];
}
CTfLiteClass::~CTfLiteClass()
@@ -252,3 +235,12 @@ CTfLiteClass::~CTfLiteClass()
}
+namespace tflite {
+
+ int OwnMicroErrorReporter::Report(const char* format, va_list args) {
+ return 0;
+ }
+
+} // namespace tflite
+
+
diff --git a/code/lib/jomjol_tfliteclass/CTfLiteClass.h b/code/lib/jomjol_tfliteclass/CTfLiteClass.h
index 01d972bf..8beb48ba 100644
--- a/code/lib/jomjol_tfliteclass/CTfLiteClass.h
+++ b/code/lib/jomjol_tfliteclass/CTfLiteClass.h
@@ -1,7 +1,3 @@
-#pragma once
-
-#ifndef __CFINDTEMPLATE
-#define __CFINGTEMPLATE
#define TFLITE_MINIMAL_CHECK(x) \
if (!(x)) { \
@@ -9,9 +5,6 @@
exit(1); \
}
-//#include "CAccessSD.h"
-#include "CFindTemplate.h"
-
#include "tensorflow/lite/micro/kernels/all_ops_resolver.h"
#include "tensorflow/lite/micro/micro_error_reporter.h"
#include "tensorflow/lite/micro/micro_interpreter.h"
@@ -21,37 +14,44 @@
#include "esp_err.h"
#include "esp_log.h"
-//extern CAccessSDClass accessSD;
+
+
+#define SUPRESS_TFLITE_ERRORS // use, to avoid error messages from TFLITE
+
+#ifdef SUPRESS_TFLITE_ERRORS
+#include "tensorflow/lite/core/api/error_reporter.h"
+#include "tensorflow/lite/micro/compatibility.h"
+#include "tensorflow/lite/micro/debug_log.h"
+///// OwnErrorReporter to prevent printing of Errors (especially unavoidable in CalculateActivationRangeQuantized@kerne_util.cc)
+namespace tflite {
+ class OwnMicroErrorReporter : public ErrorReporter {
+ public:
+ int Report(const char* format, va_list args) override;
+ };
+} // namespace tflite
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#endif
class CTfLiteClass
{
protected:
-// CAccessSDClass *accessSD;
-
- tflite::ErrorReporter* error_reporter;
-
+ tflite::ErrorReporter *error_reporter;
const tflite::Model* model;
tflite::MicroInterpreter* interpreter;
-// TfLiteTensor* input = nullptr;
TfLiteTensor* output = nullptr;
static tflite::ops::micro::AllOpsResolver *resolver;
- tflite::MicroOpResolver<5> micro_op_resolver;
-
-
int kTensorArenaSize;
uint8_t *tensor_arena;
float* input;
int input_i;
-
int im_height, im_width, im_channel;
long GetFileSize(std::string filename);
unsigned char* ReadFileToCharArray(std::string _fn);
public:
-// CTfLiteClass(CAccessSDClass *_accessSD);
CTfLiteClass();
~CTfLiteClass();
void LoadModel(std::string _fn);
@@ -65,8 +65,5 @@ class CTfLiteClass
float GetOutputValue(int nr);
void GetInputDimension(bool silent);
-
};
-
-#endif
\ No newline at end of file
diff --git a/code/sdkconfig b/code/sdkconfig
index 8d7e12d6..12a3b16d 100644
--- a/code/sdkconfig
+++ b/code/sdkconfig
@@ -221,7 +221,7 @@ CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
CONFIG_ESP_INT_WDT_CHECK_CPU1=y
CONFIG_ESP_TASK_WDT=y
# CONFIG_ESP_TASK_WDT_PANIC is not set
-CONFIG_ESP_TASK_WDT_TIMEOUT_S=5
+CONFIG_ESP_TASK_WDT_TIMEOUT_S=60
CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=y
CONFIG_ETH_USE_ESP32_EMAC=y
@@ -649,7 +649,7 @@ CONFIG_INT_WDT_TIMEOUT_MS=300
CONFIG_INT_WDT_CHECK_CPU1=y
CONFIG_TASK_WDT=y
# CONFIG_TASK_WDT_PANIC is not set
-CONFIG_TASK_WDT_TIMEOUT_S=5
+CONFIG_TASK_WDT_TIMEOUT_S=60
CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1=y
# CONFIG_EVENT_LOOP_PROFILING is not set
diff --git a/code/sdkconfig.old b/code/sdkconfig.old
new file mode 100644
index 00000000..41745270
--- /dev/null
+++ b/code/sdkconfig.old
@@ -0,0 +1,565 @@
+#
+# Automatically generated file. DO NOT EDIT.
+# Espressif IoT Development Framework (ESP-IDF) Project Configuration
+#
+CONFIG_IDF_TARGET_ESP32=y
+CONFIG_IDF_TARGET="esp32"
+CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
+
+#
+# SDK tool configuration
+#
+CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-"
+CONFIG_APP_COMPILE_TIME_DATE=y
+# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
+# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
+CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
+# CONFIG_BOOTLOADER_LOG_LEVEL_NONE is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_ERROR is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_WARN is not set
+CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y
+# CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set
+# CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set
+CONFIG_BOOTLOADER_LOG_LEVEL=3
+# CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V is not set
+CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
+# CONFIG_BOOTLOADER_FACTORY_RESET is not set
+# CONFIG_BOOTLOADER_APP_TEST is not set
+CONFIG_BOOTLOADER_WDT_ENABLE=y
+# CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE is not set
+CONFIG_BOOTLOADER_WDT_TIME_MS=9000
+# CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE is not set
+# CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT is not set
+# CONFIG_SECURE_BOOT_ENABLED is not set
+# CONFIG_SECURE_FLASH_ENC_ENABLED is not set
+CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200
+# CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set
+# CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set
+CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
+# CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set
+CONFIG_ESPTOOLPY_FLASHMODE="dio"
+# CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set
+CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
+# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
+# CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
+CONFIG_ESPTOOLPY_FLASHFREQ="40m"
+# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
+# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE="2MB"
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+CONFIG_ESPTOOLPY_BEFORE_RESET=y
+# CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
+CONFIG_ESPTOOLPY_BEFORE="default_reset"
+CONFIG_ESPTOOLPY_AFTER_RESET=y
+# CONFIG_ESPTOOLPY_AFTER_NORESET is not set
+CONFIG_ESPTOOLPY_AFTER="hard_reset"
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_9600B is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_57600B is not set
+CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_230400B is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_2MB is not set
+# CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER is not set
+CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200
+CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
+CONFIG_PARTITION_TABLE_SINGLE_APP=y
+# CONFIG_PARTITION_TABLE_TWO_OTA is not set
+# CONFIG_PARTITION_TABLE_CUSTOM is not set
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp.csv"
+CONFIG_PARTITION_TABLE_OFFSET=0x8000
+CONFIG_PARTITION_TABLE_MD5=y
+CONFIG_EXAMPLE_CONNECT_WIFI=y
+# CONFIG_EXAMPLE_CONNECT_ETHERNET is not set
+CONFIG_EXAMPLE_WIFI_SSID="SSID"
+CONFIG_EXAMPLE_WIFI_PASSWORD="passwd"
+CONFIG_EXAMPLE_CONNECT_IPV6=y
+CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG=y
+# CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE is not set
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
+# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set
+# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set
+# CONFIG_COMPILER_CXX_EXCEPTIONS is not set
+CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
+# CONFIG_COMPILER_STACK_CHECK_MODE_NORM is not set
+# CONFIG_COMPILER_STACK_CHECK_MODE_STRONG is not set
+# CONFIG_COMPILER_STACK_CHECK_MODE_ALL is not set
+# CONFIG_COMPILER_STACK_CHECK is not set
+# CONFIG_COMPILER_WARN_WRITE_STRINGS is not set
+# CONFIG_COMPILER_DISABLE_GCC8_WARNINGS is not set
+# CONFIG_ESP32_APPTRACE_DEST_TRAX is not set
+CONFIG_ESP32_APPTRACE_DEST_NONE=y
+# CONFIG_ESP32_APPTRACE_ENABLE is not set
+CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y
+# CONFIG_BT_ENABLED is not set
+CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
+# CONFIG_BTDM_CTRL_AUTO_LATENCY_EFF is not set
+CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0
+CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=0
+CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0
+CONFIG_BTDM_CTRL_PINNED_TO_CORE=0
+CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1
+CONFIG_BT_RESERVE_DRAM=0
+# CONFIG_BLE_MESH is not set
+# CONFIG_ADC_FORCE_XPD_FSM is not set
+CONFIG_ADC_DISABLE_DAC=y
+# CONFIG_SPI_MASTER_IN_IRAM is not set
+CONFIG_SPI_MASTER_ISR_IN_IRAM=y
+# CONFIG_SPI_SLAVE_IN_IRAM is not set
+CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
+# CONFIG_EFUSE_CUSTOM_TABLE is not set
+# CONFIG_EFUSE_VIRTUAL is not set
+# CONFIG_EFUSE_CODE_SCHEME_COMPAT_NONE is not set
+CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y
+# CONFIG_EFUSE_CODE_SCHEME_COMPAT_REPEAT is not set
+CONFIG_EFUSE_MAX_BLK_LEN=192
+# CONFIG_ESP_TLS_SERVER is not set
+CONFIG_ESP32_REV_MIN_0=y
+# CONFIG_ESP32_REV_MIN_1 is not set
+# CONFIG_ESP32_REV_MIN_2 is not set
+# CONFIG_ESP32_REV_MIN_3 is not set
+CONFIG_ESP32_REV_MIN=0
+CONFIG_ESP32_DPORT_WORKAROUND=y
+# CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set
+CONFIG_ESP32_DEFAULT_CPU_FREQ_160=y
+# CONFIG_ESP32_DEFAULT_CPU_FREQ_240 is not set
+CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=160
+CONFIG_ESP32_SPIRAM_SUPPORT=y
+CONFIG_SPIRAM_BOOT_INIT=y
+# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
+# CONFIG_SPIRAM_USE_MEMMAP is not set
+# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
+CONFIG_SPIRAM_USE_MALLOC=y
+CONFIG_SPIRAM_TYPE_AUTO=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
+CONFIG_SPIRAM_SIZE=-1
+CONFIG_SPIRAM_SPEED_40M=y
+CONFIG_SPIRAM_MEMTEST=y
+CONFIG_SPIRAM_CACHE_WORKAROUND=y
+CONFIG_SPIRAM_BANKSWITCH_ENABLE=y
+CONFIG_SPIRAM_BANKSWITCH_RESERVE=8
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
+# CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is not set
+CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
+# CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY is not set
+# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
+CONFIG_D0WD_PSRAM_CLK_IO=17
+CONFIG_D0WD_PSRAM_CS_IO=16
+CONFIG_D2WD_PSRAM_CLK_IO=9
+CONFIG_D2WD_PSRAM_CS_IO=10
+CONFIG_PICO_PSRAM_CS_IO=10
+CONFIG_SPIRAM_SPIWP_SD3_PIN=7
+# CONFIG_SPIRAM_2T_MODE is not set
+# CONFIG_ESP32_MEMMAP_TRACEMEM is not set
+# CONFIG_ESP32_MEMMAP_TRACEMEM_TWOBANKS is not set
+# CONFIG_ESP32_TRAX is not set
+CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0
+# CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_TWO is not set
+CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y
+CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4
+# CONFIG_ESP32_ULP_COPROC_ENABLED is not set
+CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0
+# CONFIG_ESP32_PANIC_PRINT_HALT is not set
+CONFIG_ESP32_PANIC_PRINT_REBOOT=y
+# CONFIG_ESP32_PANIC_SILENT_REBOOT is not set
+# CONFIG_ESP32_PANIC_GDBSTUB is not set
+CONFIG_ESP32_DEBUG_OCDAWARE=y
+CONFIG_ESP32_DEBUG_STUBS_ENABLE=y
+CONFIG_ESP32_BROWNOUT_DET=y
+CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_0=y
+# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_1 is not set
+# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_2 is not set
+# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_3 is not set
+# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_4 is not set
+# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_5 is not set
+# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_6 is not set
+# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_7 is not set
+CONFIG_ESP32_BROWNOUT_DET_LVL=0
+CONFIG_ESP32_REDUCE_PHY_TX_POWER=y
+CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y
+# CONFIG_ESP32_TIME_SYSCALL_USE_RTC is not set
+# CONFIG_ESP32_TIME_SYSCALL_USE_FRC1 is not set
+# CONFIG_ESP32_TIME_SYSCALL_USE_NONE is not set
+CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y
+# CONFIG_ESP32_RTC_CLK_SRC_EXT_CRYS is not set
+# CONFIG_ESP32_RTC_CLK_SRC_EXT_OSC is not set
+# CONFIG_ESP32_RTC_CLK_SRC_INT_8MD256 is not set
+CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
+CONFIG_ESP32_RTC_XTAL_CAL_RETRY=1
+CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000
+CONFIG_ESP32_XTAL_FREQ_40=y
+# CONFIG_ESP32_XTAL_FREQ_26 is not set
+# CONFIG_ESP32_XTAL_FREQ_AUTO is not set
+CONFIG_ESP32_XTAL_FREQ=40
+# CONFIG_ESP32_DISABLE_BASIC_ROM_CONSOLE is not set
+# CONFIG_ESP32_NO_BLOBS is not set
+# CONFIG_ESP32_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set
+# CONFIG_ESP32_USE_FIXED_STATIC_RAM_SIZE is not set
+CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5
+# CONFIG_PM_ENABLE is not set
+CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
+CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
+CONFIG_ADC_CAL_LUT_ENABLE=y
+# CONFIG_ESP_TIMER_PROFILING is not set
+CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
+CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32
+CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=3584
+CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
+CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584
+CONFIG_ESP_CONSOLE_UART_DEFAULT=y
+# CONFIG_ESP_CONSOLE_UART_CUSTOM is not set
+# CONFIG_ESP_CONSOLE_UART_NONE is not set
+CONFIG_ESP_CONSOLE_UART_NUM=0
+CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
+CONFIG_ESP_INT_WDT=y
+CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
+CONFIG_ESP_INT_WDT_CHECK_CPU1=y
+CONFIG_ESP_TASK_WDT=y
+# CONFIG_ESP_TASK_WDT_PANIC is not set
+CONFIG_ESP_TASK_WDT_TIMEOUT_S=5
+CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
+CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=y
+CONFIG_ETH_USE_ESP32_EMAC=y
+CONFIG_ETH_PHY_INTERFACE_RMII=y
+# CONFIG_ETH_PHY_INTERFACE_MII is not set
+CONFIG_ETH_RMII_CLK_INPUT=y
+# CONFIG_ETH_RMII_CLK_OUTPUT is not set
+CONFIG_ETH_RMII_CLK_IN_GPIO=0
+CONFIG_ETH_DMA_BUFFER_SIZE=512
+CONFIG_ETH_DMA_RX_BUFFER_NUM=10
+CONFIG_ETH_DMA_TX_BUFFER_NUM=10
+CONFIG_ETH_USE_SPI_ETHERNET=y
+CONFIG_ETH_SPI_ETHERNET_DM9051=y
+# CONFIG_ESP_EVENT_LOOP_PROFILING is not set
+CONFIG_ESP_EVENT_POST_FROM_ISR=y
+CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y
+CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
+# CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH is not set
+CONFIG_HTTPD_MAX_REQ_HDR_LEN=512
+CONFIG_HTTPD_MAX_URI_LEN=512
+CONFIG_HTTPD_ERR_RESP_NO_DELAY=y
+CONFIG_HTTPD_PURGE_BUF_LEN=32
+# CONFIG_HTTPD_LOG_PURGE_DATA is not set
+# CONFIG_OTA_ALLOW_HTTP is not set
+# CONFIG_ESP_HTTPS_SERVER_ENABLE is not set
+CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10
+CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
+CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
+CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
+CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=16
+# CONFIG_ESP32_WIFI_CSI_ENABLED is not set
+CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP32_WIFI_TX_BA_WIN=6
+CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP32_WIFI_RX_BA_WIN=6
+CONFIG_ESP32_WIFI_NVS_ENABLED=y
+CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y
+# CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set
+CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
+CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
+# CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE is not set
+CONFIG_ESP32_WIFI_IRAM_OPT=y
+CONFIG_ESP32_WIFI_RX_IRAM_OPT=y
+CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y
+CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y
+# CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set
+CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20
+CONFIG_ESP32_PHY_MAX_TX_POWER=20
+# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
+# CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
+CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
+# CONFIG_ESP32_ENABLE_COREDUMP is not set
+# CONFIG_FATFS_CODEPAGE_DYNAMIC is not set
+CONFIG_FATFS_CODEPAGE_437=y
+# CONFIG_FATFS_CODEPAGE_720 is not set
+# CONFIG_FATFS_CODEPAGE_737 is not set
+# CONFIG_FATFS_CODEPAGE_771 is not set
+# CONFIG_FATFS_CODEPAGE_775 is not set
+# CONFIG_FATFS_CODEPAGE_850 is not set
+# CONFIG_FATFS_CODEPAGE_852 is not set
+# CONFIG_FATFS_CODEPAGE_855 is not set
+# CONFIG_FATFS_CODEPAGE_857 is not set
+# CONFIG_FATFS_CODEPAGE_860 is not set
+# CONFIG_FATFS_CODEPAGE_861 is not set
+# CONFIG_FATFS_CODEPAGE_862 is not set
+# CONFIG_FATFS_CODEPAGE_863 is not set
+# CONFIG_FATFS_CODEPAGE_864 is not set
+# CONFIG_FATFS_CODEPAGE_865 is not set
+# CONFIG_FATFS_CODEPAGE_866 is not set
+# CONFIG_FATFS_CODEPAGE_869 is not set
+# CONFIG_FATFS_CODEPAGE_932 is not set
+# CONFIG_FATFS_CODEPAGE_936 is not set
+# CONFIG_FATFS_CODEPAGE_949 is not set
+# CONFIG_FATFS_CODEPAGE_950 is not set
+CONFIG_FATFS_CODEPAGE=437
+# CONFIG_FATFS_LFN_NONE is not set
+CONFIG_FATFS_LFN_HEAP=y
+# CONFIG_FATFS_LFN_STACK is not set
+CONFIG_FATFS_MAX_LFN=255
+CONFIG_FATFS_API_ENCODING_ANSI_OEM=y
+# CONFIG_FATFS_API_ENCODING_UTF_16 is not set
+# CONFIG_FATFS_API_ENCODING_UTF_8 is not set
+CONFIG_FATFS_FS_LOCK=0
+CONFIG_FATFS_TIMEOUT_MS=10000
+CONFIG_FATFS_PER_FILE_CACHE=y
+CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y
+CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=150
+CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200
+CONFIG_FMB_QUEUE_LENGTH=20
+CONFIG_FMB_SERIAL_TASK_STACK_SIZE=2048
+CONFIG_FMB_SERIAL_BUF_SIZE=256
+CONFIG_FMB_SERIAL_TASK_PRIO=10
+# CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set
+CONFIG_FMB_CONTROLLER_NOTIFY_TIMEOUT=20
+CONFIG_FMB_CONTROLLER_NOTIFY_QUEUE_SIZE=20
+CONFIG_FMB_CONTROLLER_STACK_SIZE=4096
+CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20
+CONFIG_FMB_TIMER_PORT_ENABLED=y
+CONFIG_FMB_TIMER_GROUP=0
+CONFIG_FMB_TIMER_INDEX=0
+# CONFIG_FREERTOS_UNICORE is not set
+CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF
+CONFIG_FREERTOS_CORETIMER_0=y
+# CONFIG_FREERTOS_CORETIMER_1 is not set
+CONFIG_FREERTOS_HZ=100
+CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y
+# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set
+# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set
+CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y
+# CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set
+CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y
+CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1
+CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y
+# CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set
+# CONFIG_FREERTOS_ASSERT_DISABLE is not set
+CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536
+CONFIG_FREERTOS_ISR_STACKSIZE=1536
+# CONFIG_FREERTOS_LEGACY_HOOKS is not set
+CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
+CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
+# CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
+CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
+CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
+CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
+CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0
+# CONFIG_FREERTOS_USE_TRACE_FACILITY is not set
+# CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS is not set
+# CONFIG_FREERTOS_DEBUG_INTERNALS is not set
+CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y
+CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
+# CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set
+CONFIG_HEAP_POISONING_DISABLED=y
+# CONFIG_HEAP_POISONING_LIGHT is not set
+# CONFIG_HEAP_POISONING_COMPREHENSIVE is not set
+CONFIG_HEAP_TRACING_OFF=y
+# CONFIG_HEAP_TRACING_STANDALONE is not set
+# CONFIG_HEAP_TRACING_TOHOST is not set
+# CONFIG_HEAP_TRACING is not set
+# CONFIG_LOG_DEFAULT_LEVEL_NONE is not set
+# CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set
+# CONFIG_LOG_DEFAULT_LEVEL_WARN is not set
+CONFIG_LOG_DEFAULT_LEVEL_INFO=y
+# CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set
+# CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
+CONFIG_LOG_DEFAULT_LEVEL=3
+CONFIG_LOG_COLORS=y
+CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
+# CONFIG_LWIP_L2_TO_L3_COPY is not set
+# CONFIG_LWIP_IRAM_OPTIMIZATION is not set
+CONFIG_LWIP_TIMERS_ONDEMAND=y
+CONFIG_LWIP_MAX_SOCKETS=10
+# CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set
+CONFIG_LWIP_SO_REUSE=y
+CONFIG_LWIP_SO_REUSE_RXTOALL=y
+# CONFIG_LWIP_SO_RCVBUF is not set
+CONFIG_LWIP_IP_FRAG=y
+# CONFIG_LWIP_IP_REASSEMBLY is not set
+# CONFIG_LWIP_STATS is not set
+# CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set
+CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
+CONFIG_LWIP_GARP_TMR_INTERVAL=60
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
+CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
+# CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set
+CONFIG_LWIP_DHCPS_LEASE_UNIT=60
+CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8
+# CONFIG_LWIP_AUTOIP is not set
+# CONFIG_LWIP_IPV6_AUTOCONFIG is not set
+CONFIG_LWIP_NETIF_LOOPBACK=y
+CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
+CONFIG_LWIP_MAX_ACTIVE_TCP=16
+CONFIG_LWIP_MAX_LISTENING_TCP=16
+CONFIG_LWIP_TCP_MAXRTX=12
+CONFIG_LWIP_TCP_SYNMAXRTX=6
+CONFIG_LWIP_TCP_MSS=1440
+CONFIG_LWIP_TCP_MSL=60000
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744
+CONFIG_LWIP_TCP_WND_DEFAULT=5744
+CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
+CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
+# CONFIG_LWIP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set
+CONFIG_LWIP_TCP_OVERSIZE_MSS=y
+# CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set
+# CONFIG_LWIP_TCP_OVERSIZE_DISABLE is not set
+CONFIG_LWIP_MAX_UDP_PCBS=16
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=6
+CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072
+CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
+# CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0 is not set
+# CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU1 is not set
+CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF
+# CONFIG_LWIP_PPP_SUPPORT is not set
+# CONFIG_LWIP_MULTICAST_PING is not set
+# CONFIG_LWIP_BROADCAST_PING is not set
+CONFIG_LWIP_MAX_RAW_PCBS=16
+CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
+CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
+CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
+# CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC is not set
+# CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC is not set
+# CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set
+CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
+CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=16384
+CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=4096
+# CONFIG_MBEDTLS_DEBUG is not set
+# CONFIG_MBEDTLS_ECP_RESTARTABLE is not set
+# CONFIG_MBEDTLS_CMAC_C is not set
+CONFIG_MBEDTLS_HARDWARE_AES=y
+# CONFIG_MBEDTLS_HARDWARE_MPI is not set
+CONFIG_MBEDTLS_HARDWARE_SHA=y
+CONFIG_MBEDTLS_HAVE_TIME=y
+# CONFIG_MBEDTLS_HAVE_TIME_DATE is not set
+CONFIG_MBEDTLS_TLS_SERVER_AND_CLIENT=y
+# CONFIG_MBEDTLS_TLS_SERVER_ONLY is not set
+# CONFIG_MBEDTLS_TLS_CLIENT_ONLY is not set
+# CONFIG_MBEDTLS_TLS_DISABLED is not set
+CONFIG_MBEDTLS_TLS_SERVER=y
+CONFIG_MBEDTLS_TLS_CLIENT=y
+CONFIG_MBEDTLS_TLS_ENABLED=y
+# CONFIG_MBEDTLS_PSK_MODES is not set
+CONFIG_MBEDTLS_KEY_EXCHANGE_RSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA=y
+CONFIG_MBEDTLS_SSL_RENEGOTIATION=y
+# CONFIG_MBEDTLS_SSL_PROTO_SSL3 is not set
+CONFIG_MBEDTLS_SSL_PROTO_TLS1=y
+CONFIG_MBEDTLS_SSL_PROTO_TLS1_1=y
+CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
+# CONFIG_MBEDTLS_SSL_PROTO_DTLS is not set
+CONFIG_MBEDTLS_SSL_ALPN=y
+CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y
+CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y
+CONFIG_MBEDTLS_AES_C=y
+# CONFIG_MBEDTLS_CAMELLIA_C is not set
+# CONFIG_MBEDTLS_DES_C is not set
+CONFIG_MBEDTLS_RC4_DISABLED=y
+# CONFIG_MBEDTLS_RC4_ENABLED_NO_DEFAULT is not set
+# CONFIG_MBEDTLS_RC4_ENABLED is not set
+# CONFIG_MBEDTLS_BLOWFISH_C is not set
+# CONFIG_MBEDTLS_XTEA_C is not set
+CONFIG_MBEDTLS_CCM_C=y
+CONFIG_MBEDTLS_GCM_C=y
+# CONFIG_MBEDTLS_RIPEMD160_C is not set
+CONFIG_MBEDTLS_PEM_PARSE_C=y
+CONFIG_MBEDTLS_PEM_WRITE_C=y
+CONFIG_MBEDTLS_X509_CRL_PARSE_C=y
+CONFIG_MBEDTLS_X509_CSR_PARSE_C=y
+CONFIG_MBEDTLS_ECP_C=y
+CONFIG_MBEDTLS_ECDH_C=y
+CONFIG_MBEDTLS_ECDSA_C=y
+CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_SECP256K1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=y
+CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y
+CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
+CONFIG_MDNS_MAX_SERVICES=10
+CONFIG_MQTT_PROTOCOL_311=y
+CONFIG_MQTT_TRANSPORT_SSL=y
+CONFIG_MQTT_TRANSPORT_WEBSOCKET=y
+CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y
+# CONFIG_MQTT_USE_CUSTOM_CONFIG is not set
+# CONFIG_MQTT_TASK_CORE_SELECTION_ENABLED is not set
+# CONFIG_MQTT_CUSTOM_OUTBOX is not set
+CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF=y
+# CONFIG_NEWLIB_STDOUT_LINE_ENDING_LF is not set
+# CONFIG_NEWLIB_STDOUT_LINE_ENDING_CR is not set
+# CONFIG_NEWLIB_STDIN_LINE_ENDING_CRLF is not set
+# CONFIG_NEWLIB_STDIN_LINE_ENDING_LF is not set
+CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y
+# CONFIG_NEWLIB_NANO_FORMAT is not set
+# CONFIG_OPENSSL_DEBUG is not set
+# CONFIG_OPENSSL_ASSERT_DO_NOTHING is not set
+CONFIG_OPENSSL_ASSERT_EXIT=y
+CONFIG_PTHREAD_TASK_PRIO_DEFAULT=5
+CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
+CONFIG_PTHREAD_STACK_MIN=768
+CONFIG_PTHREAD_DEFAULT_CORE_NO_AFFINITY=y
+# CONFIG_PTHREAD_DEFAULT_CORE_0 is not set
+# CONFIG_PTHREAD_DEFAULT_CORE_1 is not set
+CONFIG_PTHREAD_TASK_CORE_DEFAULT=-1
+CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread"
+# CONFIG_SPI_FLASH_VERIFY_WRITE is not set
+# CONFIG_SPI_FLASH_ENABLE_COUNTERS is not set
+CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
+CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y
+# CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set
+# CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set
+# CONFIG_SPI_FLASH_USE_LEGACY_IMPL is not set
+CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y
+CONFIG_SPI_FLASH_SUPPORT_GD_CHIP=y
+CONFIG_SPIFFS_MAX_PARTITIONS=3
+CONFIG_SPIFFS_CACHE=y
+CONFIG_SPIFFS_CACHE_WR=y
+# CONFIG_SPIFFS_CACHE_STATS is not set
+CONFIG_SPIFFS_PAGE_CHECK=y
+CONFIG_SPIFFS_GC_MAX_RUNS=10
+# CONFIG_SPIFFS_GC_STATS is not set
+CONFIG_SPIFFS_PAGE_SIZE=256
+CONFIG_SPIFFS_OBJ_NAME_LEN=32
+CONFIG_SPIFFS_USE_MAGIC=y
+CONFIG_SPIFFS_USE_MAGIC_LENGTH=y
+CONFIG_SPIFFS_META_LENGTH=4
+CONFIG_SPIFFS_USE_MTIME=y
+# CONFIG_SPIFFS_DBG is not set
+# CONFIG_SPIFFS_API_DBG is not set
+# CONFIG_SPIFFS_GC_DBG is not set
+# CONFIG_SPIFFS_CACHE_DBG is not set
+# CONFIG_SPIFFS_CHECK_DBG is not set
+# CONFIG_SPIFFS_TEST_VISUALISATION is not set
+CONFIG_NETIF_IP_LOST_TIMER_INTERVAL=120
+CONFIG_TCPIP_LWIP=y
+CONFIG_UNITY_ENABLE_FLOAT=y
+CONFIG_UNITY_ENABLE_DOUBLE=y
+# CONFIG_UNITY_ENABLE_COLOR is not set
+CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
+# CONFIG_UNITY_ENABLE_FIXTURE is not set
+# CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL is not set
+CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT=y
+CONFIG_VFS_SUPPORT_TERMIOS=y
+CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1
+CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128
+# CONFIG_WL_SECTOR_SIZE_512 is not set
+CONFIG_WL_SECTOR_SIZE_4096=y
+CONFIG_WL_SECTOR_SIZE=4096
+CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
+CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
+CONFIG_WPA_MBEDTLS_CRYPTO=y
+# CONFIG_WPA_TLS_V12 is not set
+# CONFIG_LEGACY_INCLUDE_COMMON_HEADERS is not set
diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin
index a8aaf709..37db1b31 100644
Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ
diff --git a/firmware/firmware.bin b/firmware/firmware.bin
index dda80531..b501f86e 100644
Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ
diff --git a/firmware/html.zip b/firmware/html.zip
index 755a1e89..2405fcee 100644
Binary files a/firmware/html.zip and b/firmware/html.zip differ
diff --git a/sd-card/html/gethost.js b/sd-card/html/gethost.js
index 34343236..c61614e8 100644
--- a/sd-card/html/gethost.js
+++ b/sd-card/html/gethost.js
@@ -1,4 +1,8 @@
+function gethost_Version(){
+ return "1.0.0 - 20200910";
+}
+
function getbasepath(){
var host = window.location.hostname;
if (host == "127.0.0.1")
@@ -14,8 +18,13 @@ function getbasepath(){
return host;
}
-function UpdatePage(){
+function UpdatePage(_dosession = true){
var zw = location.href;
zw = zw.substr(0, zw.indexOf("?"));
- window.location = zw + '?session=' + Math.floor((Math.random() * 1000000) + 1);
+ if (_dosession) {
+ window.location = zw + '?session=' + Math.floor((Math.random() * 1000000) + 1);
+ }
+ else {
+ window.location = zw;
+ }
}
diff --git a/sd-card/html/readconfig.js b/sd-card/html/readconfig.js
index c43e948d..88e13e85 100644
--- a/sd-card/html/readconfig.js
+++ b/sd-card/html/readconfig.js
@@ -1,3 +1,7 @@
+function readconfig_Version(){
+ return "1.0.0 - 20200910";
+ }
+
var config_gesamt;
var config_split;
var ref = new Array(2);
diff --git a/sd-card/html/upload_script.html b/sd-card/html/upload_script.html
index 9967774a..7e588e82 100644
--- a/sd-card/html/upload_script.html
+++ b/sd-card/html/upload_script.html
@@ -30,8 +30,10 @@
-
-
+