projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telefire: Add cast to AO_LED_CONTINUITY to eliminate -Wconversion warning
[fw/altos]
/
src
/
micropeak-v2.0
/
ao_micropeak.c
diff --git
a/src/micropeak-v2.0/ao_micropeak.c
b/src/micropeak-v2.0/ao_micropeak.c
index c0242b91d5d77a106c1013e9854ba3cd83c49f19..c6c1e221880c0fc38e158e15dbcb4b36bb66ed5a 100644
(file)
--- a/
src/micropeak-v2.0/ao_micropeak.c
+++ b/
src/micropeak-v2.0/ao_micropeak.c
@@
-56,7
+56,7
@@
ao_pips(void)
}
void
}
void
-ao_delay_until(
uint16_t
target) {
+ao_delay_until(
AO_TICK_TYPE
target) {
int16_t delay = target - ao_time();
if (delay > 0) {
ao_sleep_for(ao_delay_until, delay);
int16_t delay = target - ao_time();
if (delay > 0) {
ao_sleep_for(ao_delay_until, delay);
@@
-145,10
+145,10
@@
ao_battery_fini(void)
stm_rcc.apb2enr &= ~(1 << STM_RCC_APB2ENR_ADCEN);
}
stm_rcc.apb2enr &= ~(1 << STM_RCC_APB2ENR_ADCEN);
}
-static
uint16_t
+static
AO_TICK_TYPE
ao_battery_voltage(void)
{
ao_battery_voltage(void)
{
-
uint16_t
vrefint;
+
AO_TICK_TYPE
vrefint;
ao_battery_init();
ao_battery_init();
@@
-212,7
+212,7
@@
ao_show_bat(void)
uint8_t
ao_log_present(void)
{
uint8_t
ao_log_present(void)
{
-
uint16_t
n_samples;
+
AO_TICK_TYPE
n_samples;
ao_eeprom_read(N_SAMPLES_OFFSET, &n_samples, sizeof (n_samples));
ao_eeprom_read(N_SAMPLES_OFFSET, &n_samples, sizeof (n_samples));
@@
-225,7
+225,7
@@
ao_log_list(void)
if (ao_log_present())
printf ("flight %d start %x end %x\n",
1,
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");
}
printf ("done\n");
}