Merge remote-tracking branch 'px4/master' into navigator_cleanup

2026-10-15 10:23:33 +08:00 · 2014-04-26 12:56:18 +02:00
parent ea0142810a 4a949a9565
commit 3a12cb4648
15 changed files with 453 additions and 351 deletions
@@ -67,6 +67,8 @@ typedef enum {
 	MAIN_STATE_MAX
 } main_state_t;

+// If you change the order, add or remove arming_state_t states make sure to update the arrays
+// in state_machine_helper.cpp as well.
 typedef enum {
 	ARMING_STATE_INIT = 0,
 	ARMING_STATE_STANDBY,