X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fproduct%2Fao_terraui.c;h=c2bbc30e12114e14d93408858de3df02e513fe52;hp=8875ff487b7438040a9f8dd9478f8428e1f2bb61;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hpb=d35c4df12a3d8e2dab5d41f8d918ff4237f91e46

diff --git a/src/product/ao_terraui.c b/src/product/ao_terraui.c
index 8875ff48..c2bbc30e 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
@@ -16,6 +17,7 @@
  */
 
 #include "ao.h"
+#include <ao_flight.h>
 #include <math.h>
 
 static __xdata struct ao_telemetry_sensor		ao_tel_sensor;
@@ -538,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));
@@ -593,7 +593,7 @@ ao_terramonitor(void)
 			continue;
 		if (!(ao_monitor_ring[monitor].all.status & PKT_APPEND_STATUS_1_CRC_OK))
 			continue;
-		ao_tel_rssi = (ao_monitor_ring[monitor].all.rssi >> 1) - 74;
+		ao_tel_rssi = AO_RSSI_FROM_RADIO(ao_monitor_ring[monitor].all.rssi);
 		switch (ao_monitor_ring[monitor].all.telemetry.generic.type) {
 		case AO_TELEMETRY_SENSOR_TELEMETRUM:
 		case AO_TELEMETRY_SENSOR_TELEMINI:
@@ -628,7 +628,7 @@ ao_terragps(void)
 
 	for (;;) {
 		while (ao_gps_tick == gps_tick)
-			ao_sleep(&ao_gps_data);
+			ao_sleep(&ao_gps_new);
 		gps_tick = ao_gps_tick;
 		ao_gps_progress = (ao_gps_progress + 1) & 3;
 	}