From 6d9a43f94e7e1b7cc50da7359558895021ccf3d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=8F=85=E6=98=8C=E5=85=8B?= Date: Mon, 24 Feb 2020 18:27:00 +0900 Subject: [PATCH 1/2] ip address type mismatch --- wifi/wifi_ap/main/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/wifi_ap/main/main.c b/wifi/wifi_ap/main/main.c index b5d3c50..80f7e70 100644 --- a/wifi/wifi_ap/main/main.c +++ b/wifi/wifi_ap/main/main.c @@ -30,7 +30,7 @@ static const char* _STREAM_BOUNDARY = "\r\n--" PART_BOUNDARY "\r\n"; static const char* _STREAM_PART = "Content-Type: image/jpeg\r\nContent-Length: %u\r\n\r\n"; static EventGroupHandle_t s_wifi_event_group; -static ip4_addr_t s_ip_addr; +static esp_ip4_addr_t s_ip_addr; const int CONNECTED_BIT = BIT0; extern void led_brightness(int duty); static camera_config_t camera_config = { @@ -277,7 +277,7 @@ static void wifi_init_softap() ESP_ERROR_CHECK(esp_wifi_start()); uint8_t addr[4] = {192, 168, 4, 1}; - s_ip_addr = *(ip4_addr_t*)&addr; + s_ip_addr = *(esp_ip4_addr_t*)&addr; ESP_LOGI(TAG, "wifi_init_softap finished.SSID:%s password:%s", ESP_WIFI_SSID, ESP_WIFI_PASS); From e5a4efa9aa07a002d66859f492a30bdc80e2fc76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=8F=85=E6=98=8C=E5=85=8B?= Date: Mon, 24 Feb 2020 18:27:24 +0900 Subject: [PATCH 2/2] Fix : LEDc configuration error and camera_probe failed --- wifi/wifi_ap/components/esp32-camera/driver/xclk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/wifi_ap/components/esp32-camera/driver/xclk.c b/wifi/wifi_ap/components/esp32-camera/driver/xclk.c index 89ced66..b084042 100644 --- a/wifi/wifi_ap/components/esp32-camera/driver/xclk.c +++ b/wifi/wifi_ap/components/esp32-camera/driver/xclk.c @@ -13,13 +13,12 @@ static const char* TAG = "camera_xclk"; esp_err_t camera_enable_out_clock(camera_config_t* config) { - periph_module_enable(PERIPH_LEDC_MODULE); - ledc_timer_config_t timer_conf; timer_conf.duty_resolution = 2; timer_conf.freq_hz = config->xclk_freq_hz; timer_conf.speed_mode = LEDC_HIGH_SPEED_MODE; timer_conf.timer_num = config->ledc_timer; + timer_conf.clk_cfg = LEDC_USE_APB_CLK; esp_err_t err = ledc_timer_config(&timer_conf); if (err != ESP_OK) { ESP_LOGE(TAG, "ledc_timer_config failed, rc=%x", err); @@ -39,6 +38,7 @@ esp_err_t camera_enable_out_clock(camera_config_t* config) ESP_LOGE(TAG, "ledc_channel_config failed, rc=%x", err); return err; } + periph_module_enable(PERIPH_LEDC_MODULE); return ESP_OK; }