From 27942ade8e376f584fca5bbfa1223bdfefa3b0f2 Mon Sep 17 00:00:00 2001 From: Epagris Date: Tue, 19 Nov 2024 07:39:33 +0100 Subject: [PATCH] - stm32 driver fixes - example JSON vendor and product ID's placeholdered --- driver/stm32/usb_drv.c | 4 +--- examples/jsons/usb_config.json | 10 +++++----- .../jsons/{usb_config_cdc.json => usb_config_acm.json} | 10 +++++----- examples/jsons/usb_config_eem.json | 10 +++++----- 4 files changed, 16 insertions(+), 18 deletions(-) rename examples/jsons/{usb_config_cdc.json => usb_config_acm.json} (91%) diff --git a/driver/stm32/usb_drv.c b/driver/stm32/usb_drv.c index 3df1522..678cfe1 100644 --- a/driver/stm32/usb_drv.c +++ b/driver/stm32/usb_drv.c @@ -3,8 +3,6 @@ #include #include -#include "stm32f4xx_hal.h" - #include "flatUSB_config.h" #include "usb_driver_common.h" @@ -946,7 +944,7 @@ void USB_IRQ_HANDLER() { // USB reset if (ints & USB_OTG_GINTSTS_USBRST) { SET_BIT(USBG->GINTSTS, USB_OTG_GINTSTS_USBRST); // clear interrupt - PROCESS_EVENT(USB_EVT_USB_RESET, NULL); // process event + //PROCESS_EVENT(USB_EVT_USB_RESET, NULL); // process event } // End of enumeration (meaning NOT the USB ENUMERATION PROCESS, diff --git a/examples/jsons/usb_config.json b/examples/jsons/usb_config.json index 1af0929..8078b00 100644 --- a/examples/jsons/usb_config.json +++ b/examples/jsons/usb_config.json @@ -3,12 +3,12 @@ "subclass": "0x00", "protocol_code": "0x00", "max_ep0_packet_size": 64, - "vendor_id": "0x0925", - "product_id": "0x9050", + "vendor_id": "0x0000", + "product_id": "0x0001", "device_release_bcd": "0x0100", - "vendor_string": "Epagris", - "product_string": "Testdevice", - "serial_number": "1552", + "vendor_string": "", + "product_string": "", + "serial_number": "0000000000000", "configurations": [ { "id": 1, diff --git a/examples/jsons/usb_config_cdc.json b/examples/jsons/usb_config_acm.json similarity index 91% rename from examples/jsons/usb_config_cdc.json rename to examples/jsons/usb_config_acm.json index a08fa28..3f63a89 100644 --- a/examples/jsons/usb_config_cdc.json +++ b/examples/jsons/usb_config_acm.json @@ -3,12 +3,12 @@ "subclass": "0x00", "protocol_code": "0x00", "max_ep0_packet_size": 64, - "vendor_id": "0x0925", - "product_id": "0x9050", + "vendor_id": "0x0000", + "product_id": "0x0001", "device_release_bcd": "0x0100", - "vendor_string": "Epagris", - "product_string": "Testdevice", - "serial_number": "1552", + "vendor_string": "", + "product_string": "", + "serial_number": "0000000000000", "configurations": [ { "id": 1, diff --git a/examples/jsons/usb_config_eem.json b/examples/jsons/usb_config_eem.json index bf19fda..e5d08d1 100644 --- a/examples/jsons/usb_config_eem.json +++ b/examples/jsons/usb_config_eem.json @@ -3,12 +3,12 @@ "subclass": "0x00", "protocol_code": "0x00", "max_ep0_packet_size": 64, - "vendor_id": "0x0925", - "product_id": "0x9050", + "vendor_id": "0x0000", + "product_id": "0x0001", "device_release_bcd": "0x0100", - "vendor_string": "Epagris", - "product_string": "Testdevice", - "serial_number": "1552", + "vendor_string": "", + "product_string": "", + "serial_number": "0000000000000", "configurations": [ { "id": 1,