Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated Hamlib integration

Browse source 
moved back to system integration. It seems we need to have a look at the hamlib library pathes on linux distributions. They differ from version to version
This commit is contained in:
dj2ls 2021-11-24 19:16:09 +01:00
parent 9e51eaa52f
commit 93c12d642d
3 changed files with 70 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
README.md
View file

@ -22,51 +22,66 @@ sudo adduser $USER dialout
logout / login logout / login
``` ```
### 1. Install dependencies, codec2 and FreeDATA ### 1. Install dependencies, codec2 and FreeDATA
#### 1.1 Dependencies
``` ```
sudo apt install git build-essential cmake npm sudo apt install git build-essential cmake npm
npm cache clean -f
sudo npm install -g n sudo npm install -g n
sudo n stable sudo n stable
sudo apt install python3 python3-hamlib portaudio19-dev python3-pyaudio python3-pip sudo apt install python3-hamlib (if not found: python3-libhamlib2)
sudo apt install python3 portaudio19-dev python3-pyaudio python3-pip
pip3 install psutil crcengine ujson pyserial numpy structlog pip3 install psutil crcengine ujson pyserial numpy structlog
```
#### 1.2 Install FreeDATA
```
git clone https://github.com/DJ2LS/FreeDATA.git git clone https://github.com/DJ2LS/FreeDATA.git
cd FreeDATA/gui cd FreeDATA/gui
npm i npm i
cd .. cd ..
cd tnc
``` ```
#### Optional: Install codec2
If you want to use the latest version of codec2, just download and compile it. If you want to use the latest version of codec2, just download and compile it.
The tnc will detect, if a self compiled version is used. Otherwise a precompiled binary will be used. The tnc will detect, if a self compiled version is used. Otherwise a precompiled binary will be used.
``` ```
cd tnc (FreeDATA/tnc)
git clone https://github.com/drowe67/codec2.git git clone https://github.com/drowe67/codec2.git
cd codec2 cd codec2
mkdir build_linux mkdir build_linux
cd build_linux cd build_linux
cmake .. cmake ..
make make
```
#### Optional: Install newer/latest Hamlib if needed
Older versions of Ubuntu, like Ubuntu 20.04 LTS or Suse have sometimes outdated versions of Hamlib in their repositories. If you need a newer version, because of your radio for example, you can install the latest version from source.
```
sudo apt install libusb-1.0-0
cd ~/Downloads
wget https://github.com/Hamlib/Hamlib/releases/download/4.3.1/hamlib-4.3.1.tar.gz
tar xvf hamlib-4.3.1.tar.gz
cd hamlib-4.3.1
./configure --with-python-binding PYTHON=$(which python3)
make
sudo make install
sudo ldconfig
``` ```
### 2. starting tnc ### 2. Starting FreeDATA
#### 2.1 Starting the TNC daemon
``` ```
cd /home/$USER/FreeDATA/tnc cd /home/$USER/FreeDATA/tnc
python3 daemon.py python3 daemon.py
``` ```
A successfull start looks like this. A successfull start looks like this.
``` ```
running Hamlib from internal library 2021-11-24 17:45:40 [info ] [DMN] Starting... python=3.8
running Hamlib Version - Hamlib 4.4~git - from precompiled bundle 2021-11-24 17:45:40 [info ] [DMN] Hamlib found version=4.3
SRV | STARTING TCP/IP SOCKET FOR CMD ON PORT: 3001 2021-11-24 17:45:40 [info ] [DMN] Starting TCP/IP socket port=3001
Client connected...
``` ```
### 3. starting gui ### 2.2 Starting the GUI
There will be an error on startup, that "daemon" can't be found, This is because the gui is looking for precompiled tnc software. This error can be ignored, if you're running the tnc manually from source and should occur if you're using the app bundle. * Note: There will be an error on startup, that "daemon" can't be found, This is because the gui is looking for precompiled tnc software. This error can be ignored, if you're running the tnc manually from source and should occur if you're using the app bundle.
The gui is creating a directory "FreeDATA" for saving settings in /home/$USER/.config/ * The gui is creating a directory "FreeDATA" for saving settings in /home/$USER/.config/
``` ```
cd /home/$USER/FreeDATA/gui cd /home/$USER/FreeDATA/gui
npx electron main.js npx electron main.js
@ -74,12 +89,9 @@ npx electron main.js
If you're starting the gui, it will have a look for the daemon, which is by default "localhost / 127.0.0.1". The main window will stay blured as long as it can't connect to the daemon. If you're starting the gui, it will have a look for the daemon, which is by default "localhost / 127.0.0.1". The main window will stay blured as long as it can't connect to the daemon.
![gui disconnected](https://raw.githubusercontent.com/DJ2LS/FreeDATA/main/documentation/FreeDATA-no-daemon-connection.png "TNC disconnected") ![gui disconnected](https://raw.githubusercontent.com/DJ2LS/FreeDATA/main/documentation/FreeDATA-no-daemon-connection.png "TNC disconnected")
If you want to connect to a daemon which is running on another host, just select it via the ethernet icon and enter the ip address. If you want to connect to a daemon which is running on another host, just select it via the ethernet icon and enter the ip address.
![gui disconnected](https://raw.githubusercontent.com/DJ2LS/FreeDATA/main/documentation/FreeDATA-connect-to-remote-daemon.png "TNC disconnected") ![gui disconnected](https://raw.githubusercontent.com/DJ2LS/FreeDATA/main/documentation/FreeDATA-connect-to-remote-daemon.png "TNC disconnected")
As soon as the gui is able to connect to the daemon, the main window will be getting clear and you can see some settings like your audio devices and connected USB devices like a USB Interface III or the radio itself. As soon as the gui is able to connect to the daemon, the main window will be getting clear and you can see some settings like your audio devices and connected USB devices like a USB Interface III or the radio itself.
You can also set advanced hamlib settings or test them. Your settings will be saved, as soon as you start the tnc. You can also set advanced hamlib settings or test them. Your settings will be saved, as soon as you start the tnc.
![gui connected](https://raw.githubusercontent.com/DJ2LS/FreeDATA/main/documentation/FreeDATA-settings.png "TNC connected") ![gui connected](https://raw.githubusercontent.com/DJ2LS/FreeDATA/main/documentation/FreeDATA-settings.png "TNC connected")
@ -88,7 +100,8 @@ If you set your radio settings correctly, you can start the TNC. The settings di
![gui connected](https://raw.githubusercontent.com/DJ2LS/FreeDATA/main/documentation/FreeDATA-tnc-running.png "TNC connected") ![gui connected](https://raw.githubusercontent.com/DJ2LS/FreeDATA/main/documentation/FreeDATA-tnc-running.png "TNC connected")
# -------------------------- # ------------------
# TEST AREA....
## Manual Installation macOS ## Manual Installation macOS
### Install brew and python3 ### Install brew and python3
#### https://docs.python-guide.org/starting/install3/osx/ #### https://docs.python-guide.org/starting/install3/osx/

44
tnc/daemon.py
View file

@ -24,7 +24,9 @@ import re
import logging, structlog, log_handler import logging, structlog, log_handler
log_handler.setup_logging("daemon") log_handler.setup_logging("daemon")
structlog.get_logger("structlog").info("[DMN] Starting...") # get python version, which is needed later for determining installation path
python_version = str(sys.version_info[0]) + "." + str(sys.version_info[1])
structlog.get_logger("structlog").info("[DMN] Starting...", python=python_version)
#################################################### ####################################################
@ -54,34 +56,28 @@ def noalsaerr():
# with noalsaerr(): # with noalsaerr():
# p = pyaudio.PyAudio() # p = pyaudio.PyAudio()
###################################################### ######################################################
# try importing hamlib
# sys.path.append("hamlib/linux")
try: try:
from lib.hamlib.linux import Hamlib2 # installation path for Ubuntu 20.04 LTS python modules
sys.path.append('/usr/local/lib/python'+ python_version +'/site-packages')
# installation path for Ubuntu 20.10 +
sys.path.append('/usr/local/lib/')
import Hamlib
# https://stackoverflow.com/a/4703409 # https://stackoverflow.com/a/4703409
hamlib_version = re.findall(r"[-+]?\d*\.?\d+|\d+", Hamlib.cvar.hamlib_version) hamlib_version = re.findall(r"[-+]?\d*\.?\d+|\d+", Hamlib.cvar.hamlib_version)
hamlib_version = float(hamlib_version[0]) hamlib_version = float(hamlib_version[0])
hamlib_path = "lib/hamlib/" + sys.platform min_hamlib_version = 4.1
structlog.get_logger("structlog").info("[DMN] Hamlib found", version=hamlib_version, path=hamlib_path) if hamlib_version > min_hamlib_version:
structlog.get_logger("structlog").info("[DMN] Hamlib found", version=hamlib_version)
else:
structlog.get_logger("structlog").warning("[DMN] Hamlib outdated", found=hamlib_version, recommend=min_hamlib_version)
except Exception as e:
structlog.get_logger("structlog").critical("[DMN] Hamlib not found", error=e)
except ImportError: # load crc engine
try:
import Hamlib
# https://stackoverflow.com/a/4703409
hamlib_version = re.findall(r"[-+]?\d*\.?\d+|\d+", Hamlib.cvar.hamlib_version)
hamlib_version = float(hamlib_version[0])
min_hamlib_version = 4.1
if hamlib_version > min_hamlib_version:
structlog.get_logger("structlog").info("[DMN] Hamlib found", version=hamlib_version, path="system")
else:
structlog.get_logger("structlog").critical("[DMN] Hamlib outdated", found=hamlib_version, needed=min_hamlib_version, path="system")
except:
structlog.get_logger("structlog").critical("[DMN] Hamlib not found")
crc_algorithm = crcengine.new('crc16-ccitt-false') # load crc8 library crc_algorithm = crcengine.new('crc16-ccitt-false') # load crc8 library

43
tnc/modem.py
View file

@ -53,34 +53,28 @@ def noalsaerr():
# p = pyaudio.PyAudio() # p = pyaudio.PyAudio()
###################################################### ######################################################
# sys.path.append("hamlib/linux") # try importing hamlib
try: try:
from lib.hamlib.linux import Hamlib # get python version
python_version = str(sys.version_info[0]) + "." + str(sys.version_info[1])
# installation path for Ubuntu 20.04 LTS python modules
sys.path.append('/usr/local/lib/python'+ python_version +'/site-packages')
# installation path for Ubuntu 20.10 +
sys.path.append('/usr/local/lib/')
import Hamlib
# https://stackoverflow.com/a/4703409 # https://stackoverflow.com/a/4703409
hamlib_version = re.findall(r"[-+]?\d*\.?\d+|\d+", Hamlib.cvar.hamlib_version) hamlib_version = re.findall(r"[-+]?\d*\.?\d+|\d+", Hamlib.cvar.hamlib_version)
hamlib_version = float(hamlib_version[0]) hamlib_version = float(hamlib_version[0])
hamlib_path = "/lib/hamlib/" + sys.platform min_hamlib_version = 4.1
structlog.get_logger("structlog").info("[TNC] Hamlib found", version=hamlib_version, path=hamlib_path) if hamlib_version > min_hamlib_version:
except ImportError: structlog.get_logger("structlog").info("[DMN] Hamlib found", version=hamlib_version)
try: else:
import Hamlib structlog.get_logger("structlog").warning("[DMN] Hamlib outdated", found=hamlib_version, recommend=min_hamlib_version)
except Exception as e:
# https://stackoverflow.com/a/4703409 structlog.get_logger("structlog").critical("[DMN] Hamlib not found", error=e)
hamlib_version = re.findall(r"[-+]?\d*\.?\d+|\d+", Hamlib.cvar.hamlib_version)
hamlib_version = float(hamlib_version[0])
min_hamlib_version = 4.1
if hamlib_version > min_hamlib_version:
structlog.get_logger("structlog").info("[TNC] Hamlib found", version=hamlib_version, path="system")
else:
structlog.get_logger("structlog").critical("[TNC] Hamlib outdated", found=hamlib_version, needed=min_hamlib_version, path="system")
except:
structlog.get_logger("structlog").critical("[TNC] Hamlib not found")
#import rigctld
#rigctld = rigctld.Rigctld()
MODEM_STATS_NR_MAX = 320 MODEM_STATS_NR_MAX = 320
@ -125,6 +119,7 @@ class RF():
self.c_lib = ctypes.CDLL(libname) self.c_lib = ctypes.CDLL(libname)
structlog.get_logger("structlog").info("[TNC] Codec2 found", path=libname, origin="source") structlog.get_logger("structlog").info("[TNC] Codec2 found", path=libname, origin="source")
else: else:
structlog.get_logger("structlog").critical("[TNC] Codec2 not loaded")
raise UnboundLocalError raise UnboundLocalError
except: except: