rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add protocol level receiver frame rate measurement for Jeti ExBus

This commit is contained in:
Bruce Luckcuck 2019-11-28 19:20:25 -05:00
parent cf86671997
commit 2a9f0fda99
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/rx/jetiexbus.c
View File

@ -91,7 +91,7 @@ static uint8_t jetiExBusChannelFrame[EXBUS_MAX_CHANNEL_FRAME_SIZE];
uint8_t jetiExBusRequestFrame[EXBUS_MAX_REQUEST_FRAME_SIZE]; uint8_t jetiExBusRequestFrame[EXBUS_MAX_REQUEST_FRAME_SIZE];
static uint16_t jetiExBusChannelData[JETIEXBUS_CHANNEL_COUNT]; static uint16_t jetiExBusChannelData[JETIEXBUS_CHANNEL_COUNT];
static timeDelta_t lastFrameDelta = 0;
// Jeti Ex Bus CRC calculations for a frame // Jeti Ex Bus CRC calculations for a frame
uint16_t jetiExBusCalcCRC16(uint8_t *pt, uint8_t msgLen) uint16_t jetiExBusCalcCRC16(uint8_t *pt, uint8_t msgLen)
@ -152,23 +152,18 @@ static void jetiExBusDataReceive(uint16_t c, void *data)
{ {
UNUSED(data); UNUSED(data);
uint32_t now; static timeUs_t jetiExBusTimeLast = 0;
static uint32_t jetiExBusTimeLast = 0;
static int32_t jetiExBusTimeInterval;
static uint8_t *jetiExBusFrame; static uint8_t *jetiExBusFrame;
static timeUs_t lastFrameCompleteTimeUs = 0;
const timeUs_t now = microsISR();
// Check if we shall reset frame position due to time // Check if we shall reset frame position due to time
now = micros(); if (cmpTimeUs(now, jetiExBusTimeLast) > JETIEXBUS_MIN_FRAME_GAP) {
jetiExBusTimeInterval = now - jetiExBusTimeLast;
jetiExBusTimeLast = now;
if (jetiExBusTimeInterval > JETIEXBUS_MIN_FRAME_GAP) {
jetiExBusFrameReset(); jetiExBusFrameReset();
jetiExBusFrameState = EXBUS_STATE_ZERO; jetiExBusFrameState = EXBUS_STATE_ZERO;
jetiExBusRequestState = EXBUS_STATE_ZERO; jetiExBusRequestState = EXBUS_STATE_ZERO;
} }
jetiExBusTimeLast = now;
// Check if we shall start a frame? // Check if we shall start a frame?
if (jetiExBusFramePosition == 0) { if (jetiExBusFramePosition == 0) {
@ -216,8 +211,10 @@ static void jetiExBusDataReceive(uint16_t c, void *data)
if (jetiExBusFrameState == EXBUS_STATE_IN_PROGRESS) if (jetiExBusFrameState == EXBUS_STATE_IN_PROGRESS)
jetiExBusFrameState = EXBUS_STATE_RECEIVED; jetiExBusFrameState = EXBUS_STATE_RECEIVED;
if (jetiExBusRequestState == EXBUS_STATE_IN_PROGRESS) { if (jetiExBusRequestState == EXBUS_STATE_IN_PROGRESS) {
lastFrameDelta = cmpTimeUs(now, lastFrameCompleteTimeUs);
lastFrameCompleteTimeUs = now;
jetiExBusRequestState = EXBUS_STATE_RECEIVED; jetiExBusRequestState = EXBUS_STATE_RECEIVED;
jetiTimeStampRequest = micros(); jetiTimeStampRequest = now;
} }
jetiExBusFrameReset(); jetiExBusFrameReset();
@ -250,6 +247,11 @@ static uint16_t jetiExBusReadRawRC(const rxRuntimeState_t *rxRuntimeState, uint8
return (jetiExBusChannelData[chan]); return (jetiExBusChannelData[chan]);
} }
static timeDelta_t jetiExBusFrameDelta(void)
{
return lastFrameDelta;
}
bool jetiExBusInit(const rxConfig_t *rxConfig, rxRuntimeState_t *rxRuntimeState) bool jetiExBusInit(const rxConfig_t *rxConfig, rxRuntimeState_t *rxRuntimeState)
{ {
UNUSED(rxConfig); UNUSED(rxConfig);
@ -259,6 +261,7 @@ bool jetiExBusInit(const rxConfig_t *rxConfig, rxRuntimeState_t *rxRuntimeState)
rxRuntimeState->rcReadRawFn = jetiExBusReadRawRC; rxRuntimeState->rcReadRawFn = jetiExBusReadRawRC;
rxRuntimeState->rcFrameStatusFn = jetiExBusFrameStatus; rxRuntimeState->rcFrameStatusFn = jetiExBusFrameStatus;
rxRuntimeState->rcFrameDeltaFn = jetiExBusFrameDelta;
jetiExBusFrameReset(); jetiExBusFrameReset();