altos: Fix printf format mis-matches

Lots of values passed to printf are 'long' instead of 'int', so
fix the formats to use the right size indicator.

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

diff --git a/src/drivers/ao_adxl375.c b/src/drivers/ao_adxl375.c
index 4f6b816948709632e5462e1d8d0460a0f3911b49..dca2213b1ba94cb3b111a19ed81301c6e1cf8450 100644 (file)
--- a/src/drivers/ao_adxl375.c
+++ b/src/drivers/ao_adxl375.c
@@ -235,13 +235,13 @@ static struct ao_task ao_adxl375_task;
 static void
 ao_adxl375_dump(void)
 {
-       printf ("ADXL375 value %d %d %d self test %d min %d max %d\n",
+       printf ("ADXL375 value %d %d %d self test %ld min %ld max %ld\n",
                ao_adxl375_current.x,
                ao_adxl375_current.y,
                ao_adxl375_current.z,
-               self_test_value,
-               MIN_SELF_TEST,
-               MAX_SELF_TEST);
+               (long) self_test_value,
+               (long) MIN_SELF_TEST,
+               (long) MAX_SELF_TEST);
 }
 
 const struct ao_cmds ao_adxl375_cmds[] = {

diff --git a/src/drivers/ao_aprs.c b/src/drivers/ao_aprs.c
index bc5c29dfc85634d9f5a4905ead05b55308583293..826985c6e06e2f0b004a05c36a2b6976cd6a49ba 100644 (file)
--- a/src/drivers/ao_aprs.c
+++ b/src/drivers/ao_aprs.c
@@ -234,7 +234,7 @@ static void timeInit()
 #define TNC_TX_DELAY 45
 
 /// The size of the TNC output buffer.
-#define TNC_BUFFER_SIZE 40
+#define TNC_BUFFER_SIZE 48
 
 /// States that define the current mode of the 1200 bps (A-FSK) state machine.
 typedef enum

diff --git a/src/drivers/ao_lco.c b/src/drivers/ao_lco.c
index 0d7e4cba2debfca344168ccad24065cb4a94cbb1..2cb885cfc336996f7b5a3e56e4686ed48ed26c8a 100644 (file)
--- a/src/drivers/ao_lco.c
+++ b/src/drivers/ao_lco.c
@@ -163,8 +163,8 @@ ao_lco_drag_monitor(void)
 
        ao_beep_for(AO_BEEP_MID, AO_MS_TO_TICKS(200));
        for (;;) {
-               PRINTD("Drag monitor count %d active %d delay %d\n",
-                      ao_lco_drag_beep_count, ao_lco_drag_active, delay);
+               PRINTD("Drag monitor count %d active %d delay %lu\n",
+                      ao_lco_drag_beep_count, ao_lco_drag_active, (unsigned long) delay);
                if (delay == (AO_TICK_TYPE) ~0)
                        ao_sleep(&ao_lco_drag_beep_count);
                else
@@ -217,8 +217,8 @@ ao_lco_input(void)
 
        for (;;) {
                ao_event_get(&event);
-               PRINTD("event type %d unit %d value %d\n",
-                      event.type, event.unit, event.value);
+               PRINTD("event type %d unit %d value %ld\n",
+                      event.type, event.unit, (long) event.value);
                switch (event.type) {
                case AO_EVENT_QUADRATURE:
                        switch (event.unit) {

diff --git a/src/drivers/ao_lco.h b/src/drivers/ao_lco.h
index 3b123793d7ff4d8327e4d837e2ee8dddc7df1867..452092a092df80a4aa940e27f3b623977b5a1020 100644 (file)
--- a/src/drivers/ao_lco.h
+++ b/src/drivers/ao_lco.h
@@ -29,7 +29,7 @@
 
 #if DEBUG
 extern uint8_t ao_lco_debug;
-#define PRINTD(...) do { if (!ao_lco_debug) break; printf ("\r%5u %s: ", ao_tick_count, __func__); printf(__VA_ARGS__); flush(); } while(0)
+#define PRINTD(...) do { if (!ao_lco_debug) break; printf ("\r%5lu %s: ", (unsigned long) ao_tick_count, __func__); printf(__VA_ARGS__); flush(); } while(0)
 #else
 #define PRINTD(...) 
 #endif

diff --git a/src/drivers/ao_lco_bits.c b/src/drivers/ao_lco_bits.c
index bc54dc22b8ab9992d4b8b2a0419fc9774a62e228..b97662a0b29fd1eda6423eb5d1092b7b5300a8d3 100644 (file)
--- a/src/drivers/ao_lco_bits.c
+++ b/src/drivers/ao_lco_bits.c
@@ -394,9 +394,9 @@ ao_lco_toggle_drag(void)
 AO_TICK_TYPE
 ao_lco_drag_beep_check(AO_TICK_TYPE now, AO_TICK_TYPE delay)
 {
-       PRINTD("beep check count %d delta %d\n",
+       PRINTD("beep check count %d delta %ld\n",
               ao_lco_drag_beep_count,
-              (AO_TICK_SIGNED) (now - ao_lco_drag_beep_time));
+              (long) (AO_TICK_SIGNED) (now - ao_lco_drag_beep_time));
        if (ao_lco_drag_beep_count) {
                if ((AO_TICK_SIGNED) (now - ao_lco_drag_beep_time) >= 0) {
                        if (ao_lco_drag_beep_on) {

diff --git a/src/drivers/ao_lco_two.c b/src/drivers/ao_lco_two.c
index cfef2a631c488a12e86d130d2680dd3444593447..8d4476efdbe08c1c4f6ff6185ff2e5f8b591be5b 100644 (file)
--- a/src/drivers/ao_lco_two.c
+++ b/src/drivers/ao_lco_two.c
@@ -79,8 +79,8 @@ ao_lco_input(void)
                        ao_event_get(&event);
                }
                ao_lco_wakeup();
-               PRINTD("event type %d unit %d value %d\n",
-                      event.type, event.unit, event.value);
+               PRINTD("event type %d unit %d value %ld\n",
+                      event.type, event.unit, (long) event.value);
                switch (event.type) {
                case AO_EVENT_BUTTON:
                        switch (event.unit) {

diff --git a/src/drivers/ao_mma655x.c b/src/drivers/ao_mma655x.c
index b0217368692fb7939ce391663aa815f4aa46132b..4c24e98b71c1e432883f32703a90e2f569d16ce8 100644 (file)
--- a/src/drivers/ao_mma655x.c
+++ b/src/drivers/ao_mma655x.c
@@ -25,7 +25,7 @@
 #define DEBUG_LOW      1
 #define DEBUG_HIGH     2
 #if 1
-#define PRINTD(l, ...) do { if (DEBUG & (l)) { printf ("\r%5u %s: ", ao_tick_count, __func__); printf(__VA_ARGS__); flush(); } } while(0)
+#define PRINTD(l, ...) do { if (DEBUG & (l)) { printf ("\r%5lu %s: ", (unsigned long) ao_tick_count, __func__); printf(__VA_ARGS__); flush(); } } while(0)
 #else
 #define PRINTD(l,...) 
 #endif

diff --git a/src/drivers/ao_pad.c b/src/drivers/ao_pad.c
index 07c49afc6b890a4094a842360223eddc52eef715..f5c51c8b874a6ac30dd14fdc0861996562d6536f 100644 (file)
--- a/src/drivers/ao_pad.c
+++ b/src/drivers/ao_pad.c
@@ -440,8 +440,8 @@ ao_pad(void)
                                break;
                        }
                        if ((AO_TICK_SIGNED) (ao_time() - ao_pad_arm_time) > AO_SEC_TO_TICKS(20)) {
-                               PRINTD ("late pad arm_time %d time %d\n",
-                                       ao_pad_arm_time, ao_time());
+                               PRINTD ("late pad arm_time %ld time %ld\n",
+                                       (long) ao_pad_arm_time, ao_time());
                                break;
                        }
                        PRINTD ("ignite\n");
@@ -458,8 +458,8 @@ ao_pad(void)
                        if (!ao_log_running) ao_log_start();
 #endif
                        if ((AO_TICK_SIGNED) (ao_time() - ao_pad_arm_time) > AO_SEC_TO_TICKS(20)) {
-                               PRINTD ("late pad arm_time %d time %d\n",
-                                       ao_pad_arm_time, ao_time());
+                               PRINTD ("late pad arm_time %ld time %ld\n",
+                                       (long) ao_pad_arm_time, (long) ao_time());
                                break;
                        }
                        PRINTD ("ignite\n");

diff --git a/src/drivers/ao_quadrature.c b/src/drivers/ao_quadrature.c
index a5fbd1daaa43e30340a066373a8221cdb6d19b34..97e67aa07bfd72f5cf934fbb33516afd363a509b 100644 (file)
--- a/src/drivers/ao_quadrature.c
+++ b/src/drivers/ao_quadrature.c
@@ -191,7 +191,7 @@ ao_quadrature_test(void)
                        t = ao_quadrature_step[q];
                        printf("step %3d ", t);
 #endif
-                       printf ("count %3d state %2x\n", c, s);
+                       printf ("count %3ld state %2x\n", (long) c, s);
                        flush();
                }
        }

diff --git a/src/kernel/ao_config.c b/src/kernel/ao_config.c
index 687923499aef2c73efbf67ebea14b088586645d5..217b0ab1a8cd5145dbc6470f2c95bede280144f1 100644 (file)
--- a/src/kernel/ao_config.c
+++ b/src/kernel/ao_config.c
@@ -629,7 +629,7 @@ static void
 ao_config_log_set(void) 
 {
 #if FLIGHT_LOG_APPEND
-       printf("Flight log fixed size %d kB\n", ao_storage_log_max >> 10);
+       printf("Flight log fixed size %u kB\n", (unsigned) (ao_storage_log_max >> 10));
 #else
        uint32_t        r;
 
@@ -643,7 +643,7 @@ ao_config_log_set(void)
                return;
        }
        if (r > ao_storage_log_max) {
-               printf("Flight log max %d kB\n", ao_storage_log_max >> 10);
+               printf("Flight log max %u kB\n", (unsigned) (ao_storage_log_max >> 10));
                return;
        }
        _ao_config_edit_start();

diff --git a/src/kernel/ao_log_telestatic.c b/src/kernel/ao_log_telestatic.c
index fdf8da43fe9b1d3ecaa3a936f0c5c737de7c915d..0829bcbb2286df78e60efbc5f5e3a5019253b374 100644 (file)
--- a/src/kernel/ao_log_telestatic.c
+++ b/src/kernel/ao_log_telestatic.c
@@ -21,7 +21,7 @@
 #include <ao_data.h>
 #include <ao_flight.h>
 
-static struct ao_log_telestatic log;
+static struct ao_log_telestatic log_data;
 
 const uint8_t ao_log_format = AO_LOG_FORMAT_TELESTATIC;
 
@@ -41,15 +41,15 @@ ao_log_telestatic(void)
 {
        uint8_t wrote = 0;
        /* set checksum */
-       log.csum = 0;
-       log.csum = ao_log_csum((uint8_t *) &log);
+       log_data.csum = 0;
+       log_data.csum = ao_log_csum((uint8_t *) &log_data);
        ao_mutex_get(&ao_log_mutex); {
                if (ao_log_current_pos >= ao_log_end_pos && ao_log_running)
                        ao_log_stop();
                if (ao_log_running) {
                        wrote = 1;
                        ao_storage_write(ao_log_current_pos,
-                                        &log,
+                                        &log_data,
                                         sizeof (struct ao_log_telestatic));
                        ao_log_current_pos += sizeof (struct ao_log_telestatic);
                }
@@ -75,9 +75,9 @@ ao_log(void)
                while (!ao_log_running)
                        ao_sleep(&ao_log_running);
        
-               log.type = AO_LOG_FLIGHT;
-               log.tick = ao_time();
-               log.u.flight.flight = ao_flight_number;
+               log_data.type = AO_LOG_FLIGHT;
+               log_data.tick = ao_time();
+               log_data.u.flight.flight = ao_flight_number;
                ao_log_telestatic();
 
                /* Write the whole contents of the ring to the log
@@ -87,18 +87,18 @@ ao_log(void)
                for (;;) {
                        /* Write samples to EEPROM */
                        while (ao_log_data_pos != ao_data_head) {
-                               log.tick = ao_data_ring[ao_log_data_pos].tick;
-                               log.type = AO_LOG_SENSOR;
+                               log_data.tick = ao_data_ring[ao_log_data_pos].tick;
+                               log_data.type = AO_LOG_SENSOR;
 #if HAS_ADS131A0X
-                               log.u.sensor.pressure = ao_data_ring[ao_log_data_pos].ads131a0x.ain[0];
-                               log.u.sensor.pressure2 = ao_data_ring[ao_log_data_pos].ads131a0x.ain[1];
-                               log.u.sensor.thrust = ao_data_ring[ao_log_data_pos].ads131a0x.ain[2];
-                               log.u.sensor.mass = ao_data_ring[ao_log_data_pos].ads131a0x.ain[3];
+                               log_data.u.sensor.pressure = ao_data_ring[ao_log_data_pos].ads131a0x.ain[0];
+                               log_data.u.sensor.pressure2 = ao_data_ring[ao_log_data_pos].ads131a0x.ain[1];
+                               log_data.u.sensor.thrust = ao_data_ring[ao_log_data_pos].ads131a0x.ain[2];
+                               log_data.u.sensor.mass = ao_data_ring[ao_log_data_pos].ads131a0x.ain[3];
 #endif
-                               log.u.sensor.t_low = ao_data_ring[ao_log_data_pos].max6691.sensor[0].t_low;
+                               log_data.u.sensor.t_low = ao_data_ring[ao_log_data_pos].max6691.sensor[0].t_low;
                                int i;
                                for (i = 0; i < 4; i++)
-                                       log.u.sensor.t_high[i] = ao_data_ring[ao_log_data_pos].max6691.sensor[i].t_high;
+                                       log_data.u.sensor.t_high[i] = ao_data_ring[ao_log_data_pos].max6691.sensor[i].t_high;
                                ao_log_telestatic();
                                ao_log_data_pos = ao_data_ring_next(ao_log_data_pos);
                        }

diff --git a/src/kernel/ao_tracker.c b/src/kernel/ao_tracker.c
index 1454c17c31815aadd08c9d060f10a81cacf78711..0f2491031e8e2d0de8774e2ba1ab96f4d70e9b47 100644 (file)
--- a/src/kernel/ao_tracker.c
+++ b/src/kernel/ao_tracker.c
@@ -134,7 +134,7 @@ ao_tracker(void)
                                                height = -height;
 
                                        if (ao_tracker_force_telem > 1)
-                                               printf("head %d ring %d ground_distance %d height %d\n", gps_head, ring, ground_distance, height);
+                                               printf("head %d ring %d ground_distance %ld height %d\n", gps_head, ring, (long) ground_distance, height);
                                        if (ground_distance > ao_config.tracker_motion ||
                                            height > (ao_config.tracker_motion << 1))
                                        {

diff --git a/src/micropeak-v2.0/ao_micropeak.c b/src/micropeak-v2.0/ao_micropeak.c
index c0242b91d5d77a106c1013e9854ba3cd83c49f19..a4de48543a70d2cbf24dbad2f184fd73f2cc4870 100644 (file)
--- a/src/micropeak-v2.0/ao_micropeak.c
+++ b/src/micropeak-v2.0/ao_micropeak.c
@@ -225,7 +225,7 @@ ao_log_list(void)
        if (ao_log_present())
                printf ("flight %d start %x end %x\n",
                        1,
-                       0, MAX_LOG_OFFSET >> 8);
+                       0, (unsigned) (MAX_LOG_OFFSET >> 8));
        printf ("done\n");
 }
 

diff --git a/src/stmf0/ao_storage_stm.c b/src/stmf0/ao_storage_stm.c
index 4ecdc7a526534644994a8fbb6a1ffbd8772bb4af..4f5a12ef01d757a12c4e290bcb52c522c20d8438 100644 (file)
--- a/src/stmf0/ao_storage_stm.c
+++ b/src/stmf0/ao_storage_stm.c
@@ -182,8 +182,8 @@ ao_storage_setup(void)
 void
 ao_storage_device_info(void) 
 {
-       printf ("Using internal flash, page %d bytes, total %d bytes\n",
-               ao_storage_block, ao_storage_total);
+       printf ("Using internal flash, page %ld bytes, total %ld bytes\n",
+               (long) ao_storage_block, (long) ao_storage_total);
 }
 
 void

diff --git a/src/telelco-v2.0/ao_lco_v2.c b/src/telelco-v2.0/ao_lco_v2.c
index 1238d72f01dae3316ab352d00d47ad558fe12fce..a04ceb9fc89efdd936cf059ea2d72972ee3c40c2 100644 (file)
--- a/src/telelco-v2.0/ao_lco_v2.c
+++ b/src/telelco-v2.0/ao_lco_v2.c
@@ -156,7 +156,7 @@ ao_lco_drag_monitor(void)
 
        ao_beep_for(AO_BEEP_MID, AO_MS_TO_TICKS(200));
        for (;;) {
-               PRINTD("Drag monitor count %d delay %d\n", ao_lco_drag_beep_count, delay);
+               PRINTD("Drag monitor count %d delay %lu\n", ao_lco_drag_beep_count, (unsigned long) delay);
                if (delay == (AO_TICK_TYPE) ~0)
                        ao_sleep(&ao_lco_drag_beep_count);
                else
@@ -176,8 +176,8 @@ ao_lco_input(void)
 
        for (;;) {
                ao_event_get(&event);
-               PRINTD("event type %d unit %d value %d\n",
-                      event.type, event.unit, event.value);
+               PRINTD("event type %d unit %d value %ld\n",
+                      event.type, event.unit, (long) event.value);
                switch (event.type) {
                case AO_EVENT_QUADRATURE:
                        switch (event.unit) {

diff --git a/src/telestatic-v3.0/ao_telestatic.c b/src/telestatic-v3.0/ao_telestatic.c
index 7e9cd3535e1ccc529a0e73548889386eb0a750e1..721d776c3df4fee682f45f55324c1c5fce9778c1 100644 (file)
--- a/src/telestatic-v3.0/ao_telestatic.c
+++ b/src/telestatic-v3.0/ao_telestatic.c
@@ -36,7 +36,7 @@ const struct ao_cmds ao_firetwo_cmds[] = {
         { 0,    NULL },
 };
 
-void
+int
 main(void)
 {
        ao_clock_init();