Rolling 20220128

README.md

@@ -54,6 +54,10 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 
+##### Rolling (2022-01-28)
+
+- Bug fix: led intensity setting
+
 ##### Rolling (2022-01-27)
 
 - Implemented LED flash dimming (in "Take Reference Image")

code/components/jomjol_controlcamera/ClassControllCamera.cpp

@@ -249,6 +249,7 @@ void CCamera::SetQualitySize(int qual, framesize_t resol)
 
 void CCamera::EnableAutoExposure(int flashdauer)
 {
+    printf("EnableAutoExposure");
     LEDOnOff(true);
     if (flashdauer > 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);
+
 }

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)){

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);
         }

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()); 

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";
+const char* BUILD_TIME="2022-01-28 18:12";

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";
+const char* BUILD_TIME="2022-01-28 18:12";