Driver: DXX: Update

Fixes D2XX HANDLE leak.

99-intrepidcs.rules

@@ -5,3 +5,6 @@ KERNEL=="ttyACM?", ATTRS{idVendor}=="093c", GROUP="users", MODE="0666"
 
 ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="093c", KERNEL=="ttyUSB*", \
 RUN+="/bin/sh -c 'echo $id:1.0>/sys/bus/usb/drivers/ftdi_sio/unbind'"
+
+ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="093c", DRIVER=="usbhid", \
+RUN+="/bin/sh -c 'echo $id:1.0>/sys/bus/usb/drivers/usbhid/unbind'"

CMakeLists.txt

@@ -360,7 +360,7 @@ if(LIBICSNEO_ENABLE_DXX)
 	include(FetchContent)
 	FetchContent_Declare(libredxx
 		GIT_REPOSITORY https://github.com/Zeranoe/libredxx.git
-		GIT_TAG e1fe2bd6ba6079b17037379d78f3f18024b389d7
+		GIT_TAG c28c3f4e1c46f0e0fc119843eb73edd81d5bbb3d
 	)
 	set(LIBREDXX_DISABLE_INSTALL ON)
 	FetchContent_MakeAvailable(libredxx)

include/icsneo/device/tree/radgalaxy2/radgalaxy2.h

@@ -49,6 +49,10 @@ public:
 			Network::NetID::AE_10,
 			Network::NetID::AE_11,
 			Network::NetID::AE_12,
+			Network::NetID::AE_13,
+			Network::NetID::AE_14,
+			Network::NetID::AE_15,
+			Network::NetID::AE_16,
 
 			Network::NetID::ISO9141_01,
 			Network::NetID::ISO9141_02,

include/icsneo/device/tree/valuecan4/valuecan4-2el.h

@@ -67,6 +67,7 @@ public:
 	const std::vector<ChipInfo>& getChipInfo() const override {
 		static std::vector<ChipInfo> chips = {
 			{ChipID::ValueCAN4_2EL_MCHIP, true, "MCHIP", "vcan44_mchip_ief", 0, FirmwareType::IEF},
+			{ChipID::ValueCAN4_4_MCHIP, true, "MCHIP", "vcan44_mchip_ief", 0, FirmwareType::IEF}
 		};
 		return chips;
 	}
@@ -74,8 +75,8 @@ public:
 	BootloaderPipeline getBootloader() override {
 		return BootloaderPipeline()
 			.add<EnterBootloaderPhase>()
-			.add<FlashPhase>(ChipID::ValueCAN4_2EL_MCHIP, BootloaderCommunication::RED)
+			.add<FlashPhase>(ChipID::ValueCAN4_4_MCHIP, BootloaderCommunication::RED)
-			.add<EnterApplicationPhase>(ChipID::ValueCAN4_2EL_MCHIP)
+			.add<EnterApplicationPhase>(ChipID::ValueCAN4_4_MCHIP)
 			.add<WaitPhase>(std::chrono::milliseconds(3000))
 			.add<ReconnectPhase>();
 	}

platform/dxx.cpp

@@ -156,7 +156,7 @@ void DXX::read() {
 
 	while(!isDisconnected() && !isClosing()) {
 		size_t received = buffer.size();
-		const auto status = libredxx_read(device, buffer.data(), &received);
+		const auto status = libredxx_read(device, buffer.data(), &received, LIBREDXX_ENDPOINT_A);
 		if(isDisconnected() || isClosing()) {
 			return;
 		}
@@ -186,7 +186,7 @@ void DXX::write() {
 
 		for(size_t totalWritten = 0; totalWritten < writeOp.bytes.size();) {
 			size_t size = writeOp.bytes.size() - totalWritten;
-			const auto status = libredxx_write(device, &writeOp.bytes[totalWritten], &size);
+			const auto status = libredxx_write(device, &writeOp.bytes[totalWritten], &size, LIBREDXX_ENDPOINT_A);
 			if(isDisconnected() || isClosing()) {
 				return;
 			}