projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: All STM ADC users need to declare HAS_ADC_TEMP
[fw/altos]
/
src
/
core
/
ao.h
diff --git
a/src/core/ao.h
b/src/core/ao.h
index 6d617cfc89a2793631029f170dfcba62d6371b34..977e10b87d2716d5a2817b4d51dcbd3215f8bd14 100644
(file)
--- a/
src/core/ao.h
+++ b/
src/core/ao.h
@@
-94,7
+94,7
@@
extern volatile __data AO_TICK_TYPE ao_tick_count;
#define AO_SEC_TO_TICKS(s) ((s) * AO_HERTZ)
/* Returns the current time in ticks */
#define AO_SEC_TO_TICKS(s) ((s) * AO_HERTZ)
/* Returns the current time in ticks */
-uint16_t
+AO_TICK_TYPE
ao_time(void);
/* Suspend the current task until ticks time has passed */
ao_time(void);
/* Suspend the current task until ticks time has passed */
@@
-544,13
+544,13
@@
ao_radio_test(uint8_t on);
typedef int16_t (*ao_radio_fill_func)(uint8_t *buffer, int16_t len);
void
typedef int16_t (*ao_radio_fill_func)(uint8_t *buffer, int16_t len);
void
-ao_radio_send_
lot
s(ao_radio_fill_func fill);
+ao_radio_send_
apr
s(ao_radio_fill_func fill);
/*
* ao_radio_pa
*/
/*
* ao_radio_pa
*/
-#if
AO_RADIO_HAS_PA
+#if
HAS_RADIO_AMP
void
ao_radio_pa_on(void);
void
ao_radio_pa_on(void);
@@
-638,7
+638,7
@@
ao_monitor_init(void) __reentrant;
#define AO_READ_AGAIN (-1)
struct ao_stdio {
#define AO_READ_AGAIN (-1)
struct ao_stdio {
- int (*
pollchar)(void);
+ int (*
_pollchar)(void); /* Called with interrupts blocked */
void (*putchar)(char c) __reentrant;
void (*flush)(void);
uint8_t echo;
void (*putchar)(char c) __reentrant;
void (*flush)(void);
uint8_t echo;
@@
-715,7
+715,7
@@
extern __xdata uint8_t ao_force_freq;
#endif
#define AO_CONFIG_MAJOR 1
#endif
#define AO_CONFIG_MAJOR 1
-#define AO_CONFIG_MINOR 1
3
+#define AO_CONFIG_MINOR 1
4
#define AO_AES_LEN 16
#define AO_AES_LEN 16
@@
-743,6
+743,12
@@
struct ao_config {
struct ao_pyro pyro[AO_PYRO_NUM]; /* minor version 12 */
#endif
uint16_t aprs_interval; /* minor version 13 */
struct ao_pyro pyro[AO_PYRO_NUM]; /* minor version 12 */
#endif
uint16_t aprs_interval; /* minor version 13 */
+#if HAS_RADIO_POWER
+ uint8_t radio_power; /* minor version 14 */
+#endif
+#if HAS_RADIO_AMP
+ uint8_t radio_amp; /* minor version 14 */
+#endif
};
#define AO_IGNITE_MODE_DUAL 0
};
#define AO_IGNITE_MODE_DUAL 0