fixed merge conflicts

This commit is contained in:
Jakob.Meier
2021-07-23 14:36:15 +02:00
46 changed files with 1648 additions and 351 deletions

View File

@ -142,7 +142,7 @@ csp_iface_t * csp_can_socketcan_init(const char * ifc, int bitrate, int promisc)
struct sockaddr_can addr;
pthread_t rx_thread;
printf("-I-: Initiating CAN interface %s\n", ifc);
//printf("-I-: Initiating CAN interface %s\n", ifc);
#ifdef CSP_HAVE_LIBSOCKETCAN
/* Set interface up */