X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_config.c;h=565ac61e450e6d6a567975761e0b4fcb02bf2b4d;hb=HEAD;hp=52d25aec0b226aca40d6a281f3ef9415b91185c2;hpb=ba0239ca6839605c7ce45d56677bb9a3b782b7f2;p=fw%2Faltos

diff --git a/src/kernel/ao_config.c b/src/kernel/ao_config.c
index 52d25aec..565ac61e 100644
--- a/src/kernel/ao_config.c
+++ b/src/kernel/ao_config.c
@@ -54,6 +54,8 @@ uint8_t ao_force_freq;
 #define AO_CONFIG_DEFAULT_IGNITE_MODE	AO_IGNITE_MODE_DUAL
 #define AO_CONFIG_DEFAULT_PAD_ORIENTATION	AO_PAD_ORIENTATION_ANTENNA_UP
 #define AO_CONFIG_DEFAULT_PYRO_TIME	AO_MS_TO_TICKS(50)
+#define AO_CONFIG_DEFAULT_RADIO_10MW	0
+#define AO_CONFIG_DEFAULT_REPORT_FEET	0
 #if HAS_CONFIG_SAVE
 #ifndef USE_INTERNAL_FLASH
 #error Please define USE_INTERNAL_FLASH
@@ -188,7 +190,7 @@ _ao_config_get(void)
 #if HAS_RADIO_POWER
 		if (minor < 14)
 			ao_config.radio_power = AO_CONFIG_DEFAULT_RADIO_POWER;
-		#endif
+#endif
 #if HAS_RADIO_AMP
 		if (minor  < 14)
 			ao_config.radio_amp = AO_CONFIG_DEFAULT_RADIO_AMP;
@@ -246,6 +248,12 @@ _ao_config_get(void)
 		if (minor < 24)
 			ao_config.aprs_offset = 0;
 #endif
+#if HAS_RADIO_10MW
+		if (minor < 25)
+			ao_config.radio_10mw = AO_CONFIG_DEFAULT_RADIO_10MW;
+#endif
+		if (minor < 26)
+			ao_config.report_feet = AO_CONFIG_DEFAULT_REPORT_FEET;
 		ao_config.minor = AO_CONFIG_MINOR;
 		ao_config_dirty = 1;
 	}
@@ -472,6 +480,7 @@ ao_config_accel_calibrate_set(void)
 		return;
 	down = (int16_t) ao_cmd_decimal();
 	auto_cal = (up == 0 && ao_cmd_status != ao_cmd_success);
+	ao_cmd_status = ao_cmd_success;
 	if (auto_cal) {
 		up = ao_config_accel_calibrate_auto("up");
 #if HAS_IMU
@@ -853,6 +862,46 @@ ao_config_radio_power_set(void)
 
 #endif
 
+#if HAS_RADIO_10MW
+
+static void
+ao_config_radio_10mw_show(void)
+{
+	printf ("Radio 10mw limit: %d\n", ao_config.radio_10mw);
+}
+
+static void
+ao_config_radio_10mw_set(void)
+{
+	uint32_t r = ao_cmd_decimal();
+	if (ao_cmd_status != ao_cmd_success)
+		return;
+	_ao_config_edit_start();
+	ao_config.radio_10mw = !!r;
+	_ao_config_edit_finish();
+}
+
+#endif
+
+#if HAS_BARO
+static void
+ao_config_report_feet_show(void)
+{
+	printf ("Report in feet: %d\n", ao_config.report_feet);
+}
+
+static void
+ao_config_report_feet_set(void)
+{
+	uint32_t r = ao_cmd_decimal();
+	if (ao_cmd_status != ao_cmd_success)
+		return;
+	_ao_config_edit_start();
+	ao_config.report_feet = !!r;
+	_ao_config_edit_finish();
+}
+#endif
+
 #if HAS_BEEP
 static void
 ao_config_beep_show(void)
@@ -1099,6 +1148,14 @@ const struct ao_config_var ao_config_vars[] = {
 	  ao_config_pad_box_set, ao_config_pad_box_show },
 	{ "i <seconds>\0Set idle timeout (0 disable)",
 	  ao_config_pad_idle_set, ao_config_pad_idle_show },
+#endif
+#if HAS_RADIO_10MW
+	{ "p <0 no limit, 1 limit>\0Limit radio power to 10mW",
+	  ao_config_radio_10mw_set,	ao_config_radio_10mw_show },
+#endif
+#if HAS_BARO
+	{ "u <0 meters, 1 feet>\0Units to report height after landing",
+	  ao_config_report_feet_set,	ao_config_report_feet_show },
 #endif
 	{ "s\0Show",
 	  ao_config_show,		0 },