DroneCAN: ignore device name and hw version

ArduPilot · Dec 18, 2024 · bcca100 · bcca100
1 parent b543427
commit bcca100
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/ExtLibs/DroneCAN/DroneCAN.cs b/ExtLibs/DroneCAN/DroneCAN.cs
@@ -1129,12 +1129,14 @@ public void Update(byte nodeid, string devicename, double hwversion, string firm
                     var gnires = msg as DroneCAN.uavcan_protocol_GetNodeInfo_res;
                     Console.WriteLine(frame.SourceNode + " " + "GetNodeInfo: seen '{0}' from {1}",
                         ASCIIEncoding.ASCII.GetString(gnires.name).TrimEnd('\0'), frame.SourceNode);
-                    if (devicename == ASCIIEncoding.ASCII.GetString(gnires.name).TrimEnd('\0') ||
+                    // ignore devicename, managed by the device itself
+                    if (true || devicename == ASCIIEncoding.ASCII.GetString(gnires.name).TrimEnd('\0') ||
                         devicename == ASCIIEncoding.ASCII.GetString(gnires.name).TrimEnd('\0') + "-BL" || gnires.name_len == 0)
                     {
                         if (firmware_crc != gnires.software_version.image_crc || firmware_crc == ulong.MaxValue)
                         {
-                            if (hwversion ==
+                            // ignore hw version
+                            if (true || hwversion ==
                                 double.Parse(gnires.hardware_version.major + "." + gnires.hardware_version.minor,
                                     CultureInfo.InvariantCulture) || hwversion == 0)
                             {