scrape/ubitx-v5d-xcvr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Been experimenting with ways to clean up audio when USB is connected.

Browse Source 
Believe it is likely a ground loop issue however.
This commit is contained in:
Rob French 2020-05-10 13:24:34 -05:00
parent 57c97d9f98
commit a039740466
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ubitx_iop/audio.ino
View File

@ -78,6 +78,7 @@ void audioInit()
audioSelectRxInput(RX_RIG_IN); audioSelectRxInput(RX_RIG_IN);
audioSelectTxInput(TX_MIC_IN); // superfluous I think audioSelectTxInput(TX_MIC_IN); // superfluous I think
//audioCtrl.adcHighPassFilterDisable();
audioCtrl.audioPreProcessorEnable(); audioCtrl.audioPreProcessorEnable();
} }
@ -202,11 +203,15 @@ void audioSelectRxInput(RxInput input)
case RX_RIG_IN: case RX_RIG_IN:
muteRxUSBIn(); muteRxUSBIn();
restoreRxRigIn(); restoreRxRigIn();
mixRX.gain(2, 0);
mixRX.gain(3, 0);
break; break;
case RX_USB_IN: case RX_USB_IN:
muteRxRigIn(); muteRxRigIn();
restoreRxUSBIn(); restoreRxUSBIn();
mixRX.gain(2, 0);
mixRX.gain(3, 0);
break; break;
} }
} }
@ -219,6 +224,8 @@ void audioSelectTxInput(TxInput input)
//muteTxMicIn(); // redundant w/ Line-In //muteTxMicIn(); // redundant w/ Line-In
muteTxLineIn(); muteTxLineIn();
muteTxUSBIn(); muteTxUSBIn();
mixTX.gain(2, 0);
mixTX.gain(3, 0);
/* switch(input) { /* switch(input) {
case TX_MIC_IN: case TX_MIC_IN:
muteTxUSBIn(); muteTxUSBIn();
@ -579,8 +586,8 @@ int hpFilter[5];
void audioSSBFilter() void audioSSBFilter()
{ {
// calcBiquad(FilterType,FrequencyC,dBgain,Q,QuantizationUnit,SampleRate,int*); // calcBiquad(FilterType,FrequencyC,dBgain,Q,QuantizationUnit,SampleRate,int*);
calcBiquad(FILTER_LOPASS, 3100, 0, 0.707, 524288, 44100, lpFilter); calcBiquad(FILTER_LOPASS, 3300, 0, 0.707, 524288, 44100, lpFilter);
calcBiquad(FILTER_HIPASS, 300, 0, 0.707, 524288, 44100, hpFilter); calcBiquad(FILTER_HIPASS, 100, 0, 0.707, 524288, 44100, hpFilter);
audioCtrl.eqFilter(0, lpFilter); audioCtrl.eqFilter(0, lpFilter);
audioCtrl.eqFilter(1, hpFilter); audioCtrl.eqFilter(1, hpFilter);
audioCtrl.eqFilter(2, lpFilter); audioCtrl.eqFilter(2, lpFilter);
@ -592,8 +599,8 @@ void audioSSBFilter()
void audioCWFilter() void audioCWFilter()
{ {
// calcBiquad(FilterType,FrequencyC,dBgain,Q,QuantizationUnit,SampleRate,int*); // calcBiquad(FilterType,FrequencyC,dBgain,Q,QuantizationUnit,SampleRate,int*);
calcBiquad(FILTER_LOPASS, 700, 0, 0.707, 524288, 44100, lpFilter); calcBiquad(FILTER_LOPASS, 1300, 0, 0.707, 524288, 44100, lpFilter);
calcBiquad(FILTER_HIPASS, 300, 0, 0.707, 524288, 44100, hpFilter); calcBiquad(FILTER_HIPASS, 100, 0, 0.707, 524288, 44100, hpFilter);
audioCtrl.eqFilter(0, lpFilter); audioCtrl.eqFilter(0, lpFilter);
audioCtrl.eqFilter(1, hpFilter); audioCtrl.eqFilter(1, hpFilter);
audioCtrl.eqFilter(2, lpFilter); audioCtrl.eqFilter(2, lpFilter);
@ -602,11 +609,19 @@ void audioCWFilter()
audioCtrl.eqFilter(5, hpFilter); audioCtrl.eqFilter(5, hpFilter);
} }
//======================================================================
// audioDigiFilter()
// Create a very wide filter for digital modes... wider than the uBITX
// needs, but just want to make sure we leave the full audio bandwidth
// open for digimodes, while ensuring we've cut down any extraneous
// noise outside the normal band.
//======================================================================
void audioDigiFilter() void audioDigiFilter()
{ {
// calcBiquad(FilterType,FrequencyC,dBgain,Q,QuantizationUnit,SampleRate,int*); // calcBiquad(FilterType,FrequencyC,dBgain,Q,QuantizationUnit,SampleRate,int*);
calcBiquad(FILTER_LOPASS, 3100, 0, 0.707, 524288, 44100, lpFilter); calcBiquad(FILTER_LOPASS, 5000, 0, 0.707, 524288, 44100, lpFilter);
calcBiquad(FILTER_HIPASS, 300, 0, 0.707, 524288, 44100, hpFilter); calcBiquad(FILTER_HIPASS, 100, 0, 0.707, 524288, 44100, hpFilter);
audioCtrl.eqFilter(0, lpFilter); audioCtrl.eqFilter(0, lpFilter);
audioCtrl.eqFilter(1, hpFilter); audioCtrl.eqFilter(1, hpFilter);
audioCtrl.eqFilter(2, lpFilter); audioCtrl.eqFilter(2, lpFilter);