diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-12-06 15:39:53 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-12-06 15:39:53 -0700 |
| commit | 7339d2379713b5b7e4c4fe6bad89ed93f9d39e82 (patch) | |
| tree | 41e653c4014940a0d78900fddd433514b9dbfc66 /src/kernel/ao.h | |
| parent | d1f9121593fe30b924223e89ef4d596b5bec2b25 (diff) | |
| parent | b6462ca3a7e99fe390ec97f94c23d36fab8c294d (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/kernel/ao.h')
| -rw-r--r-- | src/kernel/ao.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/kernel/ao.h b/src/kernel/ao.h index ad5bbf8e..16d600aa 100644 --- a/src/kernel/ao.h +++ b/src/kernel/ao.h @@ -43,10 +43,6 @@ #define HAS_TASK 1 #endif -#ifndef AO_PORT_TYPE -#define AO_PORT_TYPE uint8_t -#endif - typedef AO_PORT_TYPE ao_port_t; #if HAS_TASK @@ -518,15 +514,9 @@ struct ao_telemetry_raw_recv { /* Set delay between telemetry reports (0 to disable) */ -#ifdef AO_SEND_ALL_BARO -#define AO_TELEMETRY_INTERVAL_PAD AO_MS_TO_TICKS(100) -#define AO_TELEMETRY_INTERVAL_FLIGHT AO_MS_TO_TICKS(100) -#define AO_TELEMETRY_INTERVAL_RECOVER AO_MS_TO_TICKS(100) -#else #define AO_TELEMETRY_INTERVAL_PAD AO_MS_TO_TICKS(1000) #define AO_TELEMETRY_INTERVAL_FLIGHT AO_MS_TO_TICKS(100) #define AO_TELEMETRY_INTERVAL_RECOVER AO_MS_TO_TICKS(1000) -#endif void ao_telemetry_reset_interval(void); @@ -662,6 +652,7 @@ union ao_monitor { extern __xdata union ao_monitor ao_monitor_ring[AO_MONITOR_RING]; #define ao_monitor_ring_next(n) (((n) + 1) & (AO_MONITOR_RING - 1)) +#define ao_monitor_ring_prev(n) (((n) - 1) & (AO_MONITOR_RING - 1)) extern __data uint8_t ao_monitoring; extern __data uint8_t ao_monitor_head; |