From 1dc4b48241cd4f945ee8a712ef1b87f23d304e10 Mon Sep 17 00:00:00 2001 From: Wu Jian Gang Date: Fri, 25 May 2018 16:26:12 +0800 Subject: [PATCH] fix(example): Fix warning in openssl_demo --- .../openssl_demo/main/openssl_demo.c | 95 +++++++++++++++- .../protocols/openssl_demo/main/user_main.c | 105 ------------------ 2 files changed, 94 insertions(+), 106 deletions(-) delete mode 100644 examples/protocols/openssl_demo/main/user_main.c diff --git a/examples/protocols/openssl_demo/main/openssl_demo.c b/examples/protocols/openssl_demo/main/openssl_demo.c index 5e534843..1008e919 100644 --- a/examples/protocols/openssl_demo/main/openssl_demo.c +++ b/examples/protocols/openssl_demo/main/openssl_demo.c @@ -11,14 +11,21 @@ #include #include +#include "esp_sta.h" +#include "esp_system.h" +#include "esp_wifi.h" + #include "openssl_demo.h" #include "openssl/ssl.h" + #include "freertos/FreeRTOS.h" #include "freertos/task.h" -#include "c_types.h" + #include "lwip/sockets.h" #include "lwip/api.h" +#include "user_config.h" + #define OPENSSL_DEMO_THREAD_NAME "ssl_demo" #define OPENSSL_DEMO_THREAD_STACK_WORDS 2048 #define OPENSSL_DEMO_THREAD_PRORIOTY 6 @@ -185,3 +192,89 @@ void user_conn_init(void) } } +/****************************************************************************** + * FunctionName : user_rf_cal_sector_set + * Description : SDK just reversed 4 sectors, used for rf init data and paramters. + * We add this function to force users to set rf cal sector, since + * we don't know which sector is free in user's application. + * sector map for last several sectors : ABCCC + * A : rf cal + * B : rf init data + * C : sdk parameters + * Parameters : none + * Returns : rf cal sector +*******************************************************************************/ +uint32_t user_rf_cal_sector_set(void) +{ + flash_size_map size_map = system_get_flash_size_map(); + uint32_t rf_cal_sec = 0; + + switch (size_map) { + case FLASH_SIZE_4M_MAP_256_256: + rf_cal_sec = 128 - 5; + break; + + case FLASH_SIZE_8M_MAP_512_512: + rf_cal_sec = 256 - 5; + break; + + case FLASH_SIZE_16M_MAP_512_512: + case FLASH_SIZE_16M_MAP_1024_1024: + rf_cal_sec = 512 - 5; + break; + + case FLASH_SIZE_32M_MAP_512_512: + case FLASH_SIZE_32M_MAP_1024_1024: + rf_cal_sec = 1024 - 5; + break; + case FLASH_SIZE_64M_MAP_1024_1024: + rf_cal_sec = 2048 - 5; + break; + case FLASH_SIZE_128M_MAP_1024_1024: + rf_cal_sec = 4096 - 5; + break; + default: + rf_cal_sec = 0; + break; + } + + return rf_cal_sec; +} + +void wifi_event_handler_cb(System_Event_t *event) +{ + if (event == NULL) { + return; + } + + switch (event->event_id) { + case EVENT_STAMODE_GOT_IP: + printf("sta got ip , creat task %d\n", system_get_free_heap_size()); + user_conn_init(); + break; + + default: + break; + } +} + +/****************************************************************************** + * FunctionName : user_init + * Description : entry of user application, init user function here + * Parameters : none + * Returns : none +*******************************************************************************/ +void user_init(void) +{ + printf("SDK version:%s %d\n", system_get_sdk_version(), system_get_free_heap_size()); + wifi_set_opmode(STATION_MODE); + + // set AP parameter + struct station_config config; + bzero(&config, sizeof(struct station_config)); + sprintf((char *)config.ssid, SSID); + sprintf((char *)config.password, PASSWORD); + wifi_station_set_config(&config); + + wifi_set_event_handler_cb(wifi_event_handler_cb); +} diff --git a/examples/protocols/openssl_demo/main/user_main.c b/examples/protocols/openssl_demo/main/user_main.c deleted file mode 100644 index d5a3adec..00000000 --- a/examples/protocols/openssl_demo/main/user_main.c +++ /dev/null @@ -1,105 +0,0 @@ -/* openSSL demo example - - This example code is in the Public Domain (or CC0 licensed, at your option.) - - Unless required by applicable law or agreed to in writing, this - software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - CONDITIONS OF ANY KIND, either express or implied. -*/ - -#include -#include -#include - -#include "esp_sta.h" -#include "esp_system.h" -#include "esp_wifi.h" - -#include "user_config.h" - -/****************************************************************************** - * FunctionName : user_rf_cal_sector_set - * Description : SDK just reversed 4 sectors, used for rf init data and paramters. - * We add this function to force users to set rf cal sector, since - * we don't know which sector is free in user's application. - * sector map for last several sectors : ABCCC - * A : rf cal - * B : rf init data - * C : sdk parameters - * Parameters : none - * Returns : rf cal sector -*******************************************************************************/ -uint32_t user_rf_cal_sector_set(void) -{ - flash_size_map size_map = system_get_flash_size_map(); - uint32_t rf_cal_sec = 0; - - switch (size_map) { - case FLASH_SIZE_4M_MAP_256_256: - rf_cal_sec = 128 - 5; - break; - - case FLASH_SIZE_8M_MAP_512_512: - rf_cal_sec = 256 - 5; - break; - - case FLASH_SIZE_16M_MAP_512_512: - case FLASH_SIZE_16M_MAP_1024_1024: - rf_cal_sec = 512 - 5; - break; - - case FLASH_SIZE_32M_MAP_512_512: - case FLASH_SIZE_32M_MAP_1024_1024: - rf_cal_sec = 1024 - 5; - break; - case FLASH_SIZE_64M_MAP_1024_1024: - rf_cal_sec = 2048 - 5; - break; - case FLASH_SIZE_128M_MAP_1024_1024: - rf_cal_sec = 4096 - 5; - break; - default: - rf_cal_sec = 0; - break; - } - - return rf_cal_sec; -} - -void wifi_event_handler_cb(System_Event_t *event) -{ - if (event == NULL) { - return; - } - - switch (event->event_id) { - case EVENT_STAMODE_GOT_IP: - printf("sta got ip , creat task %d\n", system_get_free_heap_size()); - user_conn_init(); - break; - - default: - break; - } -} - -/****************************************************************************** - * FunctionName : user_init - * Description : entry of user application, init user function here - * Parameters : none - * Returns : none -*******************************************************************************/ -void user_init(void) -{ - printf("SDK version:%s %d\n", system_get_sdk_version(), system_get_free_heap_size()); - wifi_set_opmode(STATION_MODE); - - // set AP parameter - struct station_config config; - bzero(&config, sizeof(struct station_config)); - sprintf(config.ssid, SSID); - sprintf(config.password, PASSWORD); - wifi_station_set_config(&config); - - wifi_set_event_handler_cb(wifi_event_handler_cb); -}