Merge pull request #73 from NonPIayerCharacter/ecr6600

ECR6600 flasher

Author: openshwprojects

BK7231Flasher/BK7231Flasher.csproj

@@ -56,6 +56,7 @@
     <Reference Include="System.Configuration" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ECR6600Flasher.cs" />
     <Compile Include="BaseFlasher.cs" />
     <Compile Include="BitUtils.cs" />
     <Compile Include="BK7231Flasher.cs" />
@@ -183,6 +184,12 @@
     <AdditionalFiles Include="easyflash\libef.so">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AdditionalFiles>
+    <AdditionalFiles Include="easyflash\libef_ECR.so">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </AdditionalFiles>
+    <AdditionalFiles Include="easyflash\libef_GRAN8.so">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </AdditionalFiles>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -208,6 +215,12 @@
     <AdditionalFiles Include="easyflash\WinEF_x86.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AdditionalFiles>
+    <AdditionalFiles Include="easyflash\WinEF_ECR_x64.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </AdditionalFiles>
+    <AdditionalFiles Include="easyflash\WinEF_ECR_x86.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </AdditionalFiles>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

BK7231Flasher/BL602Flasher.cs

@@ -617,23 +617,25 @@ public override void doReadAndWrite(int startSector, int sectors, string sourceF
                     var offset = OBKFlashLayout.getConfigLocation(chipType, out sectors);
                     var areaSize = sectors * BK7231Flasher.SECTOR_SIZE;
 
+                    cfg.saveConfig(chipType);
+                    var cfgData = cfg.getData();
                     byte[] efdata;
                     if(cfg.efdata != null)
                     {
                         try
                         {
-                            efdata = EasyFlash.SaveCfgToExistingEasyFlash(cfg, areaSize, chipType);
+                            efdata = EasyFlash.SaveValueToExistingEasyFlash("mY0bcFg", cfg.efdata, cfgData, areaSize, chipType);
                         }
                         catch(Exception ex)
                         {
                             addLog("Saving config to existing EasyFlash failed" + Environment.NewLine);
                             addLog(ex.Message + Environment.NewLine);
-                            efdata = EasyFlash.SaveCfgToNewEasyFlash(cfg, areaSize, chipType);
+                            efdata = EasyFlash.SaveValueToNewEasyFlash("mY0bcFg", cfgData, areaSize, chipType);
                         }
                     }
                     else
                     {
-                        efdata = EasyFlash.SaveCfgToNewEasyFlash(cfg, areaSize, chipType);
+                        efdata = EasyFlash.SaveValueToNewEasyFlash("mY0bcFg", cfgData, areaSize, chipType);
                     }
                     addLog("Now will also write OBK config..." + Environment.NewLine);
                     addLog("Long name from CFG: " + cfg.longDeviceName + Environment.NewLine);

BK7231Flasher/BaseFlasher.cs

@@ -20,6 +20,7 @@ public enum BKType
         RTL8720D,
         LN882H,
         BL602,
+        ECR6600,
 
         BekenSPI,
         GenericSPI,