Rolling 20220122

FeatureRequest.md

@@ -11,6 +11,18 @@
 
 ____
 
+#### #21 Extended "CheckDigitalConsistency" Logik
+
+* https://github.com/jomjol/AI-on-the-edge-device/issues/590
+
+  
+
+#### #20 Deep sleep and push mode
+
+* Let the device be normally in deep sleep state, and wake it up periodically to collect data and push it via MQTT or HTTP post.
+
+  
+
 #### #19 Extended log informations
 
 * https://github.com/jomjol/AI-on-the-edge-device/issues/580

README.md

@@ -54,42 +54,26 @@ 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")
-
-- Additional camera parameters: saturation, contrast (although not too much impact)
+##### 10.3.0 - Stability Increase (2022-01-29)
 
+- Implemented LED flash dimming (`LEDIntensity`). 
+  Remark: as auto illumination in the camera is used, this is rather for energy saving. It will not help reducing reflections
+- Additional camera parameters: saturation, contrast (although not too much impact yet)
+- Readings with not automatically removable "N"s are handled like "error" --> no return value in the field "value" anymore 
+  (still reported back via field "raw value")
 - Updated esp32 camera hardware driver
+- Bug fix: MQTT, html improvements
 
-- **ATTENTION: if the esp32 is stalled or permanently reboot try this:**
-  - Update the parameter `ImageQuality` to `12` instead of the default value `5`
-    (manually in the `config.ini`)
-  
-  
-
-Rolling (2022-01-23)
-
-- Bug fix: MQTT connection problems
-
-Rolling (2022-01-21)
+**ATTENTION:  The new ESP32 camera hardware driver is much more stable on newer OV2640  versions (no or much less reboots) but seems to be not fully compatible with older versions.**
 
-- Changed startup sequence to try to reinitialize camera during startup after failure
-- Update esp32-camera to new version (master as of 2022-01-21)
+* If you have problem with stalled systems you can try the following
+  - Update the parameter `ImageQuality` to `12` instead of current value `5` (manually in the `config.ini`)
 
-Rolling (2022-01-18)
-
-- Reduces camera clock speed to 5 MHz (instead of 20 MHz - `xclk_freq_hz =   5000000`)
-
-  
+  - If this is not helping, you might need to update your hardware or stay with version 9.2
 
 ##### 10.2.0 - Stability Increase (2022-01-14)
 
-- **ATTENTION:** Due to the update camera driver, the image looks different and a new setup might be needed
+- Due to the update camera driver, the image looks different and a new setup might be needed
 
   - Update reference image
   - Update Alignment marks

code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -111,25 +111,9 @@ bool ClassFlowPostProcessing::LoadPreValue(void)
                     double difference = difftime(tStart, NUMBERS[j]->lastvalue);
                     difference /= 60;
                     if (difference > PreValueAgeStartup)
-                    {
                         NUMBERS[j]->PreValueOkay = false;
-                    }
                     else
-                    {
                         NUMBERS[j]->PreValueOkay = true;
-/*
-                        NUMBERS[j]->Value = NUMBERS[j]->PreValue;
-                        NUMBERS[j]->ReturnValue = to_string(NUMBERS[j]->Value);
-                        NUMBERS[j]->ReturnValueNoError = NUMBERS[j]->ReturnValue; 
-
-                        if (NUMBERS[j]->digit_roi || NUMBERS[j]->analog_roi)
-                        {
-                            NUMBERS[j]->ReturnValue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma + 1);  // SIcherheitshalber 1 Stelle mehr, da ggf. Exgtended Resolution an ist (wird erst beim ersten Durchlauf gesetzt)
-                            NUMBERS[j]->ReturnValueNoError = NUMBERS[j]->ReturnValue;
-                        }
-*/
-                    }
-
                 }
             }
 
@@ -638,6 +622,11 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
                 UpdatePreValueINI = true;
                 SavePreValue();
             }
