Skip to content

Commit 51ac0fe

Browse files
wujiangangwujiangang
committed
NEW VERSION: 1.5.0
1. add spi flash erase protect mechanism, boot and current runing user bin can not been erased; 2. add memleak debug feature; 3. fix spi overlap issue; 4. fix call wifi_station_disconnect, disconnect event enter twice issue; 5. fix crash when set opmode from station to softAP in scan done callback; 6. modify spi flash erase/write flow, clear protect status if needed; 7. fix rf init data sector broken issue, add user_rf_cal_sector_set, user application MUST have this function, refer to examples; 8. fix system parameter sector broken issue when frequently power on/off; 9. fix the max value of os_timer_arm; 10. fix dns issue in some routers; 11. add sntp support; 12. update smartconfig to 2.5.4; 13. update open freedom to support send beacon packet; 14. fix seldom rf not work issue after external reset; 15. fix pwm issue; 16. fix status error got by wifi_station_get_connect_status; 17. fix assert in pp; 18. fix huawei X4 connect softAP issue; 19. optimize sleep strategy； 20. add vendor IE support; 21. update libphy.a to 1055; 22. add weak function wifi_set_backup_mac to let user set MAC; 23. fix bug of lwip and optimize socket mechanism; 24. update boot loader to v1.6; 25. update esp_init_data_default.bin 26. add mbedtls support； 27. fix other bugs;
1 parent efd2819 commit 51ac0fe

File tree

287 files changed

+91975
-267
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

287 files changed

+91975
-267
lines changed

‎Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,8 @@ CCFLAGS += \
200200
-mlongcalls \
201201
-mtext-section-literals \
202202
-ffunction-sections \
203-
-fdata-sections
203+
-fdata-sections \
204+
-fno-builtin-printf
204205
# -Wall
205206

206207
CFLAGS = $(CCFLAGS) $(DEFINES) $(EXTRA_CCFLAGS) $(INCLUDES)
@@ -397,6 +398,7 @@ $(foreach image,$(GEN_IMAGES),$(eval $(call MakeImage,$(basename $(image)))))
397398
#
398399

399400
INCLUDES := $(INCLUDES) -I $(SDK_PATH)/include -I $(SDK_PATH)/extra_include
401+
INCLUDES += -I $(SDK_PATH)/driver_lib/include
400402
INCLUDES += -I $(SDK_PATH)/include/espressif
401403
INCLUDES += -I $(SDK_PATH)/include/lwip
402404
INCLUDES += -I $(SDK_PATH)/include/lwip/ipv4

‎bin/boot_v1.5.bin

-3.16 KB
Binary file not shown.

‎bin/boot_v1.6.bin

3.77 KB
Binary file not shown.

‎bin/esp_init_data_default.bin

100644100755
0 Bytes
Binary file not shown.

