From 2a9f0fda9928ec9787aa4eddc3ba7d38f4296a10 Mon Sep 17 00:00:00 2001
From: Bruce Luckcuck <github@etracer.net>
Date: Thu, 28 Nov 2019 19:20:25 -0500
Subject: [PATCH] Add protocol level receiver frame rate measurement for Jeti
 ExBus

---
 src/main/rx/jetiexbus.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

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