scrape/ubitx-v5x
1
0
Fork 0
Code Issues 10 Pull Requests Projects Releases Wiki Activity

Miscellaneous fixes on the integration branch. Next up on hardware: swap the FWD and REV PWR lines (or switch them in software, duh...). Then in software--verify that S-Meter, FWD/REV PWR, and VSWR signals are working correctly.

Browse Source
This commit is contained in:
Rob French
2021-01-31 22:46:43 -06:00
parent 4e818b6a89
commit ba744f5b7a
8 changed files with 144 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
TeensyDSP/DSP.cpp
View File

@@ -22,30 +22,28 @@ UBitxDSP DSP;
//static struct {
// GUItool: begin automatically generated code
AudioInputI2S lineIn; //xy=137,220
AudioInputUSB usbIn; //xy=142,326
AudioMixer4 rxAudio; //xy=394,134
AudioMixer4 txAudio; //xy=398,322
AudioOutputAnalog spkrOut; //xy=774,104
AudioOutputUSB usbOut; //xy=774,138
AudioOutputI2S lineOut; //xy=776,236
AudioConnection patchCord1(lineIn, 0, rxAudio, 0);
AudioConnection patchCord2(lineIn, 1, txAudio, 0);
AudioConnection patchCord3(usbIn, 0, txAudio, 1);
AudioConnection patchCord4(usbIn, 1, txAudio, 2);
AudioConnection patchCord5(rxAudio, spkrOut);
AudioConnection patchCord6(rxAudio, 0, lineOut, 0);
AudioConnection patchCord7(rxAudio, 0, usbOut, 0);
AudioConnection patchCord8(rxAudio, 0, usbOut, 1);
AudioConnection patchCord9(txAudio, 0, lineOut, 1);
AudioControlSGTL5000 audioCtrl; //xy=403,463
// GUItool: end automatically generated code
// GUItool: begin automatically generated code
AudioInputI2S lineIn; //xy=385.9371643066406,1001.9600830078125
AudioInputUSB usbIn; //xy=390.9371643066406,1107.9600830078125
AudioMixer4 rxAudio; //xy=642.9371643066406,915.9600830078125
AudioMixer4 txAudio; //xy=646.9371643066406,1103.9600830078125
AudioOutputUSB usbOut; //xy=1022.9371643066406,919.9600830078125
AudioOutputI2S lineOut; //xy=1024.9371643066406,1017.9600830078125
AudioConnection patchCord1(lineIn, 0, rxAudio, 0);
AudioConnection patchCord2(lineIn, 1, txAudio, 0);
AudioConnection patchCord3(usbIn, 0, txAudio, 1);
AudioConnection patchCord4(usbIn, 1, txAudio, 2);
AudioConnection patchCord5(rxAudio, 0, lineOut, 0);
AudioConnection patchCord6(rxAudio, 0, usbOut, 0);
AudioConnection patchCord7(rxAudio, 0, usbOut, 1);
AudioConnection patchCord8(txAudio, 0, lineOut, 1);
AudioControlSGTL5000 audioCtrl; //xy=651.9371643066406,1244.9600830078125
// GUItool: end automatically generated code
//} audio;
void UBitxDSP::begin() {
AudioMemory(20);
AudioMemory(16);
audioCtrl.enable();
audioCtrl.volume(0.0); // headphone volume...
audioCtrl.muteHeadphone(); // ...not used by UBitxDSP
@@ -66,8 +64,8 @@ void UBitxDSP::begin() {
// Rig (Line) Input (RX)
audioCtrl.inputSelect(AUDIO_INPUT_LINEIN);
audioCtrl.unmuteLineout();
audioCtrl.lineInLevel(5, 5); // RX, TX
audioCtrl.lineOutLevel(29, 29); //RX, TX
audioCtrl.lineInLevel(9, 5); // RX, TX
audioCtrl.lineOutLevel(29, 31); //RX, TX
// Mic Input (TX)
audioCtrl.micGain(0); // TODO: set value
@@ -78,9 +76,6 @@ void UBitxDSP::begin() {
// SETUP THE AUDIO OUTPUTS
// Speaker Output (RX)
spkrOut.analogReference(INTERNAL);
// Line Output (RX)
// USB Output (RX)
@@ -96,6 +91,7 @@ void UBitxDSP::end() {
void UBitxDSP::rx() {
// mute all tx audio
audioCtrl.micGain(0);
for (int i = 0; i < 4; i++) {
txAudio.gain(i, 0.0);
}
@@ -110,9 +106,10 @@ void UBitxDSP::txMicIn() {
rxAudio.gain(RX_AUDIO_CH, 0.0);
// restore the tx mic audio
audioCtrl.inputSelect(AUDIO_INPUT_MIC);
audioCtrl.micGain(12);
for (int i = 0; i < 4; i++) {
if (i == TX_MIC_IN_CH)
txAudio.gain(i, 1.0);
txAudio.gain(i, 0.1);
else
txAudio.gain(i, 0.0);
}
@@ -125,7 +122,7 @@ void UBitxDSP::txLineIn() {
audioCtrl.inputSelect(AUDIO_INPUT_LINEIN);
for (int i = 0; i < 4; i++) {
if (i == TX_LINE_IN_CH)
txAudio.gain(i, 1.0);
txAudio.gain(i, 0.1);
else
txAudio.gain(i, 0.0);
}
@@ -138,7 +135,7 @@ void UBitxDSP::txUSBIn() {
audioCtrl.inputSelect(AUDIO_INPUT_LINEIN);
for (int i = 0; i < 4; i++) {
if (i == TX_USB_IN_CH1 || i == TX_USB_IN_CH2)
txAudio.gain(i, 1.0);
txAudio.gain(i, 0.1);
else
txAudio.gain(i, 0.0);
}