From 41e6c1d1e684d830a7d394640545f464b6015f10 Mon Sep 17 00:00:00 2001 From: Silvano Seva Date: Mon, 4 Jan 2021 08:58:02 +0100 Subject: [PATCH] Added flags to enable TX and RX tones in rtxStatus_t --- openrtx/include/interfaces/rtx.h | 7 +++++-- platform/drivers/baseband/rtx_MD3x0.c | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/openrtx/include/interfaces/rtx.h b/openrtx/include/interfaces/rtx.h index 9e6224ba..ccf03746 100644 --- a/openrtx/include/interfaces/rtx.h +++ b/openrtx/include/interfaces/rtx.h @@ -40,8 +40,11 @@ typedef struct float txPower; /**< TX power, in W */ uint8_t sqlLevel; /**< Squelch opening level */ - tone_t rxTone; /**< RX CTC/DCS tone */ - tone_t txTone; /**< TX CTC/DCS tone */ + uint16_t rxToneEn : 1, /**< RX CTC/DCS tone enable */ + rxTone : 15; /**< RX CTC/DCS tone */ + + uint16_t txToneEn : 1, /**< TX CTC/DCS tone enable */ + txTone : 15; /**< TX CTC/DCS tone */ } rtxStatus_t; diff --git a/platform/drivers/baseband/rtx_MD3x0.c b/platform/drivers/baseband/rtx_MD3x0.c index 185f3d35..7cf185eb 100644 --- a/platform/drivers/baseband/rtx_MD3x0.c +++ b/platform/drivers/baseband/rtx_MD3x0.c @@ -33,8 +33,6 @@ #include "HR-C5000_MD3x0.h" #include "pll_MD3x0.h" -#include - const freq_t IF_FREQ = 49950000; /* Intermediate frequency: 49.95MHz */ OS_MUTEX *cfgMutex; /* Mutex for incoming config messages */ @@ -180,7 +178,7 @@ void _updateC5000IQparams() void _setCTCSS() { - if((rtxStatus.opMode == FM) && (rtxStatus.txTone != 0)) + if((rtxStatus.opMode == FM) && (rtxStatus.txToneEn != 0)) { float tone = ((float) rtxStatus.txTone) / 10.0f; toneGen_setToneFreq(tone); @@ -306,7 +304,9 @@ void rtx_init(OS_MUTEX *m) rtxStatus.txFrequency = 430000000; rtxStatus.txPower = 0.0f; rtxStatus.sqlLevel = 1; + rtxStatus.rxToneEn = 0; rtxStatus.rxTone = 0; + rtxStatus.txToneEn = 0; rtxStatus.txTone = 0; }