diff --git a/install.sh b/install.sh index f589168..e46eb8b 100755 --- a/install.sh +++ b/install.sh @@ -1,11 +1,14 @@ echo Install rpitx - some package need internet connexion - sudo apt-get update -sudo apt-get install -y libsndfile1-dev +sudo apt-get install -y libsndfile1-dev git sudo apt-get install -y imagemagick -sudo mknod /dev/rpidatv-mb c 100 0 cd src -make -j4 +git clone https://github.com/F5OEO/librpitx +cd librpitx/src +make +cd ../../ +make sudo make install cd .. echo Installation done diff --git a/snapsstv.sh b/snapsstv.sh index 474281b..11f5a54 100755 --- a/snapsstv.sh +++ b/snapsstv.sh @@ -1,6 +1,6 @@ raspistill -w 320 -h 256 -o picture.jpg -t 1 convert -depth 8 picture.jpg picture.rgb -sudo ./pisstv picture.rgb picture.ft -sudo ./rpitx -m RF -i picture.ft -f 50105 +sudo ./pisstv picture.rgb 144.5e6 + diff --git a/src/sstv/pisstv.cpp b/src/sstv/pisstv.cpp index cf593d3..b5cf38b 100644 --- a/src/sstv/pisstv.cpp +++ b/src/sstv/pisstv.cpp @@ -159,22 +159,22 @@ void ProcessMartin1() int main(int argc, char **argv) { - uint64_t frequency=144200; + float frequency=144.5e6; if (argc > 2) { char *sFilePicture=(char *)argv[1]; FilePicture = open(argv[1], O_RDONLY); - frequency=atol(argv[2]); + frequency=atof(argv[2]); } else { - printf("usage : pisstv picture.rgb frequency(khz)\n"); + printf("usage : pisstv picture.rgb frequency(Hz)\n"); exit(0); } - fmmod=new ngfmdmasync(frequency*1000,100000,14,FifoSize); + fmmod=new ngfmdmasync(frequency,100000,14,FifoSize); ProcessMartin1(); close(FilePicture); delete fmmod; diff --git a/testopera.sh b/testopera.sh index fcc13e0..781ba2b 100755 --- a/testopera.sh +++ b/testopera.sh @@ -1,3 +1,3 @@ -./piopera F5OEO 0.5 opera.rfa -sudo ./rpitx -m RFA -i opera.rfa -f 144180 -l -c 1 -r +sudo ./piopera F5OEO 0.5 144.18e6 + diff --git a/testsstv.sh b/testsstv.sh new file mode 100755 index 0000000..409d405 --- /dev/null +++ b/testsstv.sh @@ -0,0 +1 @@ +sudo ./pisstv testcard.rgb 144.5e6