No commit message

fsmoke · Oct 7, 2019 · aba1333 · aba1333
1 parent a0e95ab
commit aba1333
Show file tree

Hide file tree

Showing 6 changed files with 127 additions and 101 deletions.
diff --git a/Distrib/MSBuildTemplate/ESPBuilder.props b/Distrib/MSBuildTemplate/ESPBuilder.props
@@ -10,18 +10,25 @@
     <MasterIOT>false</MasterIOT>
     <ESPDataLocal>false</ESPDataLocal>
     <FlashMaster>false</FlashMaster>
-    <FlashESPData>true</FlashESPData>
+    <!--FlashESPData>false</FlashESPData-->
+	<FlashESPDataFile>No</FlashESPDataFile>
+
     <FlashBlank>true</FlashBlank>
     <FlashBoot>true</FlashBoot>
     <FlashUser>true</FlashUser>
   </PropertyGroup>
 
-  <ItemGroup>
-    <BootList Include="No boot"/>
-    <BootList Condition="Exists('$(VisualStudioXtensa)ESPressif\$(SelectRelease)\$(SelectVersion)')" Include="$(VisualStudioXtensa)ESPressif\$(SelectRelease)\$(SelectVersion)\bin\Boot*.bin" />
-    <BootName Include="@(BootList->'%(filename)')"/>
-  </ItemGroup>
+	<ItemGroup>
+		<BootList Include="No boot"/>
+		<BootList Condition="Exists('$(VisualStudioXtensa)ESPressif\$(SelectRelease)\$(SelectVersion)')" Include="$(VisualStudioXtensa)ESPressif\$(SelectRelease)\$(SelectVersion)\bin\Boot*.bin" />
+		<BootName Include="@(BootList->'%(filename)')"/>
+	</ItemGroup>
 
+	<ItemGroup>
+		<ESPDataFileList Include="No"/>
+		<ESPDataFileList Condition="Exists('$(VisualStudioXtensa)ESPressif\$(SelectRelease)\$(SelectVersion)')" Include="$(VisualStudioXtensa)ESPressif\$(SelectRelease)\$(SelectVersion)\bin\esp_init_data_default*.bin" />
+		<FlashESPDataFileName Include="@(ESPDataFileList->'%(filename)')"/>
+	</ItemGroup>
   <ItemDefinitionGroup>
     <ESPBuilder>
     </ESPBuilder>

diff --git a/Distrib/MSBuildTemplate/ESPBuilder.targets b/Distrib/MSBuildTemplate/ESPBuilder.targets
@@ -110,14 +110,15 @@
 
   <Target Name="ESPTOOL" AfterTargets="ESPRAM" DependsOnTargets="SetPythonVariable">
     <Message Importance="High" Text="*** Flash Table **************************************" />
-    <Message Condition="'$(FlashMaster)'=='true'" Importance="High" Text="Master Device Key adresss : %(ESPBuilder.MasterKey)" />
-    <Message Condition="'$(FlashESPData)'=='true'" Importance="High" Text="ESP Init Data adresss     : %(ESPBuilder.ESPData)" />
-    <Message Condition="'$(FlashBlank)'=='true'" Importance="High" Text="Blank Data adresss        : %(ESPBuilder.Blank)" />
-    <Message Condition="'$(ESPBoot)'=='No Boot' and '$(FlashBoot)'=='true'" Importance="High" Text="eagle.flash adresss       : 0x00000" />
+    <Message Condition="'$(FlashMaster)'=='true'" Importance="High" Text="Master Device Key address : %(ESPBuilder.MasterKey)" />
+    <!--Message Condition="'$(FlashESPData)'!='true'" Importance="High" Text="ESP Init Data address     : %(ESPBuilder.ESPData)" /-->
+	<Message Condition="'$(FlashESPDataFile)'!='No'" Importance="High" Text="ESP Init Data address     : %(ESPBuilder.ESPData)" />
+    <Message Condition="'$(FlashBlank)'=='true'" Importance="High" Text="Blank Data address        : %(ESPBuilder.Blank)" />
+    <Message Condition="'$(ESPBoot)'=='No Boot' and '$(FlashBoot)'=='true'" Importance="High" Text="eagle.flash address       : 0x00000" />
     <Message Condition="'$(ESPBoot)'=='No Boot' and $(SelectVersion.Substring(0, $(SelectVersion.IndexOf('.'))))&lt;2 and '$(FlashUser)'=='true'" Importance="High" Text="eagle.irom0text address   : 0x40000" />
 	<Message Condition="'$(ESPBoot)'=='No Boot' and $(SelectVersion.Substring(0, $(SelectVersion.IndexOf('.'))))&gt;=2 and '$(FlashUser)'=='true'" Importance="High" Text="eagle.irom0text address   : 0x10000" />
 
-    <Message Condition="'$(ESPBoot)'!='No Boot' and '$(FlashBoot)'=='true'" Importance="High" Text="boot adresss              : 0x00000" />
+    <Message Condition="'$(ESPBoot)'!='No Boot' and '$(FlashBoot)'=='true'" Importance="High" Text="boot address              : 0x00000" />
     <Message Condition="'$(ESPBoot)'!='No Boot' and '$(FlashUser)'=='true'" Importance="High" Text="User$(ESPBin) address             : %(ESPBuilder.UserAddr)" />
 
     <PropertyGroup>
