Uploader: fix external flash crc check #3297

ArduPilot · Mar 5, 2024 · caa0436 · caa0436
1 parent 065f88a
commit caa0436
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/ExtLibs/px4uploader/Uploader.cs b/ExtLibs/px4uploader/Uploader.cs
@@ -806,6 +806,9 @@ public void currentChecksum(Firmware fw)
 
             this.port.ReadTimeout = 1000; // 1 sec
 
+            bool sameflash = true;
+            bool sameexternalflash = true;
+
             if (self.fw_maxsize > 0)
             {
                 int expect_crc = fw.crc(self.fw_maxsize);
@@ -817,16 +820,16 @@ public void currentChecksum(Firmware fw)
                 print("FW File 0x" + hexlify(BitConverter.GetBytes(expect_crc)) + " " + expect_crc);
                 print("Current 0x" + hexlify(BitConverter.GetBytes(report_crc)) + " " + report_crc);
 
-                if (expect_crc == report_crc)
-                    throw new Exception("Same Firmware. Not uploading");
+                if (expect_crc != report_crc)
+                    sameflash = false;                    
             }
 
             if (self.extf_maxsize > 0)
             {
                 int expect_crc = fw.extf_crc(fw.extf_image_size);
 
                 byte[] size_bytes = BitConverter.GetBytes(fw.extf_image_size);
- 
+
                 __send(new byte[] {(byte)Code.EXTF_GET_CRC,
                     size_bytes[0], size_bytes[1], size_bytes[2], size_bytes[3],
                     (byte) Code.EOC});
@@ -840,9 +843,12 @@ public void currentChecksum(Firmware fw)
                 print("Ext FW File 0x" + hexlify(BitConverter.GetBytes(expect_crc)) + " " + expect_crc);
                 print("Current 0x" + hexlify(BitConverter.GetBytes(report_crc)) + " " + report_crc);
 
-                if (expect_crc == report_crc)
-                    throw new Exception("Same Firmware. Not uploading");
+                if (expect_crc != report_crc)
+                    sameexternalflash = false;
             }
+
+            if (sameflash && sameexternalflash)
+                throw new Exception("Same Firmware. Not uploading");
         }
 
         public void identify()

diff --git a/MissionPlanner.sln b/MissionPlanner.sln
@@ -187,8 +187,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FaceMap", "Plugins\FaceMap\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ntrip", "ExtLibs\Ntrip\Ntrip.csproj", "{CBB78367-91B7-4D53-AD31-429B71F867D2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetDFULib", "ExtLibs\NetDFULib\NetDFULib.csproj", "{DC7BAD19-540A-4407-8E89-C15C899D74DF}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms-net_4_x", "ExtLibs\mono\mcs\class\System.Windows.Forms\System.Windows.Forms-net_4_x.csproj", "{E4902330-74FE-45F6-86C3-0A5F73A1EEC0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Drawing", "Drawing", "{3CA4F989-80BA-4814-8CC1-6D0DC1F5FF52}"
@@ -444,6 +442,10 @@ Global
 		{EECDFE74-6CDC-45E0-AA39-34FF55FFB49F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EECDFE74-6CDC-45E0-AA39-34FF55FFB49F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EECDFE74-6CDC-45E0-AA39-34FF55FFB49F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9BA6FC55-148D-4481-B9E6-B31A1D4BCD0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9BA6FC55-148D-4481-B9E6-B31A1D4BCD0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9BA6FC55-148D-4481-B9E6-B31A1D4BCD0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9BA6FC55-148D-4481-B9E6-B31A1D4BCD0F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DFCB0240-50CF-4F56-92C7-05941569231D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DFCB0240-50CF-4F56-92C7-05941569231D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DFCB0240-50CF-4F56-92C7-05941569231D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -488,10 +490,6 @@ Global
 		{CBB78367-91B7-4D53-AD31-429B71F867D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CBB78367-91B7-4D53-AD31-429B71F867D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CBB78367-91B7-4D53-AD31-429B71F867D2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC7BAD19-540A-4407-8E89-C15C899D74DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC7BAD19-540A-4407-8E89-C15C899D74DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC7BAD19-540A-4407-8E89-C15C899D74DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC7BAD19-540A-4407-8E89-C15C899D74DF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E4902330-74FE-45F6-86C3-0A5F73A1EEC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E4902330-74FE-45F6-86C3-0A5F73A1EEC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E4902330-74FE-45F6-86C3-0A5F73A1EEC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -619,7 +617,6 @@ Global
 		{A0B60830-D1C0-4E1F-9E44-793A71C5D720} = {0371886E-5A61-4626-B9E0-50A837ECE2DD}
 		{3D787D5F-1DCA-4C2E-8D3A-93353E7BB62A} = {9B3AC501-5FCB-4A2A-A628-BE0985DB2BD4}
 		{CBB78367-91B7-4D53-AD31-429B71F867D2} = {B35C7AA8-707D-4575-96CD-41ECFA439286}
-		{DC7BAD19-540A-4407-8E89-C15C899D74DF} = {7E264F12-9EC3-4CDC-A187-6879C2B2BFCF}
 		{E4902330-74FE-45F6-86C3-0A5F73A1EEC0} = {82872363-B5AC-4ACE-9200-83F5EF9AF27A}
 		{3CA4F989-80BA-4814-8CC1-6D0DC1F5FF52} = {7E264F12-9EC3-4CDC-A187-6879C2B2BFCF}
 		{0371886E-5A61-4626-B9E0-50A837ECE2DD} = {7E264F12-9EC3-4CDC-A187-6879C2B2BFCF}