FLARM NMEA protocol serie

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: ["https://paypal.me/stratuxeu"]

.gitignore

@@ -1,18 +1,20 @@
 .idea/
-.vscode/
 dump978/extract_nexrad
 dump978/uat2esnt
 dump978/uat2json
 dump978/uat2text
 gen_gdl90
 libdump978.so
 fancontrol
+ogn/ddb.json
+ogn/esp-idf
+ogn/esp32-ogn-tracker
 
 *.mp4
 
 *.img
 
-*.zip
+#*.zip
 
 test/bmp180_read
 

.gitmodules

@@ -1,6 +1,11 @@
 [submodule "dump1090"]
-	path = dump1090
-	url = https://github.com/stratux/dump1090
-[submodule "goflying"]
-	path = goflying
-	url = https://github.com/cyoung/goflying
+        path = dump1090
+	url = https://github.com/flightaware/dump1090.git
+	branch = dev
+[submodule "rtl-ais"]
+	path = rtl-ais
+	url = https://github.com/mik3y/rtl-ais
+	ignore = dirty
+[submodule "ogn/ogn-tracker"]
+	path = ogn/ogn-tracker
+	url = https://github.com/pjalocha/ogn-tracker.git

.vscode/launch.json

@@ -0,0 +1,30 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch rPI/x86",
+            "type": "go",
+            "request": "launch",
+            "mode": "exec",
+            "cwd": "${workspaceRoot}",
+            "program": "${workspaceRoot}/gen_gdl90",
+            "env": {"CGO_CFLAGS_ALLOW": "-L${workspaceRoot}"},
+            "args": ["-log_dir", "/tmp/", "-logtostderr"],//, "-trace", "/var/log/stratux/2023-05-17T13:17:29Z_trace.txt.gz", "-traceSpeed", "1", "-traceSkip", "20"],
+            //"args": ["-log_dir", "/tmp/", "-logtostderr", "-replay", "-uatlog",  "test-data/cyoung-09062015-noproblem-stratux-uat.log"],
+            "preLaunchTask": "Build",
+            "internalConsoleOptions": "openOnSessionStart"
+        },
+        {
+            "name": "Launch Fancontrol",
+            "type": "go",
+            "request": "launch",
+            "mode": "exec",
+            "cwd": "${workspaceRoot}",
+            "program": "${workspaceRoot}/fancontrol",
+            "env": {"CGO_CFLAGS_ALLOW": "-L${workspaceRoot}"},
+            //"args": ["-log_dir", "/tmp/", "-logtostderr", "-replay", "-uatlog",  "test-data/cyoung-09062015-noproblem-stratux-uat.log"],
+            "preLaunchTask": "Build Fancontrol",
+            "internalConsoleOptions": "openOnSessionStart"
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,23 @@
+{
+    "go.useLanguageServer": true,
+    "go.lintFlags": [ "--disable-all" ],
+    "go.toolsEnvVars": {
+        "CGO_CFLAGS_ALLOW": "-L${workspaceRoot}",
+    },
+    "go.buildOnSave": "off",
+
+    "terminal.integrated.env.linux": {
+        "CGO_CFLAGS_ALLOW": "-L${workspaceRoot}",
+    },
+
+    "[go]": {
+        "editor.formatOnSave": false
+    },
+
+    // Use this to make it possible to hide the gen_gdl90 vs fancontrol redeclaration errors..
+    "files.exclude": {
+        "**/.git": true,
+        "ogn/esp-idf/**": true,
+        "test/**": true
+    }
+}

.vscode/tasks.json

@@ -0,0 +1,27 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build",
+            "type": "shell",
+            "command": "make gen_gdl90 debug=true",
+            "problemMatcher": "$go",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "Build Fancontrol",
+            "type": "shell",
+            "command": "make fancontrol debug=true",
+            "problemMatcher": "$go",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        }
+    ]
+}

GxAirCom/install-GxAirCom-Stratux-firmware.sh

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+fwName=firmware_psRam
+
+RED='\033[1;31m'
+NC='\033[0m' # No Color
+
+function cleanup {
+  sudo systemctl start stratux
+}
+trap cleanup EXIT
+
+
+cd "$(dirname "$0")"
+
+if [ -e /dev/serialin ]; then
+  usbDevice=/dev/serialin
+else
+  echo ""
+  echo "To which USB would you like to install the firmware at?"
+  echo ""
+  echo -e "${RED}If you are unsure about which USB device is which (sorry we cannot detect..) then unplug${NC}"
+  echo -e "${RED}the device you do not want to flash and re-run this script.${NC}"
+  echo ""
+  list=$(find /dev/ -regextype egrep -regex '\/dev\/(ttyACM|ttyAMA|ttyUSB)[0-9]')
+
+  if [ -z "$list" ]; then
+      echo "No connected USB, ACM or AMA device found"
+      exit
+  fi
+
+  select usbDevice in $list
+    do test -n "$usbDevice" && break; 
+      echo "No USB device selected"
+      exit
+  done
+fi
+
+echo "Installing $fwName to $usbDevice"
+echo ""
+
+sudo systemctl stop stratux
+echo ""
+
+python3 esptool.py --chip esp32 --port $usbDevice --baud 921600 --before default_reset erase_flash
+
+python3 esptool.py --chip esp32 --port $usbDevice --baud 921600 --before default_reset --after hard_reset \
+    write_flash -u --flash_mode dio --flash_freq 40m --flash_size detect \
+    0x1000 bootloader_dio_40m.bin 0x10000 $fwName.bin 0x8000 partitions.bin 0x3d0000 spiffs.bin 0xe000 boot_app0.bin