@@ -126,8 +127,11 @@
       <AdresseList></AdresseList>
       <AdresseList Condition="'$(FlashMaster)'=='true'">$([System.String]::Concat($(AdresseList), "-a%(ESPBuilder.MasterKey) &quot;$(MSBuildProjectDirectory)\master_device_key.bin&quot; "))</AdresseList>
 
-      <AdresseList Condition="'$(FlashESPData)'=='true' and '$(ESPDataLocal)'!='true'">$([System.String]::Concat($(AdresseList), "-a%(ESPBuilder.ESPData) &quot;$(VisualStudioXtensa)ESPressif\$(SelectRelease)\$(SelectVersion)\bin\esp_init_data_default.bin&quot; "))</AdresseList>
-      <AdresseList Condition="'$(FlashESPData)'=='true' and '$(ESPDataLocal)'=='true'">$([System.String]::Concat($(AdresseList), "-a%(ESPBuilder.ESPData) &quot;$(MSBuildProjectDirectory)\esp_init_data_default.bin&quot; "))</AdresseList>
+      <!--AdresseList Condition="'$(FlashESPData)'=='true' and '$(ESPDataLocal)'!='true'">$([System.String]::Concat($(AdresseList), "-a%(ESPBuilder.ESPData) &quot;$(VisualStudioXtensa)ESPressif\$(SelectRelease)\$(SelectVersion)\bin\esp_init_data_default.bin&quot; "))</AdresseList>
+      <AdresseList Condition="'$(FlashESPData)'=='true' and '$(ESPDataLocal)'=='true'">$([System.String]::Concat($(AdresseList), "-a%(ESPBuilder.ESPData) &quot;$(MSBuildProjectDirectory)\esp_init_data_default.bin&quot; "))</AdresseList-->
+
+	  <AdresseList Condition="'$(FlashESPDataFile)'!='No' and '$(ESPDataLocal)'!='true'">$([System.String]::Concat($(AdresseList), "-a%(ESPBuilder.ESPData) &quot;$(VisualStudioXtensa)ESPressif\$(SelectRelease)\$(SelectVersion)\bin\$(FlashESPDataFile).bin&quot; "))</AdresseList>
+      <AdresseList Condition="'$(FlashESPDataFile)'!='No' and '$(ESPDataLocal)'=='true'">$([System.String]::Concat($(AdresseList), "-a%(ESPBuilder.ESPData) &quot;$(MSBuildProjectDirectory)\esp_init_data_default.bin&quot; "))</AdresseList>
 
       <AdresseList Condition="'$(FlashBlank)'=='true'">$([System.String]::Concat($(AdresseList), "-a%(ESPBuilder.Blank) &quot;$(VisualStudioXtensa)ESPressif\$(SelectRelease)\$(SelectVersion)\bin\blank.bin&quot; "))</AdresseList>
 

diff --git a/Distrib/MSBuildTemplate/ESPBuilder/ESPBuilder_Boot_Merged.xml b/Distrib/MSBuildTemplate/ESPBuilder/ESPBuilder_Boot_Merged.xml
@@ -96,7 +96,12 @@
       <BoolProperty Name="MasterIOT" DisplayName="Master Key IOT Rule" Description="Use Master Key IOT Rule adress" Category="ESPToolConfig"/>
       <BoolProperty Name="ESPDataLocal" DisplayName="Use Local ESP Init Data" Description="Use ESP Init Data located inside projects folder." Category="ESPToolConfig" />
       <BoolProperty Name="FlashMaster" DisplayName="Flash Master Key" Description="Flash master_device_key.bin" Category="ESPToolConfig" />
-      <BoolProperty Name="FlashESPData" DisplayName="Flash ESP Init Data" Description="Flash esp_init_data_default.bin" Category="ESPToolConfig" />
+      <!--BoolProperty Name="FlashESPData" DisplayName="Flash ESP Init Data" Description="Flash esp_init_data_default.bin" Category="ESPToolConfig" /-->
+		<DynamicEnumProperty Name="FlashESPDataFile" DisplayName="Flash ESP Init Data File" Description="Version of esp_init_data_default.bin" Category="ESPToolConfig">
+			<DynamicEnumProperty.ProviderSettings>
+				<NameValuePair Name="Include" Value="@(FlashESPDataFileName)" />
+			</DynamicEnumProperty.ProviderSettings>
+		</DynamicEnumProperty>
       <BoolProperty Name="FlashBlank" DisplayName="Flash Blank Section" Description="Flash Blank.bin" Category="ESPToolConfig" />
       <BoolProperty Name="FlashBoot" DisplayName="Flash Blank Boot/Eagle" Description="Flash Boot.bin or eagle.flash.bin" Category="ESPToolConfig" />
       <BoolProperty Name="FlashUser" DisplayName="Flash Blank User/irom0text" Description="Flash UserX.bin or eagle.irom0text.bin" Category="ESPToolConfig" />