Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2025-12-07 20:16:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

v11.0.0

Browse Source
This commit is contained in:
jomjol
2022-08-13 14:20:40 +02:00
parent 9695dba415
commit bfe8d3b37a
28 changed files with 1054 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp
View File

@@ -760,7 +760,7 @@ bool ClassFlowCNNGeneral::doNeuralNetwork(string time)
_fit = _val + _valminus;
}
if (result >= 10)
if (result > 10)
result = result - 10;
if (result < 0)
result = result + 10;
@@ -872,11 +872,14 @@ std::vector<HTMLInfo*> ClassFlowCNNGeneral::GetHTMLInfo()
for (int _ana = 0; _ana < GENERAL.size(); ++_ana)
for (int i = 0; i < GENERAL[_ana]->ROI.size(); ++i)
{
printf("Image: %d\n", (int) GENERAL[_ana]->ROI[i]->image);
if (GENERAL[_ana]->ROI[i]->image)
{
if (GENERAL[_ana]->name == "default")
GENERAL[_ana]->ROI[i]->image->SaveToFile(FormatFileName("/sdcard/img_tmp/" + GENERAL[_ana]->ROI[i]->name + ".bmp"));
else
GENERAL[_ana]->ROI[i]->image->SaveToFile(FormatFileName("/sdcard/img_tmp/" + GENERAL[_ana]->name + "_" + GENERAL[_ana]->ROI[i]->name + ".bmp"));
}
HTMLInfo *zw = new HTMLInfo;
if (GENERAL[_ana]->name == "default")

2
code/components/jomjol_flowcontroll/ClassFlowControll.cpp
View File

@@ -586,6 +586,8 @@ esp_err_t ClassFlowControll::GetJPGStream(std::string _fn, httpd_req_t *req)
{
std::vector<HTMLInfo*> htmlinfo;
htmlinfo = GetAllDigital();
printf("After getClassFlowControll::GetAllDigital\n");
for (int i = 0; i < htmlinfo.size(); ++i)
{
if (_fn == htmlinfo[i]->filename)

1
code/components/jomjol_tfliteclass/server_tflite.cpp
View File

@@ -314,6 +314,7 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
std::vector<HTMLInfo*> htmlinfodig;
htmlinfodig = tfliteflow.GetAllDigital();
for (int i = 0; i < htmlinfodig.size(); ++i)
{
if (tfliteflow.GetTypeDigital() == Digital)

6
code/main/version.cpp
View File

@@ -1,4 +1,4 @@
const char* GIT_REV="0e7c600";
const char* GIT_REV="9695dba";
const char* GIT_TAG="";
const char* GIT_BRANCH="master";
const char* BUILD_TIME="2022-07-24 18:59";
const char* GIT_BRANCH="rolling";
const char* BUILD_TIME="2022-08-13 14:15";

2
code/main/version.h
View File

@@ -13,7 +13,7 @@ extern "C"
#include "Helper.h"
#include <fstream>
const char* GIT_BASE_BRANCH = "master - v10.6.1 - 2022-07-24";
const char* GIT_BASE_BRANCH = "master - v11.0.0 - 2022-08-13";
const char* git_base_branch(void)

6
code/version.cpp
View File

@@ -1,4 +1,4 @@
const char* GIT_REV="0e7c600";
const char* GIT_REV="9695dba";
const char* GIT_TAG="";
const char* GIT_BRANCH="master";
const char* BUILD_TIME="2022-07-24 18:59";
const char* GIT_BRANCH="rolling";
const char* BUILD_TIME="2022-08-13 14:15";