X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcore%2Fao_monitor.c;fp=src%2Fcore%2Fao_monitor.c;h=d492e32a8424d312d104ba24772c1d1baeaff8aa;hp=51d614254ab5e19db14a0cd6c89fb7ae887f30de;hb=fe70611c3c7d4b8cce3b5292f0ec549f3191bf86;hpb=18431c88c8a6cb267922b97192e8b7ddb88d0e7e

diff --git a/src/core/ao_monitor.c b/src/core/ao_monitor.c
index 51d61425..d492e32a 100644
--- a/src/core/ao_monitor.c
+++ b/src/core/ao_monitor.c
@@ -141,8 +141,7 @@ ao_monitor_put(void)
 		case AO_MONITORING_ORIG:
 			state = recv_orig.telemetry_orig.flight_state;
 
-			/* Typical RSSI offset for 38.4kBaud at 433 MHz is 74 */
-			rssi = (int16_t) (recv_orig.rssi >> 1) - 74;
+			rssi = (int16_t) AO_RSSI_FROM_RADIO(recv_orig.rssi);
 			ao_xmemcpy(callsign, recv_orig.telemetry_orig.callsign, AO_MAX_CALLSIGN);
 			if (state > ao_flight_invalid)
 				state = ao_flight_invalid;
@@ -240,7 +239,7 @@ ao_monitor_put(void)
 			putchar ('\n');
 #if HAS_RSSI
 			if (recv_raw.packet[ao_monitoring + 1] & PKT_APPEND_STATUS_1_CRC_OK) {
-				rssi = ((int16_t) recv_raw.packet[ao_monitoring] >> 1) - 74;
+				rssi = AO_RSSI_FROM_RADIO(recv_raw.packet[ao_monitoring]);
 				ao_rssi_set(rssi);
 			}
 #endif