Skip to content

Commit

Permalink
Merge pull request #258 from espressif/feat/esp32p4_support
Browse files Browse the repository at this point in the history
feat(esp32p4): Added support in components
  • Loading branch information
jakub-kocka authored Aug 2, 2024
2 parents d84ef17 + 010dacd commit 1406a13
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 1 deletion.
7 changes: 7 additions & 0 deletions Build-Installer.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -417,15 +417,22 @@ if (('offline' -eq $InstallerType) -or ('espressif-ide' -eq $InstallerType)){
$IsccParameters += '/DDISABLE_TARGET_ESP32_S3'
$IsccParameters += '/DDISABLE_TARGET_ESP32_C2'
$IsccParameters += '/DDISABLE_TARGET_ESP32_C6'
$IsccParameters += '/DDISABLE_TARGET_ESP32_P4'
}

if (($OfflineBranch -like 'v4.3*') -or ($OfflineBranch -like 'v4.4*') ){
$IsccParameters += '/DDISABLE_TARGET_ESP32_C2'
$IsccParameters += '/DDISABLE_TARGET_ESP32_C6'
$IsccParameters += '/DDISABLE_TARGET_ESP32_P4'
}

if ($OfflineBranch -like 'v5.0*') {
$IsccParameters += '/DDISABLE_TARGET_ESP32_C6'
$IsccParameters += '/DDISABLE_TARGET_ESP32_P4'
}

if (($OfflineBranch -like 'v5.1*') -or ($OfflineBranch -like 'v5.2*') ){
$IsccParameters += '/DDISABLE_TARGET_ESP32_P4'
}

