From 01337ddcbf84e651c060dc1e4e8f857d14e67f70 Mon Sep 17 00:00:00 2001 From: Cristian Date: Wed, 21 Sep 2022 09:37:15 +0200 Subject: [PATCH 1/5] Few typing corrections and translations --- .../esp32-camera-master/sensors/bf3005.c | 2 +- .../esp32-camera-master/sensors/gc0308.c | 6 +++--- .../esp32-camera-master/sensors/gc032a.c | 6 +++--- .../esp32-camera-master/sensors/gc2145.c | 6 +++--- .../esp32-camera-master/sensors/nt99141.c | 14 +++++++------- code/components/jomjol_controlGPIO/server_GPIO.cpp | 6 +++--- .../jomjol_controlcamera/ClassControllCamera.cpp | 10 +++++----- .../jomjol_fileserver_ota/server_file.cpp | 4 ++-- .../jomjol_fileserver_ota/server_ota.cpp | 12 ++++++------ .../jomjol_flowcontroll/ClassFlowAlignment.cpp | 2 +- .../jomjol_flowcontroll/ClassFlowImage.cpp | 4 ++-- .../jomjol_image_proc/CAlignAndCutImage.cpp | 2 +- code/components/jomjol_image_proc/CImageBasis.cpp | 10 +++++----- code/components/jomjol_logfile/ClassLogFile.cpp | 2 +- .../components/jomjol_tfliteclass/CTfLiteClass.cpp | 6 +++--- .../jomjol_tfliteclass/server_tflite.cpp | 8 ++++---- code/components/jomjol_wlan/connect_wlan.cpp | 12 ++++++------ code/components/jomjol_wlan/read_wlanini.cpp | 2 +- code/main/main.cpp | 6 +++--- code/main/server_main.cpp | 2 +- code/main/version.cpp | 4 ++-- .../test_flowpostprocessing.cpp | 8 ++++---- code/version.cpp | 4 ++-- 23 files changed, 69 insertions(+), 69 deletions(-) diff --git a/code/components/esp32-camera-master/sensors/bf3005.c b/code/components/esp32-camera-master/sensors/bf3005.c index 2da7594a..7f0bb26f 100644 --- a/code/components/esp32-camera-master/sensors/bf3005.c +++ b/code/components/esp32-camera-master/sensors/bf3005.c @@ -399,7 +399,7 @@ static int set_awb_gain_dsp(sensor_t *sensor, int value) int ret = 0; ret = SCCB_Write(sensor->slv_addr, 0xa6, value); if (ret == 0) { - ESP_LOGD(TAG, "Set awb gain threthold to: %d", value); + ESP_LOGD(TAG, "Set awb gain threshold to: %d", value); sensor->status.awb_gain = value; } return ret; diff --git a/code/components/esp32-camera-master/sensors/gc0308.c b/code/components/esp32-camera-master/sensors/gc0308.c index 8b106a3a..46481735 100644 --- a/code/components/esp32-camera-master/sensors/gc0308.c +++ b/code/components/esp32-camera-master/sensors/gc0308.c @@ -160,7 +160,7 @@ static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) ret = set_reg_bits(sensor->slv_addr, 0x24, 0, 0x0f, 2); //yuv422 Y Cb Y Cr break; default: - ESP_LOGW(TAG, "unsupport format"); + ESP_LOGW(TAG, "unsupported format"); ret = -1; break; } @@ -330,7 +330,7 @@ static int get_reg(sensor_t *sensor, int reg, int mask) { int ret = 0; if (mask > 0xFF) { - ESP_LOGE(TAG, "mask should not more than 0xff"); + ESP_LOGE(TAG, "mask should not be more than 0xff"); } else { ret = read_reg(sensor->slv_addr, reg); } @@ -344,7 +344,7 @@ static int set_reg(sensor_t *sensor, int reg, int mask, int value) { int ret = 0; if (mask > 0xFF) { - ESP_LOGE(TAG, "mask should not more than 0xff"); + ESP_LOGE(TAG, "mask should not be more than 0xff"); } else { ret = read_reg(sensor->slv_addr, reg); } diff --git a/code/components/esp32-camera-master/sensors/gc032a.c b/code/components/esp32-camera-master/sensors/gc032a.c index 612e17b1..062f18dd 100644 --- a/code/components/esp32-camera-master/sensors/gc032a.c +++ b/code/components/esp32-camera-master/sensors/gc032a.c @@ -166,7 +166,7 @@ static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) ret = set_reg_bits(sensor->slv_addr, 0x44, 0, 0x1f, 3); break; default: - ESP_LOGW(TAG, "unsupport format"); + ESP_LOGW(TAG, "unsupported format"); ret = -1; break; } @@ -255,7 +255,7 @@ static int get_reg(sensor_t *sensor, int reg, int mask) { int ret = 0; if (mask > 0xFF) { - ESP_LOGE(TAG, "mask should not more than 0xff"); + ESP_LOGE(TAG, "mask should not be more than 0xff"); } else { ret = read_reg(sensor->slv_addr, reg); } @@ -269,7 +269,7 @@ static int set_reg(sensor_t *sensor, int reg, int mask, int value) { int ret = 0; if (mask > 0xFF) { - ESP_LOGE(TAG, "mask should not more than 0xff"); + ESP_LOGE(TAG, "mask should not be more than 0xff"); } else { ret = read_reg(sensor->slv_addr, reg); } diff --git a/code/components/esp32-camera-master/sensors/gc2145.c b/code/components/esp32-camera-master/sensors/gc2145.c index 3a066cd9..a7053be5 100644 --- a/code/components/esp32-camera-master/sensors/gc2145.c +++ b/code/components/esp32-camera-master/sensors/gc2145.c @@ -166,7 +166,7 @@ static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) ret = set_reg_bits(sensor->slv_addr, P0_OUTPUT_FORMAT, 0, 0x1f, 2); //yuv422 break; default: - ESP_LOGW(TAG, "unsupport format"); + ESP_LOGW(TAG, "unsupported format"); ret = -1; break; } @@ -339,7 +339,7 @@ static int get_reg(sensor_t *sensor, int reg, int mask) { int ret = 0; if (mask > 0xFF) { - ESP_LOGE(TAG, "mask should not more than 0xff"); + ESP_LOGE(TAG, "mask should not be more than 0xff"); } else { ret = read_reg(sensor->slv_addr, reg); } @@ -353,7 +353,7 @@ static int set_reg(sensor_t *sensor, int reg, int mask, int value) { int ret = 0; if (mask > 0xFF) { - ESP_LOGE(TAG, "mask should not more than 0xff"); + ESP_LOGE(TAG, "mask should not be more than 0xff"); } else { ret = read_reg(sensor->slv_addr, reg); } diff --git a/code/components/esp32-camera-master/sensors/nt99141.c b/code/components/esp32-camera-master/sensors/nt99141.c index 86a8b8a0..6adfe2f3 100644 --- a/code/components/esp32-camera-master/sensors/nt99141.c +++ b/code/components/esp32-camera-master/sensors/nt99141.c @@ -468,14 +468,14 @@ static int set_lenc_dsp(sensor_t *sensor, int enable) static int get_agc_gain(sensor_t *sensor) { - ESP_LOGD(TAG, "get_agc_gain can not be configured at present"); + ESP_LOGD(TAG, "get_agc_gain cannot be configured now"); return 0; } //real gain static int set_agc_gain(sensor_t *sensor, int gain) { - ESP_LOGD(TAG, "set_agc_gain can not be configured at present"); + ESP_LOGD(TAG, "set_agc_gain cannot be configured now"); // ESP_LOGD(TAG, "GAIN = %d\n", gain); int cnt = gain / 2; @@ -515,13 +515,13 @@ static int set_agc_gain(sensor_t *sensor, int gain) static int get_aec_value(sensor_t *sensor) { - ESP_LOGD(TAG, "get_aec_value can not be configured at present"); + ESP_LOGD(TAG, "get_aec_value can not be configured now"); return 0; } static int set_aec_value(sensor_t *sensor, int value) { - ESP_LOGD(TAG, "set_aec_value can not be configured at present"); + ESP_LOGD(TAG, "set_aec_value cannot be configured now"); int ret = 0; // ESP_LOGD(TAG, " set_aec_value to: %d", value); ret = write_reg_bits(sensor->slv_addr, 0x3012, 0x00, (value >> 8) & 0xff); @@ -537,7 +537,7 @@ static int set_aec_value(sensor_t *sensor, int value) static int set_ae_level(sensor_t *sensor, int level) { - ESP_LOGD(TAG, "set_ae_level can not be configured at present"); + ESP_LOGD(TAG, "set_ae_level cannot be configured now"); int ret = 0; if (level < 0) { @@ -814,7 +814,7 @@ static int set_sharpness(sensor_t *sensor, int level) static int set_gainceiling(sensor_t *sensor, gainceiling_t level) { - ESP_LOGD(TAG, "set_gainceiling can not be configured at present"); + ESP_LOGD(TAG, "set_gainceiling cannot be configured now"); return 0; } @@ -826,7 +826,7 @@ static int get_denoise(sensor_t *sensor) static int set_denoise(sensor_t *sensor, int level) { - ESP_LOGD(TAG, "set_denoise can not be configured at present"); + ESP_LOGD(TAG, "set_denoise cannot be configured now"); return 0; } diff --git a/code/components/jomjol_controlGPIO/server_GPIO.cpp b/code/components/jomjol_controlGPIO/server_GPIO.cpp index 8b0b8c4d..b6cb5a4c 100644 --- a/code/components/jomjol_controlGPIO/server_GPIO.cpp +++ b/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; diff --git a/code/components/jomjol_controlcamera/ClassControllCamera.cpp b/code/components/jomjol_controlcamera/ClassControllCamera.cpp index ff410da3..20a3ebab 100644 --- a/code/components/jomjol_controlcamera/ClassControllCamera.cpp +++ b/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; } diff --git a/code/components/jomjol_fileserver_ota/server_file.cpp b/code/components/jomjol_fileserver_ota/server_file.cpp index e6802dc0..8e8ea3b3 100644 --- a/code/components/jomjol_fileserver_ota/server_file.cpp +++ b/code/components/jomjol_fileserver_ota/server_file.cpp @@ -414,7 +414,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); @@ -676,7 +676,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; } diff --git a/code/components/jomjol_fileserver_ota/server_ota.cpp b/code/components/jomjol_fileserver_ota/server_ota.cpp index 3d41b78f..0847e863 100644 --- a/code/components/jomjol_fileserver_ota/server_ota.cpp +++ b/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); @@ -370,7 +370,7 @@ esp_err_t handler_ota_update(httpd_req_t *req) { filetype = "BIN"; fn = retfirmware; - zw = "HTML Update Successfull!

