X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=doc%2Faprs-operation.inc;h=09f929d088588f13da9e7ae1c87ce3e487bb5ef9;hp=9b1d91ebdc06b30be8c880fa321368154d3f8ff5;hb=HEAD;hpb=2133c235af9511a42b65b239c6fcbeafa0e6d272

diff --git a/doc/aprs-operation.inc b/doc/aprs-operation.inc
index 9b1d91eb..d0e38266 100644
--- a/doc/aprs-operation.inc
+++ b/doc/aprs-operation.inc
@@ -1,12 +1,19 @@
 	=== APRS
 
 		{aprsdevices} can send APRS if desired, and the
-		interval between APRS packets can be configured. As each APRS
-		packet takes a full second to transmit, we recommend an
-		interval of at least 5 seconds to avoid consuming too much
-		battery power or radio channel bandwidth. You can configure
-		the APRS interval using {application}; that process is described in
-		<<{configure_section}>>.
+		interval between APRS packets can be configured. As
+		each APRS packet takes a full second to transmit, we
+		recommend an interval of at least 5 seconds to avoid
+		consuming too much battery power or radio channel
+		bandwidth. You can configure the time within each
+		minute that APRS transmits by changing the APRS offset
+		value. When the GPS signal is locked and knows the
+		current time, the APRS offset selects the time with
+		each minute for the first APRS transmission;
+		subsequent transmissions occur each APRS interval
+		seconds thereafter.  You can configure the APRS
+		interval and APRS offset using {application}; that
+		process is described in <<{configure_section}>>.
 
 		AltOS supports both compressed and uncompressed APRS
 		position report data formats. The compressed format
@@ -26,10 +33,9 @@
 		the receiver. By default, the SSID is set to the last digit of
 		the device serial number.
 
-		The APRS packet format includes a comment field that can have
-		arbitrary text in it. AltOS uses this to send status
-		information about the flight computer. It sends four fields as
-		shown in the following table.
+		The APRS packet format includes a comment field that
+		can have arbitrary text in it. AltOS uses this to send
+		status information as shown in the following table.
 
 		.Altus Metrum APRS Comments
 		[options="header",cols="1,1,3"]
@@ -48,6 +54,8 @@
 		|B4.0
 		|Altimeter Battery Voltage
 
+	ifdef::altusmetrum[]
+
 		|4
 		|A3.7
 		|Apogee Igniter Voltage
@@ -59,8 +67,19 @@
 		|6
 		|1286
 		|Device Serial Number
+
+	endif::altusmetrum[]
+	ifdef::telegps[]
+
+		|4
+		|1286
+		|Device Serial Number
+
+	endif::telegps[]
+
 		|====
 
+		ifdef::altusmetrum[]
 		Here's an example of an APRS comment showing GPS lock with 6
 		satellites in view, a primary battery at 4.0V, and
 		apogee and main igniters both at 3.7V from device 1286.
@@ -68,13 +87,25 @@
 		....
 		L6 B4.0 A3.7 M3.7 1286
 		....
+		endif::altusmetrum[]
+
+		ifdef::telegps[]
+		Here's an example of an APRS comment showing GPS lock with 6
+		satellites in view and a primary battery at 4.0V from device 1876.
+
+		....
+		L6 B4.0 1876
+		....
+		endif::telegps[]
 
-		Make sure your primary battery is above 3.8V, any
-		connected igniters are above 3.5V and GPS is locked
-		with at least 5 or 6 satellites in view before
-		flying. If GPS is switching between L and U regularly,
-		then it doesn't have a good lock and you should wait
-		until it becomes stable.
+		Make sure your primary battery is above 3.8V
+	ifdef::altusmetrum[]
+		any connected igniters are above 3.5V
+	endif::altusmetrum[]
+		and GPS is locked with at least 5 or 6 satellites in
+		view before flying. If GPS is switching between L and
+		U regularly, then it doesn't have a good lock and you
+		should wait until it becomes stable.
 
 		If the GPS receiver loses lock, the APRS data
 		transmitted will contain the last position for which