added flarm status to main status page and reduced ogn-decode process spawn delay

Author: b3nn0

main/flarm.go

@@ -459,6 +459,7 @@ func handleAprsConnection(conn net.Conn) {
 	if globalSettings.DEBUG {
 		log.Println("FLARM APRS: Incoming connection:", conn.RemoteAddr())
 	}
+	globalStatus.FLARM_connected = true
 
 	// send initial message
 	conn.Write([]byte(fmt.Sprintf("# %s %s\r\n", "stratux", globalStatus.Version)))
@@ -475,6 +476,11 @@ func handleAprsConnection(conn net.Conn) {
 
 			break
 		}
+		var thisMsg msg
+		thisMsg.MessageClass = MSGCLASS_FLARM
+		thisMsg.TimeReceived = stratuxClock.Time
+		thisMsg.Data = message
+		MsgLog = append(MsgLog, thisMsg)
 
 		// check if message is not a receiver beacon
 		if !strings.HasPrefix(string(message), "Stratux") {
@@ -493,6 +499,7 @@ func handleAprsConnection(conn net.Conn) {
 		}
 	}
 
+	globalStatus.FLARM_connected = false
 	// Close the connection when you're done with it.
 	conn.Close()
 }
@@ -540,7 +547,7 @@ func flarmListen() {
 		ognDecoderIsRunning = false
 
 		// set timer for (re-)starting decoding process (to use latest position)
-		flarmDecoderRestartTimer := time.NewTicker(60 * time.Second)
+		flarmDecoderRestartTimer := time.NewTicker(10 * time.Second)
 
 		// initialize last position
 		var lastLon, lastLat float32 = 0.0, 0.0
@@ -560,8 +567,8 @@ func flarmListen() {
 					break decodingLoop
 				}
 
-				// check if position has changes significantly
-				if !ognDecoderIsRunning || math.Abs(float64(mySituation.GPSLongitude-lastLon)) > 0.001 || math.Abs(float64(mySituation.GPSLatitude-lastLat)) > 0.001 {
+				// check if position has changes significantly. 0.3 lat/lon diff is approximately 35km
+				if !ognDecoderIsRunning || math.Abs(float64(mySituation.GPSLongitude-lastLon)) > 0.3 || math.Abs(float64(mySituation.GPSLatitude-lastLat)) > 0.3 {
 					if globalSettings.DEBUG {
 						if !ognDecoderIsRunning {
 							log.Println("FLARM: Decoder is not running")

main/gen_gdl90.go

@@ -75,8 +75,9 @@ const (
 	MSGTYPE_BASIC_REPORT = 0x1E
 	MSGTYPE_LONG_REPORT  = 0x1F
 
-	MSGCLASS_UAT = 0
-	MSGCLASS_ES  = 1
+	MSGCLASS_UAT   = 0
+	MSGCLASS_ES    = 1
+	MSGCLASS_FLARM = 2
 
 	LON_LAT_RESOLUTION = float32(180.0 / 8388608.0)
 	TRACK_RESOLUTION   = float32(360.0 / 256.0)
@@ -810,6 +811,7 @@ func updateMessageStats() {
 	m := len(MsgLog)
 	UAT_messages_last_minute := uint(0)
 	ES_messages_last_minute := uint(0)
+	FLARM_messages_last_minute := uint(0)
 
 	ADSBTowerMutex.Lock()
 	defer ADSBTowerMutex.Unlock()
@@ -849,12 +851,15 @@ func updateMessageStats() {
 				}
 			} else if MsgLog[i].MessageClass == MSGCLASS_ES {
 				ES_messages_last_minute++
+			} else if MsgLog[i].MessageClass == MSGCLASS_FLARM {
+				FLARM_messages_last_minute++
 			}
 		}
 	}
 	MsgLog = t
 	globalStatus.UAT_messages_last_minute = UAT_messages_last_minute
 	globalStatus.ES_messages_last_minute = ES_messages_last_minute
+	globalStatus.FLARM_messages_last_minute = FLARM_messages_last_minute
 
 	// Update "max messages/min" counters.
 	if globalStatus.UAT_messages_max < UAT_messages_last_minute {
@@ -863,6 +868,9 @@ func updateMessageStats() {
 	if globalStatus.ES_messages_max < ES_messages_last_minute {
 		globalStatus.ES_messages_max = ES_messages_last_minute
 	}
+	if globalStatus.FLARM_messages_max < FLARM_messages_last_minute {
+		globalStatus.FLARM_messages_max = FLARM_messages_last_minute
+	}
 
 	// Update average signal strength over last minute for all ADSB towers.
 	for t, tinf := range ADSBTowers {
@@ -1149,6 +1157,9 @@ type status struct {
 	UAT_messages_max                           uint
 	ES_messages_last_minute                    uint
 	ES_messages_max                            uint
+	FLARM_messages_last_minute                 uint
+	FLARM_messages_max                         uint
+	FLARM_connected                            bool
 	UAT_traffic_targets_tracking               uint16
 	ES_traffic_targets_tracking                uint16
 	Ping_connected                             bool

web/plates/js/status.js

@@ -50,6 +50,9 @@ function StatusCtrl($rootScope, $scope, $state, $http, $interval) {
 			$scope.UAT_messages_max = status.UAT_messages_max;
 			$scope.ES_messages_last_minute = status.ES_messages_last_minute;
 			$scope.ES_messages_max = status.ES_messages_max;
+			$scope.FLARM_messages_last_minute = status.FLARM_messages_last_minute;
+			$scope.FLARM_messages_max = status.FLARM_messages_max;
+			$scope.FLARM_connected = status.FLARM_connected;
 			$scope.GPS_satellites_locked = status.GPS_satellites_locked;
 			$scope.GPS_satellites_tracked = status.GPS_satellites_tracked;
 			$scope.GPS_satellites_seen = status.GPS_satellites_seen;

web/plates/status.html

@@ -46,6 +46,12 @@
 					<span class="col-xs-6"><div class="bar_container"><div class="bar_display traffic-style1" ng-attr-style="width:{{ES_messages_max ? 100*ES_messages_last_minute / ES_messages_max : 0}}%;">{{ES_messages_last_minute}}</div></div></span>
 					<span class="col-xs-2 text-right">{{ES_messages_max}}</span>
 				</div>
+				<div class="row" ng-class="{'section_invisible': !visible_flarm}">
+					<span class="col-xs-1"></span>
+					<label class="col-xs-3">FLARM{{FLARM_connected ? "" : " (disconnected)"}}:</label>
+					<span class="col-xs-6"><div class="bar_container"><div class="bar_display traffic-style4" ng-attr-style="width:{{FLARM_messages_max ? 100*FLARM_messages_last_minute / FLARM_messages_max : 0}}%;">{{FLARM_messages_last_minute}}</div></div></span>
+					<span class="col-xs-2 text-right">{{FLARM_messages_max}}</span>
+				</div>
 				<div class="row" ng-class="{ 'section_invisible': (!visible_gps && !visible_ahrs && !visible_uat)}">
 					<span class="col-xs-1">&nbsp;</span>
 				</div>