diff options
| author | tumbili <bapstr@ethz.ch> | 2014-12-15 22:47:10 +0100 |
|---|---|---|
| committer | tumbili <bapstr@ethz.ch> | 2014-12-15 22:47:10 +0100 |
| commit | 89e2e08de0e9f76114b095782167722597f298fa (patch) | |
| tree | 3fa5eebf711f77f58c43f8ef8157cfa6347289d8 | |
| parent | 736f57f436d05f3c2f10a8d7c12e54db29ed364c (diff) | |
| download | px4-firmware-89e2e08de0e9f76114b095782167722597f298fa.tar.gz px4-firmware-89e2e08de0e9f76114b095782167722597f298fa.tar.bz2 px4-firmware-89e2e08de0e9f76114b095782167722597f298fa.zip | |
removed white space noise
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.autostart | 2 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.vtol_defaults | 2 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 4 | ||||
| -rw-r--r-- | src/modules/systemlib/mixer/mixer.h | 2 | ||||
| -rw-r--r-- | src/modules/vtol_att_control/vtol_att_control_main.cpp | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rc.autostart b/ROMFS/px4fmu_common/init.d/rc.autostart index 19fce6ea5..8388da1dd 100644 --- a/ROMFS/px4fmu_common/init.d/rc.autostart +++ b/ROMFS/px4fmu_common/init.d/rc.autostart @@ -246,5 +246,5 @@ fi # if param compare SYS_AUTOSTART 13001 then - sh /etc/init.d/13001_caipirinha_vtol + sh /etc/init.d/13001_caipirinha_vtol fi diff --git a/ROMFS/px4fmu_common/init.d/rc.vtol_defaults b/ROMFS/px4fmu_common/init.d/rc.vtol_defaults index 376a2e257..10ee5db9b 100644 --- a/ROMFS/px4fmu_common/init.d/rc.vtol_defaults +++ b/ROMFS/px4fmu_common/init.d/rc.vtol_defaults @@ -20,7 +20,7 @@ then param set MC_YAWRATE_I 0.0 param set MC_YAWRATE_D 0.0 param set MC_YAW_FF 0.3 - + # # Default parameters for FW # diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index f0fe6d25b..5748fe2b5 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -550,7 +550,7 @@ then sh /etc/init.d/rc.mc_apps fi fi - + # # VTOL setup # @@ -589,7 +589,7 @@ then sh /etc/init.d/rc.vtol_apps fi fi - + # # Start the navigator # diff --git a/src/modules/systemlib/mixer/mixer.h b/src/modules/systemlib/mixer/mixer.h index f14bdb9fd..1fe4380ad 100644 --- a/src/modules/systemlib/mixer/mixer.h +++ b/src/modules/systemlib/mixer/mixer.h @@ -466,7 +466,7 @@ public: OCTA_X, OCTA_PLUS, OCTA_COX, - TWIN_ENGINE, /**< VTOL: one engine on each wing */ + TWIN_ENGINE, /**< VTOL: one engine on each wing */ MAX_GEOMETRY }; diff --git a/src/modules/vtol_att_control/vtol_att_control_main.cpp b/src/modules/vtol_att_control/vtol_att_control_main.cpp index e3a2dd72e..24800cce8 100644 --- a/src/modules/vtol_att_control/vtol_att_control_main.cpp +++ b/src/modules/vtol_att_control/vtol_att_control_main.cpp @@ -436,7 +436,7 @@ void VtolAttitudeControl::fill_mc_att_control_output() { _actuators_out_0.control[0] = _actuators_mc_in.control[0]; _actuators_out_0.control[1] = _actuators_mc_in.control[1]; - _actuators_out_0.control[2] = _actuators_mc_in.control[2]; + _actuators_out_0.control[2] = _actuators_mc_in.control[2]; _actuators_out_0.control[3] = _actuators_mc_in.control[3]; //set neutral position for elevons _actuators_out_1.control[0] = _actuators_mc_in.control[2]; //roll elevon @@ -457,7 +457,7 @@ void VtolAttitudeControl::fill_fw_att_control_output() _actuators_out_1.control[0] = -_actuators_fw_in.control[0]; // roll elevon _actuators_out_1.control[1] = _actuators_fw_in.control[1]; // pitch elevon // unused now but still logged - _actuators_out_1.control[2] = _actuators_fw_in.control[2]; // yaw + _actuators_out_1.control[2] = _actuators_fw_in.control[2]; // yaw _actuators_out_1.control[3] = _actuators_fw_in.control[3]; // throttle } |