Merge branch 'pr/1044' into rolling

code/components/jomjol_controlGPIO/server_GPIO.cpp

@@ -227,7 +227,7 @@ void GpioHandler::init()
         clear();
         delete gpioMap;
         gpioMap = NULL;
-        ESP_LOGI(TAG_SERVERGPIO, "GPIO init comleted, handler is disabled");
+        ESP_LOGI(TAG_SERVERGPIO, "GPIO init completed, handler is disabled");
         return;
     }
 
@@ -249,7 +249,7 @@ void GpioHandler::init()
         }
     }
 
-    ESP_LOGI(TAG_SERVERGPIO, "GPIO init comleted, is enabled");
+    ESP_LOGI(TAG_SERVERGPIO, "GPIO init completed, is enabled");
 }
 
 void GpioHandler::taskHandler() {
@@ -502,7 +502,7 @@ esp_err_t GpioHandler::handleHttpRequest(httpd_req_t *req)
     gpio_num_t gpio_num = resolvePinNr(gpionum);
     if (gpio_num == GPIO_NUM_NC)
     {
-        std::string zw = "GPIO" + std::to_string(gpionum) + " not support - only 12 & 13 free";
+        std::string zw = "GPIO" + std::to_string(gpionum) + " unsupported - only 12 & 13 free";
             httpd_resp_sendstr_chunk(req, zw.c_str());
             httpd_resp_sendstr_chunk(req, NULL);          
             return ESP_OK;

code/components/jomjol_controlcamera/ClassControllCamera.cpp

@@ -266,7 +266,7 @@ void CCamera::EnableAutoExposure(int flashdauer)
         LogFile.SwitchOnOff(true);
         LogFile.WriteToFile("Camera Capture Failed (Procedure 'EnableAutoExposure') --> Reboot"
                 "Check that your camera module is working and connected properly.");
-        doReboot();
+        //doReboot();
     }
     esp_camera_fb_return(fb);        
 
@@ -316,7 +316,7 @@ esp_err_t CCamera::CaptureToBasisImage(CImageBasis *_Image, int delay)
         LightOnOff(false);
 
         LogFile.SwitchOnOff(true);
-        LogFile.WriteToFile("Camera is not working anymore (CCamera::CaptureToBasisImage) - most propably hardware problem (instablility, ...). "
+        LogFile.WriteToFile("Camera is not working anymore (CCamera::CaptureToBasisImage) - most probably caused by a hardware problem (instablility, ...). "
                 "System will reboot.");
         doReboot();
 
@@ -327,9 +327,9 @@ esp_err_t CCamera::CaptureToBasisImage(CImageBasis *_Image, int delay)
     zwischenspeicher = (uint8_t*) malloc(_size);
     if (!zwischenspeicher)
     {
-        ESP_LOGE(TAGCAMERACLASS, "Nicht ausreichend Speicherplatz für Bild in Funktion CaptureToBasisImage()");
+        ESP_LOGE(TAGCAMERACLASS, "Insufficient memory space for image in function CaptureToBasisImage()");
         LogFile.SwitchOnOff(true);
-        LogFile.WriteToFile("Nicht ausreichend Speicherplatz für Bild in Funktion CaptureToBasisImage()");
+        LogFile.WriteToFile("Insufficient memory space for image in function CaptureToBasisImage()");
     }
     for (int i = 0; i < _size; ++i)
         *(zwischenspeicher + i) = *(fb->buf + i);
@@ -416,7 +416,7 @@ esp_err_t CCamera::CaptureToFile(std::string nm, int delay)
         LogFile.SwitchOnOff(true);
         LogFile.WriteToFile("Camera Capture Failed (CCamera::CaptureToFile) --> Reboot"
                 "Check that your camera module is working and connected properly.");
-        doReboot();
+        //doReboot();
 
         return ESP_FAIL;
     }

code/components/jomjol_fileserver_ota/server_file.cpp

@@ -418,7 +418,7 @@ static esp_err_t download_get_handler(httpd_req_t *req)
 
     /* Close file after sending complete */
     fclose(fd);
-    ESP_LOGI(TAG_FILESERVER, "File sending complete");
+    ESP_LOGI(TAG_FILESERVER, "File successfully sent");
 
     /* Respond with an empty chunk to signal HTTP response completion */
     httpd_resp_send_chunk(req, NULL, 0);
@@ -680,7 +680,7 @@ static esp_err_t delete_post_handler(httpd_req_t *req)
     /* Redirect onto root to see the updated file list */
     httpd_resp_set_status(req, "303 See Other");
     httpd_resp_set_hdr(req, "Location", directory.c_str());
-    httpd_resp_sendstr(req, "File deleted successfully");
+    httpd_resp_sendstr(req, "File successfully deleted");
     return ESP_OK;
 }
 

