Merge pull request #7 from paulh002/Dev

update

CMakeLists.txt

@@ -4,7 +4,7 @@ project(sdrberry)
 file(GLOB_RECURSE SOURCES ./lvgl/src/*.c)
 set(LIBRARIES_FROM_REFERENCES -lpthread -lbluetooth -lSoapySDR -latomic -ltinyb -lliquid -lasound -lfftw3 -Wl,-verbose)
 include_directories(lvgl ft8)
-add_executable(sdrberry sdrberry.cpp FT8Demodulator.cpp FT8Demodulator.h HidDev.cpp HidDev.h PeakLevelDetector.cpp PeakLevelDetector.h ft8/fft.cpp ft8/fft.h ft8/ft8.cpp ft8/ft8.h ft8/libldpc.cpp ft8/unpack.cpp ft8/util.cpp ft8/osd.cpp ft8/arrays.h gui_ft8.cpp gui_ft8.h gui_speech.cpp gui_speech.h FMDemodulator.cpp Agc_class.cpp AMDemodulator.cpp AMModulator.cpp AudioInput.cpp AudioOutput.cpp BandFilter.cpp ble_interface.cpp Catinterface.cpp configfile.cpp configoption.cpp Demodulator.cpp Filter.cpp FmDecode.cpp FMDemodulator.cpp FMModulator.cpp FreeSansOblique24.c FreeSansOblique32.c FreeSansOblique42.c FT891_CAT.cpp gui_agc.cpp Gui_band.cpp gui_bar.cpp gui_setup.cpp gui_top_bar.cpp gui_tx.cpp gui_vfo.cpp Keyboard.cpp MidiControle.cpp Mouse.cpp PCF8574.cpp RtMidi.cpp SdrDevice.cpp sdrstream.cpp Settings.cpp vfo.cpp RtAudio.cpp Waterfall.cpp wiringPiI2C.c wiringSerial.c lv_drivers/display/fbdev.c lv_drivers/indev/evdev.c lv_drivers/indev/mouse.c Agc_class.h AMDemodulator.h AMModulator.h Audiodefs.h AudioInput.h AudioOutput.h BandFilter.h ble_interface.h Catinterface.h configfile.h configoption.h DataBuffer.h Demodulator.h Filter.h FmDecode.h FMDemodulator.h FMModulator.h FT891_CAT.h gattlib.h gui_agc.h Gui_band.h gui_bar.h gui_setup.h gui_top_bar.h gui_tx.h gui_vfo.h Keyboard.h liquid.h liquid.internal.h lv_conf.h lv_drv_conf.h MidiControle.h Mouse.h PCF8574.h RtAudio.h RtMidi.h sdrberry.h SdrDevice.h sdrstream.h sma.h Settings.h vfo.h Waterfall.h wiringPiI2C.h wiringSerial.h strlib.cpp strlib.h MorseDecoder.cpp MorseDecoder.h FreeSans42.c ${SOURCES} lv_drivers/indev/evdev.h)
+add_executable(sdrberry sdrberry.cpp FT8Demodulator.cpp FT8Demodulator.h HidDev.cpp HidDev.h PeakLevelDetector.cpp PeakLevelDetector.h ft8/fft.cpp ft8/fft.h ft8/ft8.cpp ft8/ft8.h ft8/libldpc.cpp ft8/unpack.cpp ft8/util.cpp ft8/osd.cpp ft8/arrays.h gui_ft8.cpp gui_ft8.h gui_speech.cpp gui_speech.h FMDemodulator.cpp Agc_class.cpp AMDemodulator.cpp AMModulator.cpp AudioInput.cpp AudioOutput.cpp BandFilter.cpp ble_interface.cpp Catinterface.cpp configfile.cpp configoption.cpp Demodulator.cpp Filter.cpp FmDecode.cpp FMDemodulator.cpp FMModulator.cpp FreeSansOblique24.c FreeSansOblique32.c FreeSansOblique42.c FT891_CAT.cpp gui_agc.cpp Gui_band.cpp gui_bar.cpp gui_setup.cpp gui_top_bar.cpp gui_tx.cpp gui_vfo.cpp Keyboard.cpp MidiControle.cpp Mouse.cpp PCF8574.cpp RtMidi.cpp SdrDevice.cpp sdrstream.cpp Settings.cpp vfo.cpp RtAudio.cpp Waterfall.cpp wiringPiI2C.c wiringSerial.c lv_drivers/display/fbdev.c lv_drivers/indev/evdev.c lv_drivers/indev/mouse.c Agc_class.h AMDemodulator.h AMModulator.h Audiodefs.h AudioInput.h AudioOutput.h BandFilter.h ble_interface.h Catinterface.h configfile.h configoption.h DataBuffer.h Demodulator.h Filter.h FmDecode.h FMDemodulator.h FMModulator.h FT891_CAT.h gattlib.h gui_agc.h Gui_band.h gui_bar.h gui_setup.h gui_top_bar.h gui_tx.h gui_vfo.h Keyboard.h liquid.h liquid.internal.h lv_conf.h lv_drv_conf.h MidiControle.h Mouse.h PCF8574.h RtAudio.h RtMidi.h sdrberry.h SdrDevice.h sdrstream.h sma.h Settings.h vfo.h Waterfall.h wiringPiI2C.h wiringSerial.h strlib.cpp strlib.h MorseDecoder.cpp MorseDecoder.h EchoAudio.cpp EchoAudio.h FreeSans42.c ${SOURCES} lv_drivers/indev/evdev.h)
 target_compile_definitions(sdrberry PRIVATE __LINUX_ALSA__ LV_LVGL_H_INCLUDE_SIMPLE)
 target_compile_options(sdrberry PRIVATE)
 target_include_directories(sdrberry PRIVATE /usr/local/include/liquid)

install/install_pluto.sh

@@ -47,16 +47,6 @@ cd ~
 sudo apt-get install -y ninja-build libiio-dev libiio-dev libiio-utils libasound-dev
 sudo apt-get install -y libboost1.62-all-dev
 sudo ldconfig
-git clone https://github.com/thestk/rtaudio
-cd rtaudio
-git checkout 5.2.0
-mkdir build
-cd build
-cmake ..
-make -j4
-sudo make install
-sudo ldconfig 
-cd~
 sudo apt-get remove -y pulseaudio
 sudo apt install -y libxml2 libxml2-dev bison flex cmake git libaio-dev libboost-all-dev
 git clone https://github.com/analogdevicesinc/libad9361-iio
@@ -80,7 +70,8 @@ sudo make install
 sudo ldconfig
 cd ~
 #fi
-wget https://raw.githubusercontent.com/paulh002/sdrberry/master/install/sdrberry_settings.cfg
+wget https://raw.githubusercontent.com/paulh002/sdrberry/master/install/sdrberry_settings_pluto.cfg
+mv sdrberry_settings_pluto.cfg sdrberry_settings.cfg
 git clone https://github.com/paulh002/sdrberry
 cd sdrberry
 mkdir build

install/sdrberry_settings_pluto.cfg

@@ -0,0 +1,88 @@
+[Agc]
+fast = {"10", "100"}
+medium = {"50", "250"}
+mode = "1"
+ratio = "10"
+sdrplay = "off"
+slow = {"100", "500"}
+threshold = "10"
+
+[Audio]
+device = "USB Audio Device"
+
+[CAT]
+USB = "/dev/serial/by-id/usb-Silicon_Labs_CP2102_USB_to_UART_Bridge_Controller_0001-if00-port0"
+
+[ESP32]
+mac address = ""
+
+[Radio]
+AGC = "off"
+band = "ham"
+drive = "89"
+gain = 3
+if-gain = 60
+micgain = "85"
+span = "100"
+volume = 57
+
+[SDR Receivers]
+default = "plutosdr"
+receivers = {"radioberry", "plutosdr", "rtlsdr", "sdrplay"}
+
+[Speech]
+bass = 4
+fast = {"12", "120"}
+medium = {"50", "250"}
+mode = "1"
+ratio = "12"
+slow = {"100", "500"}
+threshold = "0"
+treble = 0
+
+[VFO1]
+Mode = "lsb"
+freq = "3600000"
+
+[VFO2]
+Mode = "LSB"
+freq = "3500000"
+
+[bands]
+f_high = {"1880000", "3800000", "5450000", "7200000", "10150000", "14350000", "18168000", "21450000", "29000000", "52000000", "70500000", "107000000", "146000000", "436000000", "1300000000", "2400000000"}
+f_low = {"1800000", "3500000", "5350000", "7000000", "10100000", "14000000", "18068000", "21000000", "28000000", "50000000", "70000000", "83000000", "144000000", "430000000", "1240000000", "2320000000"}
+labels = {"m", "m", "m", "m", "m", "m", "m", "m", "m", "m", "m", "m", "m", "cm", "cm", "cm"}
+meters = {"160", "80", "60", "40", "30", "20", "17", "15", "10", "6", "4", "3", "2", "70", "23", "13"}
+mode = {"lsb", "lsb", "lsb", "lsb", "lsb", "usb", "usb", "usb", "usb", "usb", "usb", "usb", "usb", "usb", "usb", "usb"}
+
+[filter]
+address = {"56", "57", "63"}
+command_rx = {"21", "137", "24", "22", "133", "144", "21", "137", "48", "25", "133", "48", "21", "137", "20", "37", "133", "20", "21", "134", "18", "21", "137", "18", "21", "137", "18", "21", "137", "18", "21", "137", "18", "21", "137", "18", "21", "137", "18", "21", "137", "18", "21", "137", "18", "21", "137", "18"}
+command_tx = {"21", "73", "8", "22", "69", "128", "21", "73", "32", "25", "69", "32", "21", "73", "4", "37", "69", "2", "21", "70", "2", "21", "73", "2", "21", "73", "2", "21", "73", "2", "21", "73", "2", "21", "73", "2", "21", "73", "2", "21", "73", "2", "21", "73", "2", "21", "73", "2"}
+i2cdevice = "pcf8574"
+passthrough_rx = {"21", "137", "18"}
+passthrough_tx = {"21", "73", "2"}
+
+[ft8]
+call = "PA0PHH"
+freq = {"1840", "3573", "5357", "7073", "10133", "14074", "18100", "21074", "28074"}
+locator = "JO22"
+
+[input]
+mouse = "Mouse"
+touchscreen = "raspberrypi-ts"
+
+[probes]
+pluto = "driver=plutosdr,hostname=192.168.100.1"
+radioberry = "driver=radioberry"
+rtlsdr = "driver=rtlsdr"
+sdrplay = "driver=sdrplay"
+
+[samplerate]
+plutosdr = "1000"
+radioberry = "384"
+rtlsdr = "1000"
+sdrplay = "1000"
+
+[samplerate_tx]
+radioberry = "48"