Index: firmware/include/can.h =================================================================== diff -u -r792764062d7b7826af10e030277f18379af4fcd1 -r850f8042a02fd17ee53b8db24bc2e3d17bbb9c7f --- firmware/include/can.h (.../can.h) (revision 792764062d7b7826af10e030277f18379af4fcd1) +++ firmware/include/can.h (.../can.h) (revision 850f8042a02fd17ee53b8db24bc2e3d17bbb9c7f) @@ -632,12 +632,12 @@ /* Configuration registers initial value for CAN1*/ #define CAN1_CTL_CONFIGVALUE ((uint32)0x00000000U \ | (uint32)0x00000000U \ - | (uint32)((uint32)0x00000005U << 10U) | 0x00020002U) + | (uint32)((uint32)0x0000000AU << 10U) | 0x00020002U) #define CAN1_ES_CONFIGVALUE 0x00000007U #define CAN1_BTR_CONFIGVALUE ((uint32)((uint32)0U << 16U) \ - | (uint32)((uint32)(3U - 1U) << 12U) \ - | (uint32)((uint32)((4U + 3U) - 1U) << 8U) \ - | (uint32)((uint32)(3U - 1U) << 6U) | (uint32)19U) + | (uint32)((uint32)(2U - 1U) << 12U) \ + | (uint32)((uint32)((3U + 2U) - 1U) << 8U) \ + | (uint32)((uint32)(2U - 1U) << 6U) | (uint32)51U) #define CAN1_TEST_CONFIGVALUE 0x00000080U #define CAN1_ABOTR_CONFIGVALUE ((uint32)(0U)) #define CAN1_INTMUX0_CONFIGVALUE ((uint32)0x00000000U \ @@ -722,190 +722,6 @@ |(uint32)((uint32)0U << 1U )) -/* Configuration registers initial value for CAN2*/ -#define CAN2_CTL_CONFIGVALUE ((uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)((uint32)0x00000005U << 10U) | 0x00020002U) -#define CAN2_ES_CONFIGVALUE 0x00000007U -#define CAN2_BTR_CONFIGVALUE ((uint32)((uint32)0U << 16U) \ - | (uint32)((uint32)(3U - 1U) << 12U) \ - | (uint32)((uint32)((4U + 3U) - 1U) << 8U) \ - | (uint32)((uint32)(3U - 1U) << 6U) | (uint32)19U) -#define CAN2_TEST_CONFIGVALUE 0x00000080U -#define CAN2_ABOTR_CONFIGVALUE ((uint32)(0U)) -#define CAN2_INTMUX0_CONFIGVALUE ((uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U) - -#define CAN2_INTMUX1_CONFIGVALUE ((uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U) - -#define CAN2_INTMUX2_CONFIGVALUE 0x00000000U -#define CAN2_INTMUX3_CONFIGVALUE 0x00000000U -#define CAN2_TIOC_CONFIGVALUE ((uint32)((uint32)1U << 18U ) \ - |(uint32)((uint32)0U << 17U ) \ - |(uint32)((uint32)0U << 16U )\ - |(uint32)((uint32)1U << 3U ) \ - |(uint32)((uint32)1U << 2U ) \ - |(uint32)((uint32)1U << 1U )) -#define CAN2_RIOC_CONFIGVALUE ((uint32)((uint32)1U << 18U ) \ - |(uint32)((uint32)0U << 17U ) \ - |(uint32)((uint32)0U << 16U )\ - |(uint32)((uint32)1U << 3U ) \ - |(uint32)((uint32)0U << 2U ) \ - |(uint32)((uint32)0U << 1U )) - -/* Configuration registers initial value for CAN3*/ -#define CAN3_CTL_CONFIGVALUE ((uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)((uint32)0x00000005U << 10U) | 0x00020002U) -#define CAN3_ES_CONFIGVALUE 0x00000007U -#define CAN3_BTR_CONFIGVALUE ((uint32)((uint32)0U << 16U) \ - | (uint32)((uint32)(3U - 1U) << 12U) \ - | (uint32)((uint32)((4U + 3U) - 1U) << 8U) \ - | (uint32)((uint32)(3U - 1U) << 6U) | (uint32)19U) -#define CAN3_TEST_CONFIGVALUE 0x00000080U -#define CAN3_ABOTR_CONFIGVALUE ((uint32)(0U)) -#define CAN3_INTMUX0_CONFIGVALUE ((uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U) - -#define CAN3_INTMUX1_CONFIGVALUE ((uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U \ - | (uint32)0x00000000U) - -#define CAN3_INTMUX2_CONFIGVALUE 0x00000000U -#define CAN3_INTMUX3_CONFIGVALUE 0x00000000U -#define CAN3_TIOC_CONFIGVALUE ((uint32)((uint32)1U << 18U ) \ - |(uint32)((uint32)0U << 17U ) \ - |(uint32)((uint32)0U << 16U )\ - |(uint32)((uint32)1U << 3U ) \ - |(uint32)((uint32)1U << 2U ) \ - |(uint32)((uint32)1U << 1U )) -#define CAN3_RIOC_CONFIGVALUE ((uint32)((uint32)1U << 18U ) \ - |(uint32)((uint32)0U << 17U ) \ - |(uint32)((uint32)0U << 16U )\ - |(uint32)((uint32)1U << 3U ) \ - |(uint32)((uint32)0U << 2U ) \ - |(uint32)((uint32)0U << 1U )) - /** * @defgroup CAN CAN * @brief Controller Area Network Module. @@ -947,8 +763,6 @@ uint32 canGetID(canBASE_t *node, uint32 messageBox); void canUpdateID(canBASE_t *node, uint32 messageBox, uint32 msgBoxArbitVal); void can1GetConfigValue(can_config_reg_t *config_reg, config_value_type_t type); -void can2GetConfigValue(can_config_reg_t *config_reg, config_value_type_t type); -void can3GetConfigValue(can_config_reg_t *config_reg, config_value_type_t type); /** @fn void canErrorNotification(canBASE_t *node, uint32 notification) * @brief Error notification