diff --git a/README.md b/README.md index 3979246e3..8be6df4cd 100644 --- a/README.md +++ b/README.md @@ -39,8 +39,11 @@ If you would like to support the developer with a cup of coffee you can do that **General remark:** Beside the `firmware.bin`, typically also the content of `/html` needs to be updated! -##### 6.6.0 Image Processing in Memory - (2021-03-28) + +##### 6.6.1 Image Processing in Memory - (2021-04-05) + +* NEW 6.6.1: failed SD card initialization indicated by fast blinking LED at startup * Improved SD-card handling (increase compatibility with more type of cards) ##### 6.5.0 Image Processing in Memory - (2021-03-25) diff --git a/code/main/main.cpp b/code/main/main.cpp index 0aef19084..493ff17b3 100644 --- a/code/main/main.cpp +++ b/code/main/main.cpp @@ -33,11 +33,14 @@ #include "server_GPIO.h" #endif + +#define BLINK_GPIO GPIO_NUM_33 + static const char *TAGMAIN = "connect_wlan_main"; #define FLASH_GPIO GPIO_NUM_4 -void Init_NVS_SDCard() +bool Init_NVS_SDCard() { esp_err_t ret = nvs_flash_init(); if (ret == ESP_ERR_NVS_NO_FREE_PAGES) { @@ -92,7 +95,7 @@ void Init_NVS_SDCard() ESP_LOGE(TAG, "Failed to initialize the card (%s). " "Make sure SD card lines have pull-up resistors in place.", esp_err_to_name(ret)); } - return; + return false; } // Card has been initialized, print its properties @@ -104,6 +107,29 @@ void Init_NVS_SDCard() gpio_pad_select_gpio(FLASH_GPIO); gpio_set_direction(FLASH_GPIO, GPIO_MODE_OUTPUT); gpio_set_level(FLASH_GPIO, 0); + + return true; +} + +void task_NoSDBlink(void *pvParameter) +{ + gpio_pad_select_gpio(BLINK_GPIO); + gpio_set_direction(BLINK_GPIO, GPIO_MODE_OUTPUT); + + + TickType_t xDelay; + xDelay = 100 / portTICK_PERIOD_MS; + printf("SD-Card could not be inialized - STOP THE PROGRAMM HERE\n"); + + while (1) + { + gpio_set_level(BLINK_GPIO, 1); + vTaskDelay( xDelay ); + gpio_set_level(BLINK_GPIO, 0); + vTaskDelay( xDelay ); + + } + vTaskDelete(NULL); //Delete this task if it exits from the loop above } extern "C" void app_main(void) @@ -113,7 +139,11 @@ extern "C" void app_main(void) Camera.InitCam(); Camera.LightOnOff(false); - Init_NVS_SDCard(); + if (!Init_NVS_SDCard()) + { + xTaskCreate(&task_NoSDBlink, "task_NoSDBlink", configMINIMAL_STACK_SIZE * 64, NULL, tskIDLE_PRIORITY+1, NULL); + return; + }; CheckOTAUpdate(); diff --git a/code/main/version.cpp b/code/main/version.cpp index 999eac1ba..4ec3d4746 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="d8c9146"; +const char* GIT_REV="9923be2"; const char* GIT_TAG=""; -const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2021-03-28 20:09"; \ No newline at end of file +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2021-04-05 10:04"; \ No newline at end of file diff --git a/code/main/version.h b/code/main/version.h index 649fd17e0..4cf341ff1 100644 --- a/code/main/version.h +++ b/code/main/version.h @@ -13,7 +13,7 @@ extern "C" #include "Helper.h" #include -const char* GIT_BASE_BRANCH = "master - v6.6.0 - 2020-03-28"; +const char* GIT_BASE_BRANCH = "master - v6.6.1 - 2020-04-05"; const char* git_base_branch(void) diff --git a/code/version.cpp b/code/version.cpp index 999eac1ba..4ec3d4746 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="d8c9146"; +const char* GIT_REV="9923be2"; const char* GIT_TAG=""; -const char* GIT_BRANCH="master"; -const char* BUILD_TIME="2021-03-28 20:09"; \ No newline at end of file +const char* GIT_BRANCH="rolling"; +const char* BUILD_TIME="2021-04-05 10:04"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 3af839503..e48163ab4 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 63e5549b2..798a2b738 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