Add diversity antenna element for CRSF

betaflight · Feb 13, 2023 · c90e05f · c90e05f
1 parent 19f22f5
commit c90e05f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/src/main/osd/osd_elements.c b/src/main/osd/osd_elements.c
@@ -1458,7 +1458,13 @@ static void osdElementRssiDbm(osdElementParms_t *element)
 #ifdef USE_RX_RSNR
 static void osdElementRsnr(osdElementParms_t *element)
 {
-    tfp_sprintf(element->buff, "%c%3d", SYM_RSSI, getRsnr());
+    const int8_t antenna = getActiveAntenna();
+
+    if (antenna) {
+        tfp_sprintf(element->buff, "%c%3d(%1d)", SYM_RSSI, getRsnr(), antenna + 1);
+    } else {
+        tfp_sprintf(element->buff, "%c%3d", SYM_RSSI, getRsnr());
+    }
 }
 #endif // USE_RX_RSNR
 

diff --git a/src/main/rx/crsf.c b/src/main/rx/crsf.c
@@ -238,6 +238,7 @@ static void handleCrsfLinkStatisticsFrame(const crsfLinkStatistics_t* statsPtr,
 
 #ifdef USE_RX_RSNR
     setRsnr(stats.uplink_SNR);
+    setActiveAntenna(stats.active_antenna);
 #endif
 
 #ifdef USE_RX_LINK_QUALITY_INFO

diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c
@@ -83,6 +83,7 @@ static int16_t rssiDbm = CRSF_RSSI_MIN;    // range: [-130,0]
 static int16_t rssiDbmRaw = CRSF_RSSI_MIN; // range: [-130,0]
 #endif //USE_RX_RSSI_DBM
 #ifdef USE_RX_RSNR
+static int8_t activeAntenna;
 static int16_t rsnr = CRSF_SNR_MIN;        // range: [-30,20]
 static int16_t rsnrRaw = CRSF_SNR_MIN;     // range: [-30,20]
 #endif //USE_RX_RSNR
@@ -945,6 +946,16 @@ void setRssiDbmDirect(int16_t newRssiDbm, rssiSource_e source)
 #endif //USE_RX_RSSI_DBM
 
 #ifdef USE_RX_RSNR
+int8_t getActiveAntenna(void)
+{
+    return activeAntenna;
+}
+
+void setActiveAntenna(int8_t antenna)
+{
+    activeAntenna = antenna;
+}
+
 int16_t getRsnr(void)
 {
     return rsnr;

diff --git a/src/main/rx/rx.h b/src/main/rx/rx.h
@@ -208,7 +208,9 @@ void setRssiDbmDirect(int16_t newRssiDbm, rssiSource_e source);
 #endif //USE_RX_RSSI_DBM
 
 #ifdef USE_RX_RSNR
+int8_t getActiveAntenna(void);
 int16_t getRsnr(void);
+void setActiveAntenna(int8_t antenna);
 void setRsnr(int16_t newRsnr);
 void setRsnrDirect(int16_t newRsnr);
 #endif //USE_RX_RSNR