Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions boards/px4/fmu-v6xrt/nuttx-config/nsh/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,9 @@ CONFIG_IMXRT_USDHC1_INVERT_CD=y
CONFIG_IMXRT_USDHC1_WIDTH_D1_D4=y
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INIT_STACKSIZE=2944
CONFIG_IOB_NBUFFERS=24
CONFIG_IOB_THROTTLE=0
CONFIG_IOB_NBUFFERS=256
CONFIG_IOB_NCHAINS=196
CONFIG_IOB_NOTIFIER=y
CONFIG_IPCFG_BINARY=y
CONFIG_IPCFG_CHARDEV=y
CONFIG_IPCFG_PATH="/fs/mtd_net"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,11 @@ uavcan::int16_t CanIface::send(const uavcan::CanFrame &frame, uavcan::MonotonicT
return 1;

} else {
return res;
if (errno == ENOBUFS || errno == EAGAIN || errno == EWOULDBLOCK) {
return 0; // Transmit queue is full, retry
}

return -1;
}
}

Expand All @@ -210,7 +214,11 @@ uavcan::int16_t CanIface::receive(uavcan::CanFrame &out_frame, uavcan::Monotonic
int32_t result = recvmsg(_fd, &_recv_msg, MSG_DONTWAIT);

if (result < 0) {
return result;
if (errno == EAGAIN || errno == EWOULDBLOCK) {
return 0;
}

return -1;
}

/* Copy SocketCAN frame to CanardFrame */
Expand All @@ -220,7 +228,7 @@ uavcan::int16_t CanIface::receive(uavcan::CanFrame &out_frame, uavcan::Monotonic
out_frame.id = recv_frame->can_id;

if (recv_frame->len > CANFD_MAX_DLEN) {
return -EFAULT;
return -1;
}

out_frame.dlc = recv_frame->len;
Expand All @@ -231,7 +239,7 @@ uavcan::int16_t CanIface::receive(uavcan::CanFrame &out_frame, uavcan::Monotonic
out_frame.id = recv_frame->can_id;

if (recv_frame->can_dlc > CAN_MAX_DLEN) {
return -EFAULT;
return -1;
}

out_frame.dlc = recv_frame->can_dlc;
Expand All @@ -245,7 +253,7 @@ uavcan::int16_t CanIface::receive(uavcan::CanFrame &out_frame, uavcan::Monotonic
out_ts_monotonic = uavcan::MonotonicTime::fromUSec(tv->tv_sec * 1000000ULL + tv->tv_usec);
}

return result;
return 1;
}


Expand Down
Loading