jens/cpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed includes after refactor

Browse Source 
- fixed mutual inclusions

git-svn-id: http://moon:8086/svn/software/trunk/libsrc/cpp@865 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2022-05-23 11:48:59 +00:00
parent 48707c7d61
commit 8e2d22f95e
7 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/Equalizer.hpp
+3 -3
View File
@@ -5,8 +5,8 @@
* Created on 20. Dezember 2014, 09:24 * Created on 20. Dezember 2014, 09:24
*/ */
#ifndef EQUALIZER_HPP #ifndef _RADIO_EQUALIZER_HPP_
#define EQUALIZER_HPP #define _RADIO_EQUALIZER_HPP_
#include "Vector.hpp" #include "Vector.hpp"
#include "FirComplex.hpp" #include "FirComplex.hpp"
@@ -198,5 +198,5 @@ private:
} // ::Radio } // ::Radio
#endif /* EQUALIZER_HPP */ #endif /* _RADIO_EQUALIZER_HPP_ */
radio/FirComplex.hpp
+3 -3
View File
@@ -5,8 +5,8 @@
* Created on 20. Dezember 2014, 08:12 * Created on 20. Dezember 2014, 08:12
*/ */
#ifndef FIRCOMPLEX_HPP #ifndef _RADIO_FIRCOMPLEX_HPP_
#define FIRCOMPLEX_HPP #define _RADIO_FIRCOMPLEX_HPP_
#include "Vector.hpp" #include "Vector.hpp"
@@ -66,5 +66,5 @@ protected:
} // ::Radio } // ::Radio
#endif /* FIRCOMPLEX_HPP */ #endif /* _RADIO_FIRCOMPLEX_HPP_ */
radio/Frame.cpp
+1
View File
@@ -1,6 +1,7 @@
// -------------------------------------------------------------- // --------------------------------------------------------------
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include <stdint.h>
#include <crc/crc.h> #include <crc/crc.h>
#include <radio/symbol.h> #include <radio/symbol.h>
#include "Frame.hpp" #include "Frame.hpp"
radio/Frame.hpp
+3 -3
View File
@@ -1,6 +1,6 @@
// -------------------------------------------------------------- // --------------------------------------------------------------
#ifndef _FRAME_HPP_ #ifndef _RADIO_FRAME_HPP_
#define _FRAME_HPP_ #define _RADIO_FRAME_HPP_
#include <radio/radio_types.h> #include <radio/radio_types.h>
#include <radio/cpx.h> #include <radio/cpx.h>
@@ -304,4 +304,4 @@ private:
}; };
// -------------------------------------------------------------- // --------------------------------------------------------------
#endif // _FRAME_HPP_ #endif // _RADIO_FRAME_HPP_
radio/Interpolation.hpp
+5 -5
View File
@@ -5,8 +5,8 @@
* Created on 20. Dezember 2014, 19:02 * Created on 20. Dezember 2014, 19:02
*/ */
#ifndef INTERPOLATION_HPP #ifndef _RADIO_INTERPOLATION_HPP_
#define INTERPOLATION_HPP #define _RADIO_INTERPOLATION_HPP_
#include <cstdio> #include <cstdio>
#include "Vector.hpp" #include "Vector.hpp"
@@ -92,13 +92,13 @@ public:
} }
} }
Eigen::internal::set_is_malloc_allowed(true); // Eigen::internal::set_is_malloc_allowed(true);
// Partial filter responses // Partial filter responses
for (i=0; i < m_M; i++) for (i=0; i < m_M; i++)
{ {
m_h[i] = FirComplex::processReal(m_coeff.col(i)); m_h[i] = FirComplex::processReal(m_coeff.col(i));
} }
Eigen::internal::set_is_malloc_allowed(false); // Eigen::internal::set_is_malloc_allowed(false);
// Combine // Combine
return horner(mu); return horner(mu);
@@ -437,5 +437,5 @@ private:
} // Radio::Interpolation } // Radio::Interpolation
} // ::Radio } // ::Radio
#endif /* INTERPOLATION_HPP */ #endif /* _RADIO_INTERPOLATION_HPP_ */
radio/Nco.hpp
+4 -4
View File
@@ -5,10 +5,10 @@
* Created on 22. Dezember 2014, 12:51 * Created on 22. Dezember 2014, 12:51
*/ */
#ifndef NCO_HPP #ifndef _RADIO_NCO_HPP_
#define NCO_HPP #define _RADIO_NCO_HPP_
#include "radio/Vector.hpp" #include "Vector.hpp"
namespace Radio namespace Radio
{ {
@@ -140,5 +140,5 @@ private:
} // ::Radio } // ::Radio
#endif /* NCO_HPP */ #endif /* _RADIO_NCO_HPP_ */
radio/Vector.hpp
+4 -4
View File
@@ -5,8 +5,8 @@
* Created on 19. Dezember 2014, 18:24 * Created on 19. Dezember 2014, 18:24
*/ */
#ifndef VECTOR_HPP #ifndef _RADIO_VECTOR_HPP_
#define VECTOR_HPP #define _RADIO_VECTOR_HPP_
#include <Eigen/Dense> #include <Eigen/Dense>
using namespace Eigen; using namespace Eigen;
@@ -14,7 +14,7 @@ using namespace Eigen;
#include <complex> #include <complex>
using namespace std; using namespace std;
#include "../radio/radio_types.h" #include <radio/radio_types.h>
using Eigen::Dense; using Eigen::Dense;
@@ -63,5 +63,5 @@ static void toCpxVector(cpx_t *pDst, CVec const &src, uint32_t len)
} // ::Radio } // ::Radio
#endif /* VECTOR_HPP */ #endif /* _RADIO_VECTOR_HPP_ */