Makefile

@@ -1,63 +1,124 @@
-
+export STRATUX_HOME := /opt/stratux/
 ifeq "$(CIRCLECI)" "true"
 	BUILDINFO=
 	PLATFORMDEPENDENT=
 else
-	LDFLAGS_VERSION=-X main.stratuxVersion=`git describe --tags --abbrev=0` -X main.stratuxBuild=`git log -n 1 --pretty=%H`
-	BUILDINFO=-ldflags "$(LDFLAGS_VERSION)"
-	BUILDINFO_STATIC=-ldflags "-extldflags -static $(LDFLAGS_VERSION)"
-$(if $(GOROOT),,$(error GOROOT is not set!))
+	LFLAGS=-X main.stratuxVersion=`git describe --tags --abbrev=0` -X main.stratuxBuild=`git log -n 1 --pretty=%H`  
+	BUILDINFO=-ldflags "$(LFLAGS)"
+	BUILDINFO_STATIC=-ldflags "-extldflags -static $(LFLAGS)"
 	PLATFORMDEPENDENT=fancontrol
 endif
 
-all:
-	make xdump978 xdump1090 xgen_gdl90 $(PLATFORMDEPENDENT)
+ifeq ($(debug),true)
+	BUILDINFO := -gcflags '-N -l' $(BUILDINFO)
+endif
+
+ARCH=$(shell arch)
+ifeq ($(ARCH),aarch64)
+	OGN_RX_BINARY=ogn/ogn-rx-eu_aarch64
+else ifeq ($(ARCH),x86_64)
+	OGN_RX_BINARY=ogn/ogn-rx-eu_x86
+else
+	OGN_RX_BINARY=ogn/ogn-rx-eu_arm
+endif
+
 
-xgen_gdl90:
-	go get -t -d -v ./main ./godump978 ./uatparse ./sensors
-	go build $(BUILDINFO) -p 4 main/gen_gdl90.go main/traffic.go main/gps.go main/network.go main/managementinterface.go main/sdr.go main/ping.go main/uibroadcast.go main/monotonic.go main/datalog.go main/equations.go main/sensors.go main/cputemp.go main/lowpower_uat.go
 
-fancontrol:
-	go get -t -d -v ./main
-	go build $(BUILDINFO_STATIC) -p 4 main/fancontrol.go main/equations.go main/cputemp.go
+all: libdump978.so xdump1090 xrtlais gen_gdl90 $(PLATFORMDEPENDENT)
+
+gen_gdl90: main/*.go common/*.go libdump978.so
+	LIBRARY_PATH=$(CURDIR) CGO_CFLAGS_ALLOW="-L$(CURDIR)" go build $(BUILDINFO) -o gen_gdl90 -p 4 ./main/
+
+fancontrol: fancontrol_main/*.go common/*.go
+	go build $(BUILDINFO) -o fancontrol -p 4 ./fancontrol_main/
 
 xdump1090:
-	git submodule update --init
-	cd dump1090 && make
+	git submodule update --init dump1090
+	cd dump1090 && make BLADERF=no
 
-xdump978:
+libdump978.so: dump978/*.c dump978/*.h
 	cd dump978 && make lib
-	sudo cp -f ./libdump978.so /usr/lib/libdump978.so
+
+xrtlais:
+	git submodule update --init rtl-ais
+	cd rtl-ais && sed -i 's/^LDFLAGS+=-lpthread.*/LDFLAGS+=-lpthread -lm -lrtlsdr -L \/usr\/lib\//' Makefile && make
+
 
 .PHONY: test
 test:
-	make -C test	
+	make -C test
 
 www:
