rolling 20210517

code/main/main._c_p_p

@@ -0,0 +1,188 @@
+#include <string>
+#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();
+}

code/main/main.cpp

@@ -17,6 +17,7 @@
 #include "ClassLogFile.h"
 
 #include "connect_wlan.h"
+#include "read_wlanini.h"
 
 #include "server_tflite.h"
 #include "server_file.h"
@@ -30,7 +31,7 @@
 #define __SD_USE_ONE_LINE_MODE__
 
 #ifdef __SD_USE_ONE_LINE_MODE__
-#include "server_GPIO.h"
+// #include "server_GPIO.h"
 #endif
 
 
@@ -67,8 +68,10 @@ bool Init_NVS_SDCard()
     // 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
+#ifndef __SD_USE_ONE_LINE_MODE__
     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
+#endif
     gpio_set_pull_mode(GPIO_NUM_13, GPIO_PULLUP_ONLY);   // D3, needed in 4- and 1-line modes
 
     // Options for mounting the filesystem.
@@ -104,6 +107,7 @@ bool Init_NVS_SDCard()
 
 	// 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);   
@@ -147,9 +151,26 @@ extern "C" void app_main(void)
 
     CheckOTAUpdate();
 
-    LoadWlanFromFile("/sdcard/wlan.ini"); 
-    ConnectToWLAN();
-    printf("\nNetparameter: IP: %s - GW: %s - NetMask %s\n", getIPAddress().c_str(), getGW().c_str(), getNetMask().c_str());
+    char *ssid = NULL, *passwd = NULL, *hostname = NULL, *ip = NULL, *gateway = NULL, *netmask = NULL, *dns = NULL;
+    LoadWlanFromFile("/sdcard/wlan.ini", ssid, passwd, hostname, ip, gateway, netmask, dns);
+
+    if (ssid != NULL && passwd != NULL)
+        printf("\nWLan: %s, %s\n", ssid, passwd);
+    else
+        printf("No SSID and PASSWORD set!!!");
+
+    if (hostname != NULL)
+        printf("Hostename: %s\n", hostname);
+    else
+        printf("Hostname not set.\n");
+
+    if (ip != NULL && gateway != NULL && netmask != NULL)
+       printf("Fixed IP: %s, Gateway %s, Netmask %s\n", ip, gateway, netmask);
+    if (dns != NULL)
+       printf("DNS IP: %s\n", dns);
+
+
+    wifi_init_sta(ssid, passwd, hostname, ip, gateway, netmask, dns);
     
     TickType_t xDelay;
     xDelay = 2000 / portTICK_PERIOD_MS;
@@ -179,10 +200,12 @@ extern "C" void app_main(void)
     register_server_ota_sdcard_uri(server);
 
 #ifdef __SD_USE_ONE_LINE_MODE__
-    register_server_GPIO_uri(server);
+//    register_server_GPIO_uri(server);
 #endif    
+    printf("vor reg server main\n");
 
     register_server_main_uri(server, "/sdcard");
 
+    printf("vor dotautostart\n");
     TFliteDoAutoStart();
 }

code/main/server_main.cpp

@@ -107,7 +107,7 @@ esp_err_t info_get_handler(httpd_req_t *req)
     if (_task.compare("Hostname") == 0)
     {
         std::string zw;
-        zw = std::string(getHostname());
+        zw = std::string(hostname);
         httpd_resp_sendstr_chunk(req, zw.c_str());
         httpd_resp_sendstr_chunk(req, NULL);  
         return ESP_OK;        

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="b7e6d33";
+const char* GIT_REV="39eda4a";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-05-13 08:18";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-05-17 19:21";