projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Force telemetry rate to 38400 when ao_force_freq is set
[fw/altos]
/
src
/
kernel
/
ao_config.c
diff --git
a/src/kernel/ao_config.c
b/src/kernel/ao_config.c
index f95ca8933cc3f526c15a9c7d2acf2d7efea4f9c4..86d4838fbe8d6630a458c0904bf459e9aeb29ee8 100644
(file)
--- 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
*
* 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
*
* 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;
__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
#ifndef AO_CONFIG_DEFAULT_APRS_INTERVAL
#define AO_CONFIG_DEFAULT_APRS_INTERVAL 0
#endif
@@
-238,6
+243,9
@@
_ao_config_get(void)
if (ao_force_freq) {
ao_config.frequency = 434550;
ao_config.radio_cal = ao_radio_cal;
if (ao_force_freq) {
ao_config.frequency = 434550;
ao_config.radio_cal = ao_radio_cal;
+#if HAS_RADIO_RATE
+ ao_config.radio_rate = AO_CONFIG_DEFAULT_RADIO_RATE;
+#endif
ao_xmemcpy(&ao_config.callsign, CODE_TO_XDATA(AO_CONFIG_DEFAULT_CALLSIGN),
sizeof(AO_CONFIG_DEFAULT_CALLSIGN) - 1);
}
ao_xmemcpy(&ao_config.callsign, CODE_TO_XDATA(AO_CONFIG_DEFAULT_CALLSIGN),
sizeof(AO_CONFIG_DEFAULT_CALLSIGN) - 1);
}