Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d807a8c

Browse files
wujiangangwujiangang
committed
Merge branch 'feature/remove_user_rf_cal_sector_set_in_example' into 'master'
feat(examples): remove the use of user_rf_cal_sector_set in examples See merge request sdk/ESP8266_RTOS_SDK!275
2 parents aa040c9 + c4faded commit d807a8c

File tree

14 files changed

+21
-697
lines changed

14 files changed

+21
-697
lines changed

‎components/mqtt/paho/MQTTClient-C/src/FreeRTOS/MQTTFreeRTOS.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
* Ian Craggs - convert to FreeRTOS
1616
*******************************************************************************/
1717

18-
#include "MQTTFreeRTOS.h"
19-
2018
#include <string.h>
19+
2120
#include <netdb.h>
21+
#include <sys/socket.h>
22+
23+
#include "MQTTFreeRTOS.h"
2224

2325
int ThreadStart(Thread* thread, void (*fn)(void*), void* arg)
2426
{

‎examples/get-started/project_template/main/user_main.c‎

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -7,61 +7,8 @@
77
*/
88

99
#include <stdio.h>
10-
#include <stdint.h>
1110

12-
#include <esp_system.h>
13-
14-
/******************************************************************************
15-
* FunctionName : user_rf_cal_sector_set
16-
* Description : SDK just reversed 4 sectors, used for rf init data and paramters.
17-
* We add this function to force users to set rf cal sector, since
18-
* we don't know which sector is free in user's application.
19-
* sector map for last several sectors : ABCCC
20-
* A : rf cal
21-
* B : rf init data
22-
* C : sdk parameters
23-
* Parameters : none
24-
* Returns : rf cal sector
25-
*******************************************************************************/
26-
uint32_t user_rf_cal_sector_set(void)
27-
{
28-
flash_size_map size_map = system_get_flash_size_map();
29-
uint32_t rf_cal_sec = 0;
30-
31-
switch (size_map) {
32-
case FLASH_SIZE_4M_MAP_256_256:
33-
rf_cal_sec = 128 - 5;
34-
break;
35-
36-
case FLASH_SIZE_8M_MAP_512_512:
37-
rf_cal_sec = 256 - 5;
38-
break;
39-
40-
case FLASH_SIZE_16M_MAP_512_512:
41-
case FLASH_SIZE_16M_MAP_1024_1024:
42-
rf_cal_sec = 512 - 5;
43-
break;
44-
45-
case FLASH_SIZE_32M_MAP_512_512:
46-
case FLASH_SIZE_32M_MAP_1024_1024:
47-
rf_cal_sec = 1024 - 5;
48-
break;
49-
50-
case FLASH_SIZE_64M_MAP_1024_1024:
51-
rf_cal_sec = 2048 - 5;
52-
break;
53-
54-
case FLASH_SIZE_128M_MAP_1024_1024:
55-
rf_cal_sec = 4096 - 5;
56-
break;
57-
58-
default:
59-
rf_cal_sec = 0;
60-
break;
61-
}
62-
63-
return rf_cal_sec;
64-
}
11+
#include "esp_system.h"
6512

6613
/******************************************************************************
6714
* FunctionName : app_main

‎examples/protocols/http_request/main/http_request_example_main.c‎

Lines changed: 6 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
77
CONDITIONS OF ANY KIND, either express or implied.
88
*/
9+
910
#include <string.h>
11+
1012
#include "freertos/FreeRTOS.h"
1113
#include "freertos/task.h"
1214
#include "freertos/event_groups.h"
13-
#include "esp_system.h"
15+
1416
#include "esp_wifi.h"
1517
#include "esp_event_loop.h"
1618
#include "esp_log.h"
19+
1720
#include "nvs_flash.h"
1821

19-
#include "lwip/err.h"
20-
#include "lwip/sockets.h"
21-
#include "lwip/sys.h"
22-
#include "lwip/netdb.h"
23-
#include "lwip/dns.h"
22+
#include <netdb.h>
23+
#include <sys/socket.h>
2424

2525
/* The examples use simple WiFi configuration that you can set via
2626
'make menuconfig'.
@@ -184,58 +184,6 @@ static void http_get_task(void *pvParameters)
184184
}
185185
}
186186

187-
/******************************************************************************
188-
* FunctionName : user_rf_cal_sector_set
189-
* Description : SDK just reversed 4 sectors, used for rf init data and paramters.
190-
* We add this function to force users to set rf cal sector, since
191-
* we don't know which sector is free in user's application.
192-
* sector map for last several sectors : ABCCC
193-
* A : rf cal
194-
* B : rf init data
195-
* C : sdk parameters
196-
* Parameters : none
197-
* Returns : rf cal sector
198-
*******************************************************************************/
199-
uint32_t user_rf_cal_sector_set(void)
200-
{
201-
flash_size_map size_map = system_get_flash_size_map();
202-
uint32_t rf_cal_sec = 0;
203-
204-
switch (size_map) {
205-
case FLASH_SIZE_4M_MAP_256_256:
206-
rf_cal_sec = 128 - 5;
207-
break;
208-
209-
case FLASH_SIZE_8M_MAP_512_512:
210-
rf_cal_sec = 256 - 5;
211-
break;
212-
213-
case FLASH_SIZE_16M_MAP_512_512:
214-
case FLASH_SIZE_16M_MAP_1024_1024:
215-
rf_cal_sec = 512 - 5;
216-
break;
217-
218-
case FLASH_SIZE_32M_MAP_512_512:
219-
case FLASH_SIZE_32M_MAP_1024_1024:
220-
rf_cal_sec = 1024 - 5;
221-
break;
222-
223-
case FLASH_SIZE_64M_MAP_1024_1024:
224-
rf_cal_sec = 2048 - 5;
225-
break;
226-
227-
case FLASH_SIZE_128M_MAP_1024_1024:
228-
rf_cal_sec = 4096 - 5;
229-
break;
230-
231-
default:
232-
rf_cal_sec = 0;
233-
break;
234-
}
235-
236-
return rf_cal_sec;
237-
}
238-
239187
void app_main()
240188
{
241189
ESP_ERROR_CHECK( nvs_flash_init() );

‎examples/protocols/https_mbedtls/main/https_mbedtls_example_main.c‎

Lines changed: 6 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,19 @@
2323
*/
2424
#include <string.h>
2525
#include <stdlib.h>
26+
2627
#include "freertos/FreeRTOS.h"
2728
#include "freertos/task.h"
2829
#include "freertos/event_groups.h"
30+
2931
#include "esp_wifi.h"
3032
#include "esp_event_loop.h"
3133
#include "esp_log.h"
32-
#include "esp_system.h"
34+
3335
#include "nvs_flash.h"
3436

35-
#include "lwip/err.h"
36-
#include "lwip/sockets.h"
37-
#include "lwip/sys.h"
38-
#include "lwip/netdb.h"
39-
#include "lwip/dns.h"
37+
#include <netdb.h>
38+
#include <sys/socket.h>
4039

4140
#include "mbedtls/platform.h"
4241
#include "mbedtls/net_sockets.h"
@@ -333,59 +332,7 @@ static void https_get_task(void *pvParameters)
333332
}
334333
}
335334

