X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fproduct%2Fao_terraui.c;h=f8f23a0ff00771b649de8798725dd32c9031bbe9;hb=6023ff81f1bbd240169b9548209133d3b02d475f;hp=8fd97033d6533329bd25af5d0e5ee3bb453f36ff;hpb=039446f54ef6968a3f0b37ce32ca6bdcdbe62546;p=fw%2Faltos

diff --git a/src/product/ao_terraui.c b/src/product/ao_terraui.c
index 8fd97033..f8f23a0f 100644
--- a/src/product/ao_terraui.c
+++ b/src/product/ao_terraui.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -539,9 +540,7 @@ ao_terraui(void)
 		else
 			ao_terraui_page[ao_current_page]();
 
-		ao_alarm(AO_SEC_TO_TICKS(1));
-		b = ao_button_get();
-		ao_clear_alarm();
+		b = ao_button_get(AO_SEC_TO_TICKS(1));
 
 		if (b > 0) {
 			ao_beep_for(AO_BEEP_HIGH, AO_MS_TO_TICKS(10));
@@ -589,7 +588,7 @@ ao_terramonitor(void)
 	     monitor = ao_monitor_ring_next(monitor))
 	{
 		while (monitor == ao_monitor_head)
-			ao_sleep(DATA_TO_XDATA(&ao_monitor_head));
+			ao_sleep(&ao_monitor_head);
 		if (ao_monitoring != sizeof (union ao_telemetry_all))
 			continue;
 		if (!(ao_monitor_ring[monitor].all.status & PKT_APPEND_STATUS_1_CRC_OK))