SWR

STM32/Core/Src/rf_unit.c

@@ -98,14 +98,32 @@ void RF_UNIT_ProcessSensors(void)
 		else
 			backward = 0.001f;
 
-		TRX_VLT_forward = 0.80f * TRX_VLT_forward + 0.20f * forward;
-		TRX_VLT_backward = 0.99f * TRX_VLT_backward + 0.01f * backward;
-		TRX_SWR = (TRX_VLT_forward + TRX_VLT_backward) / (TRX_VLT_forward - TRX_VLT_backward);
+//		TRX_VLT_forward = 0.80f * TRX_VLT_forward + 0.20f * forward;
+//		TRX_VLT_backward = 0.99f * TRX_VLT_backward + 0.01f * backward;
+//		TRX_SWR = (TRX_VLT_forward + TRX_VLT_backward) / (TRX_VLT_forward - TRX_VLT_backward);
 
+//		if (TRX_VLT_backward > TRX_VLT_forward)
+//			TRX_SWR = 10.0f;
+//		if (TRX_SWR > 10.0f)
+//			TRX_SWR = 10.0f;
+		if(TRX_VLT_forward <= forward) {
+		TRX_VLT_forward = forward;
+	}
+	else {
+		TRX_VLT_forward = TRX_VLT_forward * 0.99f + forward * 0.01f;
+	}
+	
+	TRX_VLT_backward = TRX_VLT_backward * 0.99f + backward * 0.01f;
+
+	if ((TRX_VLT_forward - TRX_VLT_backward) > 0.0f)
+		TRX_SWR = (TRX_VLT_forward + TRX_VLT_backward) / (TRX_VLT_forward - TRX_VLT_backward);
+	else
+		TRX_SWR = 1.0f;
+	
 		if (TRX_VLT_backward > TRX_VLT_forward)
-			TRX_SWR = 10.0f;
-		if (TRX_SWR > 10.0f)
-			TRX_SWR = 10.0f;
+		TRX_SWR = 9.9f;
+	if (TRX_SWR > 9.9f)
+		TRX_SWR = 9.9f;
 
 		TRX_PWR_Forward = (TRX_VLT_forward * TRX_VLT_forward) / 50.0f;
 		if (TRX_PWR_Forward < 0.0f)

STM32/Core/Src/settings.h

@@ -17,7 +17,7 @@
 #define MAX_TX_FREQ_HZ (DAC_CLOCK / 2)			// Maximum transmission frequency
 #define TRX_SAMPLERATE 48000								// audio stream sampling rate during processing
 #define MAX_TX_AMPLITUDE 0.7f								// Maximum amplitude when transmitting to FPGA
-#define AGC_MAX_GAIN 10.0f									// Maximum gain in AGC, dB
+#define AGC_MAX_GAIN 20.0f									// Maximum gain in AGC, dB
 #define AGC_CLIPPING 6.0f				 						// Limit over target in AGC, dB
 #define TUNE_POWER 100											// % of the power selected in the settings when starting TUNE (100 - full)
 #define TX_AGC_MAXGAIN 5.0f									// Maximum microphone gain during compression

STM32/MDK-ARM/RTE/_WOLF-Lite/RTE_Components.h

@@ -1,21 +1,21 @@
-
-/*
- * Auto generated Run-Time-Environment Configuration File
- *      *** Do not modify ! ***
- *
- * Project: 'WOLF-Lite' 
- * Target:  'WOLF-Lite' 
- */
-
-#ifndef RTE_COMPONENTS_H
-#define RTE_COMPONENTS_H
-
-
-/*
- * Define the Device Header File: 
- */
-#define CMSIS_device_header "stm32f4xx.h"
-
-
-
-#endif /* RTE_COMPONENTS_H */
+
+/*
+ * Auto generated Run-Time-Environment Configuration File
+ *      *** Do not modify ! ***
+ *
+ * Project: 'WOLF-Lite' 
+ * Target:  'WOLF-Lite' 
+ */
+
+#ifndef RTE_COMPONENTS_H
+#define RTE_COMPONENTS_H
+
+
+/*
+ * Define the Device Header File: 
+ */
+#define CMSIS_device_header "stm32f4xx.h"
+
+
+
+#endif /* RTE_COMPONENTS_H */

STM32/MDK-ARM/WOLF-Lite.uvprojx

@@ -10,7 +10,7 @@
       <TargetName>WOLF-Lite</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6160000::V6.16::ARMCLANG</pCCUsed>
+      <pCCUsed>6150000::V6.15::ARMCLANG</pCCUsed>
       <uAC6>1</uAC6>
       <TargetOption>
         <TargetCommonOption>

STM32/MDK-ARM/WOLF-Lite/WOLF-Lite.lnp

@@ -65,33 +65,18 @@
 "wolf-lite\usbd_desc.o"
 "wolf-lite\usbd_ioreq.o"
 "wolf-lite\basicmathfunctions.o"
-"wolf-lite\basicmathfunctionsf16.o"
 "wolf-lite\bayesfunctions.o"
-"wolf-lite\bayesfunctionsf16.o"
 "wolf-lite\commontables.o"
-"wolf-lite\commontablesf16.o"
 "wolf-lite\complexmathfunctions.o"
-"wolf-lite\complexmathfunctionsf16.o"
 "wolf-lite\controllerfunctions.o"
 "wolf-lite\distancefunctions.o"
-"wolf-lite\distancefunctionsf16.o"
 "wolf-lite\fastmathfunctions.o"
-"wolf-lite\fastmathfunctionsf16.o"
 "wolf-lite\filteringfunctions.o"
-"wolf-lite\filteringfunctionsf16.o"
-"wolf-lite\interpolationfunctions.o"
-"wolf-lite\interpolationfunctionsf16.o"
 "wolf-lite\matrixfunctions.o"
-"wolf-lite\matrixfunctionsf16.o"
-"wolf-lite\quaternionmathfunctions.o"
 "wolf-lite\svmfunctions.o"
-"wolf-lite\svmfunctionsf16.o"
 "wolf-lite\statisticsfunctions.o"
-"wolf-lite\statisticsfunctionsf16.o"
 "wolf-lite\supportfunctions.o"
-"wolf-lite\supportfunctionsf16.o"
 "wolf-lite\transformfunctions.o"
-"wolf-lite\transformfunctionsf16.o"
 --strict --scatter ".\WOLF-Lite\WOLF-Lite-custom.sct"
 --summary_stderr --info summarysizes --map --load_addr_map_info --xref --callgraph --symbols
 --info sizes --info totals --info unused --info veneers