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

Fix for first part of #11, caused by VCO not being updated when a new configuration is received by the rtx driver

This commit is contained in:
Silvano Seva 2021-01-02 21:19:26 +01:00
parent 403f37844f
commit 16e4642b97
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,18 +46,6 @@ rtxStatus_t rtxStatus; /* RTX driver status */
uint8_t sqlOpenTsh; /* Squelch opening threshold */ uint8_t sqlOpenTsh; /* Squelch opening threshold */
uint8_t sqlCloseTsh; /* Squelch closing threshold */ uint8_t sqlCloseTsh; /* Squelch closing threshold */
static void printUnsignedInt(unsigned int x)
{
static const char hexdigits[]="0123456789abcdef";
char result[]="0x........\r\n";
for(int i=9;i>=2;i--)
{
result[i]=hexdigits[x & 0xf];
x>>=4;
}
puts(result);
}
/* /*
* Helper functions to reduce code mess. They all access 'rtxStatus' * Helper functions to reduce code mess. They all access 'rtxStatus'
* internally. * internally.
@ -111,6 +99,18 @@ void _setOpMode()
} }
} }
void _setVcoFrequency()
{
if(rtxStatus.opStatus == RX)
{
pll_setFrequency(((float) rtxStatus.rxFrequency - IF_FREQ), 5);
}
else if(rtxStatus.opStatus == TX)
{
pll_setFrequency(rtxStatus.txFrequency, 5);
}
}
void _enableTxStage() void _enableTxStage()
{ {
if(rtxStatus.txDisable == 1) return; if(rtxStatus.txDisable == 1) return;
@ -120,8 +120,6 @@ void _enableTxStage()
gpio_setPin(RF_APC_SW); gpio_setPin(RF_APC_SW);
gpio_clearPin(VCOVCC_SW); gpio_clearPin(VCOVCC_SW);
pll_setFrequency(rtxStatus.txFrequency, 5);
/* /*
* Set transmit power. Initial setting is 1W, overridden to 5W if tx power * Set transmit power. Initial setting is 1W, overridden to 5W if tx power
* is greater than 1W. * is greater than 1W.
@ -135,6 +133,8 @@ void _enableTxStage()
gpio_setPin(TX_STG_EN); gpio_setPin(TX_STG_EN);
rtxStatus.opStatus = TX; rtxStatus.opStatus = TX;
_setVcoFrequency();
} }
void _enableRxStage() void _enableRxStage()
@ -144,8 +144,6 @@ void _enableRxStage()
gpio_clearPin(RF_APC_SW); gpio_clearPin(RF_APC_SW);
gpio_setPin(VCOVCC_SW); gpio_setPin(VCOVCC_SW);
pll_setFrequency(((float) rtxStatus.rxFrequency - IF_FREQ), 5);
/* Set tuning voltage for input filter */ /* Set tuning voltage for input filter */
uint8_t tuneVoltage = interpCalParameter(rtxStatus.rxFrequency, uint8_t tuneVoltage = interpCalParameter(rtxStatus.rxFrequency,
calData->rxFreq, calData->rxFreq,
@ -154,6 +152,8 @@ void _enableRxStage()
gpio_setPin(RX_STG_EN); gpio_setPin(RX_STG_EN);
rtxStatus.opStatus = RX; rtxStatus.opStatus = RX;
_setVcoFrequency();
} }
void _disableRtxStages() void _disableRtxStages()
@ -394,6 +394,7 @@ void rtx_taskFunc()
_updateC5000IQparams(); _updateC5000IQparams();
_setCTCSS(); _setCTCSS();
_updateSqlThresholds(); _updateSqlThresholds();
_setVcoFrequency();
/* TODO: temporarily force to RX mode if rtx is off. */ /* TODO: temporarily force to RX mode if rtx is off. */
if(rtxStatus.opStatus == OFF) _enableRxStage(); if(rtxStatus.opStatus == OFF) _enableRxStage();