Fix CDC for CW340, bump version

alex-dewar · alex-dewar · commit 828a25b419b4 · 2024-07-02T17:05:53.000-03:00
diff --git a/microfw/CW310/src/CW340.bin b/microfw/CW310/src/CW340.bin
diff --git a/microfw/CW310/src/config/conf_usb.h b/microfw/CW310/src/config/conf_usb.h
@@ -83,7 +83,7 @@ extern char usb_serial_number[33];
 #define  USB_DEVICE_HS_SUPPORT
 
 #define FW_VER_MAJOR 1
-#define FW_VER_MINOR 1
+#define FW_VER_MINOR 2
 #define FW_VER_DEBUG 0
 //@}
 /**
diff --git a/microfw/CW310/src/main_cw340.c b/microfw/CW310/src/main_cw340.c
@@ -282,7 +282,7 @@ int main(void)
 	WDT->WDT_MR = (1 << 25); //disable watchdog
 
 	// unlock I2C
-	I2C_LOCK = 0;
+	// I2C_LOCK = 0;
 
 	//Convert serial number to ASCII for USB Serial number
 	uint32_t serial_number[4];
diff --git a/microfw/CW310/src/naeusb b/microfw/CW310/src/naeusb
@@ -1 +1 @@
-Subproject commit fe3c78504a3bd47f4b7efb920670078520da97c4
+Subproject commit 28fd83fa05ec9e3e30b3d781e685b3e22cb21292
