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-08 04:26:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

latest update for CCW

Browse Source
This commit is contained in:
Anthony
2022-08-27 13:19:31 -04:00
parent 58cfd8bc42
commit e8b649d315
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -468,7 +468,7 @@ general* ClassFlowCNNGeneral::GetGENERAL(string _name, bool _create = true)
_ret->ROI.push_back(neuroi); _ret->ROI.push_back(neuroi);
printf("GetGENERAL - GENERAL %s - roi %s\n", _analog.c_str(), _roi.c_str()); printf("GetGENERAL - GENERAL %s - roi %s - CCW: %d\n", _analog.c_str(), _roi.c_str(), neuroi->CCW);
return _ret; return _ret;
} }
@@ -687,7 +687,7 @@ bool ClassFlowCNNGeneral::doNeuralNetwork(string time)
else else
GENERAL[_ana]->ROI[i]->result_float = result * 10; GENERAL[_ana]->ROI[i]->result_float = result * 10;
printf("Result General(Analog)%i: %f\n", i, GENERAL[_ana]->ROI[i]->result_float); printf("Result General(Analog)%i - CCW: %d - %f\n", i, GENERAL[_ana]->ROI[i]->CCW, GENERAL[_ana]->ROI[i]->result_float);
if (isLogImage) if (isLogImage)
LogImage(logPath, GENERAL[_ana]->ROI[i]->name, &GENERAL[_ana]->ROI[i]->result_float, NULL, time, GENERAL[_ana]->ROI[i]->image_org); LogImage(logPath, GENERAL[_ana]->ROI[i]->name, &GENERAL[_ana]->ROI[i]->result_float, NULL, time, GENERAL[_ana]->ROI[i]->image_org);
} break; } break;
@@ -888,7 +888,8 @@ bool ClassFlowCNNGeneral::doNeuralNetwork(string time)
GENERAL[_ana]->ROI[i]->isReject = false; GENERAL[_ana]->ROI[i]->isReject = false;
printf("Result General(Analog)%i: %f\n", i, GENERAL[_ana]->ROI[i]->result_float); printf("Result General(Analog)%i - CCW: %d - %f\n", i, GENERAL[_ana]->ROI[i]->CCW, GENERAL[_ana]->ROI[i]->result_float);
//printf("Result General(Analog)%i: %f\n", i, GENERAL[_ana]->ROI[i]->result_float);
if (isLogImage) if (isLogImage)
{ {

BIN
firmware/firmware.bin
View File

Binary file not shown.

BIN
firmware/html.zip
View File

Binary file not shown.

6
sd-card/html/edit_analog.html
View File

@@ -205,9 +205,9 @@ function newROI(){
var _roinew = prompt("Please enter name of new ROI", "name"); var _roinew = prompt("Please enter name of new ROI", "name");
if (ROIInfo.length > 0) if (ROIInfo.length > 0)
erg = CreateROI(_number, "analog", sel.selectedIndex, _roinew, 1, 1, ROIInfo[aktindex]["dx"], ROIInfo[aktindex]["dy"], ROIInfo[aktindex]["CCW"]); erg = CreateROI(_number, "analog", sel.selectedIndex, _roinew, 1, 1, ROIInfo[aktindex]["dx"], ROIInfo[aktindex]["dy"], ROIInfo[aktindex]["CCW"]=="true");
else else
erg = CreateROI(_number, "analog", sel.selectedIndex, _roinew, 1, 1, 30, 30, 0); erg = CreateROI(_number, "analog", sel.selectedIndex, _roinew, 1, 1, 30, 30, false);
if (erg != "") if (erg != "")
alert(erg); alert(erg);
@@ -332,7 +332,7 @@ function UpdateROIs(_sel){
document.getElementById("refy").value = ROIInfo[aktindex]["y"]; document.getElementById("refy").value = ROIInfo[aktindex]["y"];
document.getElementById("refdx").value = ROIInfo[aktindex]["dx"]; document.getElementById("refdx").value = ROIInfo[aktindex]["dx"];
document.getElementById("refdy").value = ROIInfo[aktindex]["dy"]; document.getElementById("refdy").value = ROIInfo[aktindex]["dy"];
document.getElementById("CCW").checked = ROIInfo[aktindex]["CCW"]; document.getElementById("CCW").checked = ROIInfo[aktindex]["CCW"] == "true";
rect.startX = ROIInfo[aktindex]["x"]; rect.startX = ROIInfo[aktindex]["x"];
rect.startY = ROIInfo[aktindex]["y"]; rect.startY = ROIInfo[aktindex]["y"];