Switch from GPLv2 to GPLv2+

[fw/altos] / src / test / ao_aprs_test.c

diff --git a/src/test/ao_aprs_test.c b/src/test/ao_aprs_test.c
index f16c94e8d696b93b53f0ca21732781b979826c4a..3852668af9014e133f05ffa1aefa5c69859a10ac 100644 (file)
--- a/src/test/ao_aprs_test.c
+++ b/src/test/ao_aprs_test.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.

  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -21,9 +22,20 @@
 #include <stdint.h>
 #include <stdarg.h>
 
 #include <stdint.h>
 #include <stdarg.h>
 

+#define HAS_GPS        1
+

 #include <ao_telemetry.h>
 
 #include <ao_telemetry.h>
 

+#define AO_GPS_NUM_SAT_MASK    (0xf << 0)
+#define AO_GPS_NUM_SAT_SHIFT   (0)
+
+#define AO_GPS_VALID           (1 << 4)
+#define AO_GPS_RUNNING         (1 << 5)
+#define AO_GPS_DATE_VALID      (1 << 6)
+#define AO_GPS_COURSE_VALID    (1 << 7)
+

 struct ao_telemetry_location ao_gps_data;
 struct ao_telemetry_location ao_gps_data;

+struct ao_telemetry_satellite ao_gps_tracking_data;

 
 #define AO_APRS_TEST
 
 
 #define AO_APRS_TEST
 


@@ -46,7 +58,7 @@ ao_aprs_bit(uint8_t bit)
 #endif
 
 void
 #endif
 
 void

-ao_radio_send_lots(ao_radio_fill_func fill);
+ao_radio_send_aprs(ao_radio_fill_func fill);

 
 #include <ao_aprs.c>
 
 
 #include <ao_aprs.c>
 


@@ -73,7 +85,7 @@ ao_radio_send_lots(ao_radio_fill_func fill);
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- *  
+ *

 
  */
 
 
  */
 


@@ -93,18 +105,22 @@ int main(int argc, char **argv)
 {
     audio_gap(1);
 
 {
     audio_gap(1);
 

-    ao_gps_data.latitude = 45.4694766 * 10000000;
-    ao_gps_data.longitude = -122.7376250 * 10000000;
-    ao_gps_data.altitude = 83;
+    ao_gps_data.latitude = (45.0 + 28.25 / 60.0) * 10000000;
+    ao_gps_data.longitude = (-(122 + 44.2649 / 60.0)) * 10000000;
+    AO_TELEMETRY_LOCATION_SET_ALTITUDE(&ao_gps_data, 84);
+    ao_gps_data.flags = (AO_GPS_VALID|AO_GPS_RUNNING);

 
     /* Transmit one packet */
     ao_aprs_send();
 
 
     /* Transmit one packet */
     ao_aprs_send();
 

+    tncBuffer[strlen((char *) tncBuffer) - 2] = '\0';
+    fprintf(stderr, "packet: %s\n", tncBuffer);
+

     exit(0);
 }
 
 void
     exit(0);
 }
 
 void

-ao_radio_send_lots(ao_radio_fill_func fill)
+ao_radio_send_aprs(ao_radio_fill_func fill)

 {
        int16_t len;
        uint8_t done = 0;
 {
        int16_t len;
        uint8_t done = 0;