X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fmicropeak-v2.0%2Fao_micropeak.c;h=c6c1e221880c0fc38e158e15dbcb4b36bb66ed5a;hb=HEAD;hp=f3fbc9f42ca016041026086b88b0e562e84574a0;hpb=77e6bad5e66023e487430ef31244edaeaef7c606;p=fw%2Faltos diff --git a/src/micropeak-v2.0/ao_micropeak.c b/src/micropeak-v2.0/ao_micropeak.c index f3fbc9f4..c6c1e221 100644 --- a/src/micropeak-v2.0/ao_micropeak.c +++ b/src/micropeak-v2.0/ao_micropeak.c @@ -56,7 +56,7 @@ ao_pips(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); @@ -145,10 +145,10 @@ ao_battery_fini(void) stm_rcc.apb2enr &= ~(1 << STM_RCC_APB2ENR_ADCEN); } -static uint16_t +static AO_TICK_TYPE ao_battery_voltage(void) { - uint16_t vrefint; + AO_TICK_TYPE vrefint; ao_battery_init(); @@ -167,9 +167,7 @@ ao_battery_voltage(void) static void ao_log_erase(void) { - uint32_t pos; - for (pos = 0; pos < ao_storage_log_max; pos += ao_storage_block) - ao_storage_erase(pos); + ao_storage_erase(0, ao_storage_log_max); } uint8_t ao_on_battery; @@ -214,7 +212,7 @@ ao_show_bat(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)); @@ -227,7 +225,7 @@ ao_log_list(void) 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"); }