Decrease telemetry rate on the pad to 1/sec instead of 20/sec

[fw/altos] / ao.h

diff --git a/ao.h b/ao.h
index 13497095c450aff3f45e78777ab441c46628efe3..fb06df06aeef473fbce7374be20490d92067a1b3 100644 (file)
--- a/ao.h
+++ b/ao.h
@@ -259,10 +259,10 @@ ao_led_init(uint8_t enable);
 
 /* Put one character to the USB output queue */
 void
 
 /* Put one character to the USB output queue */
 void

-ao_usb_putchar(uint8_t c);
+ao_usb_putchar(char c);

 
 /* Get one character from the USB input queue */
 
 /* Get one character from the USB input queue */

-uint8_t
+char

 ao_usb_getchar(void);
 
 /* Flush the USB output queue */
 ao_usb_getchar(void);
 
 /* Flush the USB output queue */


@@ -296,7 +296,7 @@ enum ao_cmd_status {
 };
 
 extern __xdata uint16_t ao_cmd_lex_i;
 };
 
 extern __xdata uint16_t ao_cmd_lex_i;

-extern __xdata uint8_t ao_cmd_lex_c;
+extern __xdata char    ao_cmd_lex_c;

 extern __xdata enum ao_cmd_status ao_cmd_status;
 
 void
 extern __xdata enum ao_cmd_status ao_cmd_status;
 
 void


@@ -318,7 +318,7 @@ void
 ao_cmd_decimal(void);
 
 struct ao_cmds {
 ao_cmd_decimal(void);
 
 struct ao_cmds {

-       uint8_t         cmd;
+       char            cmd;

        void            (*func)(void);
        const char      *help;
 };
        void            (*func)(void);
        const char      *help;
 };


@@ -462,12 +462,12 @@ struct ao_gps_pos {
 #define AO_LOG_POS_NONE                (~0UL)
 
 struct ao_log_record {
 #define AO_LOG_POS_NONE                (~0UL)
 
 struct ao_log_record {

-       uint8_t                 type;
+       char                    type;

        uint8_t                 csum;
        uint16_t                tick;
        union {
                struct {
        uint8_t                 csum;
        uint16_t                tick;
        union {
                struct {

-                       uint16_t        serial;
+                       int16_t         ground_accel;

                        uint16_t        flight;
                } flight;
                struct {
                        uint16_t        flight;
                } flight;
                struct {


@@ -654,11 +654,11 @@ void
 ao_serial_tx1_isr(void) interrupt 14;
 #endif
 
 ao_serial_tx1_isr(void) interrupt 14;
 #endif
 

-uint8_t
+char

 ao_serial_getchar(void) __critical;
 
 void
 ao_serial_getchar(void) __critical;
 
 void

-ao_serial_putchar(uint8_t c) __critical;
+ao_serial_putchar(char c) __critical;

 
 void
 ao_serial_init(void);
 
 void
 ao_serial_init(void);


@@ -727,6 +727,7 @@ struct ao_telemetry {
 
 /* Set delay between telemetry reports (0 to disable) */
 
 
 /* Set delay between telemetry reports (0 to disable) */
 

+#define AO_TELEMETRY_INTERVAL_PAD      AO_MS_TO_TICKS(1000)

 #define AO_TELEMETRY_INTERVAL_FLIGHT   AO_MS_TO_TICKS(50)
 #define AO_TELEMETRY_INTERVAL_RECOVER  AO_MS_TO_TICKS(1000)
 
 #define AO_TELEMETRY_INTERVAL_FLIGHT   AO_MS_TO_TICKS(50)
 #define AO_TELEMETRY_INTERVAL_RECOVER  AO_MS_TO_TICKS(1000)
 


@@ -832,4 +833,17 @@ ao_config_get(void);
 void
 ao_config_init(void);
 
 void
 ao_config_init(void);
 

+/*
+ * ao_product.c
+ *
+ * values which need to be defined for
+ * each instance of a product
+ */
+
+extern const uint8_t ao_usb_descriptors [];
+extern const uint16_t ao_serial_number;
+extern const char ao_version[];
+extern const char ao_manufacturer[];
+extern const char ao_product[];
+

 #endif /* _AO_H_ */
 #endif /* _AO_H_ */