Skip to content

Commit 54548c9

Browse files
committed
Merge branch 'feature/re_add_ota' into 'master'
feat(N8266-90): Re-added ota implement and generated AT firmwares on ci See merge request sdk/ESP8266_NONOS_SDK!317
2 parents 7785626 + 1534a44 commit 54548c9

File tree

7 files changed

+724
-8
lines changed

7 files changed

+724
-8
lines changed

.gitlab-ci.yml

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ stages:
4141
# - chmod +x gen_misc_non_os.sh
4242
# - ./gen_misc_non_os.sh
4343

44-
build_at:
44+
.at_setup_tokens: &at_setup_tokens
45+
- echo -e "#define CONFIG_AT_1024_1024_TOKEN \"$AT_1024_1024_TOKEN\"" >> include/user_config.h
46+
- echo -e "#define CONFIG_AT_512_512_TOKEN \"$AT_512_512_TOKEN\"" >> include/user_config.h
47+
48+
build_at_1024_1024_u1:
4549
<<: *build_template
4650
artifacts:
4751
paths:
@@ -51,7 +55,47 @@ build_at:
5155
script:
5256
- cp -rf examples/at at
5357
- cd at
54-
- make COMPILE=gcc BOOT=new APP=1 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=5
58+
- *at_setup_tokens
59+
- make COMPILE=gcc BOOT=new APP=1 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=5 AT_ESP_UPGRADE=1
60+
61+
build_at_1024_1024_u2:
62+
<<: *build_template
63+
artifacts:
64+
paths:
65+
- ./bin/upgrade
66+
- ./bin/*.bin
67+
expire_in: 6 mos
68+
script:
69+
- cp -rf examples/at at
70+
- cd at
71+
- *at_setup_tokens
72+
- make COMPILE=gcc BOOT=new APP=2 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=5 AT_ESP_UPGRADE=1
73+
74+
build_at_512_512_u1:
75+
<<: *build_template
76+
artifacts:
77+
paths:
78+
- ./bin/upgrade
79+
- ./bin/*.bin
80+
expire_in: 6 mos
81+
script:
82+
- cp -rf examples/at_nano at
83+
- cd at
84+
- *at_setup_tokens
85+
- make COMPILE=gcc BOOT=new APP=1 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=2 AT_ESP_UPGRADE=1
86+
87+
build_at_512_512_u2:
88+
<<: *build_template
89+
artifacts:
90+
paths:
91+
- ./bin/upgrade
92+
- ./bin/*.bin
93+
expire_in: 6 mos
94+
script:
95+
- cp -rf examples/at_nano at
96+
- cd at
97+
- *at_setup_tokens
98+
- make COMPILE=gcc BOOT=new APP=2 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=2 AT_ESP_UPGRADE=1
5599

56100
build_at_espconn:
57101
<<: *build_template

examples/at/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,11 @@ CONFIGURATION_DEFINES += \
127127
-DAT_UPGRADE_SUPPORT
128128
endif
129129

130+
ifeq ($(AT_ESP_UPGRADE),1)
131+
CONFIGURATION_DEFINES += \
132+
-DAT_ESP_UPGRADE
133+
endif
134+
130135
ifeq ($(SPI_SIZE_MAP),5)
131136
CONFIGURATION_DEFINES += -DFLASH_MAP=$(SPI_SIZE_MAP)
132137
endif

examples/at/include/user_config.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,13 @@
2222
*
2323
*/
2424

25-
#ifndef __USER_CONFIG_H__
26-
#define __USER_CONFIG_H__
25+
#pragma once
2726

27+
// #define AT_ESP_UPGRADE
28+
29+
#ifndef AT_ESP_UPGRADE
2830
#define AT_CUSTOM_UPGRADE
31+
#endif
2932

3033
#ifdef AT_CUSTOM_UPGRADE
3134
#ifndef AT_UPGRADE_SUPPORT
@@ -37,4 +40,5 @@
3740
// #define CONFIG_AT_WPA2_ENTERPRISE_COMMAND_ENABLE
3841

3942
#define CONFIG_ENABLE_IRAM_MEMORY 1
40-
#endif
43+
44+
#define ESP_AT_FW_VERSION "Bin version(Wroom 02):1.7.6"

0 commit comments

Comments
 (0)