Enabled M17 support also in MD-UV3x0 radio driver

replace/e524f82d9c8ce8ed43e98d7e00bcb864da9d36e3
Silvano Seva 2021-09-21 12:02:32 +02:00
rodzic 431ba17b26
commit 5113a39f2a
3 zmienionych plików z 10 dodań i 4 usunięć

Wyświetl plik

@ -205,7 +205,7 @@ void HR_Cx000< M >::startAnalogTx(const TxAudioSource source, const FmConfig cfg
if(source == TxAudioSource::LINE_IN) audioCfg |= 0x02; if(source == TxAudioSource::LINE_IN) audioCfg |= 0x02;
writeReg(M::CONFIG, 0xE2, 0x00); // Mic preamp disabled, anti-pop disabled writeReg(M::CONFIG, 0xE2, 0x00); // Mic preamp disabled, anti-pop disabled
writeReg(M::CONFIG, 0xE4, 0x23); // Lineout gain, first and second stage mic gain // writeReg(M::CONFIG, 0xE4, 0x23); // Lineout gain, first and second stage mic gain
writeReg(M::CONFIG, 0xC2, 0x00); // Codec AGC gain writeReg(M::CONFIG, 0xC2, 0x00); // Codec AGC gain
writeReg(M::CONFIG, 0xA1, 0x80); // FM_mod, all modes cleared writeReg(M::CONFIG, 0xA1, 0x80); // FM_mod, all modes cleared
writeReg(M::CONFIG, 0x83, 0xFF); // Clear all interrupt flags writeReg(M::CONFIG, 0x83, 0xFF); // Clear all interrupt flags

Wyświetl plik

@ -113,8 +113,9 @@ void radio_setOpmode(const enum opmode mode)
switch(mode) switch(mode)
{ {
case FM: case FM:
at1846s.setOpMode(AT1846S_OpMode::FM); at1846s.setOpMode(AT1846S_OpMode::FM); // AT1846S in FM mode
C6000.fmMode(); C6000.fmMode(); // HR_C6000 in FM mode
C6000.setInputGain(-3); // Input gain in dB, as per TYT firmware
break; break;
case DMR: case DMR:
@ -123,7 +124,9 @@ void radio_setOpmode(const enum opmode mode)
break; break;
case M17: case M17:
// TODO at1846s.setOpMode(AT1846S_OpMode::DMR); // AT1846S in DMR mode, disables RX filter
C6000.fmMode(); // HR_C6000 in FM mode
C6000.setInputGain(+3); // Input gain in dB, found experimentally
break; break;
default: default:

Wyświetl plik

@ -24,6 +24,7 @@
#include <ADC1_MDx.h> #include <ADC1_MDx.h>
#include <calibInfo_MDx.h> #include <calibInfo_MDx.h>
#include <interfaces/nvmem.h> #include <interfaces/nvmem.h>
#include <toneGenerator_MDx.h>
#include <interfaces/rtc.h> #include <interfaces/rtc.h>
#include <interfaces/audio.h> #include <interfaces/audio.h>
#include <chSelector.h> #include <chSelector.h>
@ -56,6 +57,7 @@ void platform_init()
nvm_init(); /* Initialise non volatile memory manager */ nvm_init(); /* Initialise non volatile memory manager */
nvm_readCalibData(&calibration); /* Load calibration data */ nvm_readCalibData(&calibration); /* Load calibration data */
nvm_loadHwInfo(&hwInfo); /* Load hardware information data */ nvm_loadHwInfo(&hwInfo); /* Load hardware information data */
toneGen_init(); /* Initialise tone generator */
rtc_init(); /* Initialise RTC */ rtc_init(); /* Initialise RTC */
chSelector_init(); /* Initialise channel selector handler */ chSelector_init(); /* Initialise channel selector handler */
audio_init(); /* Initialise audio management module */ audio_init(); /* Initialise audio management module */
@ -85,6 +87,7 @@ void platform_terminate()
adc1_terminate(); adc1_terminate();
nvm_terminate(); nvm_terminate();
rtc_terminate(); rtc_terminate();
toneGen_terminate();
chSelector_terminate(); chSelector_terminate();
audio_terminate(); audio_terminate();