mirror
/
OpenRTX
kopia lustrzana https://github.com/OpenRTX/OpenRTX
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fixed bug in OpMode_FM.cpp which prevented entering in RX mode, removed code for setting input gain in HR_C5000 driver, modified meson.build to make it compile the new sources

replace/7723d1e4e5c42c79a7b89729d37b2569b1242b53
Silvano Seva 2021-04-30 22:13:11 +02:00
rodzic 850e3580ed
commit f0dfd7036f
4 zmienionych plików z 21 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

27
meson.build
Wyświetl plik

@ -23,13 +23,15 @@ openrtx_src = ['openrtx/src/state.c',
'openrtx/src/input.c',
'openrtx/src/calibUtils.c',
'openrtx/src/queue.c',
'openrtx/src/rtx.c',
'openrtx/src/rtx/rtx.cpp',
'openrtx/src/rtx/OpMode_FM.cpp',
'openrtx/src/gps.c',
'openrtx/src/dsp.cpp',
'openrtx/src/memory_profiling.cpp']
openrtx_inc = ['openrtx/include',
'openrtx/include/calibration',
'openrtx/include/rtx',
'platform/drivers/ADC',
'platform/drivers/NVM',
'platform/drivers/GPS',
@ -91,6 +93,7 @@ mdx_src = ['platform/drivers/ADC/ADC1_MDx.c',
'platform/drivers/GPS/GPS_MDx.cpp',
'platform/drivers/NVM/W25Qx.c',
'platform/drivers/audio/audio_MDx.c',
'platform/drivers/baseband/HR_Cx000.cpp',
'platform/drivers/backlight/backlight_MDx.c',
'platform/drivers/tones/toneGenerator_MDx.cpp']
@ -105,10 +108,10 @@ gdx_src = ['platform/drivers/NVM/W25Qx.c',
'platform/drivers/ADC/ADC0_GDx.c',
'platform/drivers/backlight/backlight_GDx.c',
'platform/drivers/baseband/radio_GDx.c',
'platform/drivers/baseband/AT1846S_wrapper.cpp',
'platform/drivers/baseband/AT1846S_GDx.cpp',
'platform/drivers/baseband/HR_C6000.c',
'platform/drivers/baseband/interfaces_GDx.c',
# 'platform/drivers/baseband/AT1846S_wrapper.cpp',
# 'platform/drivers/baseband/AT1846S_GDx.cpp',
# 'platform/drivers/baseband/HR_C6000.c',
# 'platform/drivers/baseband/interfaces_GDx.c',
'platform/drivers/display/UC1701_GDx.c',
'platform/drivers/keyboard/keyboard_GDx.c',
'platform/drivers/audio/audio_GDx.c']
@ -216,8 +219,8 @@ endif
md3x0_src = src + mdx_src + stm32f405_src + ['platform/drivers/NVM/nvmem_MD3x0.c',
'platform/drivers/NVM/spiFlash_MD3x.c',
'platform/drivers/baseband/SKY72310.c',
'platform/drivers/baseband/radio_MD3x0.c',
'platform/drivers/baseband/HR_C5000.c',
'platform/drivers/baseband/radio_MD3x0.cpp',
'platform/drivers/baseband/HR_C5000_MDx.cpp',
'platform/drivers/keyboard/keyboard_MD3x.c',
'platform/drivers/display/HX8353_MD3x.cpp',
'platform/targets/MD-3x0/platform.c']
@ -234,11 +237,11 @@ mduv3x0_src = src + mdx_src + stm32f405_src + ['platform/drivers/NVM/nvmem_MDUV3
'platform/drivers/keyboard/keyboard_MD3x.c',
'platform/drivers/display/HX8353_MD3x.cpp',
'platform/drivers/chSelector/chSelector_UV3x0.c',
'platform/drivers/baseband/radio_UV3x0.c',
'platform/drivers/baseband/AT1846S_wrapper.cpp',
'platform/drivers/baseband/AT1846S_UV3x0.cpp',
'platform/drivers/baseband/HR_C6000_UV3x0.c',
'platform/drivers/baseband/interfaces_UV3x0.c']
'platform/drivers/baseband/radio_UV3x0.c']
# 'platform/drivers/baseband/AT1846S_wrapper.cpp',
# 'platform/drivers/baseband/AT1846S_UV3x0.cpp',
# 'platform/drivers/baseband/HR_C6000_UV3x0.c',
# 'platform/drivers/baseband/interfaces_UV3x0.c']
mduv3x0_inc = inc + stm32f405_inc + ['platform/targets/MD-UV3x0']
mduv3x0_def = def + stm32f405_def + {'PLATFORM_MDUV3x0': '', 'timegm': 'mktime'}

