X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao.h;h=1f32ba50f4f0df2ffc3983fd5133d2323cb2070f;hp=949151bf5700d9a50ecd2dafd99cbe10b371c12f;hb=3a3bfd471a868d546d83cdc431b53c8f5208edb9;hpb=b99315cee4ab796376458a2442cf36806fa4aed3 diff --git a/ao.h b/ao.h index 949151bf..1f32ba50 100644 --- a/ao.h +++ b/ao.h @@ -23,13 +23,16 @@ #include #include "cc1111.h" +#define TRUE 1 +#define FALSE 0 + /* Convert a __data pointer into an __xdata pointer */ #define DATA_TO_XDATA(a) ((void __xdata *) ((uint8_t) (a) | 0xff00)) /* Stack runs from above the allocated __data space to 0xfe, which avoids * writing to 0xff as that triggers the stack overflow indicator */ -#define AO_STACK_START 0x78 +#define AO_STACK_START 0x80 #define AO_STACK_END 0xfe #define AO_STACK_SIZE (AO_STACK_END - AO_STACK_START + 1) @@ -44,7 +47,7 @@ struct ao_task { extern __xdata struct ao_task *__data ao_cur_task; -#define AO_NUM_TASKS 10 /* maximum number of tasks */ +#define AO_NUM_TASKS 16 /* maximum number of tasks */ #define AO_NO_TASK 0 /* no task id */ /* @@ -65,7 +68,7 @@ ao_yield(void) _naked; /* Add a task to the run queue */ void -ao_add_task(__xdata struct ao_task * task, void (*start)(void), __code char *name); +ao_add_task(__xdata struct ao_task * task, void (*start)(void), __code char *name) __reentrant; /* Dump task info to console */ void @@ -149,7 +152,7 @@ extern volatile __data uint8_t ao_adc_head; /* Trigger a conversion sequence (called from the timer interrupt) */ void ao_adc_poll(void); - + /* Suspend the current task until another A/D sample is converted */ void ao_adc_sleep(void); @@ -215,7 +218,7 @@ ao_beep(uint8_t beep); /* Turn on the beeper for the specified time */ void -ao_beep_for(uint8_t beep, uint16_t ticks); +ao_beep_for(uint8_t beep, uint16_t ticks) __reentrant; /* Initialize the beeper */ void @@ -241,13 +244,17 @@ ao_led_off(uint8_t colors); void ao_led_set(uint8_t colors); +/* Toggle the specified LEDs */ +void +ao_led_toggle(uint8_t colors); + /* Turn on the specified LEDs for the indicated interval */ void -ao_led_for(uint8_t colors, uint16_t ticks); +ao_led_for(uint8_t colors, uint16_t ticks) __reentrant; /* Initialize the LEDs */ void -ao_led_init(void); +ao_led_init(uint8_t enable); /* * ao_usb.c @@ -255,10 +262,10 @@ ao_led_init(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 */ -uint8_t +char ao_usb_getchar(void); /* Flush the USB output queue */ @@ -269,6 +276,14 @@ ao_usb_flush(void); void ao_usb_isr(void) interrupt 6; +/* Enable the USB controller */ +void +ao_usb_enable(void); + +/* Disable the USB controller */ +void +ao_usb_disable(void); + /* Initialize the USB system */ void ao_usb_init(void); @@ -284,7 +299,7 @@ enum ao_cmd_status { }; 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 @@ -302,8 +317,11 @@ ao_cmd_white(void); void ao_cmd_hex(void); +void +ao_cmd_decimal(void); + struct ao_cmds { - uint8_t cmd; + char cmd; void (*func)(void); const char *help; }; @@ -319,7 +337,7 @@ ao_cmd_init(void); */ /* Allocate a DMA channel. the 'done' parameter will be set to 1 - * when the dma is finished and will be used to wakeup any waiters + * when the dma is finished and will be used to wakeup any waiters */ uint8_t ao_dma_alloc(__xdata uint8_t * done); @@ -417,7 +435,7 @@ struct ao_gps_pos { * packet type, the packet checksum and the tick count. Then * they all contain 2 16 bit values which hold packet-specific * data. - * + * * For each flight, the first packet * is FLIGHT packet, indicating the serial number of the * device and a unique number marking the number of flights @@ -447,12 +465,12 @@ struct ao_gps_pos { #define AO_LOG_POS_NONE (~0UL) struct ao_log_record { - uint8_t type; + char type; uint8_t csum; uint16_t tick; union { struct { - uint16_t serial; + int16_t ground_accel; uint16_t flight; } flight; struct { @@ -550,6 +568,7 @@ extern __pdata enum ao_flight_state ao_flight_state; extern __pdata uint16_t ao_flight_tick; extern __pdata int16_t ao_flight_accel; extern __pdata int16_t ao_flight_pres; +extern __pdata int32_t ao_flight_vel; extern __pdata int16_t ao_ground_pres; extern __pdata int16_t ao_ground_accel; extern __pdata int16_t ao_min_pres; @@ -581,10 +600,10 @@ int16_t ao_pres_to_altitude(int16_t pres) __reentrant; int16_t -ao_temp_to_dC(int16_t temp) __reentrant; +ao_altitude_to_pres(int16_t alt) __reentrant; int16_t -ao_accel_to_cm_per_s2(int16_t accel) __reentrant; +ao_temp_to_dC(int16_t temp) __reentrant; /* * ao_dbg.c @@ -639,11 +658,11 @@ void ao_serial_tx1_isr(void) interrupt 14; #endif -uint8_t +char ao_serial_getchar(void) __critical; void -ao_serial_putchar(uint8_t c) __critical; +ao_serial_putchar(char c) __critical; void ao_serial_init(void); @@ -686,17 +705,44 @@ ao_gps_print(__xdata struct ao_gps_data *gps_data); void ao_gps_init(void); +/* + * ao_gps_report.c + */ + +void +ao_gps_report(void); + +void +ao_gps_report_init(void); + /* * ao_telemetry.c */ +#define AO_MAX_CALLSIGN 8 + struct ao_telemetry { uint8_t addr; uint8_t flight_state; + int16_t flight_accel; + int16_t ground_accel; + int32_t flight_vel; + int16_t flight_pres; + int16_t ground_pres; struct ao_adc adc; struct ao_gps_data gps; + char callsign[AO_MAX_CALLSIGN]; }; +/* 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) + +void +ao_telemetry_set_interval(uint16_t interval); + void ao_telemetry_init(void); @@ -709,7 +755,7 @@ ao_radio_send(__xdata struct ao_telemetry *telemetry) __reentrant; struct ao_radio_recv { struct ao_telemetry telemetry; - uint8_t rssi; + int8_t rssi; uint8_t status; }; @@ -723,11 +769,16 @@ ao_radio_init(void); * ao_monitor.c */ +extern const char const * const ao_state_names[]; + void ao_monitor(void); void -ao_monitor_init(void); +ao_set_monitor(uint8_t monitoring); + +void +ao_monitor_init(uint8_t led, uint8_t monitoring) __reentrant; /* * ao_stdio.c @@ -761,5 +812,51 @@ ao_igniter_status(enum ao_igniter igniter); void ao_igniter_init(void); -#endif /* _AO_H_ */ +/* + * ao_config.c + */ + +#define AO_CONFIG_MAJOR 1 +#define AO_CONFIG_MINOR 0 + +struct ao_config { + uint8_t major; + uint8_t minor; + uint16_t main_deploy; + int16_t accel_zero_g; + uint8_t radio_channel; + char callsign[AO_MAX_CALLSIGN + 1]; +}; + +extern __xdata struct ao_config ao_config; + +void +ao_config_get(void); + +void +ao_config_init(void); +/* + * ao_rssi.c + */ + +void +ao_rssi_set(int rssi_value); + +void +ao_rssi_init(uint8_t rssi_led); + +/* + * 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_ */