-	cd web && make
-
-install:
-	cp -f gen_gdl90 /usr/bin/gen_gdl90
-	chmod 755 /usr/bin/gen_gdl90
-	cp -f fancontrol /usr/bin/fancontrol
-	chmod 755 /usr/bin/fancontrol
-	-/usr/bin/fancontrol remove
-	/usr/bin/fancontrol install
+	make -C web
+
+ogn/ddb.json:
+	cd ogn && ./fetch_ddb.sh
+
+optinstall: www ogn/ddb.json
+	mkdir -p $(STRATUX_HOME)/bin
+	mkdir -p $(STRATUX_HOME)/www
+	mkdir -p $(STRATUX_HOME)/ogn
+	mkdir -p $(STRATUX_HOME)/GxAirCom
+	mkdir -p $(STRATUX_HOME)/cfg
+	mkdir -p $(STRATUX_HOME)/lib
+	mkdir -p $(STRATUX_HOME)/mapdata
+	chmod a+rwx $(STRATUX_HOME)/mapdata # so users can upload their stuff as user pi
+
+	# binaries
+	cp -f gen_gdl90 $(STRATUX_HOME)/bin/
+	cp -f fancontrol $(STRATUX_HOME)/bin/
+	cp -f dump1090/dump1090 $(STRATUX_HOME)/bin
+	cp -f rtl-ais/rtl_ais $(STRATUX_HOME)/bin
+	cp -f $(OGN_RX_BINARY) $(STRATUX_HOME)/bin/ogn-rx-eu
+	chmod +x $(STRATUX_HOME)/bin/*
+
+	# Libs
+	cp -f libdump978.so $(STRATUX_HOME)/lib/
+
+	# map data
+	cp -ru mapdata/* $(STRATUX_HOME)/mapdata/
+
+	# OGN stuff
+	cp -f ogn/ddb.json ogn/*ogn-tracker-bin-*.zip ogn/install-ogntracker-firmware-pi.sh ogn/fetch_ddb.sh $(STRATUX_HOME)/ogn
+
+	# GxAirCom stuff
+	# Wget -N doesn't work with -O.. need to change directory temporarily
+	# Could also use latest CI build: https://github.com/rvt/GxAirCom/releases/latest/download/$$artifact
+	cd $(STRATUX_HOME)/GxAirCom/; \
+	wget -N https://raw.githubusercontent.com/pjalocha/esp32-ogn-tracker/master/esptool.py; \
+	for artifact in "firmware_psRam.bin" "spiffs.bin" "partitions.bin" "version.txt" "README.md" "bootloader_dio_40m.bin" "boot_app0.bin" ; do \
+		wget -N https://github.com/rvt/GXAirCom/releases/download/stratux-eu029/$$artifact; \
+	done
+	cp -f GxAirCom/install-GxAirCom-Stratux-firmware.sh $(STRATUX_HOME)/GxAirCom
+
+	# Scripts
+	cp __opt__stratux__bin__stratux-pre-start.sh $(STRATUX_HOME)/bin/stratux-pre-start.sh
+	chmod 744 $(STRATUX_HOME)/bin/stratux-pre-start.sh
+	cp -f image/stratux-wifi.sh $(STRATUX_HOME)/bin/
+	cp -f image/sdr-tool.sh $(STRATUX_HOME)/bin/
+	chmod 755 $(STRATUX_HOME)/bin/*
+
+	# Config templates
+	cp -f image/stratux-dnsmasq.conf.template $(STRATUX_HOME)/cfg/
+	cp -f image/interfaces.template $(STRATUX_HOME)/cfg/
+	cp -f image/wpa_supplicant.conf.template $(STRATUX_HOME)/cfg/
+	cp -f image/wpa_supplicant_ap.conf.template $(STRATUX_HOME)/cfg/
+
+
+install: optinstall
+	-$(STRATUX_HOME)/bin/fancontrol remove
+	$(STRATUX_HOME)/bin/fancontrol install
+
+	# System configuration
 	cp image/10-stratux.rules /etc/udev/rules.d/10-stratux.rules
 	cp image/99-uavionix.rules /etc/udev/rules.d/99-uavionix.rules
-	rm -f /etc/init.d/stratux
 	cp __lib__systemd__system__stratux.service /lib/systemd/system/stratux.service
-	cp __root__stratux-pre-start.sh /root/stratux-pre-start.sh
 	chmod 644 /lib/systemd/system/stratux.service
-	chmod 744 /root/stratux-pre-start.sh
 	ln -fs /lib/systemd/system/stratux.service /etc/systemd/system/multi-user.target.wants/stratux.service
-	make www
-	cp -f libdump978.so /usr/lib/libdump978.so
-	cp -f dump1090/dump1090 /usr/bin/
-	cp -f image/hostapd_manager.sh /usr/sbin/
-	cp -f image/stratux-wifi.sh /usr/sbin/
+
 
 clean:
 	rm -f gen_gdl90 libdump978.so fancontrol ahrs_approx
 	cd dump1090 && make clean
 	cd dump978 && make clean
+	cd rtl-ais && make clean