Skip to content

Commit c24c2a5

Browse files
author
Espressif Systems
committed
NEW VERSION: 1.1.0
1. Add pwm support; 2. Add c++ support; Please update to the latest folder "ld". 3. Add rand in libminic; 4. Add new reset reason REASON_EXT_SYS_RST in rst_reason; 5. Update the complied script ‘gen_misc.sh(bat)’, use the new boot and remove the old one; 6. Update folder "tools", and support CRC check of bin files; Please update to the latest folder "tools". 7. Optimize the process procedure of Wi-Fi event; 8. Fix bugs in printf when its runs out of memory; 9. Fix bugs in malloc when CACHE is disabled; 10.Fix exception and WDT reset bugs when CACHE is disabled; 11.Fix some Wi-Fi connection bugs; 12.Fix some Wi-Fi scan bugs; 13.Tune API "wifi_station_get_connect_status" for more accurate WiFi positioning; 14.Porting the optimization of non-OS SDK to RTOS SDK; 15.Fix other minor bugs.
1 parent a6d4f57 commit c24c2a5

34 files changed

+231
-947
lines changed

‎Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ else
1515
AR = xt-ar
1616
CC = xt-xcc
1717
NM = xt-nm
18-
CPP = xt-cpp
18+
CPP = xt-xt++
1919
OBJCOPY = xt-objcopy
2020
OBJDUMP = xt-objdump
2121
endif
@@ -242,6 +242,7 @@ ifeq ($(APP), 0)
242242
@$(OBJDUMP) -x -s $< > ../bin/eagle.dump
243243
@$(OBJDUMP) -S $< > ../bin/eagle.S
244244
else
245+
@mkdir -p ../bin/upgrade
245246
@$(RM) -r ../bin/upgrade/$(BIN_NAME).S ../bin/upgrade/$(BIN_NAME).dump
246247
@$(OBJDUMP) -x -s $< > ../bin/upgrade/$(BIN_NAME).dump
247248
@$(OBJDUMP) -S $< > ../bin/upgrade/$(BIN_NAME).S

‎app/gen_misc.bat

+3-14
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,11 @@
11
@echo off
22

3-
echo gen_misc.bat version 20150511
3+
echo gen_misc.bat version 20150819
44
echo .
55

66
echo Please follow below steps(1-5) to generate specific bin(s):
7-
echo STEP 1: choose boot version(0=boot_v1.1, 1=boot_v1.2+, 2=none)
8-
set input=default
9-
set /p input=enter(0/1/2, default 2):
10-
11-
if %input% equ 0 (
12-
set boot=old
13-
) else (
14-
if %input% equ 1 (
15-
set boot=new
16-
) else (
17-
set boot=none
18-
)
19-
)
7+
echo STEP 1: use boot_v1.2+ by default
8+
set boot=new
209

2110
echo boot mode: %boot%
2211
echo.

‎app/gen_misc.sh

+3-14
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,11 @@
11
#!/bin/bash
22

3-
echo "gen_misc.sh version 20150511"
3+
echo "gen_misc.sh version 20150819"
44
echo ""
55

66
echo "Please follow below steps(1-5) to generate specific bin(s):"
7-
echo "STEP 1: choose boot version(0=boot_v1.1, 1=boot_v1.2+, 2=none)"
8-
echo "enter(0/1/2, default 2):"
9-
read input
10-
11-
if [ -z "$input" ]; then
12-
boot=none
13-
elif [ $input == 0 ]; then
14-
boot=old
15-
elif [ $input == 1 ]; then
16-
boot=new
17-
else
18-
boot=none
19-
fi
7+
echo "STEP 1: use boot_v1.2+ by default"
8+
boot=new
209

2110
echo "boot mode: $boot"
2211
echo ""

‎examples/smart_config/gen_misc.bat

+4-15
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,11 @@
11
@echo off
22

3-
echo gen_misc.bat version 20150511
3+
echo gen_misc.bat version 20150819
44
echo .
55

