Skip to content

Commit

Permalink
Merge branch 'feature/re_add_ota' into 'master'
Browse files Browse the repository at this point in the history
feat(N8266-90): Re-added ota implement and generated AT firmwares on ci

See merge request sdk/ESP8266_NONOS_SDK!317
  • Loading branch information
xcguang committed Jun 14, 2024
2 parents 7785626 + 1534a44 commit 54548c9
Show file tree
Hide file tree
Showing 7 changed files with 724 additions and 8 deletions.
48 changes: 46 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ stages:
# - chmod +x gen_misc_non_os.sh
# - ./gen_misc_non_os.sh

build_at:
.at_setup_tokens: &at_setup_tokens
- echo -e "#define CONFIG_AT_1024_1024_TOKEN \"$AT_1024_1024_TOKEN\"" >> include/user_config.h
- echo -e "#define CONFIG_AT_512_512_TOKEN \"$AT_512_512_TOKEN\"" >> include/user_config.h

build_at_1024_1024_u1:
<<: *build_template
artifacts:
paths:
Expand All @@ -51,7 +55,47 @@ build_at:
script:
- cp -rf examples/at at
- cd at
- make COMPILE=gcc BOOT=new APP=1 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=5
- *at_setup_tokens
- make COMPILE=gcc BOOT=new APP=1 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=5 AT_ESP_UPGRADE=1

build_at_1024_1024_u2:
<<: *build_template
artifacts:
paths:
- ./bin/upgrade
- ./bin/*.bin
expire_in: 6 mos
script:
- cp -rf examples/at at
- cd at
- *at_setup_tokens
- make COMPILE=gcc BOOT=new APP=2 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=5 AT_ESP_UPGRADE=1

build_at_512_512_u1:
<<: *build_template
artifacts:
paths:
- ./bin/upgrade
- ./bin/*.bin
expire_in: 6 mos
script:
- cp -rf examples/at_nano at
- cd at
- *at_setup_tokens
- make COMPILE=gcc BOOT=new APP=1 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=2 AT_ESP_UPGRADE=1

build_at_512_512_u2:
<<: *build_template
artifacts:
paths:
- ./bin/upgrade
- ./bin/*.bin
expire_in: 6 mos
script:
- cp -rf examples/at_nano at
- cd at
- *at_setup_tokens
- make COMPILE=gcc BOOT=new APP=2 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=2 AT_ESP_UPGRADE=1

build_at_espconn:
<<: *build_template
Expand Down
5 changes: 5 additions & 0 deletions examples/at/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,11 @@ CONFIGURATION_DEFINES += \
-DAT_UPGRADE_SUPPORT
endif

ifeq ($(AT_ESP_UPGRADE),1)
CONFIGURATION_DEFINES += \
-DAT_ESP_UPGRADE
endif

ifeq ($(SPI_SIZE_MAP),5)
CONFIGURATION_DEFINES += -DFLASH_MAP=$(SPI_SIZE_MAP)
endif
Expand Down
10 changes: 7 additions & 3 deletions examples/at/include/user_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@
*
*/

#ifndef __USER_CONFIG_H__
#define __USER_CONFIG_H__
#pragma once

// #define AT_ESP_UPGRADE

#ifndef AT_ESP_UPGRADE
#define AT_CUSTOM_UPGRADE
#endif

#ifdef AT_CUSTOM_UPGRADE
#ifndef AT_UPGRADE_SUPPORT
Expand All @@ -37,4 +40,5 @@
// #define CONFIG_AT_WPA2_ENTERPRISE_COMMAND_ENABLE

#define CONFIG_ENABLE_IRAM_MEMORY 1
#endif

#define ESP_AT_FW_VERSION "Bin version(Wroom 02):1.7.6"
Loading

0 comments on commit 54548c9

Please sign in to comment.