- fixed include path after refactor

git-svn-id: http://moon:8086/svn/software/trunk/projects/mpsk_rx_gui@863 b431acfa-c32f-4a4a-93f1-934dc6c82436

Source/MainComponent.h

@@ -28,7 +28,7 @@
 #include "ControlComponent.h"
 #include "Receiver.h"
 #include "Transmitter.h"
-#include <radio/Vector.hpp>
+#include <cpp/radio/Vector.hpp>
 #include "RxBuffer.hpp"
 //[/Headers]
 

Source/Receiver.cpp

@@ -2,8 +2,8 @@
 #include <float.h>
 #include "Receiver.h"
 #include "MinMaxLemire.h"
-#include "radio/Interpolation.hpp"
-#include <radio/Frame.hpp>
+#include <cpp/radio/Interpolation.hpp>
+#include <cpp/radio/Frame.hpp>
 
 #if 0
 #include <radio/ComplexVector.hpp>
@@ -425,6 +425,7 @@ void Receiver::processBaseband(CVec const &iq, uint32_t len)
 	cpx_t IQ_cma;
 	cpx_t IQ_dfeOn;
 	cpx_t IQ_dfeOff;
+	cpx_t IQ_eq_in;
 	cpx_t IQ_eq;
 	cpx_t IQ_soft;
 	cpx_t IQ_hard;
@@ -491,7 +492,7 @@ void Receiver::processBaseband(CVec const &iq, uint32_t len)
 			}
 
 			// AGC Blind process samples
-			IQ_agc = CpxScaleRealS(IQ_mf, AGC_GetWeight(&agcBlind));
+			IQ_agc = CpxScaleRealS(IQ_mf, 4+0*AGC_GetWeight(&agcBlind));
 
 			// Symbol timing recovery
 			Vd = STRGardnerProcess(&m_SymbolTimingRevovery, IQ_agc);
@@ -506,6 +507,8 @@ void Receiver::processBaseband(CVec const &iq, uint32_t len)
 					break;
 			}
 
+			IQ_eq_in = IQ_cpr;
+			
 			// Operate at symbol clock
 			// @1 x symbolrate
 			if (ClockIsTick(&m_symClock, 1))
@@ -515,19 +518,19 @@ void Receiver::processBaseband(CVec const &iq, uint32_t len)
 				{
 					if (m_params.agcMu_index == agc_state_acquisition)
 					{
-//						AGC_Process(&agcBlind, CpxMagS(IQ_cpr), m_params.agcMu[m_params.agcMu_index], 1.0);
+//						AGC_Process(&agcBlind, CpxMagS(IQ_eq_in), m_params.agcMu[m_params.agcMu_index], 1.0);
 						e_agc = m_pSymMapper->R2_cma - CpxMagS(m_trackers[0]);
 						AGC_Train(&agcBlind, e_agc, m_params.agcMu[m_params.agcMu_index]);
 					}
 					if (m_params.agcMu_index == agc_state_track)
 					{
 						e_agc = m_pSymMapper->R2_cma - CpxMagS(m_trackers[0]);
-//						e_agc = CpxMagS(IQ_hard_last) - CpxMagS(IQ_cpr);
+//						e_agc = CpxMagS(IQ_hard_last) - CpxMagS(IQ_eq_in);
 						AGC_Train(&agcBlind, e_agc, m_params.agcMu[m_params.agcMu_index]);
 					}
 				}
 #ifndef DISABLE_UNUSED_STATISTICS
-				minMaxProcess(&m_statistics.ddcMinMax, IQ_cpr);
+				minMaxProcess(&m_statistics.ddcMinMax, IQ_eq_in);
 #endif
 				// -----------------------------------------------------
 				// Equalizer Process samples
@@ -535,17 +538,17 @@ void Receiver::processBaseband(CVec const &iq, uint32_t len)
 				ComplexScalar __IQ_cma;
 				ComplexScalar __IQ_dfeOn;
 				
-				IQ_eq = IQ_cpr;
+				IQ_eq = IQ_eq_in;
 				if (m_params.eq_mode == eq_mode_cma)
 				{
-					__IQ_cma = m_cma2.process(toComplexScalar(IQ_cpr));
+					__IQ_cma = m_cma2.process(toComplexScalar(IQ_eq_in));
 					IQ_cma = toCpx(__IQ_cma);
 					IQ_eq = IQ_cma;
 				}
 
 				if (m_params.eq_mode == eq_mode_dfe)
 				{
-					__IQ_dfeOn = m_dfe_on2.process(toComplexScalar(IQ_cpr), toComplexScalar(IQ_hard_last));
+					__IQ_dfeOn = m_dfe_on2.process(toComplexScalar(IQ_eq_in), toComplexScalar(IQ_hard_last));
 					IQ_dfeOn = toCpx(__IQ_dfeOn);
 					IQ_eq = IQ_dfeOn;
 				}
@@ -602,7 +605,7 @@ void Receiver::processBaseband(CVec const &iq, uint32_t len)
 					m_dfe_off2.train(toComplexScalar(m_dfe_e_cpx), m_params.eqMuDfe);
 		
 					// DFE: Calc offline response
-					ComplexScalar __IQ_dfeOff = m_dfe_off2.process(toComplexScalar(IQ_cpr), toComplexScalar(sym_dfe_off.rect));
+					ComplexScalar __IQ_dfeOff = m_dfe_off2.process(toComplexScalar(IQ_eq_in), toComplexScalar(sym_dfe_off.rect));
 					IQ_dfeOff = toCpx(__IQ_dfeOff);
 					
 					sym_dfe_off = SymMapGetSymbolInfo(m_pSymMapper, SymMapDemap(m_pSymMapper, IQ_soft));

Source/Receiver.h

@@ -7,16 +7,16 @@
 #include <radio/interpolation.h>
 #include <radio/statistics.h>
 #include <radio/agc.h>
-#include <radio/Frame.hpp>
+#include <cpp/radio/Frame.hpp>
 
-#include "JuceHeader.h"
+#include <JuceHeader.h>
 #include "LogComponent.h"
 
-#include <radio/Vector.hpp>
-#include <radio/FirComplex.hpp>
-#include <radio/Equalizer.hpp>
-#include <radio/Interpolation.hpp>
-#include <radio/Nco.hpp>
+#include <cpp/radio/Vector.hpp>
+#include <cpp/radio/FirComplex.hpp>
+#include <cpp/radio/Equalizer.hpp>
+#include <cpp/radio/Interpolation.hpp>
+#include <cpp/radio/Nco.hpp>
 
 #ifdef _WINDOWS
 #include <float.h>

Source/RxBuffer.hpp

@@ -8,7 +8,7 @@
 #ifndef RXBUFFER_HPP
 #define	RXBUFFER_HPP
 
-#include <radio/Vector.hpp>
+#include <cpp/radio/Vector.hpp>
 
 using namespace Radio;
 

Source/Transmitter.h

@@ -4,14 +4,14 @@
 #include <cstdint>
 #include <radio/symbol.h>
 #include <radio/interpolation.h>
-#include <radio/Frame.hpp>
+#include <cpp/radio/Frame.hpp>
 
 #include "JuceHeader.h"
 #include "LogComponent.h"
 
-#include <radio/Vector.hpp>
-#include <radio/Nco.hpp>
-#include <radio/Interpolation.hpp>
+#include <cpp/radio/Vector.hpp>
+#include <cpp/radio/Nco.hpp>
+#include <cpp/radio/Interpolation.hpp>
 
 using namespace Radio;