diff --git a/README.md b/README.md index f08816a1..91355fff 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,10 @@ In other cases you can contact the developer via email: 0) LightOnOff(true); @@ -550,7 +551,7 @@ void CCamera::LightOnOff(bool status) #ifdef USE_PWM_LEDFLASH if (status) { - printf("Internal Flash-LED turn on with PWMy\n"); + printf("Internal Flash-LED turn on with PWM %d\n", led_intensity); ESP_ERROR_CHECK(ledc_set_duty(LEDC_MODE, LEDC_CHANNEL, led_intensity)); // Update duty to apply the new value ESP_ERROR_CHECK(ledc_update_duty(LEDC_MODE, LEDC_CHANNEL)); @@ -688,4 +689,5 @@ void CCamera::SetLEDIntensity(float _intrel) _intrel = _intrel / 100; led_intensity = (int) (_intrel * 8191); printf("Set led_intensity to %d of 8191\n", led_intensity); + } diff --git a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp index c76a7ec2..66105e32 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp @@ -41,8 +41,6 @@ std::string ClassFlowControll::doSingleStep(std::string _stepname, std::string _ _classname = "ClassFlowAlignment"; } if ((_stepname.compare(0, 7, "[Digits") == 0) || (_stepname.compare(0, 8, ";[Digits") == 0)) { -// if ((_stepname.compare("[Digits]") == 0) || (_stepname.compare(";[Digits]") == 0)){ -// printf("Digits!!!\n"); _classname = "ClassFlowCNNGeneral"; } if ((_stepname.compare("[Analog]") == 0) || (_stepname.compare(";[Analog]") == 0)){ diff --git a/code/components/jomjol_flowcontroll/ClassFlowMakeImage.cpp b/code/components/jomjol_flowcontroll/ClassFlowMakeImage.cpp index 7aee0062..9e68a5f8 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowMakeImage.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowMakeImage.cpp @@ -128,7 +128,7 @@ bool ClassFlowMakeImage::ReadParameter(FILE* pfile, string& aktparamgraph) if ((toUpper(zerlegt[0]) == "LEDINTENSITY") && (zerlegt.size() > 1)) { float ledintensity = stof(zerlegt[1]); - ledintensity = min((float) 1, ledintensity); + ledintensity = min((float) 100, ledintensity); ledintensity = max((float) 0, ledintensity); Camera.SetLEDIntensity(ledintensity); } diff --git a/code/components/jomjol_tfliteclass/server_tflite.cpp b/code/components/jomjol_tfliteclass/server_tflite.cpp index 4e06ce73..a91cbb0e 100644 --- a/code/components/jomjol_tfliteclass/server_tflite.cpp +++ b/code/components/jomjol_tfliteclass/server_tflite.cpp @@ -522,6 +522,7 @@ esp_err_t handler_editflow(httpd_req_t *req) // string zwzw = "Do " + _task + " start\n"; printf(zwzw.c_str()); Camera.SetBrightnessContrastSaturation(bri, con, sat); Camera.SetLEDIntensity(intens); + printf("test_take - vor MakeImage"); std::string zw = tfliteflow.doSingleStep("[MakeImage]", _host); httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*"); httpd_resp_sendstr_chunk(req, zw.c_str()); diff --git a/code/main/version.cpp b/code/main/version.cpp index 46779fee..b2dbc140 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="567dc74"; +const char* GIT_REV="887c704"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2022-01-27 21:04"; \ No newline at end of file +const char* BUILD_TIME="2022-01-28 18:12"; \ No newline at end of file diff --git a/code/version.cpp b/code/version.cpp index 46779fee..b2dbc140 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="567dc74"; +const char* GIT_REV="887c704"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2022-01-27 21:04"; \ No newline at end of file +const char* BUILD_TIME="2022-01-28 18:12"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 935fd897..ad2ca63f 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 3e40f86f..28c806f7 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