Skip to content

Commit

Permalink
Version 2.1.0(116b762)
Browse files Browse the repository at this point in the history
### System
1. Fix and update the license;
2. Add definitions of ROM functions;
3. Add efuse mac crc, save efuse mac into the system parameter area of flash, as a backup mac;
4. Implement `uart_div_modify`, which can support a 32-bit DivLatchValue in the SDK instead of the ROM one, and also remove `uart_div_modify` from the ld file;
5. Reduce iRAM usage by transferring some functions to flash;
    - add weak function `void user_spi_flash_dio_to_qio_pre_init(void)`. If the dio to qio flash mode is not used, users can add an empty `user_spi_flash_dio_to_qio_pre_init` on the application side to reduce iRAM usage;
6. Fix WDT in system_restart;
7. Fix Write & Read issue in SPI overlap mode;
8. Support 8MB & 16MB spi flash;
9. Update boot v1.7;
    - Support 8MB & 16MB spi flash;
    - Try boot the first bin for 3 times. If it fails, then boot the backup bin;
10. Fix http packet error, BBP301;
11. Support long periods of deep sleep;
12. Fix NMI handle crash on unaligned memory access, BBP309;

### Lwip
1. Add set and get dns server APIs:
    - espconn_dns_setserver
    - espconn_dns_getserver
2. Fix 2038 overflow bug in sntp_get_current_timestamp;
3. Fix MTU negotiate bug;

### AT
1. Add new commands, AT+UART? and AT+UART_DEF?;
2. Add new command, AT+SYSRAM?;
3. Add new commands, AT+SYSIO series;
4. Add new command, AT+CWHOSTNAME;
5. Add new command, AT+SYSADC?;
6. Add new commands, AT+CIPSNTPCFG and AT+CIPSNTPTIME;
7. Add new commands, AT+CIPDNS_CUR and AT+CIPDNS_DEF;
8. Support a maximum of 8 stations;
9. Modify keepalive count to 3 times;
10. Fix scan hidden ssid issue in AT+CWLAP;
11. Fix the issue of the UART stop bit being 0 when queried for the first time;
12. Fix MAC addr conflict in AP+STA mode;
13. Add new commands, AT+RFAUTOTRACE;

### WiFi
1. Optimize the RF frequency calibration workflow, having the frequency trace disabled by default;
    - users can call `system_phy_freq_trace_enable` in `user_rf_pre_init` to enable it;
2. Update libphy.a to version 1134_0;
3. Allow sending a broadcast ESP-NOW packet, but make sure that the packet is unencrypted;
4. Fix soft queue error;
5. Fix EVENT_STAMODE_AUTHMODE_CHANGE event mode info;
6. Fix lmac assert;
7. Fix bug in sniffer mode;
8. Fix arp loss continously issue;
9. Fix bug in WiFi event;
    - auth mode changed event cannot be throw when station is in the process of scanning;
    - error old auth mode and new auth mode;
    - op mode change process cannot be blocked, so add an event to notify the caller that op mode is changed;
10. Fix the bug in mic failure handler;
11. Fix the bug which causes failure of connection to an AP with shared WEP;
12. Fix the bug which causes failure of connection to an AP with hidden ssid;
13. Fix softAP deauth;
14. Fix reconnect policy when trying to connect to an AP that does not exist;
15. Fix scan issue;
16. Fix extra bytes in UDP broadcast packet, BBP310;
  • Loading branch information
wujiangang committed May 5, 2017
1 parent 06b117d commit 90c641e
Show file tree
Hide file tree
Showing 155 changed files with 777 additions and 387 deletions.
2 changes: 1 addition & 1 deletion License
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ESPERSSIF MIT License
ESPRESSIF MIT License

Copyright (c) 2015 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>

Expand Down
36 changes: 26 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,26 @@ else
addr = 0x101000
endif
else
size_map = 0
flash = 512
ifeq ($(app), 2)
addr = 0x41000
ifeq ($(SPI_SIZE_MAP), 8)
size_map = 8
flash = 8192
ifeq ($(app), 2)
addr = 0x101000
endif
else
ifeq ($(SPI_SIZE_MAP), 9)
size_map = 9
flash = 16384
ifeq ($(app), 2)
addr = 0x101000
endif
else
size_map = 0
flash = 512
ifeq ($(app), 2)
addr = 0x41000
endif
endif
endif
endif
endif
Expand All @@ -132,7 +148,7 @@ LD_FILE = $(LDDIR)/eagle.app.v6.ld

