Skip to content

Commit

Permalink
Add ramp for smooth transition on FSK
Browse files Browse the repository at this point in the history
  • Loading branch information
@F5OEO
F5OEO committed Jan 10, 2019
1 parent 19956d2 commit 5475c41
Show file tree
Hide file tree
Showing 5 changed files with 223 additions and 198 deletions.
8 changes: 4 additions & 4 deletions app/testrpitx.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,9 @@ void SimpleTestAm(uint64_t Freq)
void SimpleTestOOK(uint64_t Freq)
{

int SR = 1000;
int SR = 10; //10 HZ
int FifoSize = 21; //24
ookburst ook(Freq, SR, 14, FifoSize);
ookburst ook(Freq, SR, 14, FifoSize,100);

unsigned char TabSymbol[FifoSize] = {0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0};

Expand Down Expand Up @@ -733,6 +733,6 @@ int main(int argc, char *argv[])
//SimpleTestBurstFsk(Freq);
//SimpleTestOOKTiming(Freq);
//AlectoOOK(Freq);
//RfSwitchOOK(Freq);
SimpleTestAtv(Freq);
RfSwitchOOK(Freq);
//SimpleTestAtv(Freq);
}
184 changes: 100 additions & 84 deletions src/fskburst.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,108 +20,124 @@ This program is free software: you can redistribute it and/or modify
#include "util.h"
#include <unistd.h>

fskburst::fskburst(uint64_t TuneFrequency,uint32_t SymbolRate,float Deviation,int Channel,uint32_t FifoSize):bufferdma(Channel,FifoSize+3,2,1),freqdeviation(Deviation)
fskburst::fskburst(uint64_t TuneFrequency, float SymbolRate, float Deviation, int Channel, uint32_t FifoSize, size_t upsample,float RatioRamp) : bufferdma(Channel, FifoSize * upsample + 3, 2, 1), freqdeviation(Deviation), SR_upsample(upsample)
{

clkgpio::SetAdvancedPllMode(true);
clkgpio::SetCenterFrequency(TuneFrequency, Deviation*10); // Write Mult Int and Frac : FixMe carrier is already there
clkgpio::SetFrequency(0);
disableclk(4);
syncwithpwm = false;
Ramp = SR_upsample * RatioRamp; //Ramp time = 10%

if (syncwithpwm)
{

clkgpio::SetAdvancedPllMode(true);
clkgpio::SetCenterFrequency(TuneFrequency,SymbolRate); // Write Mult Int and Frac : FixMe carrier is already there
clkgpio::SetFrequency(0);
disableclk(4);
syncwithpwm=false;

if(syncwithpwm)
{
pwmgpio::SetPllNumber(clk_plld,1);
pwmgpio::SetFrequency(SymbolRate);
}
else
{
pcmgpio::SetPllNumber(clk_plld,1);
pcmgpio::SetFrequency(SymbolRate);
}

//Should be obligatory place before setdmaalgo
Originfsel=clkgpio::gengpio.gpioreg[GPFSEL0];
dbg_printf(1,"FSK Origin fsel %x\n",Originfsel);

SetDmaAlgo();



pwmgpio::SetPllNumber(clk_plld, 1);
pwmgpio::SetFrequency(SymbolRate * (float)SR_upsample);
}

fskburst::~fskburst()
else
{
pcmgpio::SetPllNumber(clk_plld, 1);
pcmgpio::SetFrequency(SymbolRate * (float)SR_upsample);
}

void fskburst::SetDmaAlgo()
//Should be obligatory place before setdmaalgo
Originfsel = clkgpio::gengpio.gpioreg[GPFSEL0];
dbg_printf(1, "FSK Origin fsel %x\n", Originfsel);

SetDmaAlgo();
}

fskburst::~fskburst()
{

sampletab[buffersize*registerbysample-2]=(Originfsel & ~(7 << 12)) | (4 << 12); //Gpio Clk
sampletab[buffersize*registerbysample-1]=(Originfsel & ~(7 << 12)) | (0 << 12); //Gpio In

dma_cb_t *cbp = cbarray;
// We must fill the FIFO (PWM or PCM) to be Synchronized from start
// PWM FIFO = 16
// PCM FIFO = 64
if(syncwithpwm)
{
SetEasyCB(cbp++,0,dma_pwm,16+1);
}
else
{
SetEasyCB(cbp++,0,dma_pcm,64+1);

}
}

