X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fkernel%2Fao_config.c;h=10a67116ac1d4eea5868763d66f8a9c82aa3b6cc;hp=25634ffc3178ab88769867ae0d9b9b2df416cfcd;hb=6023ff81f1bbd240169b9548209133d3b02d475f;hpb=3b4e3189211801c6f8f41c5d08c5a8551f28976c

diff --git a/src/kernel/ao_config.c b/src/kernel/ao_config.c
index 25634ffc..10a67116 100644
--- a/src/kernel/ao_config.c
+++ b/src/kernel/ao_config.c
@@ -135,7 +135,7 @@ _ao_config_get(void)
 		/* Version 0 stuff */
 		ao_config.main_deploy = AO_CONFIG_DEFAULT_MAIN_DEPLOY;
 		ao_xmemset(&ao_config.callsign, '\0', sizeof (ao_config.callsign));
-		ao_xmemcpy(&ao_config.callsign, CODE_TO_XDATA(AO_CONFIG_DEFAULT_CALLSIGN),
+		ao_xmemcpy(&ao_config.callsign, AO_CONFIG_DEFAULT_CALLSIGN,
 		       sizeof(AO_CONFIG_DEFAULT_CALLSIGN) - 1);
 		ao_config._legacy_radio_channel = 0;
 	}
@@ -243,7 +243,10 @@ _ao_config_get(void)
 	if (ao_force_freq) {
 		ao_config.frequency = 434550;
 		ao_config.radio_cal = ao_radio_cal;
-		ao_xmemcpy(&ao_config.callsign, CODE_TO_XDATA(AO_CONFIG_DEFAULT_CALLSIGN),
+#if HAS_RADIO_RATE
+		ao_config.radio_rate = AO_CONFIG_DEFAULT_RADIO_RATE;
+#endif
+		ao_xmemcpy(&ao_config.callsign, AO_CONFIG_DEFAULT_CALLSIGN,
 		       sizeof(AO_CONFIG_DEFAULT_CALLSIGN) - 1);
 	}
 #endif
@@ -418,7 +421,7 @@ ao_config_accel_calibrate_auto(char *orientation) __reentrant
 	accel_total = 0;
 	cal_data_ring = ao_sample_data;
 	while (i) {
-		ao_sleep(DATA_TO_XDATA(&ao_sample_data));
+		ao_sleep(&ao_sample_data);
 		while (i && cal_data_ring != ao_sample_data) {
 			accel_total += (int32_t) ao_data_accel(&ao_data_ring[cal_data_ring]);
 #if HAS_GYRO