Skip to content

Commit

Permalink
Merge branch 'bugfix/esp32s2_incompatible_ota_ver' into 'master'
Browse files Browse the repository at this point in the history
fix: Fixed an incompatible module information on esp32-s2 after ota

See merge request application/esp-at!1563
  • Loading branch information
xcguang committed May 17, 2024
2 parents d83db65 + 17ae5ee commit 2d0d28b
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 2 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/build_template_esp32s2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ jobs:
cd components/at/private_include
rm -f at_ota_token.h
echo -e "#pragma once" >> at_ota_token.h
echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_WROOM \"${{ secrets.AT_OTA_TOKEN_ESP32S2_WROOM }}\"" >> at_ota_token.h
echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_WROOM \"${{ secrets.AT_OTA_TOKEN_ESP32S2_WROOM }}\"" >> at_ota_token.h
echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_WROVER \"${{ secrets.AT_OTA_TOKEN_ESP32S2_WROVER }}\"" >> at_ota_token.h
echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_WROVER \"${{ secrets.AT_OTA_TOKEN_ESP32S2_WROVER }}\"" >> at_ota_token.h
echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_SOLO \"${{ secrets.AT_OTA_TOKEN_ESP32S2_SOLO }}\"" >> at_ota_token.h
echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_SOLO \"${{ secrets.AT_OTA_TOKEN_ESP32S2_SOLO }}\"" >> at_ota_token.h
echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_MINI \"${{ secrets.AT_OTA_TOKEN_ESP32S2_MINI }}\"" >> at_ota_token.h
echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_MINI \"${{ secrets.AT_OTA_TOKEN_ESP32S2_MINI }}\"" >> at_ota_token.h
cd -
Expand Down
6 changes: 6 additions & 0 deletions .gitlab/ci/build_template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,12 @@
.setup_tokens_esp32s2: &setup_tokens_esp32s2
- cd components/at/private_include
- rm -f at_ota_token.h
- echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_WROOM \"$AT_OTA_TOKEN_ESP32S2_WROOM\"" >> at_ota_token.h
- echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_WROOM \"$AT_OTA_TOKEN_ESP32S2_WROOM\"" >> at_ota_token.h
- echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_WROVER \"$AT_OTA_TOKEN_ESP32S2_WROVER\"" >> at_ota_token.h
- echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_WROVER \"$AT_OTA_TOKEN_ESP32S2_WROVER\"" >> at_ota_token.h
- echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_SOLO \"$AT_OTA_TOKEN_ESP32S2_SOLO\"" >> at_ota_token.h
- echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_SOLO \"$AT_OTA_TOKEN_ESP32S2_SOLO\"" >> at_ota_token.h
- echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_MINI \"$AT_OTA_TOKEN_ESP32S2_MINI\"" >> at_ota_token.h
- echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_MINI \"$AT_OTA_TOKEN_ESP32S2_MINI\"" >> at_ota_token.h
- cd -
Expand Down
11 changes: 9 additions & 2 deletions components/at/private_include/at_ota_token.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@
#define CONFIG_ESP_AT_OTA_TOKEN_ESP32C6_4MB CONFIG_ESP_AT_OTA_TOKEN_DEFAULT
#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C6_4MB CONFIG_ESP_AT_OTA_SSL_TOKEN_DEFAULT
#elif defined(CONFIG_IDF_TARGET_ESP32S2)
#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_MINI CONFIG_ESP_AT_OTA_TOKEN_DEFAULT
#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_MINI CONFIG_ESP_AT_OTA_SSL_TOKEN_DEFAULT
#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_WROOM CONFIG_ESP_AT_OTA_TOKEN_DEFAULT
#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_WROVER CONFIG_ESP_AT_OTA_TOKEN_DEFAULT
#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_SOLO CONFIG_ESP_AT_OTA_TOKEN_DEFAULT
#define CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_MINI CONFIG_ESP_AT_OTA_TOKEN_DEFAULT

#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_WROOM CONFIG_ESP_AT_OTA_SSL_TOKEN_DEFAULT
#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_WROVER CONFIG_ESP_AT_OTA_SSL_TOKEN_DEFAULT
#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_SOLO CONFIG_ESP_AT_OTA_SSL_TOKEN_DEFAULT
#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_MINI CONFIG_ESP_AT_OTA_SSL_TOKEN_DEFAULT
#endif
3 changes: 3 additions & 0 deletions components/at/src/at_default_config.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ static const esp_at_module_info_t esp_at_module_info[] = {
#endif

#if defined(CONFIG_IDF_TARGET_ESP32S2)
{"WROOM", CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_WROOM, CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_WROOM},
{"WROVER", CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_WROVER, CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_WROVER},
{"SOLO", CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_SOLO, CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_SOLO},
{"MINI", CONFIG_ESP_AT_OTA_TOKEN_ESP32S2_MINI, CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32S2_MINI},
#endif
};
Expand Down

0 comments on commit 2d0d28b

Please sign in to comment.