From 537c0860c398e7180263cf98e42ba5e3d6a99ea3 Mon Sep 17 00:00:00 2001 From: ConvertDevice Date: Sun, 11 Dec 2022 11:56:15 +0800 Subject: [PATCH] feat: change xCAN01 to xCAN --- CMakeLists.txt | 2 +- README.md | 2 +- include/config.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e508900..d462f1f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -265,7 +265,7 @@ endfunction() ########## generate list of targets. # the "_fw" part is appended automatically set(TGTF042_LIST "cantact" "canalyze" "canable" "usb2can" "cannette") -set(TGTF072_LIST "candleLight" "CANable_MKS" "CONVERTDEVICE_xCAN01") +set(TGTF072_LIST "candleLight" "CANable_MKS" "CONVERTDEVICE_xCAN") set(TGTF407_LIST "STM32F4_DevBoard") set(TGTG0B1_LIST "budgetcan") diff --git a/README.md b/README.md index 7c101b95..83da4c73 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ This is firmware for certain STM32F042x/STM32F072xB-based USB-CAN adapters, nota - VulCAN Gen1: https://shop.copperforge.cc/products/ac41 (STM32F042x6) - Entreé: https://github.com/tuna-f1sh/entree (STM32F042x6) - CANable-MKS: https://github.com/makerbase-mks/CANable-MKS (STM32F072xB) -- ConvertDevice-xCAN01: https://github.com/ConvertDevice/xCAN01 (STM32F072xB) +- ConvertDevice-xCAN: https://github.com/ConvertDevice/xCAN (STM32F072xB) Of important note is that the common STM32F103 will NOT work with this firmware because its hardware cannot use both USB and CAN simultaneously. Beware also the smaller packages in the F042 series which map a USB and CAN_TX signal on the same pin and are therefore unusable ! diff --git a/include/config.h b/include/config.h index 55c4b0f6..6081a090 100644 --- a/include/config.h +++ b/include/config.h @@ -89,10 +89,10 @@ THE SOFTWARE. #define LEDTX_Mode GPIO_MODE_OUTPUT_OD #define LEDTX_Active_High 0 -#elif defined(BOARD_CONVERTDEVICE_xCAN01) - #define USBD_PRODUCT_STRING_FS (uint8_t*) "ConvertDevice xCAN01" +#elif defined(BOARD_CONVERTDEVICE_xCAN) + #define USBD_PRODUCT_STRING_FS (uint8_t*) "ConvertDevice xCAN" #define USBD_MANUFACTURER_STRING (uint8_t*) "ConvertDevice" - #define DFU_INTERFACE_STRING_FS (uint8_t*) "ConvertDevice xCAN01 firmware upgrade interface" + #define DFU_INTERFACE_STRING_FS (uint8_t*) "ConvertDevice xCAN firmware upgrade interface" #define CAN_INTERFACE CAN #define CAN_CLOCK_SPEED 48000000