X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fmicropeak-v2.0%2Fao_micropeak.c;h=c6c1e221880c0fc38e158e15dbcb4b36bb66ed5a;hb=50385fa8941b58192f8955b3873a75251cde5844;hp=1bf0999ec1da00c8743e3c7421f0270ce877c99b;hpb=c37cd66b7c11f904b528c5ff7e80e18c5e0d26e5;p=fw%2Faltos

diff --git a/src/micropeak-v2.0/ao_micropeak.c b/src/micropeak-v2.0/ao_micropeak.c
index 1bf0999e..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");
 }
 
@@ -291,7 +289,7 @@ ao_hsi_init(void)
 	stm_rcc.csr |= (1 << STM_RCC_CSR_RMVF);
 }
 
-void
+int
 main(void)
 {
 	int i;