+            else
+            {
+                NUMBERS[j]->ReturnValue = "";
+                NUMBERS[j]->ReturnValueNoError = "";
+            }
         }
         else
         {

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="887c704";
+const char* GIT_REV="1ca5e12";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2022-01-28 18:12";
+const char* BUILD_TIME="2022-01-29 15:18";

code/main/version.h

@@ -13,7 +13,7 @@ extern "C"
 #include "Helper.h"
 #include <fstream>
 
-const char* GIT_BASE_BRANCH = "master - v10.2.0 - 2022-01-14";
+const char* GIT_BASE_BRANCH = "master - v10.3.0 - 2022-01-29";
 
 
 const char* git_base_branch(void)

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="887c704";
+const char* GIT_REV="1ca5e12";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2022-01-28 18:12";
+const char* BUILD_TIME="2022-01-29 15:18";

sd-card/html/edit_config_param.html

@@ -133,7 +133,8 @@ textarea {
 				<input type="number" id="MakeImage_ImageQuality_value1" size="13"   min="0" max="63">
 			</td>
 			<td class="description">
-				Quality index for picture (default = "5" - "0" high ... "63" low)
+				Quality index for picture (default = "12" - "0" high ... "63" low) <br>
+				Remark: values smaller than 12 can result in a reboot, as the bigger sized JPEG might not fit in the available RAM!
 			</td>
 		</tr>
 		<tr class="expert"  id="ex3">
@@ -152,38 +153,36 @@ textarea {
 				Picture size camera (default = "VGA")
 			</td>
 		</tr>
-		<tr class="expert"  id="Brightness_ex3">
+
+		<tr class="expert"  id="LEDIntensity_ex3">
 			<td width="20px" style="padding-left: 40px;">
 			</td>
 			<td>
-				<class id="MakeImage_Brightness_text" style="color:black;">Brightness</class>
+				<class id="MakeImage_LEDIntensity_text" style="color:black;">LEDIntensity</class>
 			</td>
 			<td>
-				<input type="number" id="MakeImage_Brightness_value1" size="13"   min="-2" max="2">
+				<input type="number" id="MakeImage_LEDIntensity_value1" size="13"   min="0" max="100">
 			</td>
 			<td style="font-size: 80%;">
-				Image Brightness (-2 .. 2 - default = "0")
+				Internal LED Flash Intensity (PWM from 0% - 100%). <br>
+				Remark: as the camera autoillumination settings are used, this is rather for energy saving, than reducing reflections.
 			</td>
 		</tr>
-		<tr class="expert"  id="MakeImage_FixedExposure_ex10">
-			<td width="20px"  style="padding-left: 40px;">
+
+		<tr class="expert"  id="Brightness_ex3">
+			<td width="20px" style="padding-left: 40px;">
 			</td>
-			<td  width="200px">
-				<class id="MakeImage_FixedExposure_text" style="color:black;">FixedExposure</class>
+			<td>
+				<class id="MakeImage_Brightness_text" style="color:black;">Brightness</class>
 			</td>
 			<td>
-				<select id="MakeImage_FixedExposure_value1">
-					<option value="true" selected>true</option>
-					<option value="false" >false</option>
-				</select>
+				<input type="number" id="MakeImage_Brightness_value1" size="13"   min="-2" max="2">
 			</td>
 			<td style="font-size: 80%;">
-				Fixes the illumination setting of camera at the startup and uses this later --> individual round is faster
+				Image Brightness (-2 .. 2 - default = "0")
 			</td>
 		</tr>
 
-
-<!--
 		<tr class="expert"  id="Contrast_ex3">
 			<td width="20px" style="padding-left: 40px;">
 			</td>
@@ -194,7 +193,8 @@ textarea {
 				<input type="number" id="MakeImage_Contrast_value1" size="13"   min="-2" max="2">
 			</td>
 			<td style="font-size: 80%;">
-				Image Contrast (-2 .. 2 - default = "0")
+				Image Contrast (-2 .. 2 - default = "0") <br>
+				Remark: camera driver is not fully supporting this setting yet (no impact on image)
 			</td>
 		</tr>
 
@@ -208,10 +208,27 @@ textarea {
 				<input type="number" id="MakeImage_Saturation_value1" size="13"   min="-2" max="2">
 			</td>
 			<td style="font-size: 80%;">
-				Image Saturation (-2 .. 2 - default = "0")
+				Image Saturation (-2 .. 2 - default = "0") <br>
+				Remark: camera driver is not fully supporting this setting yet (no impact on image)
+			</td>
+		</tr>
+		
+		<tr class="expert"  id="MakeImage_FixedExposure_ex10">
+			<td width="20px"  style="padding-left: 40px;">
+			</td>
+			<td  width="200px">
+				<class id="MakeImage_FixedExposure_text" style="color:black;">FixedExposure</class>
+			</td>
+			<td>
+				<select id="MakeImage_FixedExposure_value1">
+					<option value="true" selected>true</option>
+					<option value="false" >false</option>
+				</select>
+			</td>
+			<td style="font-size: 80%;">
+				Fixes the illumination setting of camera at the startup and uses this later --> individual round is faster
 			</td>
 		</tr>
--->		
 
 
 		<tr class="expert"  id="ex4">
@@ -1700,8 +1717,9 @@ function UpdateInput() {
 	WriteParameter(param, category, "MakeImage", "WaitBeforeTakingPicture", false);		
 	WriteParameter(param, category, "MakeImage", "ImageQuality", false);		
 	WriteParameter(param, category, "MakeImage", "Brightness", false);		
-//	WriteParameter(param, category, "MakeImage", "Contrast", false);		
-//	WriteParameter(param, category, "MakeImage", "Saturation", false);		
+	WriteParameter(param, category, "MakeImage", "Contrast", false);		
+	WriteParameter(param, category, "MakeImage", "Saturation", false);		
+	WriteParameter(param, category, "MakeImage", "LEDIntensity", false);		
 	WriteParameter(param, category, "MakeImage", "ImageSize", false);		
 	WriteParameter(param, category, "MakeImage", "FixedExposure", false);		
 
@@ -1766,8 +1784,9 @@ function ReadParameterAll()
 	ReadParameter(param, "MakeImage", "WaitBeforeTakingPicture", false);		
 	ReadParameter(param, "MakeImage", "ImageQuality", false);		
 	ReadParameter(param, "MakeImage", "Brightness", false);		
-//	ReadParameter(param, "MakeImage", "Contrast", false);		
-//	ReadParameter(param, "MakeImage", "Saturation", false);		
+	ReadParameter(param, "MakeImage", "Contrast", false);		
+	ReadParameter(param, "MakeImage", "Saturation", false);		
+	ReadParameter(param, "MakeImage", "LEDIntensity", false);		
 	ReadParameter(param, "MakeImage", "ImageSize", false);	
 	ReadParameter(param, "MakeImage", "FixedExposure", false);	
 
@@ -1783,13 +1802,11 @@ function ReadParameterAll()
 	ReadParameter(param, "Analog", "Model", false);		
 	ReadParameter(param, "Analog", "LogImageLocation", true);		
 	ReadParameter(param, "Analog", "LogfileRetentionInDays", true);		
-//	ReadParameter(param, "Analog", "ExtendedResolution", true);		
 	ReadParameter(param, "Analog", "ModelInputSize", false);
 
 	ReadParameter(param, "PostProcessing", "PreValueUse", true);		
 	ReadParameter(param, "PostProcessing", "PreValueAgeStartup", true);		
 	ReadParameter(param, "PostProcessing", "AllowNegativeRates", true);
-//	ReadParameter(param, "PostProcessing", "MaxRateValue", true);		
 	ReadParameter(param, "PostProcessing", "ErrorMessage", true);
 	ReadParameter(param, "PostProcessing", "CheckDigitIncreaseConsistency", true);
 

sd-card/html/gethost.js

@@ -13,7 +13,7 @@ function getbasepath(){
     {
 //        host = "http://192.168.2.219";          // jomjol interner test
 //        host = "http://192.168.178.46";          // jomjol interner test
-        host = "http://192.168.178.60";          // jomjol interner Real
+        host = "http://192.168.178.62";          // jomjol interner Real
 //        host = "http://192.168.43.191";
 //        host = ".";                           // jomjol interner localhost