Skip to content

Commit d875e95

Browse files
committed
Copter: remove nav and wp tests from cli
This are more fully tested in the autotester
1 parent ae91c4a commit d875e95

File tree

1 file changed

+1
-40
lines changed

1 file changed

+1
-40
lines changed

ArduCopter/test.pde

+1-40
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ static int8_t test_gps(uint8_t argc, const Menu::arg *argv);
1414
static int8_t test_ins(uint8_t argc, const Menu::arg *argv);
1515
static int8_t test_logging(uint8_t argc, const Menu::arg *argv);
1616
static int8_t test_motors(uint8_t argc, const Menu::arg *argv);
17-
static int8_t test_nav(uint8_t argc, const Menu::arg *argv);
1817
static int8_t test_optflow(uint8_t argc, const Menu::arg *argv);
1918
static int8_t test_radio_pwm(uint8_t argc, const Menu::arg *argv);
2019
static int8_t test_radio(uint8_t argc, const Menu::arg *argv);
@@ -27,7 +26,6 @@ static int8_t test_sonar(uint8_t argc, const Menu::arg *argv);
2726
#endif
2827
//static int8_t test_toy(uint8_t argc, const Menu::arg *argv);
2928
static int8_t test_tuning(uint8_t argc, const Menu::arg *argv);
30-
static int8_t test_wp(uint8_t argc, const Menu::arg *argv);
3129

3230
// This is the help function
3331
// PSTR is an AVR macro to read strings from flash memory
@@ -59,7 +57,6 @@ const struct Menu::command test_menu_commands[] PROGMEM = {
5957
{"ins", test_ins},
6058
{"logging", test_logging},
6159
{"motors", test_motors},
62-
{"nav", test_nav},
6360
{"optflow", test_optflow},
6461
{"pwm", test_radio_pwm},
6562
{"radio", test_radio},
@@ -71,8 +68,7 @@ const struct Menu::command test_menu_commands[] PROGMEM = {
7168
{"sonar", test_sonar},
7269
#endif
7370
// {"toy", test_toy},
74-
{"tune", test_tuning},
75-
{"wp", test_wp},
71+
{"tune", test_tuning}
7672
};
7773

7874
// A Macro to create the Menu
@@ -370,20 +366,6 @@ test_motors(uint8_t argc, const Menu::arg *argv)
370366
}
371367
}
372368

373-
static int8_t
374-
test_nav(uint8_t argc, const Menu::arg *argv)
375-
{
376-
current_loc.lat = 389539260;
377-
current_loc.lng = -1199540200;
378-
379-
wp_nav.set_destination(pv_latlon_to_vector(389538528,-1199541248,0));
380-
381-
// got 23506;, should be 22800
382-
update_navigation();
383-
cliSerial->printf_P(PSTR("bear: %ld\n"), wp_bearing);
384-
return 0;
385-
}
386-
387369
static int8_t
388370
test_optflow(uint8_t argc, const Menu::arg *argv)
389371
{
@@ -620,27 +602,6 @@ test_tuning(uint8_t argc, const Menu::arg *argv)
620602
}
621603
}
622604

623-
static int8_t
624-
test_wp(uint8_t argc, const Menu::arg *argv)
625-
{
626-
delay(1000);
627-
628-
// save the alitude above home option
629-
cliSerial->printf_P(PSTR("Hold alt "));
630-
if(g.rtl_altitude < 0) {
631-
cliSerial->printf_P(PSTR("\n"));
632-
}else{
633-
cliSerial->printf_P(PSTR("of %dm\n"), (int)g.rtl_altitude / 100);
634-
}
635-
636-
cliSerial->printf_P(PSTR("%d wp\n"), (int)g.command_total);
637-
cliSerial->printf_P(PSTR("Hit rad: %dm\n"), (int)wp_nav.get_waypoint_radius());
638-
639-
report_wp();
640-
641-
return (0);
642-
}
643-
644605
static void print_hit_enter()
645606
{
646607
cliSerial->printf_P(PSTR("Hit Enter to exit.\n\n"));

0 commit comments

Comments
 (0)