336-
/******************************************************************************
337-
* FunctionName : user_rf_cal_sector_set
338-
* Description : SDK just reversed 4 sectors, used for rf init data and paramters.
339-
* We add this function to force users to set rf cal sector, since
340-
* we don't know which sector is free in user's application.
341-
* sector map for last several sectors : ABCCC
342-
* A : rf cal
343-
* B : rf init data
344-
* C : sdk parameters
345-
* Parameters : none
346-
* Returns : rf cal sector
347-
*******************************************************************************/
348-
uint32_t user_rf_cal_sector_set(void)
349-
{
350-
flash_size_map size_map = system_get_flash_size_map();
351-
uint32_t rf_cal_sec = 0;
352-
353-
switch (size_map) {
354-
case FLASH_SIZE_4M_MAP_256_256:
355-
rf_cal_sec = 128 - 5;
356-
break;
357-
358-
case FLASH_SIZE_8M_MAP_512_512:
359-
rf_cal_sec = 256 - 5;
360-
break;
361-
362-
case FLASH_SIZE_16M_MAP_512_512:
363-
case FLASH_SIZE_16M_MAP_1024_1024:
364-
rf_cal_sec = 512 - 5;
365-
break;
366-
367-
case FLASH_SIZE_32M_MAP_512_512:
368-
case FLASH_SIZE_32M_MAP_1024_1024:
369-
rf_cal_sec = 1024 - 5;
370-
break;
371-
372-
case FLASH_SIZE_64M_MAP_1024_1024:
373-
rf_cal_sec = 2048 - 5;
374-
break;
375-
376-
case FLASH_SIZE_128M_MAP_1024_1024:
377-
rf_cal_sec = 4096 - 5;
378-
break;
379-
380-
default:
381-
rf_cal_sec = 0;
382-
break;
383-
}
384-
385-
return rf_cal_sec;
386-
}
387-
388-
void app_main()
335+
void app_main(void)
389336
{
390337
ESP_ERROR_CHECK( nvs_flash_init() );
391338
initialise_wifi();

‎examples/protocols/https_wolfssl/main/https_wolfssl_example_main.c‎

Lines changed: 3 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
CONDITIONS OF ANY KIND, either express or implied.
88
*/
99

10-
#include "sdkconfig.h"
10+
#include <stdio.h>
1111

12-
#include "esp_system.h"
1312
#include "esp_wifi.h"
1413
#include "esp_event_loop.h"
1514
#include "esp_log.h"
15+
1616
#include "nvs_flash.h"
1717

1818
#include "freertos/FreeRTOS.h"
@@ -23,7 +23,7 @@
2323
#include <netdb.h>
2424
#include "lwip/apps/sntp.h"
2525

26-
#include <wolfssl/ssl.h>
26+
#include "wolfssl/ssl.h"
2727

2828
/* The examples use simple WiFi configuration that you can set via
2929
'make menuconfig'.
@@ -281,58 +281,6 @@ static void wolfssl_client(void* pv)
281281
}
282282
}
283283

284-
/******************************************************************************
285-
* FunctionName : user_rf_cal_sector_set
286-
* Description : SDK just reversed 4 sectors, used for rf init data and paramters.
287-
* We add this function to force users to set rf cal sector, since
288-
* we don't know which sector is free in user's application.
289-
* sector map for last several sectors : ABCCC
290-
* A : rf cal
291-
* B : rf init data
292-
* C : sdk parameters
293-
* Parameters : none
294-
* Returns : rf cal sector
295-
*******************************************************************************/
296-
uint32_t user_rf_cal_sector_set(void)
297-
{
298-
flash_size_map size_map = system_get_flash_size_map();
299-
uint32_t rf_cal_sec = 0;
300-
301-
switch (size_map) {
302-
case FLASH_SIZE_4M_MAP_256_256:
303-
rf_cal_sec = 128 - 5;
304-
break;
305-
306-
case FLASH_SIZE_8M_MAP_512_512:
307-
rf_cal_sec = 256 - 5;
308-
break;
309-
310-
case FLASH_SIZE_16M_MAP_512_512:
311-
case FLASH_SIZE_16M_MAP_1024_1024:
312-
rf_cal_sec = 512 - 5;
313-
break;
314-
315-
case FLASH_SIZE_32M_MAP_512_512:
316-
case FLASH_SIZE_32M_MAP_1024_1024:
317-
rf_cal_sec = 1024 - 5;
318-
break;
319-
320-
case FLASH_SIZE_64M_MAP_1024_1024:
321-
rf_cal_sec = 2048 - 5;
322-
break;
323-
324-
case FLASH_SIZE_128M_MAP_1024_1024:
325-
rf_cal_sec = 4096 - 5;
326-
break;
327-
328-
default:
329-
rf_cal_sec = 0;
330-
break;
331-
}
332-
333-
return rf_cal_sec;
334-
}
335-
336284
void app_main(void)
337285
{
338286
ESP_ERROR_CHECK( nvs_flash_init() );

‎examples/protocols/mqtt/main/MQTTEcho.c‎

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -177,58 +177,6 @@ static void mqtt_client_thread(void* pvParameters)
177177
return;
178178
}
179179

180-
/******************************************************************************
181-
* FunctionName : user_rf_cal_sector_set
182-
* Description : SDK just reversed 4 sectors, used for rf init data and paramters.
183-
* We add this function to force users to set rf cal sector, since
184-
* we don't know which sector is free in user's application.
185-
* sector map for last several sectors : ABCCC
186-
* A : rf cal
187-
* B : rf init data
188-
* C : sdk parameters
189-
* Parameters : none
190-
* Returns : rf cal sector
191-
*******************************************************************************/
192-
uint32_t user_rf_cal_sector_set(void)
193-
{
194-
flash_size_map size_map = system_get_flash_size_map();
195-
uint32_t rf_cal_sec = 0;
196-
197-
switch (size_map) {
198-
case FLASH_SIZE_4M_MAP_256_256:
199-
rf_cal_sec = 128 - 5;
200-
break;
201-
202-
case FLASH_SIZE_8M_MAP_512_512:
203-
rf_cal_sec = 256 - 5;
204-
break;
205-
206-
case FLASH_SIZE_16M_MAP_512_512:
207-
case FLASH_SIZE_16M_MAP_1024_1024:
208-
rf_cal_sec = 512 - 5;
209-
break;
210-
211-
case FLASH_SIZE_32M_MAP_512_512:
212-
case FLASH_SIZE_32M_MAP_1024_1024:
213-
rf_cal_sec = 1024 - 5;
214-
break;
215-
216-
case FLASH_SIZE_64M_MAP_1024_1024:
217-
rf_cal_sec = 2048 - 5;
218-
break;
219-
220-
case FLASH_SIZE_128M_MAP_1024_1024:
221-
rf_cal_sec = 4096 - 5;
222-
break;
223-
224-
default:
225-
rf_cal_sec = 0;
226-
break;
227-
}
228-
229-
return rf_cal_sec;
230-
}
231-
232180
void app_main(void)
233181
{
234182
ESP_ERROR_CHECK( nvs_flash_init() );

0 commit comments

Comments
 (0)