ifneq ($(boot), none)
ifneq ($(app),0)
ifeq ($(size_map), 6)
ifneq ($(findstring $(size_map), 6 8 9),)
LD_FILE = $(LDDIR)/eagle.app.v6.$(boot).2048.ld
else
ifeq ($(size_map), 5)
Expand All @@ -151,11 +167,11 @@ ifneq ($(app),0)
LD_FILE = $(LDDIR)/eagle.app.v6.$(boot).512.app$(app).ld
endif
endif
endif
endif
endif
endif
BIN_NAME = user$(app).$(flash).$(boot).$(size_map)
endif
endif
endif
endif
BIN_NAME = user$(app).$(flash).$(boot).$(size_map)
endif
else
app = 0
Expand Down
Binary file modified bin/at/1024+1024/user1.2048.new.5.bin
Binary file not shown.
Binary file modified bin/at/1024+1024/user2.2048.new.5.bin
Binary file not shown.
Binary file modified bin/at/512+512/user1.1024.new.2.bin
Binary file not shown.
Binary file modified bin/at/512+512/user2.1024.new.2.bin
Binary file not shown.
Binary file removed bin/at/noboot/eagle.flash.bin
Binary file not shown.
Binary file removed bin/at/noboot/eagle.irom0text.bin
Binary file not shown.
Binary file modified bin/at_sdio/1024+1024/user1.2048.new.5.bin
Binary file not shown.
Binary file modified bin/at_sdio/1024+1024/user2.2048.new.5.bin
Binary file not shown.
Binary file modified bin/at_sdio/512+512/user1.1024.new.2.bin
Binary file not shown.
Binary file modified bin/at_sdio/512+512/user2.1024.new.2.bin
Binary file not shown.
Binary file removed bin/at_sdio/noboot/eagle.flash.bin
Binary file not shown.
Binary file removed bin/at_sdio/noboot/eagle.irom0text.bin
Binary file not shown.
Binary file added bin/boot_v1.7.bin
Binary file not shown.
2 changes: 1 addition & 1 deletion driver_lib/driver/gpio16.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion driver_lib/driver/hw_timer.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion driver_lib/driver/i2c_master.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion driver_lib/driver/key.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion driver_lib/driver/sdio_slv.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion driver_lib/driver/spi.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion driver_lib/driver/spi_interface.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion driver_lib/driver/spi_overlap.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion driver_lib/driver/uart.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion driver_lib/include/driver/gpio16.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion driver_lib/include/driver/i2c_master.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion driver_lib/include/driver/key.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion driver_lib/include/driver/sdio_slv.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion driver_lib/include/driver/slc_register.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//Generated at 2012-10-23 19:55:03
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion driver_lib/include/driver/spi.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion driver_lib/include/driver/spi_interface.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion driver_lib/include/driver/spi_overlap.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion driver_lib/include/driver/spi_register.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion driver_lib/include/driver/uart.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion driver_lib/include/driver/uart_register.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion examples/IoT_Demo/driver/i2c_master.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
7 changes: 4 additions & 3 deletions examples/IoT_Demo/driver/key.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down Expand Up @@ -31,7 +31,7 @@

#include "driver/key.h"

LOCAL void key_intr_handler(struct keys_param *keys);
LOCAL void key_intr_handler(void *arg);

/******************************************************************************
* FunctionName : key_init_single
Expand Down Expand Up @@ -144,10 +144,11 @@ key_50ms_cb(struct single_key_param *single_key)
* Returns : none
*******************************************************************************/
LOCAL void
key_intr_handler(struct keys_param *keys)
key_intr_handler(void *arg)
{
uint8 i;
uint32 gpio_status = GPIO_REG_READ(GPIO_STATUS_ADDRESS);
struct keys_param *keys = (struct keys_param *)arg;

for (i = 0; i < keys->key_num; i++) {
if (gpio_status & BIT(keys->single_key[i]->gpio_id)) {
Expand Down
19 changes: 16 additions & 3 deletions examples/IoT_Demo/gen_misc.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,10 @@ echo " 3=2048KB( 512KB+ 512KB)"
echo " 4=4096KB( 512KB+ 512KB)"
echo " 5=2048KB(1024KB+1024KB)"
echo " 6=4096KB(1024KB+1024KB)"
echo "enter (0/2/3/4/5/6, default 0):"
echo " 7=4096KB(2048KB+2048KB) not support ,just for compatible with nodeMCU board"
echo " 8=8192KB(1024KB+1024KB)"
echo " 9=16384KB(1024KB+1024KB)"
echo "enter (0/2/3/4/5/6/7/8/9, default 0):"
read input

if [ -z "$input" ]; then
Expand All @@ -133,14 +136,24 @@ elif [ $input == 6 ]; then
spi_size_map=6
echo "spi size: 4096KB"
echo "spi ota map: 1024KB + 1024KB"
elif [ $input == 7 ]; then
spi_size_map=7
echo"not support ,just for compatible with nodeMCU board"
exit
elif [ $input == 8 ]; then
spi_size_map=8
echo "spi size: 8192KB"
echo "spi ota map: 1024KB + 1024KB"
elif [ $input == 9 ]; then
spi_size_map=9
echo "spi size: 16384KB"
echo "spi ota map: 1024KB + 1024KB"
else
spi_size_map=0
echo "spi size: 512KB"
echo "spi ota map: 256KB + 256KB"
fi

echo ""

touch user/user_main.c

echo ""
Expand Down
2 changes: 1 addition & 1 deletion examples/IoT_Demo/include/driver/i2c_master.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion examples/IoT_Demo/include/driver/key.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion examples/IoT_Demo/include/ssl/cert.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion examples/IoT_Demo/include/ssl/private_key.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion examples/IoT_Demo/include/user_config.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion examples/IoT_Demo/include/user_devicefind.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion examples/IoT_Demo/include/user_esp_platform.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion examples/IoT_Demo/include/user_esp_platform_timer.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion examples/IoT_Demo/include/user_iot_version.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion examples/IoT_Demo/include/user_json.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion examples/IoT_Demo/include/user_light.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion examples/IoT_Demo/include/user_light_adj.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion examples/IoT_Demo/include/user_plug.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion examples/IoT_Demo/include/user_sensor.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion examples/IoT_Demo/include/user_webserver.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
2 changes: 1 addition & 1 deletion examples/IoT_Demo/user/user_devicefind.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* ESPRSSIF MIT License
* ESPRESSIF MIT License
*
* Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
*
Expand Down
Loading

0 comments on commit 90c641e

Please sign in to comment.