Merge branch 'develop' into frank-dev2

.gitignore

@@ -162,3 +162,4 @@ Temporary Items
 gpsconfig.yml
 config.yml
 _db
+/build

backups/_db-210115-01/raw/KEYREGISTRY

@@ -0,0 +1 @@
+ˆ‰œœ+¥¶Îz {Hello Badger

backups/_db-210115-01/raw/LOCK

@@ -0,0 +1 @@
+38895

backups/_db-210115-01/records/KEYREGISTRY

@@ -0,0 +1 @@
+;µÐÕ0.Ñþý|uG…Hello Badger

backups/_db-210115-01/records/LOCK

@@ -0,0 +1 @@
+38895

backups/_db-210115-01/sensor/KEYREGISTRY

@@ -0,0 +1 @@
+枯華虌𤥢崱v叐<76>Hello Badger

backups/_db-210115-01/sensor/LOCK

@@ -0,0 +1 @@
+6958

backups/_db-210115-01/trackings/KEYREGISTRY

@@ -0,0 +1 @@
+ßÁuðÓJäe»|?^<5E>¢˜Hello Badger

backups/_db-210115-01/trackings/LOCK

@@ -0,0 +1 @@
+6958

cmd/replay/replay.go

@@ -1,3 +1,7 @@
+/**
+only for testing purposes
+*/
+
 package main
 
 import (

core/collectors.go

@@ -1,7 +1,6 @@
 package core
 
 import (
-	"bufio"
 	"fmt"
 	"git.timovolkmann.de/gyrogpsc/ublox"
 	"github.com/sirupsen/logrus"
@@ -212,18 +211,18 @@ func (t *tcpCollector) connectionHandler(conn net.Conn) {
 		conn.Close()
 	}()
 
-	sc := bufio.NewScanner(conn)
+	buf := make([]byte, 2048)
 	skipped := 0
 	//loop:
-	for sc.Scan() {
+	for {
 		// Read the incoming connection into the buffer.
-		res := append([]byte{}, sc.Bytes()...)
-		if err2 := sc.Err(); err2 != nil {
-			logrus.Warn("lost tcp link:", err2)
+		n, err := conn.Read(buf)
+		if err != nil {
+			fmt.Println("TCP error - reading from connection:", n, err.Error())
 			break
 		}
 		select {
-		case t.out <- res:
+		case t.out <- buf:
 			skipped = 0
 		default:
 			logrus.Traceln("skip collecting tcp messages")

readme.md

@@ -1,27 +1,42 @@
 # gyropsc ⚡
 **Realtime Location Dashboard 🚀**
-## Quickstart
+# Quickstart
 First copy `example_config.yml` to `gpsconfig.yml` and adjust your parameters. if you intend to use this tool with ublox over USB or Serial, you need to set the name of your port in this config file. otherwise the program will panic.
-### Requirements
+## Requirements
 * Win, Linux or Mac Computer, ideally with serial port and WiFi
 * GPS device (Android or iOS smartphone and/or ublox 8/M8 series module)
 * download latest release and unzip it
 
-### Preparation
+## Preparation
 Make sure you prepared your GPS device like described in chapter 3.3 of the Documentation.
 Start gyrogpsc **before** connecting your smartphone via TCP.
 
-### Run
+## Run
 Execute `gyropgsc-$OS`, according to your operating system.
 
 
-## Build from source
-### Requirements
+# Build and run from source
+## Requirements
 * git
 * go >1.15
 
-### Build Steps
+## Run
 1. `git clone --recursive https://git.timovolkmann.de/tvolkmann/gyrogpsc.git`
 2. run `go install` from project root
 3. run `go run cmd/server/server.go` from project root to start application or just `go build cmd/server/server.go` for building it only
 
+## Build
+For Windows 64-bit: `GOOS=windows GOARCH=amd64 go build -o build/gyrogpsc-win.exe cmd/server/server.go`
+
+For MacOS: `GOOS=darwin GOARCH=amd64 go build -o build/gyrogpsc-mac cmd/server/server.go`
+
+For Linux: `GOOS=linux GOARCH=arm64 go build -o build/gyrogpsc-linux cmd/server/server.go` 
+
+Make sure that binaries have execute permissions on Mac and Linux. Currently only working on 64-bit systems.
+
+## Static files and demo database
+### Demo database
+To use demo data, copy `backups/_db-210115-01/` to folder `_db/` in project root. The prebuilt binaries zip-file already contains demo data.
+
+### Static files 
+All static files (`static/` and `templates/`) must be in the root of working directory when running gyrogpsc. That's already the case if you follow "Run" instructions.

static/scripts/indicators.js

@@ -53,6 +53,8 @@ scene.add(pointLight);
 cube.position.x = 0
 cube2.position.x = 0
 
+
+
 // calibration globals
 let manCalibration = new THREE.Euler( 0, 0, 0, 'XYZ' )
 let calibrationRot = new THREE.Quaternion()
@@ -62,6 +64,7 @@ let calYaw = 0
 
 let quaternionOffset = document.getElementById("quaternionOffset")
 
+// function to set current cube rotation from sensor data with respect to calibration
 function renderTCP(x, y, z) {
     let calibration = new THREE.Quaternion().setFromEuler(manCalibration)
     let eul = new THREE.Euler( x, y, z, 'YXZ' );
@@ -73,6 +76,7 @@ function renderTCP(x, y, z) {
     renderer.render(scene, camera);
 }
 
+// function to set current cube rotation from sensor data
 function renderSerial(x, y, z) {
     let eul = new THREE.Euler( x, y, z, 'YXZ' ); // XYZ XZY YZX YXZ ZXY ZYX
 
@@ -137,9 +141,9 @@ function calibrate(evt) {
     let dif = new THREE.Euler().setFromQuaternion( diff )
     console.log("OLD:","pitch", old.x * 180/Math.PI, "yaw", old.y * 180/Math.PI, "roll", old.z * 180/Math.PI)
     console.log("DIFF:","pitch", dif.x * 180/Math.PI, "yaw", dif.y * 180/Math.PI, "roll", dif.z * 180/Math.PI)
-    calPitch = dif.x // * 180/Math.PI
-    calYaw = dif.y // * 180/Math.PI
-    calRoll = dif.z // * 180/Math.PI
+    calPitch = dif.x
+    calYaw = dif.y
+    calRoll = dif.z
     calibrationRot = diff
 }
 document.getElementById("deleteCalibration").onclick = delCalibration
@@ -172,6 +176,7 @@ let altimeter = $.flightIndicator('#altimeter', 'altimeter', options);
 let airspeedLabel = document.getElementById("airspeedLabel")
 let altitudeLabel = document.getElementById("altitudeLabel")
 
+// function to set analog indictors from current sensor data
 function setIndicatorsTcp(sensordata) {
     let q = new THREE.Euler().setFromQuaternion( cube2.quaternion, 'YXZ' ) // XYZ XZY YZX YXZ ZXY ZYX
 
@@ -185,6 +190,7 @@ function setIndicatorsTcp(sensordata) {
     }
 }
 
+// function to set analog indictors from current sensor data
 function setIndicatorsSer(sensordata) {
     if (sensordata.Orientation[0] !== 0 && sensordata.Orientation[1] !== 0) {
         attitudeSer.setPitch(sensordata.Orientation[0])

static/scripts/websocket.js

@@ -98,7 +98,6 @@ window.addEventListener("load", function(evt) {
                         document.getElementById("yellow").style.backgroundColor = 'rgb(157,117,25)'
                         document.getElementById("redlamp").style.backgroundColor = 'rgb(255,14,14)'
                     }
-
                 }
                 tempTCPCoords = null
             }

ublox/decode.go

@@ -1,3 +1,6 @@
+// credits to https://github.com/daedaleanai/ublox for basic ubx parsing idea & code
+// missing ubx messages added and code modified by Timo Volkmann
+
 // Package ublox provides methods to encode and decode u-Blox 8 / M8 NMEA and UBX messages
 // as documented in
 //		UBX-13003221 - R20 u-blox 8 / u-blox M8 Receiver description Including protocol specification