diff --git a/code/main/main._c_p_p b/code/main/main._c_p_p deleted file mode 100644 index 493ff17b..00000000 --- a/code/main/main._c_p_p +++ /dev/null @@ -1,188 +0,0 @@ -#include -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" -#include "freertos/event_groups.h" - -#include "driver/gpio.h" -#include "sdkconfig.h" - -// SD-Card //////////////////// -#include "nvs_flash.h" -#include "esp_vfs_fat.h" -#include "sdmmc_cmd.h" -#include "driver/sdmmc_host.h" -#include "driver/sdmmc_defs.h" -/////////////////////////////// - -#include "ClassLogFile.h" - -#include "connect_wlan.h" - -#include "server_tflite.h" -#include "server_file.h" -#include "server_ota.h" -#include "time_sntp.h" -#include "ClassControllCamera.h" -#include "server_main.h" -#include "server_camera.h" - - -#define __SD_USE_ONE_LINE_MODE__ - -#ifdef __SD_USE_ONE_LINE_MODE__ -#include "server_GPIO.h" -#endif - - -#define BLINK_GPIO GPIO_NUM_33 - -static const char *TAGMAIN = "connect_wlan_main"; - -#define FLASH_GPIO GPIO_NUM_4 - -bool Init_NVS_SDCard() -{ - esp_err_t ret = nvs_flash_init(); - if (ret == ESP_ERR_NVS_NO_FREE_PAGES) { - ESP_ERROR_CHECK(nvs_flash_erase()); - ret = nvs_flash_init(); - } -//////////////////////////////////////////////// - - ESP_LOGI(TAG, "Using SDMMC peripheral"); - sdmmc_host_t host = SDMMC_HOST_DEFAULT(); - - // This initializes the slot without card detect (CD) and write protect (WP) signals. - // Modify slot_config.gpio_cd and slot_config.gpio_wp if your board has these signals. - sdmmc_slot_config_t slot_config = SDMMC_SLOT_CONFIG_DEFAULT(); - - // To use 1-line SD mode, uncomment the following line: - -#ifdef __SD_USE_ONE_LINE_MODE__ - slot_config.width = 1; -#endif - - // GPIOs 15, 2, 4, 12, 13 should have external 10k pull-ups. - // Internal pull-ups are not sufficient. However, enabling internal pull-ups - // does make a difference some boards, so we do that here. - gpio_set_pull_mode(GPIO_NUM_15, GPIO_PULLUP_ONLY); // CMD, needed in 4- and 1- line modes - gpio_set_pull_mode(GPIO_NUM_2, GPIO_PULLUP_ONLY); // D0, needed in 4- and 1-line modes - gpio_set_pull_mode(GPIO_NUM_4, GPIO_PULLUP_ONLY); // D1, needed in 4-line mode only - gpio_set_pull_mode(GPIO_NUM_12, GPIO_PULLUP_ONLY); // D2, needed in 4-line mode only - gpio_set_pull_mode(GPIO_NUM_13, GPIO_PULLUP_ONLY); // D3, needed in 4- and 1-line modes - - // Options for mounting the filesystem. - // If format_if_mount_failed is set to true, SD card will be partitioned and - // formatted in case when mounting fails. - esp_vfs_fat_sdmmc_mount_config_t mount_config = { - .format_if_mount_failed = false, - .max_files = 5, - .allocation_unit_size = 16 * 1024 - }; - - // Use settings defined above to initialize SD card and mount FAT filesystem. - // Note: esp_vfs_fat_sdmmc_mount is an all-in-one convenience function. - // Please check its source code and implement error recovery when developing - // production applications. - sdmmc_card_t* card; - ret = esp_vfs_fat_sdmmc_mount("/sdcard", &host, &slot_config, &mount_config, &card); - - if (ret != ESP_OK) { - if (ret == ESP_FAIL) { - ESP_LOGE(TAG, "Failed to mount filesystem. " - "If you want the card to be formatted, set format_if_mount_failed = true."); - } else { - 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 false; - } - - // Card has been initialized, print its properties - sdmmc_card_print_info(stdout, card); - - - // Init the GPIO - // Flash ausschalten - 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) -{ - printf("Do Reset Camera\n"); - PowerResetCamera(); - Camera.InitCam(); - Camera.LightOnOff(false); - - if (!Init_NVS_SDCard()) - { - xTaskCreate(&task_NoSDBlink, "task_NoSDBlink", configMINIMAL_STACK_SIZE * 64, NULL, tskIDLE_PRIORITY+1, NULL); - return; - }; - - CheckOTAUpdate(); - - LoadWlanFromFile("/sdcard/wlan.ini"); - ConnectToWLAN(); - printf("\nNetparameter: IP: %s - GW: %s - NetMask %s\n", getIPAddress().c_str(), getGW().c_str(), getNetMask().c_str()); - - TickType_t xDelay; - xDelay = 2000 / portTICK_PERIOD_MS; - printf("Autoflow: sleep for : %ldms\n", (long) xDelay); -// LogFile.WriteToFile("Startsequence 06"); - vTaskDelay( xDelay ); -// LogFile.WriteToFile("Startsequence 07"); - setup_time(); - LogFile.WriteToFile("============================================================================================="); - LogFile.WriteToFile("=================================== Main Started ============================================"); - LogFile.WriteToFile("============================================================================================="); - LogFile.SwitchOnOff(false); - - std::string zw = gettimestring("%Y%m%d-%H%M%S"); - printf("time %s\n", zw.c_str()); - -// Camera.InitCam(); -// Camera.LightOnOff(false); - xDelay = 2000 / portTICK_PERIOD_MS; - printf("Autoflow: sleep for : %ldms\n", (long) xDelay); - vTaskDelay( xDelay ); - - server = start_webserver(); - register_server_camera_uri(server); - register_server_tflite_uri(server); - register_server_file_uri(server, "/sdcard"); - register_server_ota_sdcard_uri(server); - -#ifdef __SD_USE_ONE_LINE_MODE__ - register_server_GPIO_uri(server); -#endif - - register_server_main_uri(server, "/sdcard"); - - TFliteDoAutoStart(); -} diff --git a/code/main/version.cpp b/code/main/version.cpp index 1d849532..bdccd54d 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="026bac1"; +const char* GIT_REV="6e0a7a7"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2021-05-27 19:10"; \ No newline at end of file +const char* BUILD_TIME="2021-05-28 19:48"; \ No newline at end of file diff --git a/code/main/version.h b/code/main/version.h index 02964aeb..d900509d 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 - v7.0.1 - 2020-05-13"; +const char* GIT_BASE_BRANCH = "master - v7.1.0 - 2020-05-28"; const char* git_base_branch(void) diff --git a/code/version.cpp b/code/version.cpp index 1d849532..bdccd54d 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="026bac1"; +const char* GIT_REV="6e0a7a7"; const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2021-05-27 19:10"; \ No newline at end of file +const char* BUILD_TIME="2021-05-28 19:48"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index 94ba6dcf..11e237b5 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 86259fb8..7ea0c926 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/sd-card/config/config.ini b/sd-card/config/config.ini index 35af2bf2..9e06820d 100644 --- a/sd-card/config/config.ini +++ b/sd-card/config/config.ini @@ -18,7 +18,7 @@ InitialMirror= false AlignmentAlgo = Default [Digits] -Model = /config/dig0860s1q.tflite +Model = /config/dig0870s3q.tflite ;LogImageLocation = /log/digit ;LogfileRetentionInDays = 3 ModelInputSize = 20 32 diff --git a/sd-card/config/dig0830s2q.tflite b/sd-card/config/dig0830s2q.tflite deleted file mode 100644 index 4ac84793..00000000 Binary files a/sd-card/config/dig0830s2q.tflite and /dev/null differ diff --git a/sd-card/config/dig0840s1q.tflite b/sd-card/config/dig0840s1q.tflite deleted file mode 100644 index 2ab2fdbd..00000000 Binary files a/sd-card/config/dig0840s1q.tflite and /dev/null differ diff --git a/sd-card/config/dig0850s1q.tflite b/sd-card/config/dig0850s1q.tflite deleted file mode 100644 index aab43750..00000000 Binary files a/sd-card/config/dig0850s1q.tflite and /dev/null differ diff --git a/sd-card/config/dig0860s1q.tflite b/sd-card/config/dig0860s1q.tflite deleted file mode 100644 index ecfc67cd..00000000 Binary files a/sd-card/config/dig0860s1q.tflite and /dev/null differ diff --git a/sd-card/config/dig0870s3q.tflite b/sd-card/config/dig0870s3q.tflite new file mode 100644 index 00000000..c2dd4fdc Binary files /dev/null and b/sd-card/config/dig0870s3q.tflite differ