if ($Compression -eq 'none') {
Expand Down
4 changes: 4 additions & 0 deletions src/InnoSetup/Environment.iss
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,10 @@ begin
Targets := Targets + 'esp32-s2,';
end;
if (WizardIsComponentSelected('{#COMPONENT_TARGET_ESP32_P4}')) then begin
Targets := Targets + 'esp32-p4,';
end;
if (Length(Targets) > 1) then begin
Result := '--targets=' + Copy(Targets, 1, Length(Targets) - 1);
end else begin
Expand Down
9 changes: 8 additions & 1 deletion src/InnoSetup/IdfToolsSetup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@
#define COMPONENT_TARGET_ESP32_S = "target/esp32s"
#define COMPONENT_TARGET_ESP32_S3 = "target/esp32s/s3"
#define COMPONENT_TARGET_ESP32_S2 = "target/esp32s/s2"
#define COMPONENT_TARGET_ESP32_P = "target/esp32p"
#define COMPONENT_TARGET_ESP32_P4 = "target/esp32p/p4"
#define COMPONENT_OPTIMIZATION = 'optimization'
#define COMPONENT_OPTIMIZATION_ESPRESSIF_DOWNLOAD = 'optimization/espressif_download'
#define COMPONENT_OPTIMIZATION_GIT_MIRROR = 'optimization/git_mirror'
Expand Down Expand Up @@ -311,7 +313,7 @@ Name: "{#COMPONENT_TARGET_ESP32_C3}"; Description: {cm:ComponentTargetEsp32c3};
#endif

#ifndef DISABLE_TARGET_ESP32_C6
Name: "{#COMPONENT_TARGET_ESP32_C6}"; Description: {cm:ComponentTargetEsp32c6}; Types: custom; Flags: checkablealone
Name: "{#COMPONENT_TARGET_ESP32_C6}"; Description: {cm:ComponentTargetEsp32c6}; Types: full; Flags: checkablealone
Name: "{#COMPONENT_TARGET_ESP32_H}"; Description: {cm:ComponentTargetEsp32h}; Types: full; Flags: checkablealone
Name: "{#COMPONENT_TARGET_ESP32_H2}"; Description: {cm:ComponentTargetEsp32h2}; Types: custom; Flags: checkablealone
#endif
Expand All @@ -323,6 +325,11 @@ Name: "{#COMPONENT_TARGET_ESP32_S2}"; Description: {cm:ComponentTargetEsp32s2};
Name: "{#COMPONENT_TARGET_ESP32_S3}"; Description: {cm:ComponentTargetEsp32s3}; Types: full; Flags: checkablealone
#endif

#ifndef DISABLE_TARGET_ESP32_P4
Name: "{#COMPONENT_TARGET_ESP32_P}"; Description: {cm:ComponentTargetEsp32p}; Types: full; Flags: checkablealone

Name: "{#COMPONENT_TARGET_ESP32_P4}"; Description: {cm:ComponentTargetEsp32p4}; Types: full; Flags: checkablealone
#endif

; Following optimization are supported only in online version
#if OFFLINE == 'no'
Expand Down
2 changes: 2 additions & 0 deletions src/InnoSetup/Languages/IdfToolsSetup_cs-CZ.isl
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ ComponentTargetEsp32h2=ESP32-H2 (ESP-IDF v5.1+)
ComponentTargetEsp32s=ESP32-S Series
ComponentTargetEsp32s3=ESP32-S3 (ESP-IDF v4.4+)
ComponentTargetEsp32s2=ESP32-S2 (ESP-IDF v4.2+)
ComponentTargetEsp32p=ESP32-P Series
ComponentTargetEsp32p4=ESP32-P4 (ESP-IDF v5.3+)
ComponentOptimization=Optimalizace
ComponentOptimizationEspressifDownload=Použít Espressif download mirror místo GitHub-u
InstallationFull=Plná instalace
Expand Down
2 changes: 2 additions & 0 deletions src/InnoSetup/Languages/IdfToolsSetup_en-US.isl
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ ComponentTargetEsp32h2=ESP32-H2 (ESP-IDF v5.1+)
ComponentTargetEsp32s=ESP32-S Series
ComponentTargetEsp32s3=ESP32-S3 (ESP-IDF v4.4+)
ComponentTargetEsp32s2=ESP32-S2 (ESP-IDF v4.2+)
ComponentTargetEsp32p=ESP32-P Series
ComponentTargetEsp32p4=ESP32-P4 (ESP-IDF v5.3+)
ComponentOptimization=Optimization
ComponentOptimizationEspressifDownload=Use Espressif download mirror instead of GitHub
InstallationFull=Full installation
Expand Down
2 changes: 2 additions & 0 deletions src/InnoSetup/Languages/IdfToolsSetup_es-ES.isl
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ ComponentTargetEsp32h2=ESP32-H2 (ESP-IDF v5.1+)
ComponentTargetEsp32s=ESP32-S Series
ComponentTargetEsp32s3=ESP32-S3 (ESP-IDF v4.4+)
ComponentTargetEsp32s2=ESP32-S2 (ESP-IDF v4.2+)
ComponentTargetEsp32p=ESP32-P Series
ComponentTargetEsp32p4=ESP32-P4 (ESP-IDF v5.3+)
ComponentOptimization=Optimización
ComponentOptimizationEspressifDownload=Usar enlaces de descarga Espressif en vez de GitHub
InstallationFull=Instalación completa
Expand Down
2 changes: 2 additions & 0 deletions src/InnoSetup/Languages/IdfToolsSetup_pt-BR.isl
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ ComponentTargetEsp32h2=ESP32-H2 (ESP-IDF v5.1+)
ComponentTargetEsp32s=ESP32-S Series
ComponentTargetEsp32s3=ESP32-S3 (ESP-IDF v4.4+)
ComponentTargetEsp32s2=ESP32-S2 (ESP-IDF v4.2+)
ComponentTargetEsp32p=ESP32-P Series
ComponentTargetEsp32p4=ESP32-P4 (ESP-IDF v5.3+)
ComponentOptimization=Otimização
ComponentOptimizationEspressifDownload=Utilizar o servidor Espressif para o download e não o GitHub
InstallationFull=Instalação completa
Expand Down
2 changes: 2 additions & 0 deletions src/InnoSetup/Languages/IdfToolsSetup_pt-PT.isl
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ ComponentTargetEsp32h2=ESP32-H2 (ESP-IDF v5.1+)
ComponentTargetEsp32s=ESP32-S Series
ComponentTargetEsp32s3=ESP32-S3 (ESP-IDF v4.4+)
ComponentTargetEsp32s2=ESP32-S2 (ESP-IDF v4.2+)
ComponentTargetEsp32p=ESP32-P Series
ComponentTargetEsp32p4=ESP32-P4 (ESP-IDF v5.3+)
ComponentOptimization=Otimização
ComponentOptimizationEspressifDownload=Utilizar o servidor Espressif para descarregar e não o GitHub
InstallationFull=Instalação completa
Expand Down
2 changes: 2 additions & 0 deletions src/InnoSetup/Languages/IdfToolsSetup_sk-SK.isl
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ ComponentTargetEsp32h2=ESP32-H2 (ESP-IDF v5.1+)
ComponentTargetEsp32s=ESP32-S Series
ComponentTargetEsp32s3=ESP32-S3 (ESP-IDF v4.4+)
ComponentTargetEsp32s2=ESP32-S2 (ESP-IDF v4.2+)
ComponentTargetEsp32p=ESP32-P Series
ComponentTargetEsp32p4=ESP32-P4 (ESP-IDF v5.3+)
ComponentOptimization=Optimalizácia
ComponentOptimizationEspressifDownload=Použiť Espressif download mirror namiesto GitHub-u
InstallationFull=Plná inštalácia
Expand Down
2 changes: 2 additions & 0 deletions src/InnoSetup/Languages/IdfToolsSetup_zh-CN.isl
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ ComponentTargetEsp32h2=ESP32-H2 (ESP-IDF v5.1+)
ComponentTargetEsp32s=ESP32-S 系列
ComponentTargetEsp32s3=ESP32-S3 (ESP-IDF v4.4+)
ComponentTargetEsp32s2=ESP32-S2 (ESP-IDF v4.2+)
ComponentTargetEsp32p=ESP32-P Series
ComponentTargetEsp32p4=ESP32-P4 (ESP-IDF v5.3+)
ComponentOptimization=优化
ComponentOptimizationEspressifDownload=使用 Espressif 下载镜像代替 Github
InstallationFull=完全安装
Expand Down
4 changes: 4 additions & 0 deletions src/InnoSetup/Summary.iss
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@ begin
Result := Result + 'ESP32-S3 ';
end;
if (WizardIsComponentSelected('{#COMPONENT_TARGET_ESP32_P4}')) then begin
Result := Result + 'ESP32-P4 ';
end;
Result := Result + NewLine;
Result := Result + CustomMessage('SummaryOptimization') + ': ';
if (WizardIsComponentSelected('{#COMPONENT_OPTIMIZATION_ESPRESSIF_DOWNLOAD}')) then begin
Expand Down

0 comments on commit 1406a13

Please sign in to comment.