SetEasyCB(cbp++,buffersize*registerbysample-2,dma_fsel,1);//Enable clk
void fskburst::SetDmaAlgo()
{


for (uint32_t samplecnt = 0; samplecnt < buffersize-2; samplecnt++)
{

sampletab[buffersize * registerbysample - 2] = (Originfsel & ~(7 << 12)) | (4 << 12); //Gpio Clk
sampletab[buffersize * registerbysample - 1] = (Originfsel & ~(7 << 12)) | (0 << 12); //Gpio In

// Write a frequency sample
SetEasyCB(cbp++,samplecnt*registerbysample,dma_pllc_frac,1);//FReq

// Delay
SetEasyCB(cbp++,samplecnt*registerbysample,syncwithpwm?dma_pwm:dma_pcm,1);

}
lastcbp=cbp;
dma_cb_t *cbp = cbarray;
// We must fill the FIFO (PWM or PCM) to be Synchronized from start
// PWM FIFO = 16
// PCM FIFO = 64
if (syncwithpwm)
{
SetEasyCB(cbp++, 0, dma_pwm, 16 + 1);
}
else
{
SetEasyCB(cbp++, 0, dma_pcm, 64 + 1);
}

SetEasyCB(cbp,buffersize*registerbysample-1,dma_fsel,1);//Disable clk

cbp->next = 0; // Stop DMA

dbg_printf(2,"Last cbp : src %x dest %x next %x\n",cbp->src,cbp->dst,cbp->next);
SetEasyCB(cbp++, buffersize * registerbysample - 2, dma_fsel, 1); //Enable clk

for (uint32_t samplecnt = 0; samplecnt < buffersize - 2; samplecnt++)
{

// Write a frequency sample
SetEasyCB(cbp++, samplecnt * registerbysample, dma_pllc_frac, 1); //FReq

// Delay
SetEasyCB(cbp++, samplecnt * registerbysample, syncwithpwm ? dma_pwm : dma_pcm, 1);
}
lastcbp = cbp;

SetEasyCB(cbp, buffersize * registerbysample - 1, dma_fsel, 1); //Disable clk

cbp->next = 0; // Stop DMA

dbg_printf(2, "Last cbp : src %x dest %x next %x\n", cbp->src, cbp->dst, cbp->next);
}
void fskburst::SetSymbols(unsigned char *Symbols,uint32_t Size)
void fskburst::SetSymbols(unsigned char *Symbols, uint32_t Size)
{
if (Size > buffersize - 3)
{
if(Size>buffersize-3) {dbg_printf(1,"Buffer overflow\n");return;}

dma_cb_t *cbp=cbarray;
cbp+=2; // Skip the first 2 CB (initialisation)
for(unsigned int i=0;i<Size;i++)
dbg_printf(1, "Buffer overflow\n");
return;
}

dma_cb_t *cbp = cbarray;
cbp += 2; // Skip the first 2 CB (initialisation)



for (unsigned int i = 0; i < Size; i++)
{
for (size_t j = 0; j < SR_upsample - Ramp; j++)
{
sampletab[i]=(0x5A<<24)|GetMasterFrac(freqdeviation*Symbols[i]);
cbp++;//SKIP FREQ CB
sampletab[i * SR_upsample + j] = (0x5A << 24) | GetMasterFrac(freqdeviation * Symbols[i]);
cbp++; //SKIP FREQ CB
cbp->next = mem_virt_to_phys(cbp + 1);
cbp++;
}
cbp--;
cbp->next = mem_virt_to_phys(lastcbp);


dma::start();
while(isrunning()) //Block function : return until sent completely signal
for (size_t j = 0 ; j < Ramp; j++)
{
//dbg_printf(1,"GPIO %x\n",clkgpio::gengpio.gpioreg[GPFSEL0]);
usleep(100);
if (i < Size - 1)
{
sampletab[i * SR_upsample + j + SR_upsample - Ramp] = (0x5A << 24) | GetMasterFrac(freqdeviation * Symbols[i] + j* (freqdeviation * Symbols[i + 1] - freqdeviation * Symbols[i]) / (float)Ramp);
dbg_printf(2, "Ramp %f ->%f : %d %f\n",freqdeviation * Symbols[i],freqdeviation * Symbols[i+1], j,freqdeviation * Symbols[i] + j* (freqdeviation * Symbols[i + 1] - freqdeviation * Symbols[i]) / (float)Ramp);
}
else
{
sampletab[i * SR_upsample + j + SR_upsample -Ramp] = (0x5A << 24) | GetMasterFrac(freqdeviation * Symbols[i]);
}

cbp++; //SKIP FREQ CB
cbp->next = mem_virt_to_phys(cbp + 1);
cbp++;
}
dbg_printf(1,"FSK burst end Tx\n",cbp->src,cbp->dst,cbp->next);
usleep(100);//To be sure last symbol Tx ?

}
cbp--;
cbp->next = mem_virt_to_phys(lastcbp);

dma::start();
while (isrunning()) //Block function : return until sent completely signal
{
//dbg_printf(1,"GPIO %x\n",clkgpio::gengpio.gpioreg[GPFSEL0]);
usleep(100);
}
dbg_printf(1, "FSK burst end Tx\n", cbp->src, cbp->dst, cbp->next);
usleep(100); //To be sure last symbol Tx ?
}
4 changes: 3 additions & 1 deletion src/fskburst.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ class fskburst:public bufferdma,public clkgpio,public pwmgpio,public pcmgpio
uint32_t Originfsel;
bool syncwithpwm;
dma_cb_t *lastcbp;
size_t SR_upsample=0;
size_t Ramp=0;
public:
fskburst(uint64_t TuneFrequency,uint32_t SymbolRate,float Deviation,int Channel,uint32_t FifoSize);
fskburst(uint64_t TuneFrequency,float SymbolRate,float Deviation,int Channel,uint32_t FifoSize,size_t upsample=1,float RatioRamp=0);
~fskburst();
void SetDmaAlgo();

Expand Down
Loading

0 comments on commit 5475c41

Please sign in to comment.