Rename ry835ai.go to gps.go.

cyoung · Nov 18, 2016 · ebfb671 · ebfb671
1 parent 360845b
commit ebfb671
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ all:
 
 xgen_gdl90:
 	go get -t -d -v ./main ./test ./godump978 ./uatparse
-	go build $(BUILDINFO) -p 4 main/gen_gdl90.go main/traffic.go main/ry835ai.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
+	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
 
 xdump1090:
 	git submodule update --init

diff --git a/main/gen_gdl90.go b/main/gen_gdl90.go
@@ -257,7 +257,7 @@ func makeOwnshipReport() bool {
 		msg[12] = msg[12] | 0x09 // "Airborne" + "True Track"
 	}
 
-	msg[13] = byte(0x80 | (mySituation.NACp & 0x0F)) //Set NIC = 8 and use NACp from ry835ai.go.
+	msg[13] = byte(0x80 | (mySituation.NACp & 0x0F)) //Set NIC = 8 and use NACp from gps.go.
 
 	gdSpeed := uint16(0) // 1kt resolution.
 	if isGPSGroundTrackValid() {
@@ -1342,7 +1342,8 @@ func main() {
 	//FIXME: Only do this if data logging is enabled.
 	initDataLog()
 
-	initRY835AI()
+	// Start the GPS external sensor monitoring.
+	initGPS()
 
 	// Start the heartbeat message loop in the background, once per second.
 	go heartBeatSender()

diff --git a/main/ry835ai.go → main/gps.go b/main/ry835ai.go → main/gps.go
@@ -4,7 +4,7 @@
 	that can be found in the LICENSE file, herein included
 	as part of this header.
 
-	ry835ai.go: GPS functions, GPS init, AHRS status messages, other external sensor monitoring.
+	gps.go: GPS functions, GPS init, AHRS status messages, other external sensor monitoring.
 */
 
 package main
@@ -2009,7 +2009,7 @@ func pollGPS() {
 	}
 }
 
-func initRY835AI() {
+func initGPS() {
 	mySituation.mu_GPS = &sync.Mutex{}
 	mySituation.mu_GPSPerf = &sync.Mutex{}
 	satelliteMutex = &sync.Mutex{}

diff --git a/web/plates/status-help.html b/web/plates/status-help.html
@@ -6,7 +6,6 @@
     <ul class="list-simple">
         <li><strong>Messages</strong> is the number of messages received by the UAT (978 MHz) and 1090 MHz radios. "Current" is the 60-second rolling total for each receiver; "Peak" is the maximum 60-second total. The 1090 total includes all 1090 MHz Mode S messages received, including all-call and TCAS interrogations that do not carry ADS-B position information. If a UAT radio is receiving uplinks from one or more ground-based transceivers (GBT), this will be indicated under <strong>UAT Towers</strong>, with more details available on the Towers page.</li>
         <li><strong>GPS</strong> indicates the connection status of any attached GPS receivers. Reported data includes the type of position solution, the number of satellites used in that solution, the number of satellites being received, and the number of satellites tracked in the GPS almanac data. Position and accuracy details can be viewed on the <strong>GPS/AHRS</strong> page.</li>
-        <li><strong>AHRS</strong> indicates whether the pressure sensor and gyro on an RY835AI or similar 10-axis module are connected and enabled. If connected, attitude and pressure altitude can be viewed on the <strong>GPS/AHRS</strong> page.</li>
     </ul>
     <p class="text-warning">Devices must be manually enabled on the <strong>Settings</strong> page.</p>