Additioal firmware found in ZIP file.\n"; + zw = "HTML Update Successfull!

Additional firmware found in ZIP file.\n"; httpd_resp_sendstr_chunk(req, zw.c_str()); } else @@ -397,7 +397,7 @@ esp_err_t handler_ota_update(httpd_req_t *req) } else { - resp_str = "Error during Firmware Update!!!

Please check output of console."; + resp_str = "Error during Firmware Update!!!

Please check console output."; } httpd_resp_send(req, resp_str, strlen(resp_str)); @@ -460,7 +460,7 @@ esp_err_t handler_ota_update(httpd_req_t *req) } else { - resp_str = "Error during Firmware Update!!!

Please check output of console."; + resp_str = "Error during Firmware Update!!!

Please check console output."; } httpd_resp_send(req, resp_str, strlen(resp_str)); @@ -492,7 +492,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); @@ -512,7 +512,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 = "

"; + const char* resp_str = "

"; httpd_resp_send(req, resp_str, strlen(resp_str)); doReboot(); diff --git a/code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp b/code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp index 8e76c720..532cd63f 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp @@ -48,7 +48,7 @@ ClassFlowAlignment::ClassFlowAlignment(std::vector* 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); } } diff --git a/code/components/jomjol_flowcontroll/ClassFlowImage.cpp b/code/components/jomjol_flowcontroll/ClassFlowImage.cpp index 4053b5dc..8fd45139 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowImage.cpp +++ b/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; diff --git a/code/components/jomjol_image_proc/CAlignAndCutImage.cpp b/code/components/jomjol_image_proc/CAlignAndCutImage.cpp index 83f53088..f96d4661 100644 --- a/code/components/jomjol_image_proc/CAlignAndCutImage.cpp +++ b/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; } diff --git a/code/components/jomjol_image_proc/CImageBasis.cpp b/code/components/jomjol_image_proc/CImageBasis.cpp index 3b27d2c6..67be8a75 100644 --- a/code/components/jomjol_image_proc/CImageBasis.cpp +++ b/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; } diff --git a/code/components/jomjol_logfile/ClassLogFile.cpp b/code/components/jomjol_logfile/ClassLogFile.cpp index f462e7a4..3d3605d9 100644 --- a/code/components/jomjol_logfile/ClassLogFile.cpp +++ b/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"); } } */ diff --git a/code/components/jomjol_tfliteclass/CTfLiteClass.cpp b/code/components/jomjol_tfliteclass/CTfLiteClass.cpp index 15affbc0..1689f9c5 100644 --- a/code/components/jomjol_tfliteclass/CTfLiteClass.cpp +++ b/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"); } diff --git a/code/components/jomjol_tfliteclass/server_tflite.cpp b/code/components/jomjol_tfliteclass/server_tflite.cpp index 903cc6f4..0cd7bc7f 100644 --- a/code/components/jomjol_tfliteclass/server_tflite.cpp +++ b/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(); diff --git a/code/components/jomjol_wlan/connect_wlan.cpp b/code/components/jomjol_wlan/connect_wlan.cpp index 3b2c1a1a..cd84e0da 100644 --- a/code/components/jomjol_wlan/connect_wlan.cpp +++ b/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"); diff --git a/code/components/jomjol_wlan/read_wlanini.cpp b/code/components/jomjol_wlan/read_wlanini.cpp index eca4a11a..b10a0ec4 100644 --- a/code/components/jomjol_wlan/read_wlanini.cpp +++ b/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; } diff --git a/code/main/main.cpp b/code/main/main.cpp index 05f0a889..32beea17 100644 --- a/code/main/main.cpp +++ b/code/main/main.cpp @@ -138,7 +138,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 ); @@ -188,8 +188,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); diff --git a/code/main/server_main.cpp b/code/main/server_main.cpp index 4f2f0ce4..61e86cbc 100644 --- a/code/main/server_main.cpp +++ b/code/main/server_main.cpp @@ -178,7 +178,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"; } diff --git a/code/main/version.cpp b/code/main/version.cpp index 428f3297..d45fb58e 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="a1f6754"; +const char* GIT_REV="6cd52a3"; const char* GIT_TAG=""; const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2022-09-17 21:12"; \ No newline at end of file +const char* BUILD_TIME="2022-09-21 07:51"; \ No newline at end of file diff --git a/code/test/components/jomjol-flowcontroll/test_flowpostprocessing.cpp b/code/test/components/jomjol-flowcontroll/test_flowpostprocessing.cpp index ae4c360f..684057b1 100644 --- a/code/test/components/jomjol-flowcontroll/test_flowpostprocessing.cpp +++ b/code/test/components/jomjol-flowcontroll/test_flowpostprocessing.cpp @@ -358,21 +358,21 @@ std::string process_doFlow(std::vector analog, std::vector 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* 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* 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; } @@ -380,7 +380,7 @@ std::string process_doFlow(std::vector analog, std::vector digits, if (decimal_shift!=0) { std::vector* 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; } diff --git a/code/version.cpp b/code/version.cpp index 428f3297..d45fb58e 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="a1f6754"; +const char* GIT_REV="6cd52a3"; const char* GIT_TAG=""; const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2022-09-17 21:12"; \ No newline at end of file +const char* BUILD_TIME="2022-09-21 07:51"; \ No newline at end of file From 81f92b8b0fcc574426e033d93dff288693fe619d Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Wed, 21 Sep 2022 16:53:39 +0200 Subject: [PATCH 2/5] re-added empty firmware folder with a readme pointing to the releases page --- firmware/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 firmware/README.md diff --git a/firmware/README.md b/firmware/README.md new file mode 100644 index 00000000..ceaea6e2 --- /dev/null +++ b/firmware/README.md @@ -0,0 +1 @@ +The firmware got moved to the [Release page](https://github.com/jomjol/AI-on-the-edge-device/releases). From 7d286337ced514549037f62afca328ea2f654892 Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Wed, 21 Sep 2022 16:55:43 +0200 Subject: [PATCH 3/5] Update README.md --- firmware/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/firmware/README.md b/firmware/README.md index ceaea6e2..e09cc8e1 100644 --- a/firmware/README.md +++ b/firmware/README.md @@ -1 +1,2 @@ +# Firmware The firmware got moved to the [Release page](https://github.com/jomjol/AI-on-the-edge-device/releases). From 6938299b722b2b872044fc7580532998972d13c3 Mon Sep 17 00:00:00 2001 From: Cristian Date: Wed, 21 Sep 2022 23:36:14 +0200 Subject: [PATCH 4/5] Few typing corrections and translations --- .../jomjol_flowcontroll/ClassFlowPostProcessing.cpp | 4 ++-- code/main/version.cpp | 6 +++--- code/version.cpp | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp b/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp index 73feef3e..6222e6fe 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp +++ b/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) { diff --git a/code/main/version.cpp b/code/main/version.cpp index d45fb58e..a46631d6 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="6cd52a3"; +const char* GIT_REV="01337dd"; const char* GIT_TAG=""; -const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2022-09-21 07:51"; \ No newline at end of file +const char* GIT_BRANCH="texts-typing-corrections"; +const char* BUILD_TIME="2022-09-21 19:55"; \ No newline at end of file diff --git a/code/version.cpp b/code/version.cpp index d45fb58e..a46631d6 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="6cd52a3"; +const char* GIT_REV="01337dd"; const char* GIT_TAG=""; -const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2022-09-21 07:51"; \ No newline at end of file +const char* GIT_BRANCH="texts-typing-corrections"; +const char* BUILD_TIME="2022-09-21 19:55"; \ No newline at end of file From 7d8cdc79f26492508f51f6bf19732a030efd6082 Mon Sep 17 00:00:00 2001 From: Cristian Date: Wed, 21 Sep 2022 23:42:02 +0200 Subject: [PATCH 5/5] Reversed the changes in the directory of the esp32-cam: /components/esp32-camera-master upon request from jomjol --- .../esp32-camera-master/sensors/bf3005.c | 2 +- .../esp32-camera-master/sensors/gc0308.c | 6 +++--- .../esp32-camera-master/sensors/gc032a.c | 6 +++--- .../esp32-camera-master/sensors/gc2145.c | 6 +++--- .../esp32-camera-master/sensors/nt99141.c | 14 +++++++------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/code/components/esp32-camera-master/sensors/bf3005.c b/code/components/esp32-camera-master/sensors/bf3005.c index 7f0bb26f..2da7594a 100644 --- a/code/components/esp32-camera-master/sensors/bf3005.c +++ b/code/components/esp32-camera-master/sensors/bf3005.c @@ -399,7 +399,7 @@ static int set_awb_gain_dsp(sensor_t *sensor, int value) int ret = 0; ret = SCCB_Write(sensor->slv_addr, 0xa6, value); if (ret == 0) { - ESP_LOGD(TAG, "Set awb gain threshold to: %d", value); + ESP_LOGD(TAG, "Set awb gain threthold to: %d", value); sensor->status.awb_gain = value; } return ret; diff --git a/code/components/esp32-camera-master/sensors/gc0308.c b/code/components/esp32-camera-master/sensors/gc0308.c index 46481735..8b106a3a 100644 --- a/code/components/esp32-camera-master/sensors/gc0308.c +++ b/code/components/esp32-camera-master/sensors/gc0308.c @@ -160,7 +160,7 @@ static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) ret = set_reg_bits(sensor->slv_addr, 0x24, 0, 0x0f, 2); //yuv422 Y Cb Y Cr break; default: - ESP_LOGW(TAG, "unsupported format"); + ESP_LOGW(TAG, "unsupport format"); ret = -1; break; } @@ -330,7 +330,7 @@ static int get_reg(sensor_t *sensor, int reg, int mask) { int ret = 0; if (mask > 0xFF) { - ESP_LOGE(TAG, "mask should not be more than 0xff"); + ESP_LOGE(TAG, "mask should not more than 0xff"); } else { ret = read_reg(sensor->slv_addr, reg); } @@ -344,7 +344,7 @@ static int set_reg(sensor_t *sensor, int reg, int mask, int value) { int ret = 0; if (mask > 0xFF) { - ESP_LOGE(TAG, "mask should not be more than 0xff"); + ESP_LOGE(TAG, "mask should not more than 0xff"); } else { ret = read_reg(sensor->slv_addr, reg); } diff --git a/code/components/esp32-camera-master/sensors/gc032a.c b/code/components/esp32-camera-master/sensors/gc032a.c index 062f18dd..612e17b1 100644 --- a/code/components/esp32-camera-master/sensors/gc032a.c +++ b/code/components/esp32-camera-master/sensors/gc032a.c @@ -166,7 +166,7 @@ static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) ret = set_reg_bits(sensor->slv_addr, 0x44, 0, 0x1f, 3); break; default: - ESP_LOGW(TAG, "unsupported format"); + ESP_LOGW(TAG, "unsupport format"); ret = -1; break; } @@ -255,7 +255,7 @@ static int get_reg(sensor_t *sensor, int reg, int mask) { int ret = 0; if (mask > 0xFF) { - ESP_LOGE(TAG, "mask should not be more than 0xff"); + ESP_LOGE(TAG, "mask should not more than 0xff"); } else { ret = read_reg(sensor->slv_addr, reg); } @@ -269,7 +269,7 @@ static int set_reg(sensor_t *sensor, int reg, int mask, int value) { int ret = 0; if (mask > 0xFF) { - ESP_LOGE(TAG, "mask should not be more than 0xff"); + ESP_LOGE(TAG, "mask should not more than 0xff"); } else { ret = read_reg(sensor->slv_addr, reg); } diff --git a/code/components/esp32-camera-master/sensors/gc2145.c b/code/components/esp32-camera-master/sensors/gc2145.c index a7053be5..3a066cd9 100644 --- a/code/components/esp32-camera-master/sensors/gc2145.c +++ b/code/components/esp32-camera-master/sensors/gc2145.c @@ -166,7 +166,7 @@ static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) ret = set_reg_bits(sensor->slv_addr, P0_OUTPUT_FORMAT, 0, 0x1f, 2); //yuv422 break; default: - ESP_LOGW(TAG, "unsupported format"); + ESP_LOGW(TAG, "unsupport format"); ret = -1; break; } @@ -339,7 +339,7 @@ static int get_reg(sensor_t *sensor, int reg, int mask) { int ret = 0; if (mask > 0xFF) { - ESP_LOGE(TAG, "mask should not be more than 0xff"); + ESP_LOGE(TAG, "mask should not more than 0xff"); } else { ret = read_reg(sensor->slv_addr, reg); } @@ -353,7 +353,7 @@ static int set_reg(sensor_t *sensor, int reg, int mask, int value) { int ret = 0; if (mask > 0xFF) { - ESP_LOGE(TAG, "mask should not be more than 0xff"); + ESP_LOGE(TAG, "mask should not more than 0xff"); } else { ret = read_reg(sensor->slv_addr, reg); } diff --git a/code/components/esp32-camera-master/sensors/nt99141.c b/code/components/esp32-camera-master/sensors/nt99141.c index 6adfe2f3..86a8b8a0 100644 --- a/code/components/esp32-camera-master/sensors/nt99141.c +++ b/code/components/esp32-camera-master/sensors/nt99141.c @@ -468,14 +468,14 @@ static int set_lenc_dsp(sensor_t *sensor, int enable) static int get_agc_gain(sensor_t *sensor) { - ESP_LOGD(TAG, "get_agc_gain cannot be configured now"); + ESP_LOGD(TAG, "get_agc_gain can not be configured at present"); return 0; } //real gain static int set_agc_gain(sensor_t *sensor, int gain) { - ESP_LOGD(TAG, "set_agc_gain cannot be configured now"); + ESP_LOGD(TAG, "set_agc_gain can not be configured at present"); // ESP_LOGD(TAG, "GAIN = %d\n", gain); int cnt = gain / 2; @@ -515,13 +515,13 @@ static int set_agc_gain(sensor_t *sensor, int gain) static int get_aec_value(sensor_t *sensor) { - ESP_LOGD(TAG, "get_aec_value can not be configured now"); + ESP_LOGD(TAG, "get_aec_value can not be configured at present"); return 0; } static int set_aec_value(sensor_t *sensor, int value) { - ESP_LOGD(TAG, "set_aec_value cannot be configured now"); + ESP_LOGD(TAG, "set_aec_value can not be configured at present"); int ret = 0; // ESP_LOGD(TAG, " set_aec_value to: %d", value); ret = write_reg_bits(sensor->slv_addr, 0x3012, 0x00, (value >> 8) & 0xff); @@ -537,7 +537,7 @@ static int set_aec_value(sensor_t *sensor, int value) static int set_ae_level(sensor_t *sensor, int level) { - ESP_LOGD(TAG, "set_ae_level cannot be configured now"); + ESP_LOGD(TAG, "set_ae_level can not be configured at present"); int ret = 0; if (level < 0) { @@ -814,7 +814,7 @@ static int set_sharpness(sensor_t *sensor, int level) static int set_gainceiling(sensor_t *sensor, gainceiling_t level) { - ESP_LOGD(TAG, "set_gainceiling cannot be configured now"); + ESP_LOGD(TAG, "set_gainceiling can not be configured at present"); return 0; } @@ -826,7 +826,7 @@ static int get_denoise(sensor_t *sensor) static int set_denoise(sensor_t *sensor, int level) { - ESP_LOGD(TAG, "set_denoise cannot be configured now"); + ESP_LOGD(TAG, "set_denoise can not be configured at present"); return 0; }