rpitx/librpitx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add harmonic calculation

Browse source
This commit is contained in:
F5OEO 2018-03-22 22:48:49 +00:00
parent 15fe87990d
commit cf1cabc15d
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/iqdmasync.cpp
View file

@ -136,14 +136,14 @@ void iqdmasync::SetDmaAlgo()
} }
void iqdmasync::SetIQSample(uint32_t Index,std::complex<float> sample) void iqdmasync::SetIQSample(uint32_t Index,std::complex<float> sample,int Harmonic)
{ {
Index=Index%buffersize; Index=Index%buffersize;
mydsp.pushsample(sample); mydsp.pushsample(sample);
/*if(mydsp.frequency>2250) mydsp.frequency=2250; /*if(mydsp.frequency>2250) mydsp.frequency=2250;
if(mydsp.frequency<1000) mydsp.frequency=1000;*/ if(mydsp.frequency<1000) mydsp.frequency=1000;*/
sampletab[Index*registerbysample]=(0x5A<<24)|GetMasterFrac(mydsp.frequency); //Frequency sampletab[Index*registerbysample]=(0x5A<<24)|GetMasterFrac(mydsp.frequency)/Harmonic; //Frequency
int IntAmplitude=(int)(mydsp.amplitude*1e4*8.0)-1; int IntAmplitude=(int)(mydsp.amplitude*1e4*8.0)-1; //Fixme 1e4 seems to work with SSB but should be an issue with classical IQ file
int IntAmplitudePAD=0; int IntAmplitudePAD=0;
if(IntAmplitude>7) IntAmplitudePAD=7; if(IntAmplitude>7) IntAmplitudePAD=7;
@ -164,7 +164,7 @@ void iqdmasync::SetIQSample(uint32_t Index,std::complex<float> sample)
PushSample(Index); PushSample(Index);
} }
void iqdmasync::SetIQSamples(std::complex<float> *sample,size_t Size) void iqdmasync::SetIQSamples(std::complex<float> *sample,size_t Size,int Harmonic=1)
{ {
size_t NbWritten=0; size_t NbWritten=0;
int OSGranularity=100; int OSGranularity=100;
@ -188,9 +188,11 @@ void iqdmasync::SetIQSamples(std::complex<float> *sample,size_t Size)
for(int i=0;i<ToWrite;i++) for(int i=0;i<ToWrite;i++)
{ {
SetIQSample(Index+i,sample[NbWritten++]); SetIQSample(Index+i,sample[NbWritten++],1);
} }
} }
} }

4
src/iqdmasync.h
View file

@ -21,8 +21,8 @@ class iqdmasync:public bufferdma,public clkgpio,public pwmgpio,public pcmgpio
void SetDmaAlgo(); void SetDmaAlgo();
void SetPhase(bool inversed); void SetPhase(bool inversed);
void SetIQSample(uint32_t Index,std::complex<float> sample); void SetIQSample(uint32_t Index,std::complex<float> sample,int Harmonic);
void SetIQSamples(std::complex<float> *sample,size_t Size); void SetIQSamples(std::complex<float> *sample,size_t Size,int Harmonic);
}; };
#endif #endif