Added stages to FPGA protocol

Software/VNA_embedded/.settings/language.settings.xml

@@ -6,7 +6,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1671998965483228530" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1949595105660943601" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -18,7 +18,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1671998965483228530" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1949595105660943601" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

Software/VNA_embedded/Application/Drivers/FPGA/FPGA.cpp

@@ -130,6 +130,17 @@ void FPGA::SetSamplesPerPoint(uint32_t nsamples) {
 	WriteRegister(Reg::SamplesPerPoint, nsamples);
 }
 
+void FPGA::SetupSweep(uint8_t stages, uint8_t port1_stage, uint8_t port2_stage, bool individual_halt) {
+	uint16_t value = 0x0000;
+	value |= (uint16_t) (stages & 0x07) << 13;
+	if(individual_halt) {
+		value |= 0x1000;
+	}
+	value |= (port1_stage & 0x07) << 3;
+	value |= (port2_stage & 0x07) << 0;
+	WriteRegister(Reg::SweepSetup, value);
+}
+
 void FPGA::Enable(Periphery p, bool enable) {
 	if (enable) {
 		SysCtrlReg |= (uint16_t) p;
@@ -282,7 +293,7 @@ void HAL_SPI_TxRxCpltCallback(SPI_HandleTypeDef *hspi) {
 	result.RefI = assembleSampleResultValue(&raw[8]);
 	result.RefQ = assembleSampleResultValue(&raw[2]);
 	result.pointNum = (uint16_t)(raw[38]&0x1F) << 8 | raw[39];
-	result.activePort = raw[38] & 0x80 ? 1 : 0;
+	result.stageNum = (raw[38] & 0xE0) >> 5;
 	High(CS);
 	busy_reading = false;
 	if ((status & 0x0004) && callback) {

Software/VNA_embedded/Application/Drivers/FPGA/FPGA.hpp

@@ -17,6 +17,7 @@ enum class Reg {
 	SystemControl = 0x03,
 	ADCPrescaler = 0x04,
 	PhaseIncrement = 0x05,
+	SweepSetup = 0x06,
 	MAX2871Def0LSB = 0x08,
 	MAX2871Def0MSB = 0x09,
 	MAX2871Def1LSB = 0x0A,
@@ -33,8 +34,8 @@ using SamplingResult = struct _samplingresult {
 	int64_t P1I, P1Q;
 	int64_t P2I, P2Q;
 	int64_t RefI, RefQ;
-	uint16_t pointNum :15;
-	uint16_t activePort :1;
+	uint16_t pointNum :13;
+	uint16_t stageNum :3;
 };
 
 using DFTResult = struct _dftresult {
@@ -59,8 +60,7 @@ enum class Periphery {
 	DebugLED = 0x0080,
 	SourceChip = 0x0010,
 	LO1Chip = 0x0008,
-	ExcitePort2 = 0x0004,
-	ExcitePort1 = 0x0002,
+
 	PortSwitch = 0x0001,
 };
 
@@ -113,6 +113,7 @@ bool Init(HaltedCallback cb = nullptr);
 void WriteRegister(FPGA::Reg reg, uint16_t value);
 void SetNumberOfPoints(uint16_t npoints);
 void SetSamplesPerPoint(uint32_t nsamples);
+void SetupSweep(uint8_t stages, uint8_t port1_stage, uint8_t port2_stage, bool individual_halt = false);
 void Enable(Periphery p, bool enable = true);
 void Disable(Periphery p);
 bool IsEnabled(Periphery p);

Software/VNA_embedded/Application/Manual.cpp

@@ -69,8 +69,7 @@ void Manual::Setup(Protocol::ManualControl m) {
 	FPGA::Enable(FPGA::Periphery::Port1Mixer, m.Port1EN);
 	FPGA::Enable(FPGA::Periphery::Port2Mixer, m.Port2EN);
 	FPGA::Enable(FPGA::Periphery::RefMixer, m.RefEN);
-	FPGA::Enable(FPGA::Periphery::ExcitePort1, m.PortSwitch == 0);
-	FPGA::Enable(FPGA::Periphery::ExcitePort2, m.PortSwitch == 1);
+	FPGA::SetupSweep(0, m.PortSwitch == 1, m.PortSwitch == 0);
 	FPGA::Enable(FPGA::Periphery::PortSwitch);
 
 	// Enable new data and sweep halt interrupt

Software/VNA_embedded/Application/SpectrumAnalyzer.cpp

@@ -209,8 +209,7 @@ void SA::Setup(Protocol::SpectrumAnalyzerSettings settings) {
 	FPGA::SetWindow((FPGA::Window) s.WindowType);
 	FPGA::Enable(FPGA::Periphery::LO1Chip);
 	FPGA::Enable(FPGA::Periphery::LO1RF);
-	FPGA::Enable(FPGA::Periphery::ExcitePort1, s.trackingGeneratorPort == 0);
-	FPGA::Enable(FPGA::Periphery::ExcitePort2, s.trackingGeneratorPort == 1);
+	FPGA::SetupSweep(0, s.trackingGeneratorPort == 1, s.trackingGeneratorPort == 0);
 	FPGA::Enable(FPGA::Periphery::PortSwitch, s.trackingGenerator);
 	FPGA::Enable(FPGA::Periphery::Amplifier, s.trackingGenerator);
 	FPGA::Enable(FPGA::Periphery::Port1Mixer);

Software/VNA_embedded/Application/VNA.cpp

@@ -21,8 +21,9 @@
 
 static Protocol::SweepSettings settings;
 static uint16_t pointCnt;
+static uint8_t stageCnt;
+static uint8_t stages;
 static double logMultiplier, logFrequency;
-static bool excitingPort1;
 static Protocol::Datapoint data;
 static bool active = false;
 static Si5351C::DriveStrength fixedPowerLowband;
@@ -278,12 +279,22 @@ bool VNA::Setup(Protocol::SweepSettings s) {
 	FPGA::Enable(FPGA::Periphery::SourceRF);
 	FPGA::Enable(FPGA::Periphery::LO1Chip);
 	FPGA::Enable(FPGA::Periphery::LO1RF);
-	FPGA::Enable(FPGA::Periphery::ExcitePort1, s.excitePort1);
-	FPGA::Enable(FPGA::Periphery::ExcitePort2, s.excitePort2);
+	if(s.excitePort1 && s.excitePort2) {
+		// two stages, port 1 first, followed by port 2
+		FPGA::SetupSweep(1, 0, 1);
+		stages = 2;
+	} else if(s.excitePort1) {
+		// one stage, port 1 only
+		FPGA::SetupSweep(0, 0, 1);
+		stages = 1;
+	} else {
+		// one stage, port 2 only
+		FPGA::SetupSweep(0, 1, 0);
+		stages = 1;
+	}
 	FPGA::Enable(FPGA::Periphery::PortSwitch);
 	pointCnt = 0;
-	// starting port depends on whether port 1 is active in sweep
-	excitingPort1 = s.excitePort1;
+	stageCnt = 0;
 	IFTableIndexCnt = 0;
 	adcShifted = false;
 	active = true;
@@ -306,8 +317,8 @@ bool VNA::MeasurementDone(const FPGA::SamplingResult &result) {
 	if(!active) {
 		return false;
 	}
-	if(result.pointNum != pointCnt || !result.activePort != excitingPort1) {
-		LOG_WARN("Indicated point does not match (%u != %u, %d != %d)", result.pointNum, pointCnt, result.activePort, !excitingPort1);
+	if(result.pointNum != pointCnt || result.stageNum != stageCnt) {
+		LOG_WARN("Indicated point does not match (%u != %u, %d != %d)", result.pointNum, pointCnt, result.stageNum, stageCnt);
 		FPGA::AbortSweep();
 		return false;
 	}
@@ -320,29 +331,24 @@ bool VNA::MeasurementDone(const FPGA::SamplingResult &result) {
 	data.pointNum = pointCnt;
 	data.frequency = getPointFrequency(pointCnt);
 	data.cdbm = settings.cdbm_excitation_start + (settings.cdbm_excitation_stop - settings.cdbm_excitation_start) * pointCnt / (settings.points - 1);
-	if(excitingPort1) {
+	if(stageCnt == 0 && settings.excitePort1) {
+		// stimulus is present at port 1
 		data.real_S11 = port1.real();
 		data.imag_S11 = port1.imag();
 		data.real_S21 = port2.real();
 		data.imag_S21 = port2.imag();
 	} else {
+		// stimulus is present at port 2
 		data.real_S12 = port1.real();
 		data.imag_S12 = port1.imag();
 		data.real_S22 = port2.real();
 		data.imag_S22 = port2.imag();
 	}
-	// figure out whether this sweep point is complete and which port gets excited next
-	bool pointComplete = false;
-	if(settings.excitePort1 == 1 && settings.excitePort2 == 1) {
-		// point is complete when port 2 was active
-		pointComplete = !excitingPort1;
-		// next measurement will be from other port
-		excitingPort1 = !excitingPort1;
-	} else {
-		// only one port active, point is complete after every measurement
-		pointComplete = true;
-	}
-	if(pointComplete) {
+	// figure out whether this sweep point is complete
+	stageCnt++;
+	if(stageCnt == stages) {
+		// point is complete
+		stageCnt = 0;
 		STM::DispatchToInterrupt(PassOnData);
 		pointCnt++;
 		if (pointCnt >= settings.points) {