From d22948a096c45be366d7f49d55f0e9dcad85c4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Izzo?= Date: Sun, 26 Dec 2021 17:04:01 +0100 Subject: [PATCH] Fix naming error Replaced FM with OPMODE_FM and DMR with OPMODE_DMR. --- openrtx/src/core/cps.c | 6 +++--- platform/drivers/NVM/nvmem_GDx.c | 8 ++++---- platform/drivers/NVM/nvmem_MD3x0.c | 4 ++-- platform/drivers/NVM/nvmem_MD9600.c | 4 ++-- platform/drivers/NVM/nvmem_MDUV3x0.c | 4 ++-- platform/drivers/baseband/radio_GDx.cpp | 6 +++--- platform/drivers/baseband/radio_MD3x0.cpp | 6 +++--- platform/drivers/baseband/radio_UV3x0.cpp | 11 +++++++---- tests/platform/MD380_FM_simpleRtx.c | 2 +- 9 files changed, 27 insertions(+), 24 deletions(-) diff --git a/openrtx/src/core/cps.c b/openrtx/src/core/cps.c index cd628436..d4b4aaeb 100644 --- a/openrtx/src/core/cps.c +++ b/openrtx/src/core/cps.c @@ -5,7 +5,7 @@ channel_t get_default_channel() { channel_t channel; - channel.mode = FM; + channel.mode = OPMODE_FM; channel.bandwidth = BW_25; channel.power = 1.0; @@ -24,7 +24,7 @@ channel_t get_default_channel() channel.fm.rxToneEn = 0; //disabled channel.fm.rxTone = 0; //and no ctcss/dcs selected - channel.fm.txToneEn = 0; - channel.fm.txTone = 0; + channel.fm.txToneEn = 0; + channel.fm.txTone = 0; return channel; } diff --git a/platform/drivers/NVM/nvmem_GDx.c b/platform/drivers/NVM/nvmem_GDx.c index 4a12de57..b9a64918 100644 --- a/platform/drivers/NVM/nvmem_GDx.c +++ b/platform/drivers/NVM/nvmem_GDx.c @@ -206,7 +206,7 @@ int nvm_readVFOChannelData(channel_t *channel) _addStringTerminator(channel->name, sizeof(chData.name)); /* Load mode-specific parameters */ - if(channel->mode == FM) + if(channel->mode == OPMODE_FM) { channel->fm.txToneEn = 0; channel->fm.rxToneEn = 0; @@ -242,7 +242,7 @@ int nvm_readVFOChannelData(channel_t *channel) // TODO: Implement warning screen if tone was not found } - else if(channel->mode == DMR) + else if(channel->mode == OPMODE_DMR) { channel->dmr.contactName_index = chData.contact_name_index; channel->dmr.dmr_timeslot = chData.repeater_slot; @@ -326,7 +326,7 @@ int nvm_readChannelData(channel_t *channel, uint16_t pos) _addStringTerminator(channel->name, sizeof(chData.name)); /* Load mode-specific parameters */ - if(channel->mode == FM) + if(channel->mode == OPMODE_FM) { channel->fm.txToneEn = 0; channel->fm.rxToneEn = 0; @@ -362,7 +362,7 @@ int nvm_readChannelData(channel_t *channel, uint16_t pos) // TODO: Implement warning screen if tone was not found } - else if(channel->mode == DMR) + else if(channel->mode == OPMODE_DMR) { channel->dmr.contactName_index = chData.contact_name_index; channel->dmr.dmr_timeslot = chData.repeater_slot; diff --git a/platform/drivers/NVM/nvmem_MD3x0.c b/platform/drivers/NVM/nvmem_MD3x0.c index 73add12f..a4458725 100644 --- a/platform/drivers/NVM/nvmem_MD3x0.c +++ b/platform/drivers/NVM/nvmem_MD3x0.c @@ -205,7 +205,7 @@ int nvm_readChannelData(channel_t *channel, uint16_t pos) } /* Load mode-specific parameters */ - if(channel->mode == FM) + if(channel->mode == OPMODE_FM) { channel->fm.txToneEn = 0; channel->fm.rxToneEn = 0; @@ -241,7 +241,7 @@ int nvm_readChannelData(channel_t *channel, uint16_t pos) // TODO: Implement warning screen if tone was not found } - else if(channel->mode == DMR) + else if(channel->mode == OPMODE_DMR) { channel->dmr.contactName_index = chData.contact_name_index; channel->dmr.dmr_timeslot = chData.repeater_slot; diff --git a/platform/drivers/NVM/nvmem_MD9600.c b/platform/drivers/NVM/nvmem_MD9600.c index aad12120..7e88599b 100644 --- a/platform/drivers/NVM/nvmem_MD9600.c +++ b/platform/drivers/NVM/nvmem_MD9600.c @@ -106,7 +106,7 @@ int _nvm_readChannelAtAddress(channel_t *channel, uint32_t addr) } /* Load mode-specific parameters */ - if(channel->mode == FM) + if(channel->mode == OPMODE_FM) { channel->fm.txToneEn = 0; channel->fm.rxToneEn = 0; @@ -142,7 +142,7 @@ int _nvm_readChannelAtAddress(channel_t *channel, uint32_t addr) // TODO: Implement warning screen if tone was not found } - else if(channel->mode == DMR) + else if(channel->mode == OPMODE_DMR) { channel->dmr.contactName_index = chData.contact_name_index; channel->dmr.dmr_timeslot = chData.repeater_slot; diff --git a/platform/drivers/NVM/nvmem_MDUV3x0.c b/platform/drivers/NVM/nvmem_MDUV3x0.c index 7f8e0a45..51806e39 100644 --- a/platform/drivers/NVM/nvmem_MDUV3x0.c +++ b/platform/drivers/NVM/nvmem_MDUV3x0.c @@ -106,7 +106,7 @@ int _nvm_readChannelAtAddress(channel_t *channel, uint32_t addr) } /* Load mode-specific parameters */ - if(channel->mode == FM) + if(channel->mode == OPMODE_FM) { channel->fm.txToneEn = 0; channel->fm.rxToneEn = 0; @@ -142,7 +142,7 @@ int _nvm_readChannelAtAddress(channel_t *channel, uint32_t addr) // TODO: Implement warning screen if tone was not found } - else if(channel->mode == DMR) + else if(channel->mode == OPMODE_DMR) { channel->dmr.contactName_index = chData.contact_name_index; channel->dmr.dmr_timeslot = chData.repeater_slot; diff --git a/platform/drivers/baseband/radio_GDx.cpp b/platform/drivers/baseband/radio_GDx.cpp index b02825f1..fb8c199b 100644 --- a/platform/drivers/baseband/radio_GDx.cpp +++ b/platform/drivers/baseband/radio_GDx.cpp @@ -108,13 +108,13 @@ void radio_setOpmode(const enum opmode mode) { switch(mode) { - case FM: + case OPMODE_FM: gpio_setPin(RX_AUDIO_MUX); // Audio out to amplifier gpio_clearPin(TX_AUDIO_MUX); // Audio in to microphone at1846s.setOpMode(AT1846S_OpMode::FM); break; - case DMR: + case OPMODE_DMR: gpio_clearPin(RX_AUDIO_MUX); // Audio out to HR_C6000 gpio_setPin(TX_AUDIO_MUX); // Audio in from HR_C6000 at1846s.setOpMode(AT1846S_OpMode::DMR); @@ -317,7 +317,7 @@ void radio_updateConfiguration() apcVoltage = static_cast< uint16_t >(apc) * 16; // Set bandwidth and TX deviation, force 12.5kHz for DMR mode - if((config->bandwidth == BW_12_5) || (config->opMode == DMR)) + if((config->bandwidth == BW_12_5) || (config->opMode == OPMODE_DMR)) { at1846s.setBandwidth(AT1846S_BW::_12P5); at1846s.setTxDeviation(calData->data[currTxBand].mixGainNarrowband); diff --git a/platform/drivers/baseband/radio_MD3x0.cpp b/platform/drivers/baseband/radio_MD3x0.cpp index c12cd83b..fd4b5dd3 100644 --- a/platform/drivers/baseband/radio_MD3x0.cpp +++ b/platform/drivers/baseband/radio_MD3x0.cpp @@ -251,7 +251,7 @@ void radio_enableRx() gpio_setPin(RX_STG_EN); // Enable RX LNA - if(config->opMode == FM) + if(config->opMode == OPMODE_FM) { gpio_setPin(FM_MUTE); // In FM mode, unmute audio path towards speaker } @@ -341,7 +341,7 @@ void radio_updateConfiguration() const uint8_t *Ical = calData->sendIrange; const uint8_t *Qcal = calData->sendQrange; - if(config->opMode == FM) + if(config->opMode == OPMODE_FM) { Ical = calData->analogSendIrange; Qcal = calData->analogSendQrange; @@ -354,7 +354,7 @@ void radio_updateConfiguration() // Set bandwidth, force 12.5kHz for DMR mode enum bandwidth bandwidth = static_cast< enum bandwidth >(config->bandwidth); - if(config->opMode == DMR) bandwidth = BW_12_5; + if(config->opMode == OPMODE_DMR) bandwidth = BW_12_5; _setBandwidth(bandwidth); // Set CTCSS tone diff --git a/platform/drivers/baseband/radio_UV3x0.cpp b/platform/drivers/baseband/radio_UV3x0.cpp index 4f2f8af7..22cd5c94 100644 --- a/platform/drivers/baseband/radio_UV3x0.cpp +++ b/platform/drivers/baseband/radio_UV3x0.cpp @@ -274,16 +274,19 @@ void radio_updateConfiguration() freq_t *txCalPoints = cal->vhfCal.txFreq; uint8_t *loPwrCal = cal->vhfCal.txLowPower; uint8_t *hiPwrCal = cal->vhfCal.txHighPower; - uint8_t *qRangeCal = (config->opMode == FM) ? cal->vhfCal.analogSendQrange - : cal->vhfCal.sendQrange; + uint8_t *qRangeCal = (config->opMode == OPMODE_FM) + ? cal->vhfCal.analogSendQrange + : cal->vhfCal.sendQrange; + if(currTxBand == BND_UHF) { calPoints = 9; txCalPoints = cal->uhfCal.txFreq; loPwrCal = cal->uhfCal.txLowPower; hiPwrCal = cal->uhfCal.txHighPower; - qRangeCal = (config->opMode == FM) ? cal->uhfCal.analogSendQrange - : cal->uhfCal.sendQrange; + qRangeCal = (config->opMode == OPMODE_FM) + ? cal->uhfCal.analogSendQrange + : cal->uhfCal.sendQrange; } // APC voltage for TX output power control diff --git a/tests/platform/MD380_FM_simpleRtx.c b/tests/platform/MD380_FM_simpleRtx.c index fa5c2650..799f232f 100644 --- a/tests/platform/MD380_FM_simpleRtx.c +++ b/tests/platform/MD380_FM_simpleRtx.c @@ -52,7 +52,7 @@ int main(void) /* Take mutex and update the RTX configuration */ OSMutexPend(&mutex, 0, OS_OPT_PEND_BLOCKING, NULL, &err); - cfg.opMode = FM; + cfg.opMode = OPMODE_FM; cfg.bandwidth = BW_25; cfg.rxFrequency = rptFreq; cfg.txFrequency = rptFreq + rptShift;