From 0c1f64938ed6984325d33399023623ba699762b2 Mon Sep 17 00:00:00 2001 From: Karl Date: Sat, 11 May 2019 15:44:59 -0700 Subject: [PATCH 1/3] Remove unused SocketCAN constants These constants are no longer used in the code and can be cleaned up Fixes #574 --- can/interfaces/socketcan/constants.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/can/interfaces/socketcan/constants.py b/can/interfaces/socketcan/constants.py index 3228d4f4e..933b36269 100644 --- a/can/interfaces/socketcan/constants.py +++ b/can/interfaces/socketcan/constants.py @@ -75,14 +75,6 @@ ID_TYPE_29_BIT = ID_TYPE_EXTENDED ID_TYPE_11_BIT = ID_TYPE_STANDARD -REMOTE_FRAME = True -DATA_FRAME = False -WAKEUP_MSG = True -ERROR_FRAME = True - -DRIVER_MODE_SILENT = False -DRIVER_MODE_NORMAL = (not DRIVER_MODE_SILENT) - STD_ACCEPTANCE_MASK_ALL_BITS = (2**11 - 1) MAX_11_BIT_ID = STD_ACCEPTANCE_MASK_ALL_BITS From 0d86552b2548637dc7ef9d76d2bb944c472536da Mon Sep 17 00:00:00 2001 From: Karl Date: Sat, 11 May 2019 15:51:31 -0700 Subject: [PATCH 2/3] Remove additional unused SocketCAN constants --- can/interfaces/socketcan/constants.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/can/interfaces/socketcan/constants.py b/can/interfaces/socketcan/constants.py index 933b36269..17051ca5d 100644 --- a/can/interfaces/socketcan/constants.py +++ b/can/interfaces/socketcan/constants.py @@ -57,24 +57,11 @@ SIOCGSTAMP = 0x8906 EXTFLG = 0x0004 -SKT_ERRFLG = 0x0001 -SKT_RTRFLG = 0x0002 - CANFD_BRS = 0x01 CANFD_ESI = 0x02 CANFD_MTU = 72 -PYCAN_ERRFLG = 0x0020 -PYCAN_STDFLG = 0x0002 -PYCAN_RTRFLG = 0x0001 - -ID_TYPE_EXTENDED = True -ID_TYPE_STANDARD = False - -ID_TYPE_29_BIT = ID_TYPE_EXTENDED -ID_TYPE_11_BIT = ID_TYPE_STANDARD - STD_ACCEPTANCE_MASK_ALL_BITS = (2**11 - 1) MAX_11_BIT_ID = STD_ACCEPTANCE_MASK_ALL_BITS From 87dd03b947697b3976b315e475fddbb072510901 Mon Sep 17 00:00:00 2001 From: Karl Date: Sat, 11 May 2019 15:55:48 -0700 Subject: [PATCH 3/3] Remove additional unused SocketCAN constants --- can/interfaces/socketcan/constants.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/can/interfaces/socketcan/constants.py b/can/interfaces/socketcan/constants.py index 17051ca5d..b56eaae64 100644 --- a/can/interfaces/socketcan/constants.py +++ b/can/interfaces/socketcan/constants.py @@ -4,8 +4,6 @@ Defines shared CAN constants. """ -canMSG_EXT = 0x0004 - CAN_ERR_FLAG = 0x20000000 CAN_RTR_FLAG = 0x40000000 CAN_EFF_FLAG = 0x80000000 @@ -14,10 +12,6 @@ CAN_BCM_TX_SETUP = 1 CAN_BCM_TX_DELETE = 2 -CAN_BCM_TX_EXPIRED = 9 - -CAN_BCM_RX_TIMEOUT = 11 - # BCM flags SETTIMER = 0x0001 STARTTIMER = 0x0002