From 49e578a6578f88db6c26f826803e4d515ded3d0d Mon Sep 17 00:00:00 2001 From: Max Brombach Date: Tue, 19 May 2026 17:17:12 +0000 Subject: [PATCH] Device: RAD-Comet and RAD-Comet 2: Replace all references to RAD-Comet with RAD-Comet2 --- README.md | 1 - bindings/python/icsneopy/device/chipid.cpp | 2 +- include/icsneo/device/chipid.h | 2 +- .../tree/{radcomet => radcomet2}/radcomet2.h | 10 +++++----- .../radcomet2settings.h} | 20 +++++++++---------- include/icsneo/icsneoc2types.h | 2 +- include/icsneo/platform/posix/devices.h | 2 +- include/icsneo/platform/windows/devices.h | 2 +- platform/dxx.cpp | 2 +- test/unit/icsneoc2.cpp | 4 ++-- 10 files changed, 23 insertions(+), 24 deletions(-) rename include/icsneo/device/tree/{radcomet => radcomet2}/radcomet2.h (88%) rename include/icsneo/device/tree/{radcomet/radcometsettings.h => radcomet2/radcomet2settings.h} (92%) diff --git a/README.md b/README.md index 460961f5..4e493464 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,6 @@ Instructions for installing each API can be found in its respective documentatio - RAD-Pluto - RAD-Star 2 - RAD-SuperMoon -- RADComet - ValueCAN 3 - ValueCAN 4 diff --git a/bindings/python/icsneopy/device/chipid.cpp b/bindings/python/icsneopy/device/chipid.cpp index fa86210d..8840ab7b 100644 --- a/bindings/python/icsneopy/device/chipid.cpp +++ b/bindings/python/icsneopy/device/chipid.cpp @@ -120,7 +120,7 @@ void init_chipid(pybind11::module_& m) { .value("VEM_01_8DW_ZCHIP", ChipID::VEM_01_8DW_ZCHIP) .value("RADGalaxy_FFG_Zynq", ChipID::RADGalaxy_FFG_Zynq) .value("RADMoon3_MCHIP", ChipID::RADMoon3_MCHIP) - .value("RADComet_ZYNQ", ChipID::RADComet_ZYNQ) + .value("RADComet2_ZYNQ", ChipID::RADComet2_ZYNQ) .value("VEM_02_FR_ZCHIP", ChipID::VEM_02_FR_ZCHIP) .value("RADA2B_REVB_ZCHIP", ChipID::RADA2B_REVB_ZCHIP) .value("RADGigastar_FFG_ZYNQ", ChipID::RADGigastar_FFG_ZYNQ) diff --git a/include/icsneo/device/chipid.h b/include/icsneo/device/chipid.h index 637ce1ad..8f47c0ea 100644 --- a/include/icsneo/device/chipid.h +++ b/include/icsneo/device/chipid.h @@ -121,7 +121,7 @@ enum class ChipID : icsneoc2_chip_id_t { VEM_01_8DW_ZCHIP = icsneoc2_chip_id_vem_01_8dw_zchip, RADGalaxy_FFG_Zynq = icsneoc2_chip_id_radgalaxy_ffg_zynq, RADMoon3_MCHIP = icsneoc2_chip_id_radmoon3_mchip, - RADComet_ZYNQ = icsneoc2_chip_id_radcomet_zynq, + RADComet2_ZYNQ = icsneoc2_chip_id_radcomet2_zynq, VEM_02_FR_ZCHIP = icsneoc2_chip_id_vem_02_fr_zchip, RADA2B_REVB_ZCHIP = icsneoc2_chip_id_rada2b_revb_zchip, RADGigastar_FFG_ZYNQ = icsneoc2_chip_id_radgigastar_ffg_zynq, diff --git a/include/icsneo/device/tree/radcomet/radcomet2.h b/include/icsneo/device/tree/radcomet2/radcomet2.h similarity index 88% rename from include/icsneo/device/tree/radcomet/radcomet2.h rename to include/icsneo/device/tree/radcomet2/radcomet2.h index 1f07d4ee..97ac0102 100644 --- a/include/icsneo/device/tree/radcomet/radcomet2.h +++ b/include/icsneo/device/tree/radcomet2/radcomet2.h @@ -5,7 +5,7 @@ #include "icsneo/device/device.h" #include "icsneo/device/devicetype.h" -#include "icsneo/device/tree/radcomet/radcometsettings.h" +#include "icsneo/device/tree/radcomet2/radcomet2settings.h" namespace icsneo { @@ -53,7 +53,7 @@ public: const std::vector& getChipInfo() const override { static std::vector chips = { - {ChipID::RADComet_ZYNQ, true, "ZCHIP", "RADComet_SW_bin", 0, FirmwareType::Zip}, + {ChipID::RADComet2_ZYNQ, true, "ZCHIP", "RADComet_SW_bin", 0, FirmwareType::Zip}, }; return chips; } @@ -61,15 +61,15 @@ public: BootloaderPipeline getBootloader() override { return BootloaderPipeline() .add() - .add(ChipID::RADComet_ZYNQ, BootloaderCommunication::RAD) - .add(ChipID::RADComet_ZYNQ) + .add(ChipID::RADComet2_ZYNQ, BootloaderCommunication::RAD) + .add(ChipID::RADComet2_ZYNQ) .add(std::chrono::milliseconds(3000)) .add(); } protected: RADComet2(neodevice_t neodevice, const driver_factory_t& makeDriver) : Device(neodevice) { - initialize(makeDriver); + initialize(makeDriver); } void setupPacketizer(Packetizer& packetizer) override { diff --git a/include/icsneo/device/tree/radcomet/radcometsettings.h b/include/icsneo/device/tree/radcomet2/radcomet2settings.h similarity index 92% rename from include/icsneo/device/tree/radcomet/radcometsettings.h rename to include/icsneo/device/tree/radcomet2/radcomet2settings.h index c634c8ad..9ad1c300 100644 --- a/include/icsneo/device/tree/radcomet/radcometsettings.h +++ b/include/icsneo/device/tree/radcomet2/radcomet2settings.h @@ -1,5 +1,5 @@ -#ifndef __RADCOMETSETTINGS_H_ -#define __RADCOMETSETTINGS_H_ +#ifndef __RADCOMET2SETTINGS_H_ +#define __RADCOMET2SETTINGS_H_ #include #include "icsneo/device/idevicesettings.h" @@ -74,7 +74,7 @@ typedef struct { // 10T1S Extended settings ETHERNET10T1S_SETTINGS_EXT t1s1Ext; ETHERNET10T1S_SETTINGS_EXT t1s2Ext; -} radcomet_settings_t; +} radcomet2_settings_t; #pragma pack(pop) #ifdef _MSC_VER @@ -83,15 +83,15 @@ typedef struct { #ifdef __cplusplus -static_assert(sizeof(radcomet_settings_t) == 498, "RADComet settings size mismatch"); +static_assert(sizeof(radcomet2_settings_t) == 498, "RADComet2 settings size mismatch"); #include -class RADCometSettings : public IDeviceSettings { +class RADComet2Settings : public IDeviceSettings { public: - RADCometSettings(std::shared_ptr com) : IDeviceSettings(com, sizeof(radcomet_settings_t)) {} + RADComet2Settings(std::shared_ptr com) : IDeviceSettings(com, sizeof(radcomet2_settings_t)) {} const CAN_SETTINGS* getCANSettingsFor(Network net) const override { - auto cfg = getStructurePointer(); + auto cfg = getStructurePointer(); if(cfg == nullptr) return nullptr; switch(net.getNetID()) { @@ -104,7 +104,7 @@ public: } } const CANFD_SETTINGS* getCANFDSettingsFor(Network net) const override { - auto cfg = getStructurePointer(); + auto cfg = getStructurePointer(); if(cfg == nullptr) return nullptr; switch(net.getNetID()) { @@ -246,7 +246,7 @@ public: private: const ETHERNET10T1S_SETTINGS* getT1SSettingsFor(Network net) const { - auto cfg = getStructurePointer(); + auto cfg = getStructurePointer(); if(cfg == nullptr) return nullptr; @@ -260,7 +260,7 @@ private: } ETHERNET10T1S_SETTINGS* getMutableT1SSettingsFor(Network net) { - auto cfg = getMutableStructurePointer(); + auto cfg = getMutableStructurePointer(); if(cfg == nullptr) return nullptr; diff --git a/include/icsneo/icsneoc2types.h b/include/icsneo/icsneoc2types.h index ada34bea..c2be77a1 100644 --- a/include/icsneo/icsneoc2types.h +++ b/include/icsneo/icsneoc2types.h @@ -558,7 +558,7 @@ typedef enum _icsneoc2_chip_id_t { icsneoc2_chip_id_vem_01_8dw_zchip = 111, icsneoc2_chip_id_radgalaxy_ffg_zynq = 112, icsneoc2_chip_id_radmoon3_mchip = 113, - icsneoc2_chip_id_radcomet_zynq = 114, + icsneoc2_chip_id_radcomet2_zynq = 114, icsneoc2_chip_id_vem_02_fr_zchip = 115, icsneoc2_chip_id_rada2b_revb_zchip = 116, icsneoc2_chip_id_radgigastar_ffg_zynq = 117, diff --git a/include/icsneo/platform/posix/devices.h b/include/icsneo/platform/posix/devices.h index 9419a957..ed44dd3c 100644 --- a/include/icsneo/platform/posix/devices.h +++ b/include/icsneo/platform/posix/devices.h @@ -14,7 +14,7 @@ #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/radcomet2.h" +#include "icsneo/device/tree/radcomet2/radcomet2.h" #include "icsneo/device/tree/radcomet3/radcomet3.h" #include "icsneo/device/tree/radmoont1s/radmoont1s.h" #include "icsneo/device/tree/radepsilon/radepsilon.h" diff --git a/include/icsneo/platform/windows/devices.h b/include/icsneo/platform/windows/devices.h index ba5ac275..a347cf48 100644 --- a/include/icsneo/platform/windows/devices.h +++ b/include/icsneo/platform/windows/devices.h @@ -14,7 +14,7 @@ #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/radcomet2.h" +#include "icsneo/device/tree/radcomet2/radcomet2.h" #include "icsneo/device/tree/radcomet3/radcomet3.h" #include "icsneo/device/tree/radmoont1s/radmoont1s.h" #include "icsneo/device/tree/radepsilon/radepsilon.h" diff --git a/platform/dxx.cpp b/platform/dxx.cpp index 55b3e8d2..27df92b4 100644 --- a/platform/dxx.cpp +++ b/platform/dxx.cpp @@ -31,7 +31,7 @@ void DXX::Find(std::vector& found) { { LIBREDXX_DEVICE_TYPE_D3XX, { ICS_USB_VID, 0x1203 } }, // RAD-Gigalog { LIBREDXX_DEVICE_TYPE_D3XX, { ICS_USB_VID, 0x1204 } }, // RAD-Gigastar { LIBREDXX_DEVICE_TYPE_D3XX, { ICS_USB_VID, 0x1206 } }, // RAD-A2B Rev B - { LIBREDXX_DEVICE_TYPE_D3XX, { ICS_USB_VID, 0x1207 } }, // RAD-Comet + { LIBREDXX_DEVICE_TYPE_D3XX, { ICS_USB_VID, 0x1207 } }, // RAD-Comet2 { LIBREDXX_DEVICE_TYPE_D3XX, { ICS_USB_VID, 0x1208 } }, // RAD-Comet3 { LIBREDXX_DEVICE_TYPE_D3XX, { ICS_USB_VID, 0x1209 } }, // RAD-MoonT1S { LIBREDXX_DEVICE_TYPE_D3XX, { ICS_USB_VID, 0x1210 } }, // RAD-Gigastar 2 diff --git a/test/unit/icsneoc2.cpp b/test/unit/icsneoc2.cpp index fbc4e600..f5615af7 100644 --- a/test/unit/icsneoc2.cpp +++ b/test/unit/icsneoc2.cpp @@ -862,7 +862,7 @@ TEST(icsneoc2, test_icsneoc2_chip_id_t) ASSERT_EQ(icsneoc2_chip_id_vem_01_8dw_zchip, 111); ASSERT_EQ(icsneoc2_chip_id_radgalaxy_ffg_zynq, 112); ASSERT_EQ(icsneoc2_chip_id_radmoon3_mchip, 113); - ASSERT_EQ(icsneoc2_chip_id_radcomet_zynq, 114); + ASSERT_EQ(icsneoc2_chip_id_radcomet2_zynq, 114); ASSERT_EQ(icsneoc2_chip_id_vem_02_fr_zchip, 115); ASSERT_EQ(icsneoc2_chip_id_rada2b_revb_zchip, 116); ASSERT_EQ(icsneoc2_chip_id_radgigastar_ffg_zynq, 117); @@ -999,7 +999,7 @@ TEST(icsneoc2, test_chip_id_enum_alignment) ASSERT_EQ(static_cast(icsneo::ChipID::VEM_01_8DW_ZCHIP), icsneoc2_chip_id_vem_01_8dw_zchip); ASSERT_EQ(static_cast(icsneo::ChipID::RADGalaxy_FFG_Zynq), icsneoc2_chip_id_radgalaxy_ffg_zynq); ASSERT_EQ(static_cast(icsneo::ChipID::RADMoon3_MCHIP), icsneoc2_chip_id_radmoon3_mchip); - ASSERT_EQ(static_cast(icsneo::ChipID::RADComet_ZYNQ), icsneoc2_chip_id_radcomet_zynq); + ASSERT_EQ(static_cast(icsneo::ChipID::RADComet2_ZYNQ), icsneoc2_chip_id_radcomet2_zynq); ASSERT_EQ(static_cast(icsneo::ChipID::VEM_02_FR_ZCHIP), icsneoc2_chip_id_vem_02_fr_zchip); ASSERT_EQ(static_cast(icsneo::ChipID::RADA2B_REVB_ZCHIP), icsneoc2_chip_id_rada2b_revb_zchip); ASSERT_EQ(static_cast(icsneo::ChipID::RADGigastar_FFG_ZYNQ), icsneoc2_chip_id_radgigastar_ffg_zynq);