Device: RAD-Gigastar and RAD-Gigastar 2: Fix bootloader pipeline

README.md

@@ -30,13 +30,13 @@ Instructions for installing each API can be found in its respective documentatio
 - neoVI PLASMA
 - neoVI RED 2
 - RAD-A2B
+- RAD-Argos
 - RAD-Comet 2
 - RAD-Comet 3
 - RAD-Epsilon
 - RAD-EpsilonXL
 - RAD-Galaxy
 - RAD-Galaxy 2
-- RAD-Gemini
 - RAD-Gigastar
 - RAD-Gigastar 2
 - RAD-Moon 2

api/icsneolegacy/icsneolegacy.cpp

@@ -1073,8 +1073,8 @@ int LegacyDLLExport icsneoGetDeviceSettingsType(void* hObject, EPlasmaIonVnetCha
 	case NEODEVICE_RADMOON3:
 		*pDeviceSettingsType = DeviceRADMoon3SettingsType;
 		break;
-	case NEODEVICE_RADGEMINI:
-		*pDeviceSettingsType = DeviceRADGeminiSettingsType;
+	case NEODEVICE_RADARGOS:
+		*pDeviceSettingsType = DeviceRADArgosSettingsType;
 		break;
 	case NEODEVICE_RED2:
 		*pDeviceSettingsType = DeviceRed2SettingsType;

bindings/python/icsneopy/device/chipid.cpp

@@ -134,7 +134,7 @@ void init_chipid(pybind11::module_& m) {
 		.value("SFPModule_lan8670_MCHIP", ChipID::SFPModule_lan8670_MCHIP)
 		.value("RADGigastar2_ZYNQ", ChipID::RADGigastar2_ZYNQ)
 		.value("SFPModule_ent11100_MCHIP", ChipID::SFPModule_ent11100_MCHIP)
-		.value("RADGemini_MCHIP", ChipID::RADGemini_MCHIP)
+		.value("RADArgos_MCHIP", ChipID::RADArgos_MCHIP)
 		.value("Invalid", ChipID::Invalid)
 		.finalize();
 }

bindings/python/icsneopy/device/devicetype.cpp

@@ -38,7 +38,7 @@ void init_devicetype(pybind11::module_& m) {
 		.value("RADGalaxy2", DeviceType::Enum::RADGalaxy2)
 		.value("RADwBMS", DeviceType::Enum::RADwBMS)
 		.value("RADMoon3", DeviceType::Enum::RADMoon3)
-		.value("RADGemini", DeviceType::Enum::RADGemini)
+		.value("RADArgos", DeviceType::Enum::RADArgos)
 		.value("RADComet2", DeviceType::Enum::RADComet2)
 		.value("FIRE3_FlexRay", DeviceType::Enum::FIRE3_FlexRay)
 		.value("FIRE3_T1S_LIN", DeviceType::Enum::FIRE3_T1S_LIN)

device/devicefinder.cpp

@@ -221,8 +221,8 @@ std::vector<std::shared_ptr<Device>> DeviceFinder::FindAll() {
 		makeIfSerialMatches<RADMoon3>(dev, newFoundDevices);
 		#endif
 
-		#ifdef __RADGEMINI_H_
-		makeIfSerialMatches<RADGemini>(dev, newFoundDevices);
+		#ifdef __RADARGOS_H_
+		makeIfSerialMatches<RADArgos>(dev, newFoundDevices);
 		#endif
 
 		#ifdef __RADMOONDUO_H_
@@ -388,8 +388,8 @@ const std::vector<DeviceType>& DeviceFinder::GetSupportedDevices() {
 		RADMoon3::DEVICE_TYPE,
 		#endif
 
-		#ifdef __RADGEMINI_H_
-		RADGemini::DEVICE_TYPE,
+		#ifdef __RADARGOS_H_
+		RADArgos::DEVICE_TYPE,
 		#endif
 
 		#ifdef __RADMOONDUO_H_

include/icsneo/device/bootloaderpipeline.h

@@ -91,9 +91,10 @@ struct FlashPhase : public BootloaderPhase {
 	bool authenticate = true;
 	bool encrypt = true;
 	bool checkOutOfDate = true;
+	uint8_t slot = UINT8_MAX;
 
-	FlashPhase(ChipID chip, BootloaderCommunication comm, bool authenticate = true, bool encrypt = true, bool checkOutOfDate = true) 
-		: chip(chip), comm(comm), authenticate(authenticate), encrypt(encrypt), checkOutOfDate(checkOutOfDate) {}
+	FlashPhase(ChipID chip, BootloaderCommunication comm, bool authenticate = true, bool encrypt = true, bool checkOutOfDate = true, uint8_t slot = UINT8_MAX) 
+		: chip(chip), comm(comm), authenticate(authenticate), encrypt(encrypt), checkOutOfDate(checkOutOfDate), slot(slot) {}
 };
 
 enum class BootloaderSetting {

include/icsneo/device/chipid.h

@@ -138,7 +138,7 @@ enum class ChipID : icsneoc2_chip_id_t {
 	RADMOONT1S_ZCHIP = icsneoc2_chip_id_radmoont1s_zchip,
 	RADGigastar2_ZYNQ = icsneoc2_chip_id_radgigastar2_zynq,
 	SFPModule_ent11100_MCHIP = icsneoc2_chip_id_sfpmodule_ent11100_mchip,
-	RADGemini_MCHIP = icsneoc2_chip_id_radgemini_mchip,
+	RADArgos_MCHIP = icsneoc2_chip_id_radargos_mchip,
 	Invalid = icsneoc2_chip_id_invalid
 };
 

include/icsneo/device/device.h

@@ -151,7 +151,7 @@ public:
 		RADMoonT1S = 56,
 		RADGigastar2 = 57,
 		SFPModule_ent11100 = 58,
-		RADGemini = 60,
+		RADArgos = 60,
 	};
 
 	virtual ProductID getProductID() const = 0;

include/icsneo/device/devicetype.h

@@ -62,7 +62,7 @@ public:
 		RADGigastar2 = icsneoc2_devicetype_rad_gigastar2,
 		FIRE3_T1S_LIN = icsneoc2_devicetype_fire3_t1s_lin,
 		FIRE3_T1S_SENT = icsneoc2_devicetype_fire3_t1s_sent,
-		RADGemini = icsneoc2_devicetype_rad_gemini,
+		RADArgos = icsneoc2_devicetype_rad_argos,
 		RED = icsneoc2_devicetype_red,
 		ECU = icsneoc2_devicetype_ecu,
 		IEVB = icsneoc2_devicetype_ievb,
@@ -153,8 +153,8 @@ public:
 				return "RAD-EpsilonXL";
 			case RADMoon3:
 				return "RAD-Moon 3";
-			case RADGemini:
-				return "RAD-Gemini";
+			case RADArgos:
+				return "RAD-Argos";
 			case RADComet2:
 				return "RAD-Comet 2";
 			case RED:
@@ -281,7 +281,7 @@ private:
 #define ICSNEO_DEVICETYPE_RADGIGASTAR2 ((devicetype_t)icsneoc2_devicetype_rad_gigastar2)
 #define ICSNEO_DEVICETYPE_FIRE3_T1S_LIN ((devicetype_t)icsneoc2_devicetype_fire3_t1s_lin)
 #define ICSNEO_DEVICETYPE_FIRE3_T1S_SENT ((devicetype_t)icsneoc2_devicetype_fire3_t1s_sent)
-#define ICSNEO_DEVICETYPE_RADGEMINI ((devicetype_t)icsneoc2_devicetype_rad_gemini)
+#define ICSNEO_DEVICETYPE_RADARGOS ((devicetype_t)icsneoc2_devicetype_rad_argos)
 #define ICSNEO_DEVICETYPE_RED ((devicetype_t)icsneoc2_devicetype_red)
 #define ICSNEO_DEVICETYPE_ECU ((devicetype_t)icsneoc2_devicetype_ecu)
 #define ICSNEO_DEVICETYPE_IEVB ((devicetype_t)icsneoc2_devicetype_ievb)

include/icsneo/device/tree/radargos/radargos.h

@@ -1,19 +1,19 @@
-#ifndef __RADGEMINI_H_
-#define __RADGEMINI_H_
+#ifndef __RADARGOS_H_
+#define __RADARGOS_H_
 
 #ifdef __cplusplus
 
 #include "icsneo/device/device.h"
 #include "icsneo/device/devicetype.h"
-#include "icsneo/device/tree/radgemini/radgeminisettings.h"
+#include "icsneo/device/tree/radargos/radargossettings.h"
 
 namespace icsneo {
 
-class RADGemini : public Device {
+class RADArgos : public Device {
 public:
 	// Serial numbers start with GE
 	// USB PID is 0x110E, standard driver is CDCACM
-	ICSNEO_FINDABLE_DEVICE(RADGemini, DeviceType::RADGemini, "GE");
+	ICSNEO_FINDABLE_DEVICE(RADArgos, DeviceType::RADArgos, "GE");
 
 	static const std::vector<Network>& GetSupportedNetworks() {
 		static std::vector<Network> supportedNetworks = {
@@ -28,11 +28,11 @@ public:
 
 	bool supportsTC10() const override { return true; }
 
-	ProductID getProductID() const override { return ProductID::RADGemini; }
+	ProductID getProductID() const override { return ProductID::RADArgos; }
 
 	const std::vector<ChipInfo>& getChipInfo() const override {
 		static std::vector<ChipInfo> chips = {
-			{ChipID::RADGemini_MCHIP, true, "MCHIP", "radgemini_mchip_ief", 0, FirmwareType::IEF},
+			{ChipID::RADArgos_MCHIP, true, "MCHIP", "radargos_mchip_ief", 0, FirmwareType::IEF},
 		};
 		return chips;
 	}
@@ -40,15 +40,15 @@ public:
 	BootloaderPipeline getBootloader() override {
 		return BootloaderPipeline()
 			.add<EnterBootloaderPhase>()
-			.add<FlashPhase>(ChipID::RADGemini_MCHIP, BootloaderCommunication::RED)
-			.add<EnterApplicationPhase>(ChipID::RADGemini_MCHIP)
+			.add<FlashPhase>(ChipID::RADArgos_MCHIP, BootloaderCommunication::RED)
+			.add<EnterApplicationPhase>(ChipID::RADArgos_MCHIP)
 			.add<ReconnectPhase>()
 			.add<WaitPhase>(std::chrono::milliseconds(3000));
 	}
 
 protected:
-	RADGemini(neodevice_t neodevice, const driver_factory_t& makeDriver) : Device(neodevice) {
-		initialize<RADGeminiSettings>(makeDriver);
+	RADArgos(neodevice_t neodevice, const driver_factory_t& makeDriver) : Device(neodevice) {
+		initialize<RADArgosSettings>(makeDriver);
 	}
 
 	void setupPacketizer(Packetizer& packetizer) override {
@@ -74,4 +74,4 @@ protected:
 
 #endif // __cplusplus
 
-#endif // __RADGEMINI_H_
+#endif // __RADARGOS_H_

include/icsneo/device/tree/radargos/radargossettings.h

@@ -1,5 +1,5 @@
-#ifndef LIBICSNEO_RADGEMINISETTINGS_H
-#define LIBICSNEO_RADGEMINISETTINGS_H
+#ifndef LIBICSNEO_RADARGOSSETTINGS_H
+#define LIBICSNEO_RADARGOSSETTINGS_H
 
 #include <stdint.h>
 #include "icsneo/device/idevicesettings.h"
@@ -31,18 +31,18 @@ typedef struct {
 		uint16_t enableLatencyTest : 1;
 		uint16_t reserved : 15;
 	} flags; // 2
-} radgemini_settings_t;
+} radargos_settings_t;
 #pragma pack(pop)
 
 #ifdef __cplusplus
 
-static_assert(sizeof(radgemini_settings_t) == 86, "RADGemini settings size mismatch");
+static_assert(sizeof(radargos_settings_t) == 86, "RADArgos settings size mismatch");
 
 #include <iostream>
 
-class RADGeminiSettings : public IDeviceSettings {
+class RADArgosSettings : public IDeviceSettings {
 public:
-	RADGeminiSettings(Device* device) : IDeviceSettings(device, sizeof(radgemini_settings_t)) {}
+	RADArgosSettings(Device* device) : IDeviceSettings(device, sizeof(radargos_settings_t)) {}
 };
 
 }
@@ -50,4 +50,4 @@ public:
 #endif // __cplusplus
 
 
-#endif // LIBICSNEO_RADGEMINISETTINGS_H
+#endif // LIBICSNEO_RADARGOSSETTINGS_H

include/icsneo/device/tree/radgigastar/radgigastar.h

@@ -87,9 +87,32 @@ public:
 				}
 
 				BootloaderPipeline pipeline;
+				auto compVersions = getComponentVersions();
 				for(size_t i = 0; i < chipVersions.size(); i++) {
 					const auto& version = chipVersions[i];
-					pipeline.add<FlashPhase>(version.id, BootloaderCommunication::RADMultiChip, i == 0);
+					auto it = compVersions.begin();
+					std::vector<ComponentVersion> sameIdComponents;
+					while(it != compVersions.end()) {
+						it = std::find_if(it, compVersions.end(), [&version](const auto& component) { 
+							return (ChipID)component.identifier == version.id; 
+						});
+						if (it != compVersions.end()) {
+							sameIdComponents.push_back(*it);
+							it++;
+						}
+					}
+					if (sameIdComponents.size() > 1) {
+						std::vector<ComponentVersion> tempCompVersions;
+						for (const auto& component : compVersions) {
+							if ((ChipID)component.identifier != version.id || component.expansionSlot != sameIdComponents[0].expansionSlot) {
+								tempCompVersions.push_back(component);
+							}
+						}
+						compVersions = std::move(tempCompVersions);
+					}
+					if (!sameIdComponents.empty()) {
+						pipeline.add<FlashPhase>(version.id, BootloaderCommunication::RADMultiChip, i == 0, true, true, sameIdComponents[0].expansionSlot);
+					}
 				}
 				pipeline.add<EnterApplicationPhase>(mainChipID);
 				pipeline.add<WaitPhase>(std::chrono::milliseconds(3000));

include/icsneo/device/tree/radgigastar2/radgigastar2.h

@@ -171,9 +171,32 @@ public:
 		}
 
 		BootloaderPipeline pipeline;
+		auto compVersions = getComponentVersions();
 		for(size_t i = 0; i < chipVersions.size(); i++) {
 			const auto& version = chipVersions[i];
-			pipeline.add<FlashPhase>(version.id, BootloaderCommunication::RADMultiChip, i == 0);
+			auto it = compVersions.begin();
+			std::vector<ComponentVersion> sameIdComponents;
+			while(it != compVersions.end()) {
+				it = std::find_if(it, compVersions.end(), [&version](const auto& component) { 
+					return (ChipID)component.identifier == version.id; 
+				});
+				if (it != compVersions.end()) {
+					sameIdComponents.push_back(*it);
+					it++;
+				}
+			}
+			if (sameIdComponents.size() > 1) {
+				std::vector<ComponentVersion> tempCompVersions;
+				for (const auto& component : compVersions) {
+					if ((ChipID)component.identifier != version.id || component.expansionSlot != sameIdComponents[0].expansionSlot) {
+						tempCompVersions.push_back(component);
+					}
+				}
+				compVersions = std::move(tempCompVersions);
+			}
+			if (!sameIdComponents.empty()) {
+				pipeline.add<FlashPhase>(version.id, BootloaderCommunication::RADMultiChip, i == 0, true, true, sameIdComponents[0].expansionSlot);
+			}
 		}
 		pipeline.add<EnterApplicationPhase>(mainChipID);
 		pipeline.add<WaitPhase>(std::chrono::milliseconds(3000));

include/icsneo/icsnVC40.h

@@ -280,7 +280,7 @@ typedef unsigned __int64 uint64_t;
 #define NEODEVICE_GIGASTAR2 (0x00000029)
 #define NEODEVICE_FIRE3_T1S_LIN (0x0000002A)
 #define NEODEVICE_FIRE3_T1S_SENT (0x0000002B)
-#define NEODEVICE_RADGEMINI (0x0000002C)
+#define NEODEVICE_RADARGOS (0x0000002C)
 
 #define NEODEVICE_RED_DEPRECATED (0x00000040)
 #define NEODEVICE_ECU_DEPRECATED (0x00000080)
@@ -975,7 +975,7 @@ typedef union _stChipVersions
 	{
 		uint8_t mchip_major;
 		uint8_t mchip_minor;
-	} radgemini_versions;
+	} radargos_versions;
 
 	struct
 	{
@@ -2794,7 +2794,7 @@ typedef struct _SRADMoon3Settings
 
 #define SRADMoon3Settings_SIZE 68
 
-typedef struct _SRADGeminiSettings
+typedef struct _SRADArgosSettings
 {
 	uint16_t perf_en; // 2
 
@@ -2815,9 +2815,9 @@ typedef struct _SRADGeminiSettings
 		uint16_t enableLatencyTest : 1;
 		uint16_t reserved : 15;
 	} flags; // 2
-} SRADGeminiSettings;
+} SRADArgosSettings;
 
-#define SRADGeminiSettings_SIZE 86
+#define SRADArgosSettings_SIZE 86
 
 typedef struct _SRADGigastarSettings
 {
@@ -4450,7 +4450,7 @@ typedef struct _GLOBAL_SETTINGS
 		SRADEpsilonSettings epsilon;
 		SRADBMSSettings rad_bms;
 		SRADMoon3Settings radmoon3;
-		SRADGeminiSettings radgemini;
+		SRADArgosSettings radargos;
 		SRADCometSettings radcomet;
 		SRADComet3Settings radcomet3;
 		SRADGigastar2Settings radgigastar2;
@@ -4509,7 +4509,7 @@ typedef enum _EDeviceSettingsType
 	DeviceRADGalaxy2SettingsType,
 	DeviceRADGigastar2SettingsType,
 	DeviceRADMoonT1SSettingsType,
-	DeviceRADGeminiSettingsType,
+	DeviceRADArgosSettingsType,
 	DeviceFire3T1sLinSettingsType,
 	// add new settings type here
 	// Also add to map inside cicsneoVI::Init()
@@ -4545,7 +4545,7 @@ typedef struct _SDeviceSettings
 		SRADEpsilonSettings epsilon;
 		SRADBMSSettings rad_bms;
 		SRADMoon3Settings radmoon3;
-		SRADGeminiSettings radgemini;
+		SRADArgosSettings radargos;
 		SFire3FlexraySettings fire3Flexray;
 		SFire3T1sLinSettings fire3t1slin;
 		SRADCometSettings radcomet;
@@ -5430,7 +5430,7 @@ CHECK_STRUCT_SIZE(SRADEpsilonSettings);
 CHECK_STRUCT_SIZE(RAD_GPTP_SETTINGS);
 CHECK_STRUCT_SIZE(SRADBMSSettings);
 CHECK_STRUCT_SIZE(SRADMoon3Settings);
-CHECK_STRUCT_SIZE(SRADGeminiSettings);
+CHECK_STRUCT_SIZE(SRADArgosSettings);
 CHECK_STRUCT_SIZE(SFire3FlexraySettings);
 CHECK_STRUCT_SIZE(SFire3T1sLinSettings);
 CHECK_STRUCT_SIZE(CANHubSettings);

include/icsneo/icsneoc2types.h

@@ -52,7 +52,7 @@ typedef enum _icsneoc2_devicetype_t {
 	icsneoc2_devicetype_rad_gigastar2 = 0x00000029,
 	icsneoc2_devicetype_fire3_t1s_lin = 0x0000002a,
 	icsneoc2_devicetype_fire3_t1s_sent = 0x0000002b,
-	icsneoc2_devicetype_rad_gemini = 0x0000002c,
+	icsneoc2_devicetype_rad_argos = 0x0000002c,
 	icsneoc2_devicetype_red = 0x00000040,
 	icsneoc2_devicetype_ecu = 0x00000080,
 	icsneoc2_devicetype_ievb = 0x00000100,
@@ -678,7 +678,7 @@ typedef enum _icsneoc2_chip_id_t {
 	icsneoc2_chip_id_radmoont1s_zchip = 130,
 	icsneoc2_chip_id_radgigastar2_zynq = 131,
 	icsneoc2_chip_id_sfpmodule_ent11100_mchip = 132,
-	icsneoc2_chip_id_radgemini_mchip = 135,
+	icsneoc2_chip_id_radargos_mchip = 135,
 	icsneoc2_chip_id_maxsize, // Must be last entry, Don't use as a chip ID.
 
 	// Used for unknown or invalid chip ID

include/icsneo/platform/posix/devices.h

@@ -28,7 +28,7 @@
 #include "icsneo/device/tree/radmoon2/radmoon2.h"
 #include "icsneo/device/tree/radmoon2/radmoon2zl.h"
 #include "icsneo/device/tree/radmoon3/radmoon3.h"
-#include "icsneo/device/tree/radgemini/radgemini.h"
+#include "icsneo/device/tree/radargos/radargos.h"
 #include "icsneo/device/tree/radmoonduo/radmoonduo.h"
 #include "icsneo/device/tree/radpluto/radpluto.h"
 #include "icsneo/device/tree/radstar2/radstar2.h"

include/icsneo/platform/windows/devices.h

@@ -28,7 +28,7 @@
 #include "icsneo/device/tree/radmoon2/radmoon2.h"
 #include "icsneo/device/tree/radmoon2/radmoon2zl.h"
 #include "icsneo/device/tree/radmoon3/radmoon3.h"
-#include "icsneo/device/tree/radgemini/radgemini.h"
+#include "icsneo/device/tree/radargos/radargos.h"
 #include "icsneo/device/tree/radmoonduo/radmoonduo.h"
 #include "icsneo/device/tree/radpluto/radpluto.h"
 #include "icsneo/device/tree/radstar2/radstar2.h"

test/unit/icsneoc2.cpp

@@ -480,7 +480,7 @@ TEST(icsneoc2, test_icsneoc2_devicetype_t)
 	ASSERT_EQ(icsneoc2_devicetype_rad_gigastar2, 0x00000029);
 	ASSERT_EQ(icsneoc2_devicetype_fire3_t1s_lin, 0x0000002a);
 	ASSERT_EQ(icsneoc2_devicetype_fire3_t1s_sent, 0x0000002b);
-	ASSERT_EQ(icsneoc2_devicetype_rad_gemini, 0x0000002c);
+	ASSERT_EQ(icsneoc2_devicetype_rad_argos, 0x0000002c);
 	ASSERT_EQ(icsneoc2_devicetype_red, 0x00000040);
 	ASSERT_EQ(icsneoc2_devicetype_ecu, 0x00000080);
 	ASSERT_EQ(icsneoc2_devicetype_ievb, 0x00000100);
@@ -543,7 +543,7 @@ TEST(icsneoc2, test_devicetype_enum_alignment)
 	ASSERT_EQ(icsneo::DeviceType::RADGigastar2, icsneoc2_devicetype_rad_gigastar2);
 	ASSERT_EQ(icsneo::DeviceType::FIRE3_T1S_LIN, icsneoc2_devicetype_fire3_t1s_lin);
 	ASSERT_EQ(icsneo::DeviceType::FIRE3_T1S_SENT, icsneoc2_devicetype_fire3_t1s_sent);
-	ASSERT_EQ(icsneo::DeviceType::RADGemini, icsneoc2_devicetype_rad_gemini);
+	ASSERT_EQ(icsneo::DeviceType::RADArgos, icsneoc2_devicetype_rad_argos);
 	ASSERT_EQ(icsneo::DeviceType::RED, icsneoc2_devicetype_red);
 	ASSERT_EQ(icsneo::DeviceType::ECU, icsneoc2_devicetype_ecu);
 	ASSERT_EQ(icsneo::DeviceType::IEVB, icsneoc2_devicetype_ievb);
@@ -947,7 +947,7 @@ TEST(icsneoc2, test_icsneoc2_chip_id_t)
 	ASSERT_EQ(icsneoc2_chip_id_radmoont1s_zchip, 130);
 	ASSERT_EQ(icsneoc2_chip_id_radgigastar2_zynq, 131);
 	ASSERT_EQ(icsneoc2_chip_id_sfpmodule_ent11100_mchip, 132);
-	ASSERT_EQ(icsneoc2_chip_id_radgemini_mchip, 135);
+	ASSERT_EQ(icsneoc2_chip_id_radargos_mchip, 135);
 	ASSERT_EQ(icsneoc2_chip_id_maxsize, 136);
 	
 	ASSERT_EQ(icsneoc2_chip_id_invalid, 255);
@@ -1084,7 +1084,7 @@ TEST(icsneoc2, test_chip_id_enum_alignment)
 	ASSERT_EQ(static_cast<icsneoc2_chip_id_t>(icsneo::ChipID::RADMOONT1S_ZCHIP), icsneoc2_chip_id_radmoont1s_zchip);
 	ASSERT_EQ(static_cast<icsneoc2_chip_id_t>(icsneo::ChipID::RADGigastar2_ZYNQ), icsneoc2_chip_id_radgigastar2_zynq);
 	ASSERT_EQ(static_cast<icsneoc2_chip_id_t>(icsneo::ChipID::SFPModule_ent11100_MCHIP), icsneoc2_chip_id_sfpmodule_ent11100_mchip);
-	ASSERT_EQ(static_cast<icsneoc2_chip_id_t>(icsneo::ChipID::RADGemini_MCHIP), icsneoc2_chip_id_radgemini_mchip);
+	ASSERT_EQ(static_cast<icsneoc2_chip_id_t>(icsneo::ChipID::RADArgos_MCHIP), icsneoc2_chip_id_radargos_mchip);
 	ASSERT_EQ(static_cast<icsneoc2_chip_id_t>(icsneo::ChipID::Invalid), icsneoc2_chip_id_invalid);
 }
 
@@ -1113,7 +1113,7 @@ TEST(icsneoc2, test_icsneoc2_chip_versions_props_get)
 {
 	// Build an in-memory list of two chip_versions nodes
 	icsneoc2_chip_versions_t second{};
-	second.version_report.id = icsneo::ChipID::RADGemini_MCHIP;
+	second.version_report.id = icsneo::ChipID::RADArgos_MCHIP;
 	second.version_report.name = "second";
 	second.version_report.major = 9;
 	second.version_report.minor = 8;