mirror of https://github.com/ArduPilot/ardupilot
Rover: re-order initialiser lines so -Werror=reorder will work
This commit is contained in:
parent
3d4b57cd4a
commit
6e0f39e3e1
|
@ -735,16 +735,16 @@ ParametersG2::ParametersG2(void)
|
||||||
#if AP_BEACON_ENABLED
|
#if AP_BEACON_ENABLED
|
||||||
beacon(),
|
beacon(),
|
||||||
#endif
|
#endif
|
||||||
motors(wheel_rate_control),
|
|
||||||
wheel_rate_control(wheel_encoder),
|
wheel_rate_control(wheel_encoder),
|
||||||
|
motors(wheel_rate_control),
|
||||||
attitude_control(),
|
attitude_control(),
|
||||||
smart_rtl(),
|
smart_rtl(),
|
||||||
#if MODE_DOCK_ENABLED
|
|
||||||
mode_dock_ptr(&rover.mode_dock),
|
|
||||||
#endif
|
|
||||||
#if HAL_PROXIMITY_ENABLED
|
#if HAL_PROXIMITY_ENABLED
|
||||||
proximity(),
|
proximity(),
|
||||||
#endif
|
#endif
|
||||||
|
#if MODE_DOCK_ENABLED
|
||||||
|
mode_dock_ptr(&rover.mode_dock),
|
||||||
|
#endif
|
||||||
#if AP_AVOIDANCE_ENABLED
|
#if AP_AVOIDANCE_ENABLED
|
||||||
avoid(),
|
avoid(),
|
||||||
#endif
|
#endif
|
||||||
|
@ -752,9 +752,9 @@ ParametersG2::ParametersG2(void)
|
||||||
follow(),
|
follow(),
|
||||||
#endif
|
#endif
|
||||||
windvane(),
|
windvane(),
|
||||||
pos_control(attitude_control),
|
|
||||||
wp_nav(attitude_control, pos_control),
|
wp_nav(attitude_control, pos_control),
|
||||||
sailboat()
|
sailboat(),
|
||||||
|
pos_control(attitude_control)
|
||||||
{
|
{
|
||||||
AP_Param::setup_object_defaults(this, var_info);
|
AP_Param::setup_object_defaults(this, var_info);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue