But, only when APRS is available so that TeleMetrum and TeleMini don't
change behaviour
Signed-off-by: Keith Packard <keithp@keithp.com>
#define AO_IGNITE_MODE_APOGEE 1
#define AO_IGNITE_MODE_MAIN 2
#define AO_IGNITE_MODE_APOGEE 1
#define AO_IGNITE_MODE_MAIN 2
+#define AO_RADIO_ENABLE_CORE 1
+#define AO_RADIO_ENABLE_APRS 2
+#define AO_RADIO_DISABLE_TELEMETRY 4
+#define AO_RADIO_DISABLE_RDF 8
+
#define AO_PAD_ORIENTATION_ANTENNA_UP 0
#define AO_PAD_ORIENTATION_ANTENNA_DOWN 1
#define AO_PAD_ORIENTATION_ANTENNA_UP 0
#define AO_PAD_ORIENTATION_ANTENNA_DOWN 1
if (minor < 6)
ao_config.pad_orientation = AO_CONFIG_DEFAULT_PAD_ORIENTATION;
if (minor < 8)
if (minor < 6)
ao_config.pad_orientation = AO_CONFIG_DEFAULT_PAD_ORIENTATION;
if (minor < 8)
- ao_config.radio_enable = TRUE;
+ ao_config.radio_enable = AO_RADIO_ENABLE_CORE;
if (minor < 9)
ao_xmemset(&ao_config.aes_key, '\0', AO_AES_LEN);
if (minor < 10)
if (minor < 9)
ao_xmemset(&ao_config.aes_key, '\0', AO_AES_LEN);
if (minor < 10)
while (ao_telemetry_interval) {
while (ao_telemetry_interval) {
+#if HAS_APRS
+ if (!(ao_config.radio_enable & AO_RADIO_DISABLE_TELEMETRY))
+#endif
+ {
#endif
#ifdef AO_SEND_MEGA
#endif
#ifdef AO_SEND_MEGA
- ao_send_mega_sensor();
- ao_send_mega_data();
+ ao_send_mega_sensor();
+ ao_send_mega_data();
- if (ao_companion_running)
- ao_send_companion();
+ if (ao_companion_running)
+ ao_send_companion();
- ao_send_configuration();
+ ao_send_configuration();
- ao_send_location();
- ao_send_satellite();
+ ao_send_location();
+ ao_send_satellite();
#ifndef AO_SEND_ALL_BARO
if (ao_rdf &&
#ifndef AO_SEND_ALL_BARO
if (ao_rdf &&
+#if HAS_APRS
+ !(ao_config.radio_enable & AO_RADIO_DISABLE_RDF) &&
+#endif
(int16_t) (ao_time() - ao_rdf_time) >= 0)
{
#if HAS_IGNITE_REPORT
(int16_t) (ao_time() - ao_rdf_time) >= 0)
{
#if HAS_IGNITE_REPORT
ao_radio_rdf();
}
#if HAS_APRS
ao_radio_rdf();
}
#if HAS_APRS
- if (ao_rdf && (int16_t) (ao_time() - ao_aprs_time) >= 0) {
+ if (ao_rdf &&
+ (ao_config.radio_enable & AO_RADIO_ENABLE_APRS) &&
+ (int16_t) (ao_time() - ao_aprs_time) >= 0)
+ {
ao_aprs_time = ao_time() + AO_APRS_INTERVAL_TICKS;
ao_aprs_send();
}
ao_aprs_time = ao_time() + AO_APRS_INTERVAL_TICKS;
ao_aprs_send();
}