altos/test: Fix tests

A couple of fixups for ao_flight_test to dump pyro info only when
running in debug mode, and to change the aprs testing

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/kernel/ao_pyro.c b/src/kernel/ao_pyro.c
index c9920ab335cd681369ad8e78e893f8b1bd49b021..b11d1080a54fbc1a7c25f5cb23a8eae492a7cf23 100644 (file)
--- a/src/kernel/ao_pyro.c
+++ b/src/kernel/ao_pyro.c
@@ -75,7 +75,8 @@ uint16_t      ao_pyro_fired;
 #endif
 
 #if PYRO_DBG
-#define DBG(...)       do { printf("\t%d: ", (int) (pyro - ao_config.pyro)); printf(__VA_ARGS__); } while (0)
+int pyro_dbg;
+#define DBG(...)       do { if (pyro_dbg) printf("\t%d: ", (int) (pyro - ao_config.pyro)); printf(__VA_ARGS__); } while (0)
 #else
 #define DBG(...)
 #endif

diff --git a/src/test/ao_aprs_test.c b/src/test/ao_aprs_test.c
index 3852668af9014e133f05ffa1aefa5c69859a10ac..941bf95471d1c14abfa891cd434ba951127f136c 100644 (file)
--- a/src/test/ao_aprs_test.c
+++ b/src/test/ao_aprs_test.c
@@ -60,6 +60,20 @@ ao_aprs_bit(uint8_t bit)
 void
 ao_radio_send_aprs(ao_radio_fill_func fill);
 
+static void
+aprs_bit_debug(uint8_t tx_bit)
+{
+       fprintf (stderr, "bit %d\n", tx_bit);
+}
+
+static void
+aprs_byte_debug(uint8_t tx_byte)
+{
+       fprintf(stderr, "byte %02x\n", tx_byte);
+}
+#define APRS_BIT_DEBUG(x) aprs_bit_debug(x)
+#define APRS_BYTE_DEBUG(y) aprs_byte_debug(y)
+
 #include <ao_aprs.c>
 
 /*
@@ -103,7 +117,7 @@ audio_gap(int secs)
 // This is where we go after reset.
 int main(int argc, char **argv)
 {
-    audio_gap(1);
+//    audio_gap(1);
 
     ao_gps_data.latitude = (45.0 + 28.25 / 60.0) * 10000000;
     ao_gps_data.longitude = (-(122 + 44.2649 / 60.0)) * 10000000;

diff --git a/src/test/ao_flight_test.c b/src/test/ao_flight_test.c
index bd7f2ff8196c2759af7d9adc9790bf71e6f816ea..25ddb48fefb6f982a4558eac59c99089e463f1e3 100644 (file)
--- a/src/test/ao_flight_test.c
+++ b/src/test/ao_flight_test.c
@@ -58,6 +58,7 @@ int ao_gps_new;
 #define HAS_HMC5883            1
 #define HAS_BEEP               1
 #define AO_CONFIG_MAX_SIZE     1024
+#define AO_MMA655X_INVERT      0
 
 struct ao_adc {
        int16_t                 sense[AO_ADC_NUM_SENSE];
@@ -71,6 +72,7 @@ struct ao_adc {
 #define AO_ADC_NUM_SENSE       2
 #define HAS_MS5607             1
 #define HAS_MMA655X            1
+#define AO_MMA655X_INVERT      1
 #define HAS_BEEP               1
 #define AO_CONFIG_MAX_SIZE     1024
 
@@ -373,6 +375,8 @@ uint16_t    prev_tick;
 #define AO_PYRO_2      2
 #define AO_PYRO_3      3
 
+#define PYRO_DBG       1
+
 static void
 ao_pyro_pin_set(uint8_t pin, uint8_t value)
 {