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

diff --git a/src/kernel/ao_config.c b/src/kernel/ao_config.c
index f95ca893..10a67116 100644
--- a/src/kernel/ao_config.c
+++ b/src/kernel/ao_config.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
@@ -34,6 +35,10 @@ __pdata uint8_t ao_config_loaded;
 __pdata uint8_t ao_config_dirty;
 __xdata uint8_t ao_config_mutex;
 
+#if HAS_FORCE_FREQ
+__xdata uint8_t ao_force_freq;
+#endif
+
 #ifndef AO_CONFIG_DEFAULT_APRS_INTERVAL
 #define AO_CONFIG_DEFAULT_APRS_INTERVAL	0
 #endif
@@ -130,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;
 	}
@@ -238,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
@@ -413,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