code/components/jomjol_fileserver_ota/server_ota.cpp

@@ -80,7 +80,7 @@ static bool ota_update_task(std::string fn)
     if (configured != running) {
         ESP_LOGW(TAGPARTOTA, "Configured OTA boot partition at offset 0x%08x, but running from offset 0x%08x",
                  configured->address, running->address);
-        ESP_LOGW(TAGPARTOTA, "(This can happen if either the OTA boot data or preferred boot image become corrupted somehow.)");
+        ESP_LOGW(TAGPARTOTA, "(This can happen if either the OTA boot data or preferred boot image become somehow corrupted.)");
     }
     ESP_LOGI(TAGPARTOTA, "Running partition type %d subtype %d (offset 0x%08x)",
              running->type, running->subtype, running->address);
@@ -461,7 +461,7 @@ esp_err_t handler_ota_update(httpd_req_t *req)
     }
     else
     {
-        resp_str = "Error during Firmware Update!!!<br><br>Please check output of console.";
+        resp_str = "Error during Firmware Update!!!<br><br>Please check console output.";
     }
 
     httpd_resp_send(req, resp_str, strlen(resp_str));  
@@ -493,7 +493,7 @@ void task_reboot(void *pvParameter)
 
 void doReboot(){
     LogFile.SwitchOnOff(true);
-    LogFile.WriteToFile("Reboot triggert by Software (5s).");
+    LogFile.WriteToFile("Reboot triggered by Software (5s).");
     ESP_LOGI(TAGPARTOTA, "Reboot in 5sec");
     LogFile.WriteToFile("Reboot in 5sec");
     xTaskCreate(&task_reboot, "reboot", configMINIMAL_STACK_SIZE * 64, NULL, 10, NULL);
@@ -513,7 +513,7 @@ esp_err_t handler_reboot(httpd_req_t *req)
 
     LogFile.WriteToFile("handler_reboot");
     ESP_LOGI(TAGPARTOTA, "!!! System will restart within 5 sec!!!");
-    const char* resp_str = "<body style='font-family: arial'> <h3 id=t></h3></body><script>var h='Rebooting!<br>The page will automatically reload after around 25s.<br>'; document.getElementById('t').innerHTML=h; setInterval(function (){h +='.'; document.getElementById('t').innerHTML=h; fetch(window.location.hostname,{mode: 'no-cors'}).then(r=>{parent.location.href=('/index.html');})}, 1000);</script>";
+    const char* resp_str = "<body style='font-family: arial'> <h3 id=t></h3></body><script>var h='Rebooting!<br>The page will automatically reload in about 25s.<br>'; document.getElementById('t').innerHTML=h; setInterval(function (){h +='.'; document.getElementById('t').innerHTML=h; fetch(window.location.hostname,{mode: 'no-cors'}).then(r=>{parent.location.href=('/index.html');})}, 1000);</script>";
     httpd_resp_send(req, resp_str, strlen(resp_str)); 
     
     doReboot();

code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp

@@ -48,7 +48,7 @@ ClassFlowAlignment::ClassFlowAlignment(std::vector<ClassFlow*>* lfc)
 
     if (!ImageBasis)            // die Funktion Bilder aufnehmen existiert nicht --> muss erst erzeugt werden NUR ZU TESTZWECKEN
     {
-        if (AlignmentExtendedDebugging) printf("CImageBasis musste erzeugt werden\n");
+        if (AlignmentExtendedDebugging) printf("CImageBasis had to be created\n");
         ImageBasis = new CImageBasis(namerawimage);
     }
 }

code/components/jomjol_flowcontroll/ClassFlowImage.cpp

