ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix relative paths to custom upload method file, fix incorrect CAN length on STMicro (#380) 

* Fix relative paths to custom upload method file, fix incorrect CAN length on STMicro

* Wait we can do this better
pull/15530/head
Jamie Smith 2024-11-14 20:19:30 -08:00 committed by GitHub
parent 0a36502cf5
commit d46739ba2e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
targets/TARGET_STM/can_api.c
View File

@ -1014,7 +1014,7 @@ int can_write(can_t *obj, CAN_Message msg, int cc)
int can_read(can_t *obj, CAN_Message *msg, int handle)
{
//FIFO selection cannot be controlled by software for STM32, default FIFO is 0, hence handle is not used
int rxfifo_default = DEFAULT_RXFIFO;
const int rxfifo_default = DEFAULT_RXFIFO;
CAN_TypeDef *can = obj->CanHandle.Instance;
// check FPM0 which holds the pending message count in FIFO 0
@ -1033,7 +1033,7 @@ int can_read(can_t *obj, CAN_Message *msg, int handle)
msg->type = (CANType)(((uint8_t)0x02 & can->sFIFOMailBox[rxfifo_default].RIR) >> 1);
/* Get the DLC */
msg->len = ((uint8_t)0x0F & can->sFIFOMailBox[rxfifo_default].RDTR < 8) ? ((uint8_t)0x0F & can->sFIFOMailBox[rxfifo_default].RDTR) : ((uint8_t) 8);
msg->len = ((can->sFIFOMailBox[rxfifo_default].RDTR & CAN_RDT0R_DLC) < 8) ? (CAN_RDT0R_DLC & can->sFIFOMailBox[rxfifo_default].RDTR) : ((uint8_t) 8);
/* Get the FMI */
// msg->FMI = (uint8_t)0xFF & (can->sFIFOMailBox[rxfifo_default].RDTR >> 8);
/* Get the data field */

2
tools/cmake/app.cmake
View File

@ -64,6 +64,8 @@ set(EXPECTED_MBED_UPLOAD_CFG_FILE_PATH ${MBED_SOURCE_DIR}/targets/upload_method_
# check if a custom upload config path is defined in top lvl cmake
if((DEFINED CUSTOM_UPLOAD_CFG_PATH))
# Make path absolute, as required by EXISTS
get_filename_component(CUSTOM_UPLOAD_CFG_PATH "${CUSTOM_UPLOAD_CFG_PATH}" ABSOLUTE BASE_DIR ${CMAKE_SOURCE_DIR})
if(EXISTS ${CUSTOM_UPLOAD_CFG_PATH})
include(${CUSTOM_UPLOAD_CFG_PATH})
message(STATUS "Mbed: Custom upload config included from ${CUSTOM_UPLOAD_CFG_PATH}")