RADComet1: Deprecate and replace with RADComet2

bindings/python/icsneopy/device/devicetype.cpp

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

device/devicefinder.cpp

@@ -165,10 +165,6 @@ std::vector<std::shared_ptr<Device>> DeviceFinder::FindAll() {
 		makeIfSerialMatches<RADA2B>(dev, newFoundDevices);
 		#endif
 
-		#ifdef __RADCOMET_H_
-		makeIfSerialRangeMatches<RADComet>(dev, newFoundDevices);
-		#endif
-
 		#ifdef __RADCOMET2_H_
 		makeIfSerialRangeMatches<RADComet2>(dev, newFoundDevices);
 		#endif
@@ -340,8 +336,8 @@ const std::vector<DeviceType>& DeviceFinder::GetSupportedDevices() {
 		RADA2B::DEVICE_TYPE,
 		#endif
 
-		#ifdef __RADCOMET_H_
+		#ifdef __RADCOMET2_H_
-		RADComet::DEVICE_TYPE,
+		RADComet2::DEVICE_TYPE,
 		#endif
 
 		#ifdef __RADCOMET3_H_

include/icsneo/device/device.h

@@ -133,7 +133,7 @@ public:
 		SFPModule_88q2112 = 41,
 		RADGalaxy2 = 47,
 		RADMoon3 = 49,
-		RADComet = 50,
+		RADComet2 = 50,
 		Connect = 51,
 		SFPModule_88q2221m = 52,
 		SFPModule_88q4364 = 53,

include/icsneo/device/devicetype.h

@@ -53,7 +53,7 @@ public:
 		RADEpsilonXL = icsneoc2_devicetype_rad_epsilon_xl,
 		RADGalaxy2 = icsneoc2_devicetype_rad_galaxy2,
 		RADMoon3 = icsneoc2_devicetype_rad_moon3,
-		RADComet = icsneoc2_devicetype_rad_comet,
+		RADComet2 = icsneoc2_devicetype_rad_comet2,
 		FIRE3_FlexRay = icsneoc2_devicetype_fire3_flexray,
 		Connect = icsneoc2_devicetype_connect,
 		RADComet3 = icsneoc2_devicetype_rad_comet3,
@@ -154,8 +154,8 @@ public:
 				return "RAD-Moon 3";
 			case RADGemini:
 				return "RAD-Gemini";
-			case RADComet:
+			case RADComet2:
-				return "RAD-Comet";
+				return "RAD-Comet 2";
 			case RED:
 				return "neoVI RED";
 			case ECU:
@@ -269,7 +269,7 @@ private:
 #define ICSNEO_DEVICETYPE_RADEPSILONXL ((devicetype_t)icsneoc2_devicetype_rad_epsilon_xl)
 #define ICSNEO_DEVICETYPE_RADGALAXY2 ((devicetype_t)icsneoc2_devicetype_rad_galaxy2)
 #define ICSNEO_DEVICETYPE_RADMoon3 ((devicetype_t)icsneoc2_devicetype_rad_moon3)
-#define ICSNEO_DEVICETYPE_RADCOMET ((devicetype_t)icsneoc2_devicetype_rad_comet)
+#define ICSNEO_DEVICETYPE_RADCOMET2 ((devicetype_t)icsneoc2_devicetype_rad_comet2)
 #define ICSNEO_DEVICETYPE_FIRE3FLEXRAY ((devicetype_t)icsneoc2_devicetype_fire3_flexray)
 #define ICSNEO_DEVICETYPE_CONNECT ((devicetype_t)icsneoc2_devicetype_connect)
 #define ICSNEO_DEVICETYPE_RADCOMET3 ((devicetype_t)icsneoc2_devicetype_rad_comet3)

include/icsneo/device/tree/radcomet/radcomet.h

@@ -1,34 +0,0 @@
-#ifndef __RADCOMET_H_
-#define __RADCOMET_H_
-
-#ifdef __cplusplus
-
-#include "icsneo/device/tree/radcomet/radcometbase.h"
-#include "icsneo/device/tree/radcomet/radcometsettings.h"
-
-namespace icsneo {
-
-class RADComet : public RADCometBase {
-public:
-
-	// Serial numbers start with RC
-	// USB PID is 0x1207, standard driver is DXX
-	// Ethernet MAC allocation is 0x1D, standard driver is Raw
-	ICSNEO_FINDABLE_DEVICE_BY_SERIAL_RANGE(RADComet, DeviceType::RADComet, "RC0000", "RC0299");
-
-	std::string getProductName() const override {
-		return "RAD-Comet";
-	}
-
-protected:
-	RADComet(neodevice_t neodevice, const driver_factory_t& makeDriver) : RADCometBase(neodevice) {
-		initialize<RADCometSettings>(makeDriver);
-	}
-
-};
-
-}
-
-#endif // __cplusplus
-
-#endif

include/icsneo/device/tree/radcomet/radcomet2.h

@@ -3,39 +3,103 @@
 
 #ifdef __cplusplus
 
-#include "icsneo/device/tree/radcomet/radcometbase.h"
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
 #include "icsneo/device/tree/radcomet/radcometsettings.h"
 
 namespace icsneo {
 
-class RADComet2 : public RADCometBase {
+class RADComet2 : public Device {
 public:
 
-	// Serial numbers start with RC, Comet2 starts at RC0300
+	// Serial numbers start with RC
 	// USB PID is 0x1207, standard driver is DXX
 	// Ethernet MAC allocation is 0x1D, standard driver is Raw
-	ICSNEO_FINDABLE_DEVICE_BY_SERIAL_RANGE(RADComet2, DeviceType::RADComet, "RC0300", "RCZZZZ");
+	ICSNEO_FINDABLE_DEVICE_BY_SERIAL_RANGE(RADComet2, DeviceType::RADComet2, "RC0300", "RCZZZZ");
+
+	static const std::vector<Network>& GetSupportedNetworks() {
+		static std::vector<Network> supportedNetworks = {
+			Network::NetID::DWCAN_01,
+			Network::NetID::DWCAN_02,
+
+			Network::NetID::ETHERNET_01,
+
+			Network::NetID::AE_01,
+			Network::NetID::AE_02,
+			Network::NetID::AE_03,
+
+			Network::NetID::MDIO_01,
+			Network::NetID::MDIO_02,
+			Network::NetID::MDIO_03,
+			Network::NetID::MDIO_04,
+
+			Network::NetID::LIN_01,
+			Network::NetID::ISO9141_01,
+		};
+		return supportedNetworks;
+	}
 
 	std::string getProductName() const override {
 		return "RAD-Comet 2";
 	}
 
-	const std::vector<Network>& GetSupportedNetworks() override {
+	bool getEthPhyRegControlSupported() const override { return true; }
-		static std::vector<Network> supportedNetworks = RADCometBase::GetSupportedNetworks();
+	bool supportsTC10() const override { return true; }
-		supportedNetworks.push_back(Network::NetID::AE_03);
+	bool supportsGPTP() const override { return true; }
-		supportedNetworks.push_back(Network::NetID::MDIO_04);
+
-		supportedNetworks.push_back(Network::NetID::LIN_01);
+	ProductID getProductID() const override {
-		supportedNetworks.push_back(Network::NetID::ISO9141_01);
+		return ProductID::RADComet2;
-		return supportedNetworks;
 	}
 
-	bool supportsTC10() const override { return true; }
+	const std::vector<ChipInfo>& getChipInfo() const override {
+		static std::vector<ChipInfo> chips = {
+			{ChipID::RADComet_ZYNQ, true, "ZCHIP", "RADComet_SW_bin", 0, FirmwareType::Zip},
+		};
+		return chips;
+	}
+
+	BootloaderPipeline getBootloader() override {
+		return BootloaderPipeline()
+			.add<EnterBootloaderPhase>()
+			.add<FlashPhase>(ChipID::RADComet_ZYNQ, BootloaderCommunication::RAD)
+			.add<EnterApplicationPhase>(ChipID::RADComet_ZYNQ)
+			.add<WaitPhase>(std::chrono::milliseconds(3000))
+			.add<ReconnectPhase>();
+	}
 
 protected:
-	RADComet2(neodevice_t neodevice, const driver_factory_t& makeDriver) : RADCometBase(neodevice) {
+	RADComet2(neodevice_t neodevice, const driver_factory_t& makeDriver) : Device(neodevice) {
 		initialize<RADCometSettings>(makeDriver);
 	}
 
+	void setupPacketizer(Packetizer& packetizer) override {
+		Device::setupPacketizer(packetizer);
+		packetizer.disableChecksum = true;
+		packetizer.align16bit = false;
+	}
+
+	void setupEncoder(Encoder& encoder) override {
+		Device::setupEncoder(encoder);
+		encoder.supportCANFD = true;
+		encoder.supportEthPhy = true;
+	}
+
+	void setupDecoder(Decoder& decoder) override {
+		Device::setupDecoder(decoder);
+		decoder.timestampResolution = 10;
+	}
+
+	void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
+		for(auto& netid : GetSupportedNetworks())
+			rxNetworks.emplace_back(netid);
+	}
+
+	void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override { setupSupportedRXNetworks(txNetworks); }
+
+	std::optional<MemoryAddress> getCoreminiStartAddressFlash() const override {
+		return 32*1024*1024;
+	}
+
 };
 
 }

include/icsneo/device/tree/radcomet/radcometbase.h

@@ -1,91 +0,0 @@
-#ifndef __RADCOMETBASE_H_
-#define __RADCOMETBASE_H_
-
-#ifdef __cplusplus
-
-#include "icsneo/device/device.h"
-#include "icsneo/device/devicetype.h"
-
-namespace icsneo {
-
-class RADCometBase : public Device {
-public:
-	virtual const std::vector<Network>& GetSupportedNetworks() {
-		static std::vector<Network> supportedNetworks = {
-			Network::NetID::DWCAN_01,
-			Network::NetID::DWCAN_02,
-
-			Network::NetID::ETHERNET_01,
-
-			Network::NetID::AE_01,
-			Network::NetID::AE_02,
-
-			Network::NetID::MDIO_01,
-			Network::NetID::MDIO_02,
-			Network::NetID::MDIO_03,
-		};
-		return supportedNetworks;
-	}
-
-	bool getEthPhyRegControlSupported() const override { return true; }
-	bool supportsGPTP() const override { return true; }
-
-	ProductID getProductID() const override {
-		return ProductID::RADComet;
-	}
-
-	const std::vector<ChipInfo>& getChipInfo() const override {
-		static std::vector<ChipInfo> chips = {
-			{ChipID::RADComet_ZYNQ, true, "ZCHIP", "RADComet_SW_bin", 0, FirmwareType::Zip},
-		};
-		return chips;
-	}
-
-	BootloaderPipeline getBootloader() override { 
-		return BootloaderPipeline()
-			.add<EnterBootloaderPhase>()
-			.add<FlashPhase>(ChipID::RADComet_ZYNQ, BootloaderCommunication::RAD)
-			.add<EnterApplicationPhase>(ChipID::RADComet_ZYNQ)
-			.add<WaitPhase>(std::chrono::milliseconds(3000))
-			.add<ReconnectPhase>();
-	}
-
-protected:
-	using Device::Device;
-
-	void setupPacketizer(Packetizer& packetizer) override {
-		Device::setupPacketizer(packetizer);
-		packetizer.disableChecksum = true;
-		packetizer.align16bit = false;
-	}
-
-	void setupEncoder(Encoder& encoder) override {
-		Device::setupEncoder(encoder);
-		encoder.supportCANFD = true;		
-		encoder.supportEthPhy = true;
-	}
-
-	void setupDecoder(Decoder& decoder) override {
-		Device::setupDecoder(decoder);
-		decoder.timestampResolution = 10; // Timestamps are in 10ns increments instead of the usual 25ns
-	}
-
-	void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
-		for(auto& netid : GetSupportedNetworks())
-			rxNetworks.emplace_back(netid);
-	}
-
-	// The supported TX networks are the same as the supported RX networks for this device
-	void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override { setupSupportedRXNetworks(txNetworks); }
-
-	std::optional<MemoryAddress> getCoreminiStartAddressFlash() const override {
-		return 32*1024*1024;
-	}
-
-};
-
-}
-
-#endif // __cplusplus
-
-#endif

include/icsneo/icsnVC40.h

@@ -223,7 +223,7 @@ typedef unsigned __int64 uint64_t;
 #define NEODEVICE_RAD_GALAXY_2 (0x00000021)
 #define NEODEVICE_RAD_BMS (0x00000022)
 #define NEODEVICE_RADMOON3 (0x00000023)
-#define NEODEVICE_RADCOMET (0x00000024)
+#define NEODEVICE_RADCOMET2 (0x00000024)
 #define NEODEVICE_FIRE3_FLEXRAY (0x00000025)
 #define NEODEVICE_RED2_OEM (0x00000026)
 #define NEODEVICE_RADCOMET3 (0x00000027)

include/icsneo/icsneoc2types.h

@@ -43,7 +43,7 @@ typedef enum _icsneoc2_devicetype_t {
 	icsneoc2_devicetype_rad_epsilon_xl = 0x0000001e,
 	icsneoc2_devicetype_rad_galaxy2 = 0x00000021,
 	icsneoc2_devicetype_rad_moon3 = 0x00000023,
-	icsneoc2_devicetype_rad_comet = 0x00000024,
+	icsneoc2_devicetype_rad_comet2 = 0x00000024,
 	icsneoc2_devicetype_fire3_flexray = 0x00000025,
 	icsneoc2_devicetype_connect = 0x00000026,
 	icsneoc2_devicetype_rad_comet3 = 0x00000027,

include/icsneo/platform/posix/devices.h

@@ -14,7 +14,6 @@
 #include "icsneo/device/tree/plasion/neoviion.h"
 #include "icsneo/device/tree/plasion/neoviplasma.h"
 #include "icsneo/device/tree/rada2b/rada2b.h"
-#include "icsneo/device/tree/radcomet/radcomet.h"
 #include "icsneo/device/tree/radcomet/radcomet2.h"
 #include "icsneo/device/tree/radcomet3/radcomet3.h"
 #include "icsneo/device/tree/radmoont1s/radmoont1s.h"

include/icsneo/platform/windows/devices.h

@@ -14,7 +14,6 @@
 #include "icsneo/device/tree/plasion/neoviion.h"
 #include "icsneo/device/tree/plasion/neoviplasma.h"
 #include "icsneo/device/tree/rada2b/rada2b.h"
-#include "icsneo/device/tree/radcomet/radcomet.h"
 #include "icsneo/device/tree/radcomet/radcomet2.h"
 #include "icsneo/device/tree/radcomet3/radcomet3.h"
 #include "icsneo/device/tree/radmoont1s/radmoont1s.h"

test/unit/icsneoc2.cpp

@@ -401,7 +401,7 @@ TEST(icsneoc2, test_icsneoc2_devicetype_t)
 	ASSERT_EQ(icsneoc2_devicetype_rad_epsilon_xl, 0x0000001e);
 	ASSERT_EQ(icsneoc2_devicetype_rad_galaxy2, 0x00000021);
 	ASSERT_EQ(icsneoc2_devicetype_rad_moon3, 0x00000023);
-	ASSERT_EQ(icsneoc2_devicetype_rad_comet, 0x00000024);
+	ASSERT_EQ(icsneoc2_devicetype_rad_comet2, 0x00000024);
 	ASSERT_EQ(icsneoc2_devicetype_fire3_flexray, 0x00000025);
 	ASSERT_EQ(icsneoc2_devicetype_connect, 0x00000026);
 	ASSERT_EQ(icsneoc2_devicetype_rad_comet3, 0x00000027);
@@ -464,7 +464,7 @@ TEST(icsneoc2, test_devicetype_enum_alignment)
 	ASSERT_EQ(icsneo::DeviceType::RADEpsilon, icsneoc2_devicetype_rad_epsilon);
 	ASSERT_EQ(icsneo::DeviceType::RADEpsilonXL, icsneoc2_devicetype_rad_epsilon_xl);
 	ASSERT_EQ(icsneo::DeviceType::RADMoon3, icsneoc2_devicetype_rad_moon3);
-	ASSERT_EQ(icsneo::DeviceType::RADComet, icsneoc2_devicetype_rad_comet);
+	ASSERT_EQ(icsneo::DeviceType::RADComet2, icsneoc2_devicetype_rad_comet2);
 	ASSERT_EQ(icsneo::DeviceType::FIRE3_FlexRay, icsneoc2_devicetype_fire3_flexray);
 	ASSERT_EQ(icsneo::DeviceType::Connect, icsneoc2_devicetype_connect);
 	ASSERT_EQ(icsneo::DeviceType::RADComet3, icsneoc2_devicetype_rad_comet3);