@@ -45,8 +45,8 @@ string ClassFlowImage::CreateLogFolder(string time) {
 	string logPath = LogImageLocation + "/" + time.LOGFILE_TIME_FORMAT_DATE_EXTR + "/" + time.LOGFILE_TIME_FORMAT_HOUR_EXTR;
     isLogImage = mkdir_r(logPath.c_str(), S_IRWXU) == 0;
     if (!isLogImage) {
-        ESP_LOGW(logTag, "Can't create log foolder for analog images. Path %s", logPath.c_str());
-        LogFile.WriteToFile("Can't create log foolder for analog images. Path " + logPath);
+        ESP_LOGW(logTag, "Can't create log folder for analog images. Path %s", logPath.c_str());
+        LogFile.WriteToFile("Can't create log folder for analog images. Path " + logPath);
     }
 
 	return logPath;

code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp

@@ -109,7 +109,7 @@ bool ClassFlowPostProcessing::LoadPreValue(void)
         return false;
 
     fgets(zw, 1024, pFile);
-    printf("Read Zeile Prevalue.ini: %s", zw);
+    printf("Read line Prevalue.ini: %s", zw);
     zwtime = trim(std::string(zw));
     if (zwtime.length() == 0)
         return false;
@@ -160,7 +160,7 @@ bool ClassFlowPostProcessing::LoadPreValue(void)
                 _done = true;
             else
             {
-                printf("Read Zeile Prevalue.ini: %s", zw);
+                printf("Read line Prevalue.ini: %s", zw);
                 zerlegt = HelperZerlegeZeile(trim(std::string(zw)), "\t");
                 if (zerlegt.size() > 1)
                 {

code/components/jomjol_image_proc/CAlignAndCutImage.cpp

@@ -147,7 +147,7 @@ void CAlignAndCutImage::CutAndSave(int x1, int y1, int dx, int dy, CImageBasis *
 
     if ((_target->height != dy) || (_target->width != dx) || (_target->channels != channels))
     {
-        printf("CAlignAndCutImage::CutAndSave - Bildgröße passt nicht !!!!!!!!!");
+        printf("CAlignAndCutImage::CutAndSave - Image size does not match !!");
         return;
     }
 

code/components/jomjol_image_proc/CImageBasis.cpp

@@ -146,7 +146,7 @@ bool CImageBasis::CopyFromMemory(uint8_t* _source, int _size)
     int gr = height * width * channels;
     if (gr != _size)            // Größe passt nicht
     {
-        printf("Kann Bild nicht von Speicher kopierte - Größen passen nicht zusammen: soll %d, ist %d\n", _size, gr);
+        printf("Cannot copy image from memory - sizes do not match: should be %d, but is %d\n", _size, gr);
         return false;
     }
 
@@ -392,7 +392,7 @@ CImageBasis::CImageBasis(CImageBasis *_copyfrom, int _anzrepeat)
     int anz = 1;
     while (!rgb_image && (anz < _anzrepeat))    
     {
-	    printf("Create Image from Copy - Speicher ist voll - Versuche es erneut: %d.\n", anz);
+	    printf("Create Image from Copy - Memory is full - try again: %d.\n", anz);
         rgb_image = (unsigned char*) malloc(memsize);
         anz++;
     }
@@ -401,7 +401,7 @@ CImageBasis::CImageBasis(CImageBasis *_copyfrom, int _anzrepeat)
     if (!rgb_image)
     {
         printf(getESPHeapInfo().c_str());
-        printf("\nKein freier Speicher mehr!!!! Benötigt: %d %d %d %d\n", width, height, channels, memsize);
+        printf("\nNo more free memory!! Needed: %d %d %d %d\n", width, height, channels, memsize);
         RGBImageRelease();
         return;
     }
@@ -425,7 +425,7 @@ CImageBasis::CImageBasis(int _width, int _height, int _channels)
     if (!rgb_image)
     {
         printf(getESPHeapInfo().c_str());
-        printf("\nKein freier Speicher mehr!!!! Benötigt: %d %d %d %d\n", width, height, channels, memsize);
+        printf("\nNo more free memory!! Needed: %d %d %d %d\n", width, height, channels, memsize);
         return;
     }
 }
@@ -543,7 +543,7 @@ void CImageBasis::Resize(int _new_dx, int _new_dy, CImageBasis *_target)
 {
     if ((_target->height != _new_dy) || (_target->width != _new_dx) || (_target->channels != channels))
     {
-        printf("CImageBasis::Resize - Targetbildgröße passt nicht !!!!!!!!!");
+        printf("CImageBasis::Resize - Target image size does not fit !!");
         return;
     }
 

code/components/jomjol_logfile/ClassLogFile.cpp

@@ -114,7 +114,7 @@ void ClassLogFile::WriteToFile(std::string info, bool _time)
     if (stat(logroot.c_str(), &path_stat) != 0) {
         ESP_LOGI(TAG, "Create log folder: %s", logroot.c_str());
         if (mkdir_r(logroot.c_str(), S_IRWXU) == -1)  {
-            ESP_LOGI(TAG, "Can't create log foolder");
+            ESP_LOGI(TAG, "Can't create log folder");
         }
     }
 */

code/components/jomjol_tfliteclass/CTfLiteClass.cpp

@@ -138,7 +138,7 @@ void CTfLiteClass::Invoke()
 
 bool CTfLiteClass::LoadInputImageBasis(CImageBasis *rs)
 {
-    std::string zw = "ClassFlowCNNGeneral::doNeuralNetwork nach LoadInputResizeImage: ";
+    std::string zw = "ClassFlowCNNGeneral::doNeuralNetwork after LoadInputResizeImage: ";
 
     unsigned int w = rs->width;
     unsigned int h = rs->height;
@@ -213,7 +213,7 @@ unsigned char* CTfLiteClass::ReadFileToCharArray(std::string _fn)
 
     if (size == -1)
     {
-  		printf("\nFile existiert nicht.\n");
+  		printf("\nFile doesn't exist.\n");
       return NULL;
     }
 
@@ -234,7 +234,7 @@ unsigned char* CTfLiteClass::ReadFileToCharArray(std::string _fn)
         fread(result, 1, size, f);
         fclose(f);        
 	  }else {
-		  printf("\nKein freier Speicher vorhanden.\n");
+		  printf("\nNo free memory available.\n");
 	}    
 
 

code/components/jomjol_tfliteclass/server_tflite.cpp

@@ -171,7 +171,7 @@ esp_err_t handler_doflow(httpd_req_t *req)
 
     if (flowisrunning)
     {
-        const char* resp_str = "doFlow läuft bereits und kann nicht nochmal gestartet werden";
+        const char* resp_str = "doFlow is already running and cannot be started again";
         httpd_resp_send(req, resp_str, strlen(resp_str));       
         return 2;
     }
@@ -179,7 +179,7 @@ esp_err_t handler_doflow(httpd_req_t *req)
     {
         xTaskCreate(&blink_task_doFlow, "blink_doFlow", configMINIMAL_STACK_SIZE * 64, NULL, tskIDLE_PRIORITY+1, &xHandleblink_task_doFlow);
     }
-    const char* resp_str = "doFlow gestartet - dauert ca. 60 Sekunden";
+    const char* resp_str = "doFlow started - takes about 60 seconds";
     httpd_resp_send(req, resp_str, strlen(resp_str));  
     /* Respond with an empty chunk to signal HTTP response completion */
     httpd_resp_send_chunk(req, NULL, 0);       
@@ -724,13 +724,13 @@ void task_autodoFlow(void *pvParameter)
         if (flowisrunning)
         {
 #ifdef DEBUG_DETAIL_ON       
-            printf("Autoflow: doFLow laeuft bereits!\n");
+            printf("Autoflow: doFlow is already running!\n");
 #endif
         }
         else
         {
 #ifdef DEBUG_DETAIL_ON       
-            printf("Autoflow: doFLow wird gestartet\n");
+            printf("Autoflow: doFlow is started\n");
 #endif
             flowisrunning = true;
             doflow();

code/components/jomjol_wlan/connect_wlan.cpp

@@ -63,7 +63,7 @@ std::string* getSSID()
 
 void task_doBlink(void *pvParameter)
 {
-    ESP_LOGI("BLINK", "Blinken - start");
+    ESP_LOGI("BLINK", "Flash - start");
     while (BlinkIsRunning)
     {
 //        ESP_LOGI("BLINK", "Blinken - wait");
@@ -91,7 +91,7 @@ void task_doBlink(void *pvParameter)
     if (BlinkOff)
         gpio_set_level(BLINK_GPIO, 1);
 
-    ESP_LOGI("BLINK", "Blinken - done");
+    ESP_LOGI("BLINK", "Flash - done");
     BlinkIsRunning = false;
 
     vTaskDelete(NULL); //Delete this task if it exits from the loop above
@@ -117,11 +117,11 @@ static void event_handler(void* arg, esp_event_base_t event_base,
 //        if (s_retry_num < EXAMPLE_ESP_MAXIMUM_RETRY) {
             esp_wifi_connect();
             s_retry_num++;
-            ESP_LOGI(TAG, "retry to connect to the AP");
+            ESP_LOGI(TAG, "retrying connection to the AP");
 //        } else {
 //            xEventGroupSetBits(s_wifi_event_group, WIFI_FAIL_BIT);
 //        }
-        ESP_LOGI(TAG,"connect to the AP fail");
+        ESP_LOGI(TAG,"connection to the AP failed");
     } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
         ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data;
         ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip));
@@ -247,10 +247,10 @@ void wifi_init_sta(const char *_ssid, const char *_password, const char *_hostna
     /* xEventGroupWaitBits() returns the bits before the call returned, hence we can test which event actually
      * happened. */
     if (bits & WIFI_CONNECTED_BIT) {
-        ESP_LOGI(TAG, "connected to ap SSID:%s password:%s",
+        ESP_LOGI(TAG, "connected to ap SSID: %s, password:%s",
                  _ssid, _password);
     } else if (bits & WIFI_FAIL_BIT) {
-        ESP_LOGI(TAG, "Failed to connect to SSID:%s, password:%s",
+        ESP_LOGI(TAG, "Failed to connect to SSID: %s, password:%s",
                  _ssid, _password);
     } else {
         ESP_LOGE(TAG, "UNEXPECTED EVENT");

code/components/jomjol_wlan/read_wlanini.cpp

@@ -248,7 +248,7 @@ bool ChangeHostName(std::string fn, std::string _newhostname)
 
     fclose(pFile);
 
-    printf("*** Update hostname done ***\n");
+    printf("*** Hostname update done ***\n");
 
     return true;
 }

code/main/main.cpp

@@ -149,7 +149,7 @@ extern "C" void app_main(void)
     esp_err_t cam = Camera.InitCam();
     Camera.LightOnOff(false);
     xDelay = 2000 / portTICK_PERIOD_MS;
-    printf("nach init camera: sleep for : %ldms\n", (long) xDelay);
+    printf("After camera initialization: sleep for : %ldms\n", (long) xDelay);
     vTaskDelay( xDelay );   
 
 
@@ -200,8 +200,8 @@ extern "C" void app_main(void)
     size_t _hsize = getESPHeapSize();
     if (_hsize < 4000000)
     {
-        std::string _zws = "Not enought PSRAM available. Expected 4.194.304 MByte - available: " + std::to_string(_hsize);
-        _zws = _zws + "\nEither not initialzed or too small (2MByte only) or not present at all. Firmware cannot start!!";
+        std::string _zws = "Not enough PSRAM available. Expected 4.194.304 MByte - available: " + std::to_string(_hsize);
+        _zws = _zws + "\nEither not initialzed, too small (2MByte only) or not present at all. Firmware cannot start!!";
         printf(_zws.c_str());
         LogFile.SwitchOnOff(true);
         LogFile.WriteToFile(_zws);

code/main/server_main.cpp

@@ -180,7 +180,7 @@ esp_err_t hello_main_handler(httpd_req_t *req)
     }
 
     if (filetosend == "/sdcard/html/index.html" && isSetupModusActive()) {
-        printf("System ist im Setupmodus --> index.html --> setup.html");
+        printf("System is in setup mode --> index.html --> setup.html");
         filetosend = "/sdcard/html/setup.html";
     }
 

code/test/components/jomjol-flowcontroll/test_flowpostprocessing.cpp

@@ -359,21 +359,21 @@ std::string process_doFlow(std::vector<float> analog, std::vector<float> digits,
             gen_analog->ROI.push_back(anaROI);
         }
     }
-    printf("Setup ROIs completed.\n");
+    printf("Setting up of ROIs completed.\n");
 
     undertestPost->InitNUMBERS();
     if (checkConsistency) {
         printf("checkConsistency=true\n");
         std::vector<NumberPost*>* NUMBERS = undertestPost->GetNumbers();    
         for (int _n = 0; _n < (*NUMBERS).size(); ++_n) {
-            printf("Set checkConsistency on number: %d\n", _n);
+            printf("Setting checkConsistency on number: %d\n", _n);
             (*NUMBERS)[_n]->checkDigitIncreaseConsistency = true;
         }
     }
     if (extendedResolution ) {
        std::vector<NumberPost*>* NUMBERS = undertestPost->GetNumbers();    
         for (int _n = 0; _n < (*NUMBERS).size(); ++_n) {
-            printf("Set extendedResolution on number: %d\n", _n);
+            printf("Setting extendedResolution on number: %d\n", _n);
             (*NUMBERS)[_n]->isExtendedResolution = true;
         }
 
@@ -381,7 +381,7 @@ std::string process_doFlow(std::vector<float> analog, std::vector<float> digits,
     if (decimal_shift!=0) {
         std::vector<NumberPost*>* NUMBERS = undertestPost->GetNumbers();    
         for (int _n = 0; _n < (*NUMBERS).size(); ++_n) {
-            printf("Set decimalshif on number: %d to %d\n", _n, decimal_shift);
+            printf("Setting decimal shift on number: %d to %d\n", _n, decimal_shift);
             (*NUMBERS)[_n]->DecimalShift = decimal_shift;
             (*NUMBERS)[_n]->DecimalShiftInitial = decimal_shift;   
         }       

firmware/README.md

@@ -0,0 +1,2 @@
+# Firmware
+The firmware got moved to the [Release page](https://github.com/jomjol/AI-on-the-edge-device/releases).