‎driver_lib/Makefile

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
#############################################################
2+
# Required variables for each makefile
3+
# Discard this section from all parent makefiles
4+
# Expected variables (with automatic defaults):
5+
# CSRCS (all "C" files in the dir)
6+
# SUBDIRS (all subdirs with a Makefile)
7+
# GEN_LIBS - list of libs to be generated ()
8+
# GEN_IMAGES - list of object file images to be generated ()
9+
# GEN_BINS - list of binaries to be generated ()
10+
# COMPONENTS_xxx - a list of libs/objs in the form
11+
# subdir/lib to be extracted and rolled up into
12+
# a generated lib/image xxx.a ()
13+
#
14+
TARGET = eagle
15+
#FLAVOR = release
16+
FLAVOR = debug
17+
18+
#EXTRA_CCFLAGS += -u
19+
20+
ifndef PDIR # {
21+
GEN_IMAGES= eagle.app.v6.out
22+
GEN_BINS= eagle.app.v6.bin
23+
SPECIAL_MKTARGETS=$(APP_MKTARGETS)
24+
SUBDIRS= \
25+
user
26+
27+
endif # } PDIR
28+
29+
APPDIR = .
30+
LDDIR = ../ld
31+
32+
CCFLAGS += -Os
33+
34+
TARGET_LDFLAGS = \
35+
-nostdlib \
36+
-Wl,-EL \
37+
--longcalls \
38+
--text-section-literals
39+
40+
ifeq ($(FLAVOR),debug)
41+
TARGET_LDFLAGS += -g -O2
42+
endif
43+
44+
ifeq ($(FLAVOR),release)
45+
TARGET_LDFLAGS += -g -O0
46+
endif
47+
48+
COMPONENTS_eagle.app.v6 = \
49+
user/libuser.a
50+
51+
LINKFLAGS_eagle.app.v6 = \
52+
-L../lib \
53+
-nostdlib \
54+
-T$(LD_FILE) \
55+
-Wl,--no-check-sections \
56+
-u call_user_start \
57+
-Wl,-static \
58+
-Wl,--start-group \
59+
-lc \
60+
-lgcc \
61+
-lhal \
62+
-lphy \
63+
-lpp \
64+
-lnet80211 \
65+
-llwip \
66+
-lwpa \
67+
-lcrypto \
68+
-lmain \
69+
-ljson \
70+
-lssl \
71+
-lupgrade \
72+
-lsmartconfig \
73+
-lairkiss\
74+
$(DEP_LIBS_eagle.app.v6) \
75+
-Wl,--end-group
76+
77+
DEPENDS_eagle.app.v6 = \
78+
$(LD_FILE) \
79+
$(LDDIR)/eagle.rom.addr.v6.ld
80+
81+
#############################################################
82+
# Configuration i.e. compile options etc.
83+
# Target specific stuff (defines etc.) goes in here!
84+
# Generally values applying to a tree are captured in the
85+
# makefile at its root level - these are then overridden
86+
# for a subtree within the makefile rooted therein
87+
#
88+
89+
#UNIVERSAL_TARGET_DEFINES = \
90+
91+
# Other potential configuration flags include:
92+
# -DTXRX_TXBUF_DEBUG
93+
# -DTXRX_RXBUF_DEBUG
94+
# -DWLAN_CONFIG_CCX
95+
CONFIGURATION_DEFINES = -DICACHE_FLASH
96+
97+
DEFINES += \
98+
$(UNIVERSAL_TARGET_DEFINES) \
99+
$(CONFIGURATION_DEFINES)
100+
101+
DDEFINES += \
102+
$(UNIVERSAL_TARGET_DEFINES) \
103+
$(CONFIGURATION_DEFINES)
104+
105+
106+
#############################################################
107+
# Recursion Magic - Don't touch this!!
108+
#
109+
# Each subtree potentially has an include directory
110+
# corresponding to the common APIs applicable to modules
111+
# rooted at that subtree. Accordingly, the INCLUDE PATH
112+
# of a module can only contain the include directories up
113+
# its parent path, and not its siblings
114+
#
115+
# Required for each makefile to inherit from the parent
116+
#
117+
118+
INCLUDES := $(INCLUDES) -I $(PDIR)include
119+
PDIR := ../$(PDIR)
120+
sinclude $(PDIR)Makefile
121+
122+
.PHONY: FORCE
123+
FORCE:
124+

‎driver_lib/README.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# driver_lib
2+
## method 1
3+
Generate libdriver.a in SDK/lib, in driver_lib folder, run:
4+
5+
./make_lib.sh driver
6+
7+
## method 2
8+
* STEP 1:
9+
10+
Copy driver folder to your project sub-folder, such as app folder. Unused drivers can be removed in your project.
11+
12+
* STEP 2:
13+
14+
Modify Makefile in app folder.
15+
16+
1). Search SUBDIRS, add driver as subdir, such as:
17+
18+
SUBDIRS = user driver
19+
20+
2). Search COMPONENTS_eagle.app.v6, add libdriver.a, such as:
21+
22+
COMPONENTS_eagle.app.v6 = user/libuser.a driver/libdriver.a

‎examples/driver_lib/driver/Makefile renamed to ‎driver_lib/driver/Makefile

File renamed without changes.

‎examples/driver_lib/driver/gpio.c renamed to ‎driver_lib/driver/gpio.c

File renamed without changes.

‎examples/driver_lib/driver/hw_timer.c renamed to ‎driver_lib/driver/hw_timer.c

File renamed without changes.

0 commit comments

Comments
 (0)