fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added flags to enable TX and RX tones in rtxStatus_t

This commit is contained in:
Silvano Seva 2021-01-04 08:58:02 +01:00
parent 868a0df892
commit 41e6c1d1e6
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openrtx/include/interfaces/rtx.h
View File

@ -40,8 +40,11 @@ typedef struct
float txPower; /**< TX power, in W */ float txPower; /**< TX power, in W */
uint8_t sqlLevel; /**< Squelch opening level */ uint8_t sqlLevel; /**< Squelch opening level */
tone_t rxTone; /**< RX CTC/DCS tone */ uint16_t rxToneEn : 1, /**< RX CTC/DCS tone enable */
tone_t txTone; /**< TX CTC/DCS tone */ rxTone : 15; /**< RX CTC/DCS tone */
uint16_t txToneEn : 1, /**< TX CTC/DCS tone enable */
txTone : 15; /**< TX CTC/DCS tone */
} }
rtxStatus_t; rtxStatus_t;

6
platform/drivers/baseband/rtx_MD3x0.c
View File

@ -33,8 +33,6 @@
#include "HR-C5000_MD3x0.h" #include "HR-C5000_MD3x0.h"
#include "pll_MD3x0.h" #include "pll_MD3x0.h"
#include <stdio.h>
const freq_t IF_FREQ = 49950000; /* Intermediate frequency: 49.95MHz */ const freq_t IF_FREQ = 49950000; /* Intermediate frequency: 49.95MHz */
OS_MUTEX *cfgMutex; /* Mutex for incoming config messages */ OS_MUTEX *cfgMutex; /* Mutex for incoming config messages */
@ -180,7 +178,7 @@ void _updateC5000IQparams()
void _setCTCSS() void _setCTCSS()
{ {
if((rtxStatus.opMode == FM) && (rtxStatus.txTone != 0)) if((rtxStatus.opMode == FM) && (rtxStatus.txToneEn != 0))
{ {
float tone = ((float) rtxStatus.txTone) / 10.0f; float tone = ((float) rtxStatus.txTone) / 10.0f;
toneGen_setToneFreq(tone); toneGen_setToneFreq(tone);
@ -306,7 +304,9 @@ void rtx_init(OS_MUTEX *m)
rtxStatus.txFrequency = 430000000; rtxStatus.txFrequency = 430000000;
rtxStatus.txPower = 0.0f; rtxStatus.txPower = 0.0f;
rtxStatus.sqlLevel = 1; rtxStatus.sqlLevel = 1;
rtxStatus.rxToneEn = 0;
rtxStatus.rxTone = 0; rtxStatus.rxTone = 0;
rtxStatus.txToneEn = 0;
rtxStatus.txTone = 0; rtxStatus.txTone = 0;
} }