66
echo Please follow below steps(1-5) to generate specific bin(s):
7-
echo STEP 1: choose boot version(0=boot_v1.1, 1=boot_v1.2+, 2=none)
8-
set input=default
9-
set /p input=enter(0/1/2, default 2):
10-
11-
if %input% equ 0 (
12-
set boot=old
13-
) else (
14-
if %input% equ 1 (
15-
set boot=new
16-
) else (
17-
set boot=none
18-
)
19-
)
7+
echo STEP 1: use boot_v1.2+ by default
8+
set boot=new
209

2110
echo boot mode: %boot%
2211
echo.
@@ -90,7 +79,7 @@ if %input% equ 3 (
9079
set spi_mode=QIO
9180
)))
9281

93-
echo spi mode: %spi_mode%
82+
echo spi mode: %spi_mode%
9483
echo.
9584

9685
echo STEP 5: choose flash size and map

‎examples/smart_config/gen_misc.sh

+3-14
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,11 @@
11
#!/bin/bash
22

3-
echo "gen_misc.sh version 20150511"
3+
echo "gen_misc.sh version 20150819"
44
echo ""
55

66
echo "Please follow below steps(1-5) to generate specific bin(s):"
7-
echo "STEP 1: choose boot version(0=boot_v1.1, 1=boot_v1.2+, 2=none)"
8-
echo "enter(0/1/2, default 2):"
9-
read input
10-
11-
if [ -z "$input" ]; then
12-
boot=none
13-
elif [ $input == 0 ]; then
14-
boot=old
15-
elif [ $input == 1 ]; then
16-
boot=new
17-
else
18-
boot=none
19-
fi
7+
echo "STEP 1: use boot_v1.2+ by default"
8+
boot=new
209

2110
echo "boot mode: $boot"
2211
echo ""

‎include/espressif/esp_common.h

+1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919

2020
#include "smartconfig.h"
2121
#include "spi_flash.h"
22+
#include "pwm.h"
2223

2324
#endif

‎include/espressif/esp_system.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ enum rst_reason {
1414
REASON_EXCEPTION_RST,
1515
REASON_SOFT_WDT_RST,
1616
REASON_SOFT_RESTART,
17-
REASON_DEEP_SLEEP_AWAKE
17+
REASON_DEEP_SLEEP_AWAKE,
18+
REASON_EXT_SYS_RST
1819
};
1920

