diff --git a/Documentation/PSDR Assembly Instructions.pdf b/Documentation/PSDR Assembly Instructions.pdf
new file mode 100644
index 0000000..1c474f0
Binary files /dev/null and b/Documentation/PSDR Assembly Instructions.pdf differ
diff --git a/Hardware/Enclosure/2.5mm_Allen_Wrench.SLDPRT b/Hardware/Enclosure/2.5mm_Allen_Wrench.SLDPRT
new file mode 100644
index 0000000..42aa070
Binary files /dev/null and b/Hardware/Enclosure/2.5mm_Allen_Wrench.SLDPRT differ
diff --git a/Hardware/Enclosure/2mm_Allen_Wrench.SLDPRT b/Hardware/Enclosure/2mm_Allen_Wrench.SLDPRT
new file mode 100644
index 0000000..0054b5e
Binary files /dev/null and b/Hardware/Enclosure/2mm_Allen_Wrench.SLDPRT differ
diff --git a/Hardware/Enclosure/7x3x3 Bearing.SLDPRT b/Hardware/Enclosure/Archive/7x3x3 Bearing.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/7x3x3 Bearing.SLDPRT
rename to Hardware/Enclosure/Archive/7x3x3 Bearing.SLDPRT
diff --git a/Hardware/Enclosure/92029A208.SLDPRT b/Hardware/Enclosure/Archive/92029A208.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/92029A208.SLDPRT
rename to Hardware/Enclosure/Archive/92029A208.SLDPRT
diff --git a/Hardware/Enclosure/92095A183.SLDPRT b/Hardware/Enclosure/Archive/92095A183.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/92095A183.SLDPRT
rename to Hardware/Enclosure/Archive/92095A183.SLDPRT
diff --git a/Hardware/Enclosure/93395A198.SLDPRT b/Hardware/Enclosure/Archive/93395A198.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/93395A198.SLDPRT
rename to Hardware/Enclosure/Archive/93395A198.SLDPRT
diff --git a/Hardware/Enclosure/93395A210.SLDPRT b/Hardware/Enclosure/Archive/93395A210.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/93395A210.SLDPRT
rename to Hardware/Enclosure/Archive/93395A210.SLDPRT
diff --git a/Hardware/Enclosure/93657A708.SLDPRT b/Hardware/Enclosure/Archive/93657A708.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/93657A708.SLDPRT
rename to Hardware/Enclosure/Archive/93657A708.SLDPRT
diff --git a/Hardware/Enclosure/94500A222.SLDPRT b/Hardware/Enclosure/Archive/94500A222.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/94500A222.SLDPRT
rename to Hardware/Enclosure/Archive/94500A222.SLDPRT
diff --git a/Hardware/Enclosure/95610A530.SLDPRT b/Hardware/Enclosure/Archive/95610A530.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/95610A530.SLDPRT
rename to Hardware/Enclosure/Archive/95610A530.SLDPRT
diff --git a/Hardware/Enclosure/Balun.SLDPRT b/Hardware/Enclosure/Archive/Balun.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/Balun.SLDPRT
rename to Hardware/Enclosure/Archive/Balun.SLDPRT
diff --git a/Hardware/Enclosure/Battery.SLDPRT b/Hardware/Enclosure/Archive/Battery.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/Battery.SLDPRT
rename to Hardware/Enclosure/Archive/Battery.SLDPRT
diff --git a/Hardware/Enclosure/Bottom_Cover.SLDPRT b/Hardware/Enclosure/Archive/Bottom_Cover.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/Bottom_Cover.SLDPRT
rename to Hardware/Enclosure/Archive/Bottom_Cover.SLDPRT
diff --git a/Hardware/Enclosure/Bottom_Enclosure.SLDPRT b/Hardware/Enclosure/Archive/Bottom_Enclosure.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/Bottom_Enclosure.SLDPRT
rename to Hardware/Enclosure/Archive/Bottom_Enclosure.SLDPRT
diff --git a/Hardware/Enclosure/EncoderBoard-offset.DXF b/Hardware/Enclosure/Archive/EncoderBoard-offset.DXF
similarity index 100%
rename from Hardware/Enclosure/EncoderBoard-offset.DXF
rename to Hardware/Enclosure/Archive/EncoderBoard-offset.DXF
diff --git a/Hardware/Enclosure/EncoderBoard.DXF b/Hardware/Enclosure/Archive/EncoderBoard.DXF
similarity index 100%
rename from Hardware/Enclosure/EncoderBoard.DXF
rename to Hardware/Enclosure/Archive/EncoderBoard.DXF
diff --git a/Hardware/Enclosure/Face Cover.SLDPRT b/Hardware/Enclosure/Archive/Face Cover.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/Face Cover.SLDPRT
rename to Hardware/Enclosure/Archive/Face Cover.SLDPRT
diff --git a/Hardware/Enclosure/Face Cover3.SLDPRT b/Hardware/Enclosure/Archive/Face Cover3.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/Face Cover3.SLDPRT
rename to Hardware/Enclosure/Archive/Face Cover3.SLDPRT
diff --git a/Hardware/Enclosure/GPS_Antenna_18x18x4.SLDPRT b/Hardware/Enclosure/Archive/GPS_Antenna_18x18x4.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/GPS_Antenna_18x18x4.SLDPRT
rename to Hardware/Enclosure/Archive/GPS_Antenna_18x18x4.SLDPRT
diff --git a/Hardware/Enclosure/knob.SLDPRT b/Hardware/Enclosure/Archive/Knob.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/knob.SLDPRT
rename to Hardware/Enclosure/Archive/Knob.SLDPRT
diff --git a/Hardware/Enclosure/Knob2.SLDPRT b/Hardware/Enclosure/Archive/Knob2.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/Knob2.SLDPRT
rename to Hardware/Enclosure/Archive/Knob2.SLDPRT
diff --git a/Hardware/Enclosure/Knurled_Knob.SLDPRT b/Hardware/Enclosure/Archive/Knurled_Knob.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/Knurled_Knob.SLDPRT
rename to Hardware/Enclosure/Archive/Knurled_Knob.SLDPRT
diff --git a/Hardware/Enclosure/LCD_Standoff.SLDPRT b/Hardware/Enclosure/Archive/LCD_Standoff.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/LCD_Standoff.SLDPRT
rename to Hardware/Enclosure/Archive/LCD_Standoff.SLDPRT
diff --git a/Hardware/Enclosure/LeeSpring-LTL015B08S.SLDPRT b/Hardware/Enclosure/Archive/LeeSpring-LTL015B08S.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/LeeSpring-LTL015B08S.SLDPRT
rename to Hardware/Enclosure/Archive/LeeSpring-LTL015B08S.SLDPRT
diff --git a/Hardware/Enclosure/LeeSpring-LTR028E01S.SLDPRT b/Hardware/Enclosure/Archive/LeeSpring-LTR028E01S.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/LeeSpring-LTR028E01S.SLDPRT
rename to Hardware/Enclosure/Archive/LeeSpring-LTR028E01S.SLDPRT
diff --git a/Hardware/Enclosure/Main_Enclosure.SLDPRT b/Hardware/Enclosure/Archive/Main_Enclosure.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/Main_Enclosure.SLDPRT
rename to Hardware/Enclosure/Archive/Main_Enclosure.SLDPRT
diff --git a/Hardware/Enclosure/MicroUSBMale.SLDPRT b/Hardware/Enclosure/Archive/MicroUSBMale.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/MicroUSBMale.SLDPRT
rename to Hardware/Enclosure/Archive/MicroUSBMale.SLDPRT
diff --git a/Hardware/Enclosure/Other Spring Thing.SLDPRT b/Hardware/Enclosure/Archive/Other Spring Thing.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/Other Spring Thing.SLDPRT
rename to Hardware/Enclosure/Archive/Other Spring Thing.SLDPRT
diff --git a/Hardware/Enclosure/PSDR2.SLDDRW b/Hardware/Enclosure/Archive/PSDR2.SLDDRW
similarity index 100%
rename from Hardware/Enclosure/PSDR2.SLDDRW
rename to Hardware/Enclosure/Archive/PSDR2.SLDDRW
diff --git a/Hardware/Enclosure/PSDR2_MainBoard-Backside Housing Keepouts.DXF b/Hardware/Enclosure/Archive/PSDR2_MainBoard-Backside Housing Keepouts.DXF
similarity index 100%
rename from Hardware/Enclosure/PSDR2_MainBoard-Backside Housing Keepouts.DXF
rename to Hardware/Enclosure/Archive/PSDR2_MainBoard-Backside Housing Keepouts.DXF
diff --git a/Hardware/Enclosure/PSDR2_MainBoard.DXF b/Hardware/Enclosure/Archive/PSDR2_MainBoard.DXF
similarity index 100%
rename from Hardware/Enclosure/PSDR2_MainBoard.DXF
rename to Hardware/Enclosure/Archive/PSDR2_MainBoard.DXF
diff --git a/Hardware/Enclosure/PSDR2_MainBoard.SLDPRT b/Hardware/Enclosure/Archive/PSDR2_MainBoard.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/PSDR2_MainBoard.SLDPRT
rename to Hardware/Enclosure/Archive/PSDR2_MainBoard.SLDPRT
diff --git a/Hardware/Enclosure/PSDR2_Parts List.SLDDRW b/Hardware/Enclosure/Archive/PSDR2_Parts List.SLDDRW
similarity index 100%
rename from Hardware/Enclosure/PSDR2_Parts List.SLDDRW
rename to Hardware/Enclosure/Archive/PSDR2_Parts List.SLDDRW
diff --git a/Hardware/Enclosure/Slotted_Knob1.SLDPRT b/Hardware/Enclosure/Archive/Slotted_Knob1.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/Slotted_Knob1.SLDPRT
rename to Hardware/Enclosure/Archive/Slotted_Knob1.SLDPRT
diff --git a/Hardware/Enclosure/Spring Thing.SLDPRT b/Hardware/Enclosure/Archive/Spring Thing.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/Spring Thing.SLDPRT
rename to Hardware/Enclosure/Archive/Spring Thing.SLDPRT
diff --git a/Hardware/Enclosure/TopHalf2.sldprt b/Hardware/Enclosure/Archive/TopHalf2.sldprt
similarity index 100%
rename from Hardware/Enclosure/TopHalf2.sldprt
rename to Hardware/Enclosure/Archive/TopHalf2.sldprt
diff --git a/Hardware/Enclosure/Top_Cover.SLDPRT b/Hardware/Enclosure/Archive/Top_Cover.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/Top_Cover.SLDPRT
rename to Hardware/Enclosure/Archive/Top_Cover.SLDPRT
diff --git a/Hardware/Enclosure/paddle_Middored.SLDPRT b/Hardware/Enclosure/Archive/paddle_Middored.SLDPRT
similarity index 100%
rename from Hardware/Enclosure/paddle_Middored.SLDPRT
rename to Hardware/Enclosure/Archive/paddle_Middored.SLDPRT
diff --git a/Hardware/Enclosure/Battery Wires.sldprt b/Hardware/Enclosure/Battery Wires.sldprt
new file mode 100644
index 0000000..dcd08f4
Binary files /dev/null and b/Hardware/Enclosure/Battery Wires.sldprt differ
diff --git a/Hardware/Enclosure/Bearing_Inside.SLDPRT b/Hardware/Enclosure/Bearing_Inside.SLDPRT
new file mode 100644
index 0000000..e3a6c02
Binary files /dev/null and b/Hardware/Enclosure/Bearing_Inside.SLDPRT differ
diff --git a/Hardware/Enclosure/Bearing_Outside.SLDPRT b/Hardware/Enclosure/Bearing_Outside.SLDPRT
new file mode 100644
index 0000000..34902d2
Binary files /dev/null and b/Hardware/Enclosure/Bearing_Outside.SLDPRT differ
diff --git a/Hardware/Enclosure/BottomHalf2.sldprt b/Hardware/Enclosure/BottomHalf2.sldprt
index a179eac..c366550 100644
Binary files a/Hardware/Enclosure/BottomHalf2.sldprt and b/Hardware/Enclosure/BottomHalf2.sldprt differ
diff --git a/Hardware/Enclosure/EncoderBoard.SLDPRT b/Hardware/Enclosure/EncoderBoard.SLDPRT
index cc65e30..a87205c 100644
Binary files a/Hardware/Enclosure/EncoderBoard.SLDPRT and b/Hardware/Enclosure/EncoderBoard.SLDPRT differ
diff --git a/Hardware/Enclosure/Face Cover4.SLDPRT b/Hardware/Enclosure/Face Cover4.SLDPRT
index c3d433b..01357c3 100644
Binary files a/Hardware/Enclosure/Face Cover4.SLDPRT and b/Hardware/Enclosure/Face Cover4.SLDPRT differ
diff --git a/Hardware/Enclosure/Foam_Square.SLDPRT b/Hardware/Enclosure/Foam_Square.SLDPRT
new file mode 100644
index 0000000..72c4261
Binary files /dev/null and b/Hardware/Enclosure/Foam_Square.SLDPRT differ
diff --git a/Hardware/Enclosure/LeeSpring-LTML060L08S.SLDPRT b/Hardware/Enclosure/LeeSpring-LTML060L08S.SLDPRT
new file mode 100644
index 0000000..3b3f1d3
Binary files /dev/null and b/Hardware/Enclosure/LeeSpring-LTML060L08S.SLDPRT differ
diff --git a/Hardware/Enclosure/LeeSpring-LTMR060L08S.SLDPRT b/Hardware/Enclosure/LeeSpring-LTMR060L08S.SLDPRT
new file mode 100644
index 0000000..5b70ec8
Binary files /dev/null and b/Hardware/Enclosure/LeeSpring-LTMR060L08S.SLDPRT differ
diff --git a/Hardware/Enclosure/PSDR Parts.SLDASM b/Hardware/Enclosure/PSDR Parts.SLDASM
new file mode 100644
index 0000000..cda80f1
Binary files /dev/null and b/Hardware/Enclosure/PSDR Parts.SLDASM differ
diff --git a/Hardware/Enclosure/PSDR Parts.SLDDRW b/Hardware/Enclosure/PSDR Parts.SLDDRW
new file mode 100644
index 0000000..6f75a5b
Binary files /dev/null and b/Hardware/Enclosure/PSDR Parts.SLDDRW differ
diff --git a/Hardware/Enclosure/PSDR2.SLDASM b/Hardware/Enclosure/PSDR2.SLDASM
index 907e655..595a41c 100644
Binary files a/Hardware/Enclosure/PSDR2.SLDASM and b/Hardware/Enclosure/PSDR2.SLDASM differ
diff --git a/Hardware/Enclosure/PSDR26PCB.SLDPRT b/Hardware/Enclosure/PSDR26PCB.SLDPRT
index 92a5a26..7f59260 100644
Binary files a/Hardware/Enclosure/PSDR26PCB.SLDPRT and b/Hardware/Enclosure/PSDR26PCB.SLDPRT differ
diff --git a/Hardware/Enclosure/ST-Link.SLDPRT b/Hardware/Enclosure/ST-Link.SLDPRT
new file mode 100644
index 0000000..336c241
Binary files /dev/null and b/Hardware/Enclosure/ST-Link.SLDPRT differ
diff --git a/Source/.settings/language.settings.xml b/Source/.settings/language.settings.xml
index 8db20fd..b8bc7a0 100644
--- a/Source/.settings/language.settings.xml
+++ b/Source/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/Source/include/hal.h b/Source/include/hal.h
index 3116602..ab8c820 100644
--- a/Source/include/hal.h
+++ b/Source/include/hal.h
@@ -165,6 +165,8 @@ extern const Gpio_Pin RED_LED;
extern const Gpio_Pin CHARGE_POWER_SOURCE;
+extern const Gpio_Pin FIVE_VOLT_REGULATOR_ENABLE;
+
// extern const Gpio_Pin NC_1;
// extern const Gpio_Pin DAC_SWITCHES;
// extern const Gpio_Pin GSM_PWRKEY;
diff --git a/Source/src/main.c b/Source/src/main.c
index 4a6091d..773feb8 100644
--- a/Source/src/main.c
+++ b/Source/src/main.c
@@ -791,6 +791,139 @@ void configUartPeripheral()
// }
}
+enum signalPaths
+{
+ recieve_no_filter = 0,
+ recieve_with_filter = 1,
+ transmit_no_amp_no_filter = 2,
+ transmit_with_amp_no_filter = 3,
+ tramsmit_with_amp_with_filter = 4,
+ vna_reflected = 5,
+ vna_through = 6
+};
+
+//Set up the signal path for various scenarios.
+void signalPath(int signalPath)
+{
+ //Remember the relays operate in pairs (there is a pin that needs to be off and one that needs to be on.)
+ switch(signalPath)
+ {
+ case recieve_no_filter:
+ //Amp power off
+ HAL_GPIO_WritePin (AMP_POWER.port, AMP_POWER.pin, 1); //1 is off.
+
+ //Filter power off
+
+ //So 5V power can be off
+ HAL_GPIO_WritePin (FIVE_VOLT_REGULATOR_ENABLE.port, FIVE_VOLT_REGULATOR_ENABLE.pin, 0);
+
+ //Amp relay set to bypass
+ HAL_GPIO_WritePin (AMP_SWITCH_A.port, AMP_SWITCH_A.pin, 0); // 0 to bypass (I think!)
+ HAL_GPIO_WritePin (AMP_SWITCH_B.port, AMP_SWITCH_B.pin, 1); //always reverse of above.
+
+ //Impedance bridge relay set to bypass
+ HAL_GPIO_WritePin (IMP_BRIDGE_SWITCH_A.port, IMP_BRIDGE_SWITCH_A.pin, 0); //0 to bypass
+ HAL_GPIO_WritePin (IMP_BRIDGE_SWITCH_B.port, IMP_BRIDGE_SWITCH_B.pin, 1); //always reverse of above.
+
+ //VNA port relay (called TX_RF_Switch) set to bypass
+ HAL_GPIO_WritePin (TX_RF_SWITCH_A.port, TX_RF_SWITCH_A.pin, 1); //0 to route to VNA Out SMA connector
+ HAL_GPIO_WritePin (TX_RF_SWITCH_B.port, TX_RF_SWITCH_B.pin, 0); //always reverse of above.
+
+ //DAC Mux set to Speaker
+ HAL_GPIO_WritePin (DAC_MUX.port, DAC_MUX.pin, 0); //0 = speaker/earphone.
+
+ //Both TX/RX Muxes set to RX
+ HAL_GPIO_WritePin (TRX_SWITCH.port, TRX_SWITCH.pin, 0);
+
+ //Filter Muxes set to bypass
+ HAL_GPIO_WritePin (FILTER_S0.port, FILTER_S0.pin, 1);
+ HAL_GPIO_WritePin (FILTER_S1.port, FILTER_S1.pin, 0);
+
+ break;
+ case recieve_with_filter:
+
+ break;
+ case transmit_no_amp_no_filter:
+ //Amp power off
+ HAL_GPIO_WritePin (AMP_POWER.port, AMP_POWER.pin, 1); //1 is off.
+
+ //Filter power off
+
+ //So 5V power can be off
+ HAL_GPIO_WritePin (FIVE_VOLT_REGULATOR_ENABLE.port, FIVE_VOLT_REGULATOR_ENABLE.pin, 0);
+
+ //Amp relay set to bypass
+ HAL_GPIO_WritePin (AMP_SWITCH_A.port, AMP_SWITCH_A.pin, 0); // 0 to bypass (I think!)
+ HAL_GPIO_WritePin (AMP_SWITCH_B.port, AMP_SWITCH_B.pin, 1); //always reverse of above.
+
+ //Impedance bridge relay set to bypass
+ HAL_GPIO_WritePin (IMP_BRIDGE_SWITCH_A.port, IMP_BRIDGE_SWITCH_A.pin, 0); //0 to bypass
+ HAL_GPIO_WritePin (IMP_BRIDGE_SWITCH_B.port, IMP_BRIDGE_SWITCH_B.pin, 1); //always reverse of above.
+
+ //VNA port relay (called TX_RF_Switch) set to bypass
+ HAL_GPIO_WritePin (TX_RF_SWITCH_A.port, TX_RF_SWITCH_A.pin, 1); //0 to route to VNA Out SMA connector
+ HAL_GPIO_WritePin (TX_RF_SWITCH_B.port, TX_RF_SWITCH_B.pin, 0); //always reverse of above.
+
+ //DAC Mux set to RF
+ HAL_GPIO_WritePin (DAC_MUX.port, DAC_MUX.pin, 1); //0 = speaker/earphone.
+
+ //Both TX/RX Muxes set to TX
+ HAL_GPIO_WritePin (TRX_SWITCH.port, TRX_SWITCH.pin, 1);
+
+ //Filter Muxes set to bypass
+ HAL_GPIO_WritePin (FILTER_S0.port, FILTER_S0.pin, 1);
+ HAL_GPIO_WritePin (FILTER_S1.port, FILTER_S1.pin, 0);
+
+
+ break;
+ case transmit_with_amp_no_filter:
+ //Amp power on
+ HAL_GPIO_WritePin (AMP_POWER.port, AMP_POWER.pin, 0); //1 is off.
+
+ //Filter power off
+
+ //So 5V power needs to be on
+ HAL_GPIO_WritePin (FIVE_VOLT_REGULATOR_ENABLE.port, FIVE_VOLT_REGULATOR_ENABLE.pin, 1); //1 is on.
+
+ //Amp relay set to on
+ HAL_GPIO_WritePin (AMP_SWITCH_A.port, AMP_SWITCH_A.pin, 0); // 0 to bypass (I think!)
+ HAL_GPIO_WritePin (AMP_SWITCH_B.port, AMP_SWITCH_B.pin, 1); //always reverse of above.
+
+ //Impedance bridge relay set to bypass
+ HAL_GPIO_WritePin (IMP_BRIDGE_SWITCH_A.port, IMP_BRIDGE_SWITCH_A.pin, 0); //0 to bypass
+ HAL_GPIO_WritePin (IMP_BRIDGE_SWITCH_B.port, IMP_BRIDGE_SWITCH_B.pin, 1); //always reverse of above.
+
+ //VNA port relay (called TX_RF_Switch) set to bypass
+ HAL_GPIO_WritePin (TX_RF_SWITCH_A.port, TX_RF_SWITCH_A.pin, 1); //0 to route to VNA Out SMA connector
+ HAL_GPIO_WritePin (TX_RF_SWITCH_B.port, TX_RF_SWITCH_B.pin, 0); //always reverse of above.
+
+ //DAC Mux set to RF
+ HAL_GPIO_WritePin (DAC_MUX.port, DAC_MUX.pin, 1); //0 = speaker/earphone.
+
+ //Both TX/RX Muxes set to TX
+ HAL_GPIO_WritePin (TRX_SWITCH.port, TRX_SWITCH.pin, 1);
+
+ //Filter Muxes set to bypass
+ HAL_GPIO_WritePin (FILTER_S0.port, FILTER_S0.pin, 1);
+ HAL_GPIO_WritePin (FILTER_S1.port, FILTER_S1.pin, 0);
+
+ break;
+ case tramsmit_with_amp_with_filter:
+
+ break;
+ case vna_reflected:
+
+ break;
+ case vna_through:
+
+ break;
+// default:
+// #ifdef debug
+// trace_puts("Bad signalPath Value");
+// #endif
+ }
+}
+
int
main(int argc, char* argv[])
@@ -991,23 +1124,26 @@ setFreq(vfoAFrequency);
//if(1) //I am locking it in transmit for some testing.
{
transmitting = 1;
- HAL_GPIO_WritePin(DAC_MUX.port, DAC_MUX.pin, 1); //0 = speaker/earphone. 1=TX Drivers
-// HAL_GPIO_WritePin(RX_MUX.port, RX_MUX.pin, 1); //Active Low
-// HAL_GPIO_WritePin(TX_MUX.port, TX_MUX.pin, 0); //Active Low
- HAL_GPIO_WritePin(AMP_SWITCH_A.port, AMP_SWITCH_A.pin, 1); //Route through amp.
- HAL_GPIO_WritePin(AMP_SWITCH_B.port, AMP_SWITCH_B.pin, 0); //always reverse of above.
- HAL_GPIO_WritePin(AMP_POWER.port, AMP_POWER.pin, 0); //0 is on.
- //tone = 200;
+ signalPath(transmit_no_amp_no_filter);
+ //signalPath(transmit_with_amp_no_filter);
+// HAL_GPIO_WritePin(DAC_MUX.port, DAC_MUX.pin, 1); //0 = speaker/earphone. 1=TX Drivers
+//// HAL_GPIO_WritePin(RX_MUX.port, RX_MUX.pin, 1); //Active Low
+//// HAL_GPIO_WritePin(TX_MUX.port, TX_MUX.pin, 0); //Active Low
+// HAL_GPIO_WritePin(AMP_SWITCH_A.port, AMP_SWITCH_A.pin, 1); //Route through amp.
+// HAL_GPIO_WritePin(AMP_SWITCH_B.port, AMP_SWITCH_B.pin, 0); //always reverse of above.
+// HAL_GPIO_WritePin(AMP_POWER.port, AMP_POWER.pin, 0); //0 is on.
+// //tone = 200;
tone = 0;
} else {
transmitting = 0;
- HAL_GPIO_WritePin(DAC_MUX.port, DAC_MUX.pin, 0); //0 = speaker/earphone. 1=TX Drivers
-// HAL_GPIO_WritePin(RX_MUX.port, RX_MUX.pin, 0); //Active Low
-// HAL_GPIO_WritePin(TX_MUX.port, TX_MUX.pin, 1); //Active Low
- HAL_GPIO_WritePin(AMP_SWITCH_A.port, AMP_SWITCH_A.pin, 0); //Bypass amp.
- HAL_GPIO_WritePin(AMP_SWITCH_B.port, AMP_SWITCH_B.pin, 1); //always reverse of above.
- HAL_GPIO_WritePin(AMP_POWER.port, AMP_POWER.pin, 1); //1 is off.
- tone = 0;
+ signalPath(recieve_no_filter);
+// HAL_GPIO_WritePin(DAC_MUX.port, DAC_MUX.pin, 0); //0 = speaker/earphone. 1=TX Drivers
+//// HAL_GPIO_WritePin(RX_MUX.port, RX_MUX.pin, 0); //Active Low
+//// HAL_GPIO_WritePin(TX_MUX.port, TX_MUX.pin, 1); //Active Low
+// HAL_GPIO_WritePin(AMP_SWITCH_A.port, AMP_SWITCH_A.pin, 0); //Bypass amp.
+// HAL_GPIO_WritePin(AMP_SWITCH_B.port, AMP_SWITCH_B.pin, 1); //always reverse of above.
+// HAL_GPIO_WritePin(AMP_POWER.port, AMP_POWER.pin, 1); //1 is off.
+// tone = 0;
}
}
}