ProbeStar/Cnomicon
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed CAN frame bug

Browse Source
This commit is contained in:
Neal Probert
2024-03-06 11:47:50 -05:00
parent 8d472f4f64
commit b7d8fef0ab
8 changed files with 180 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/libcan++/CanSocket.h
View File

@ -33,7 +33,7 @@ typedef struct can_frame CanFrame;
typedef struct _BcmFrame { typedef struct _BcmFrame {
struct bcm_msg_head head; struct bcm_msg_head head;
struct can_frame frame; // struct can_frame frame;
} BcmFrame; } BcmFrame;
/* c class definitions ******************************************************/ /* c class definitions ******************************************************/

2
src/libcan++/CMakeLists.txt
View File

@ -28,6 +28,8 @@ set(LIBSRC
# includes # includes
include_directories(../include) include_directories(../include)
add_compile_options(-Warray-bounds)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../lib) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../lib)

2
src/libcan++/CanSocket.cpp
View File

@ -255,7 +255,7 @@ int CanSocket::CanAddRx( u_int32_t addr )
// mask // mask
msg.head.nframes = 1; msg.head.nframes = 1;
U64_DATA(&msg.frame) = (__u64) 0xFFFFFFFFFFFFFFFFULL; // all 64 bits U64_DATA(&msg.head.frames[0]) = (__u64) 0xFFFFFFFFFFFFFFFFULL; // all 64 bits
// send it down // send it down
if (write(m_sock, &msg, sizeof(msg)) < 0) if (write(m_sock, &msg, sizeof(msg)) < 0)

2
src/libcan++/CanSocket.h
View File

@ -33,7 +33,7 @@ typedef struct can_frame CanFrame;
typedef struct _BcmFrame { typedef struct _BcmFrame {
struct bcm_msg_head head; struct bcm_msg_head head;
struct can_frame frame; // struct can_frame frame;
} BcmFrame; } BcmFrame;
/* c class definitions ******************************************************/ /* c class definitions ******************************************************/