Skip to content

feat(driver): support kvaser leaf v3 #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dahlmo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(driver): support kvaser leaf v3 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Sources/Driver/KvaserCAN_Devices.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

const CANDEV_Device_t CANDEV_Devices[] = {
#if (OPTION_USB_LEAF_DEVEL_DEVICE != 0)
#error Device not supported!
{KVASER_VENDOR_ID, USB_LEAF_DEVEL_DRV_FAMILY, USB_LEAF_DEVEL_NUM_CHANNELS},
#endif
#if (OPTION_USB_LEAF_LITE_DEVICE != 0)
#error Device not supported!
Expand Down Expand Up @@ -219,7 +219,11 @@ static const struct kavser_can_device_t_ {
bool capErrorFrame;
} Kvaser_Devices[] = {
#if (OPTION_USB_LEAF_DEVEL_DEVICE != 0)
#error Device not supported!
{USB_LEAF_DEVEL_PRODUCT_ID, USB_LEAF_DEVEL_DRV_FAMILY,
USB_LEAF_DEVEL_NUM_CHANNELS, USB_LEAF_DEVEL_CAN_CLOCK,
USB_LEAF_DEVEL_TIMER_FREQ, USB_LEAF_DEVEL_CAP_CANFD,
USB_LEAF_DEVEL_CAP_NONISO, USB_LEAF_DEVEL_CAP_SILENT_MODE,
USB_LEAF_DEVEL_CAP_ERROR_FRAME},
#endif
#if (OPTION_USB_LEAF_LITE_DEVICE != 0)
#error Device not supported!
Expand Down
14 changes: 10 additions & 4 deletions Sources/Driver/KvaserCAN_Devices.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
/** @name Supported Kvaser Leaf Interfaces
* @brief Options to activate single devices from USB-to-CAN Leaf device family.
* @{ */
#define OPTION_USB_LEAF_DEVEL_DEVICE 0 ///< Kvaser Leaf prototype (P010v2 and v3)
#define OPTION_USB_LEAF_DEVEL_DEVICE 1 ///< Kvaser Leaf prototype (P010v2 and v3)
#define OPTION_USB_LEAF_LITE_DEVICE 0 ///< Kvaser Leaf Light (P010v3)
#define OPTION_USB_LEAF_PRO_DEVICE 0 ///< Kvaser Leaf Professional HS
#define OPTION_USB_LEAF_SPRO_DEVICE 0 ///< Kvaser Leaf SemiPro HS
Expand Down Expand Up @@ -126,9 +126,15 @@ typedef enum kavser_device_family_t_ {
* @brief Tbd.
* @{ */
#if (OPTION_USB_LEAF_DEVEL_DEVICE != 0)
#define USB_LEAF_DEVEL_PRODUCT_ID 10U
#define USB_LEAF_DEVEL_DRV_FAMILY KVASER_USB_LEAF_DEVICE_FAMILY
#error Device properties not defined!
#define USB_LEAF_DEVEL_PRODUCT_ID 279U
#define USB_LEAF_DEVEL_DRV_FAMILY KVASER_USB_MHYDRA_DEVICE_FAMILY
#define USB_LEAF_DEVEL_NUM_CHANNELS 1U
#define USB_LEAF_DEVEL_CAN_CLOCK 80U // likely correct
#define USB_LEAF_DEVEL_TIMER_FREQ 20U // likely correct
#define USB_LEAF_DEVEL_CAP_CANFD true
#define USB_LEAF_DEVEL_CAP_NONISO false
#define USB_LEAF_DEVEL_CAP_SILENT_MODE true
#define USB_LEAF_DEVEL_CAP_ERROR_FRAME false
#endif
/** @} */

Expand Down