2
openrtx/src/rtx/OpMode_FM.cpp
Wyświetl plik

@ -117,7 +117,7 @@ void OpMode_FM::update(rtxStatus_t *const status, const bool newCfg)
}
#endif
}
else if((status->opMode == OFF) && enterRx)
else if((status->opStatus == OFF) && enterRx)
{
radio_disableRtx();

8
platform/drivers/baseband/HR_C5000_MDx.cpp
Wyświetl plik

@ -131,7 +131,7 @@ void HR_Cx000< M >::dmrMode()
writeReg(M::CONFIG, 0x1F, 0x10);
writeReg(M::CONFIG, 0x0D, 0x8C);
writeReg(M::CONFIG, 0x0E, 0x44);
writeReg(M::CONFIG, 0x0F, 0xC8);
// writeReg(M::CONFIG, 0x0F, 0xC8);
writeReg(M::CONFIG, 0x37, 0xC2);
writeReg(M::CONFIG, 0x25, 0x0E);
writeReg(M::CONFIG, 0x26, 0xFD);
@ -157,8 +157,8 @@ void HR_Cx000< M >::fmMode()
writeReg(M::CONFIG, 0x06, 0x00); // VoCoder control
sendSequence(initSeq2, sizeof(initSeq2));
writeReg(M::CONFIG, 0x0D, 0x8C); // Codec control
writeReg(M::CONFIG, 0x0E, 0x44); // Mute HPout and enable MIC 1
writeReg(M::CONFIG, 0x0F, 0xC8); // ADLinVol, mic volume
writeReg(M::CONFIG, 0x0E, 0x40); // Mute HPout
// writeReg(M::CONFIG, 0x0F, 0xC8); // ADLinVol, mic volume
// writeReg(M::CONFIG, 0x25, 0x0E);
// writeReg(M::CONFIG, 0x26, 0xFE);
writeReg(M::CONFIG, 0x83, 0xFF); // Clear all interrupt flags
@ -177,7 +177,7 @@ void HR_Cx000<M>::startAnalogTx(const TxAudioSource source, const FmConfig cfg)
writeReg(M::CONFIG, 0x0D, 0x8C); // Codec control
writeReg(M::CONFIG, 0x0E, audioCfg);
writeReg(M::CONFIG, 0x0F, 0xC8); // ADLinVol, mic volume
// writeReg(M::CONFIG, 0x0F, 0xC8); // ADLinVol, mic volume
// writeReg(M::CONFIG, 0x25, 0x0E);
// writeReg(M::CONFIG, 0x26, 0xFE);
writeReg(M::CONFIG, 0x34, static_cast< uint8_t >(cfg));

1
platform/drivers/baseband/radio_MD3x0.cpp
Wyświetl plik

@ -144,6 +144,7 @@ void radio_init(const rtxStatus_t *rtxState)
void radio_terminate()
{
SKY73210_terminate();
C5000.terminate();
gpio_clearPin(PLL_PWR); // PLL off
gpio_clearPin(DMR_SW); // Disconnect HR_C5000 input IF signal and audio out