Skip to content

timestamp fixups for gs_usb #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CamilleTTT merged 4 commits into from
Dec 3, 2025
Merged

timestamp fixups for gs_usb #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e039f79
gs_usb: don't report GS_CAN_FEATURE_HW_TIMESTAMP because it isn't sup…
BenGardiner Nov 29, 2025
5802331
gs_usb: correct the GS_CAN_MODE_s
BenGardiner Nov 29, 2025
dbb6201
slcan: document timestamps and units
BenGardiner Nov 29, 2025
5e7861e
gs_usb: add GS_CAN_FEATURE_HW_TIMESTAMP
BenGardiner Nov 29, 2025
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
2 changes: 1 addition & 1 deletion firmware/RAMNV1/Core/Src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1656,7 +1656,7 @@ void RAMN_ReceiveCANFunc(void *argument)

if (RAMN_USB_Config.slcan_enableTimestamp != 0U)
{
index += uint16toASCII(xTaskGetTickCount() % 0xEA60,&slCAN_USBTxBuffer[index]);
index += uint16toASCII((xTaskGetTickCount() * (1000 /*ms per sec*/ / configTICK_RATE_HZ) ) % 0xEA60 /* 60,000 ms*/,&slCAN_USBTxBuffer[index]);
}

if ((RAMN_USB_Config.addESIFlag != 0U) && (CANRxHeader.FDFormat == FDCAN_FD_CAN) && (CANRxHeader.ErrorStateIndicator == FDCAN_ESI_PASSIVE))
Expand Down
4 changes: 2 additions & 2 deletions firmware/RAMNV1/Core/Src/ramn_gsusb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ RAMN_Result_t RAMN_GSUSB_ProcessRX(FDCAN_RxHeaderTypeDef *canRxHeader, uint8_t *
frameData->channel = 0;
frameData->flags = 0;
frameData->can_dlc = canRxHeader->DataLength;
frameData->timestamp_us = 0;
frameData->timestamp_us = (xTaskGetTickCount() * (1000000 /*us per sec*/ / configTICK_RATE_HZ) );

if (!(frameData->can_id & CAN_RTR_FLAG)) RAMN_memcpy(frameData->data, canRxData, frameData->can_dlc);

Expand Down Expand Up @@ -88,7 +88,7 @@ RAMN_Result_t RAMN_GSUSB_ProcessTX(FDCAN_TxHeaderTypeDef *canTxHeader, uint8_t *
frameData->echo_id = 0xFFFFFFFF;
frameData->channel = 0;
frameData->can_dlc = canTxHeader->DataLength;
frameData->timestamp_us = 0;
frameData->timestamp_us = 0; // timestamps are ignored on send
RAMN_memcpy(frameData->data, canRxData, frameData->can_dlc);

// Send to task
Expand Down
7 changes: 3 additions & 4 deletions ...re/RAMNV1/Middlewares/ST/STM32_USB_Device_Library/USBClass/Composite/gs_usb/usbd_gs_usb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,9 @@ THE SOFTWARE.
#define GS_CAN_MODE_NORMAL 0
#define GS_CAN_MODE_LISTEN_ONLY (1<<0)
#define GS_CAN_MODE_INTERNAL_LOOP_BACK (1<<1)
#define GS_CAN_MODE_EXTERNAL_LOOP_BACK (1<<2)
#define GS_CAN_MODE_TRIPLE_SAMPLE (1<<3)
#define GS_CAN_MODE_ONE_SHOT (1<<4)
#define GS_CAN_MODE_HW_TIMESTAMP (1<<5)
#define GS_CAN_MODE_TRIPLE_SAMPLE (1<<2)
#define GS_CAN_MODE_ONE_SHOT (1<<3)
#define GS_CAN_MODE_HW_TIMESTAMP (1<<4)

#define GS_CAN_MODE_PAD_PKTS_TO_MAX_PKT_SIZE (1<<7)

Expand Down