2021
struct rst_info{

‎include/espressif/pwm.h

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#ifndef __PWM_H__
2+
#define __PWM_H__
3+
4+
struct pwm_param {
5+
uint32 period;
6+
uint32 freq;
7+
uint32 duty[8];
8+
};
9+
10+
#define PWM_DEPTH 1023
11+
12+
void pwm_init(uint32 period, uint32 *duty, uint32 pwm_channel_num, uint32 (*pin_info_list)[3]);
13+
14+
void pwm_set_duty(uint32 duty, uint8 channel);
15+
uint32 pwm_get_duty(uint8 channel);
16+
void pwm_set_period(uint32 period);
17+
uint32 pwm_get_period(void);
18+
19+
#endif

‎include/lwip/lwipopts.h

+6-1
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,11 @@
239239
*/
240240
#define TCP_SYNMAXRTX 3
241241

242+
/**
243+
* TCP_LISTEN_BACKLOG: Enable the backlog option for tcp listen pcb.
244+
*/
245+
#define TCP_LISTEN_BACKLOG 1
246+
242247
/*
243248
----------------------------------
244249
---------- Pbuf options ----------
@@ -377,7 +382,7 @@
377382
/**
378383
* SO_REUSE==1: Enable SO_REUSEADDR option.
379384
*/
380-
#define SO_REUSE 1
385+
#define SO_REUSE 0
381386

382387
/*
383388
----------------------------------------

‎ld/eagle.app.v6.ld

+3
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,14 @@ SECTIONS
101101
*(.gnu.linkonce.e.*)
102102
*(.gnu.version_r)
103103
*(.eh_frame)
104+
. = (. + 3) & ~ 3;
104105
/* C++ constructor and destructor tables, properly ordered: */
106+
__init_array_start = ABSOLUTE(.);
105107
KEEP (*crtbegin.o(.ctors))
106108
KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
107109
KEEP (*(SORT(.ctors.*)))
108110
KEEP (*(.ctors))
111+
__init_array_end = ABSOLUTE(.);
109112
KEEP (*crtbegin.o(.dtors))
110113
KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
111114
KEEP (*(SORT(.dtors.*)))

‎ld/eagle.app.v6.new.1024.app1.ld

+3
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,14 @@ SECTIONS
101101
*(.gnu.linkonce.e.*)
102102
*(.gnu.version_r)
103103
*(.eh_frame)
104+
. = (. + 3) & ~ 3;
104105
/* C++ constructor and destructor tables, properly ordered: */
106+
__init_array_start = ABSOLUTE(.);
105107
KEEP (*crtbegin.o(.ctors))
106108
KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
107109
KEEP (*(SORT(.ctors.*)))
108110
KEEP (*(.ctors))
111+
__init_array_end = ABSOLUTE(.);
109112
KEEP (*crtbegin.o(.dtors))
110113
KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
111114
KEEP (*(SORT(.dtors.*)))

‎ld/eagle.app.v6.new.1024.app2.ld

+3
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,14 @@ SECTIONS
101101
*(.gnu.linkonce.e.*)
102102
*(.gnu.version_r)
103103
*(.eh_frame)
104+
. = (. + 3) & ~ 3;
104105
/* C++ constructor and destructor tables, properly ordered: */
106+
__init_array_start = ABSOLUTE(.);
105107
KEEP (*crtbegin.o(.ctors))
106108
KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
107109
KEEP (*(SORT(.ctors.*)))
108110
KEEP (*(.ctors))
111+
__init_array_end = ABSOLUTE(.);
109112
KEEP (*crtbegin.o(.dtors))
110113
KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
111114
KEEP (*(SORT(.dtors.*)))

‎ld/eagle.app.v6.new.2048.ld

+3
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,14 @@ SECTIONS
101101
*(.gnu.linkonce.e.*)
102102
*(.gnu.version_r)
103103
*(.eh_frame)
104+
. = (. + 3) & ~ 3;
104105
/* C++ constructor and destructor tables, properly ordered: */
106+
__init_array_start = ABSOLUTE(.);
105107
KEEP (*crtbegin.o(.ctors))
106108
KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
107109
KEEP (*(SORT(.ctors.*)))
108110
KEEP (*(.ctors))
111+
__init_array_end = ABSOLUTE(.);
109112
KEEP (*crtbegin.o(.dtors))
110113
KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
111114
KEEP (*(SORT(.dtors.*)))

‎ld/eagle.app.v6.new.512.app1.ld

+3
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,14 @@ SECTIONS
101101
*(.gnu.linkonce.e.*)
102102
*(.gnu.version_r)
103103
*(.eh_frame)
104+
. = (. + 3) & ~ 3;
104105
/* C++ constructor and destructor tables, properly ordered: */
106+
__init_array_start = ABSOLUTE(.);
105107
KEEP (*crtbegin.o(.ctors))
106108
KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
107109
KEEP (*(SORT(.ctors.*)))
108110
KEEP (*(.ctors))
111+
__init_array_end = ABSOLUTE(.);
109112
KEEP (*crtbegin.o(.dtors))
110113
KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
111114
KEEP (*(SORT(.dtors.*)))

‎ld/eagle.app.v6.new.512.app2.ld

+3
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,14 @@ SECTIONS
101101
*(.gnu.linkonce.e.*)
102102
*(.gnu.version_r)
103103
*(.eh_frame)
104+
. = (. + 3) & ~ 3;
104105
/* C++ constructor and destructor tables, properly ordered: */
106+
__init_array_start = ABSOLUTE(.);
105107
KEEP (*crtbegin.o(.ctors))
106108
KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
107109
KEEP (*(SORT(.ctors.*)))
108110
KEEP (*(.ctors))
111+
__init_array_end = ABSOLUTE(.);
109112
KEEP (*crtbegin.o(.dtors))
110113
KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
111114
KEEP (*(SORT(.dtors.*)))

0 commit comments

Comments
 (0)