mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-05-30 04:06:33 +08:00
fix(control_allocator): Remove SPACECRAFT_3D
This commit is contained in:
committed by
Matthias Grob
parent
3eaede3197
commit
c5f455f304
@@ -275,10 +275,6 @@ ControlAllocator::update_effectiveness_source()
|
|||||||
tmp = new ActuatorEffectivenessSpacecraft(this);
|
tmp = new ActuatorEffectivenessSpacecraft(this);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EffectivenessSource::SPACECRAFT_3D:
|
|
||||||
tmp = new ActuatorEffectivenessSpacecraft(this);
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
PX4_ERR("Unknown airframe");
|
PX4_ERR("Unknown airframe");
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -172,7 +172,6 @@ private:
|
|||||||
HELICOPTER_COAXIAL = 12,
|
HELICOPTER_COAXIAL = 12,
|
||||||
ROVER_MECANUM = 13,
|
ROVER_MECANUM = 13,
|
||||||
SPACECRAFT_2D = 14,
|
SPACECRAFT_2D = 14,
|
||||||
SPACECRAFT_3D = 15,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
enum class FailureMode {
|
enum class FailureMode {
|
||||||
|
|||||||
@@ -1294,24 +1294,3 @@ mixer:
|
|||||||
function: 'axisz'
|
function: 'axisz'
|
||||||
- name: 'CA_ROTOR${i}_CT'
|
- name: 'CA_ROTOR${i}_CT'
|
||||||
label: "Thrust\nCoefficient"
|
label: "Thrust\nCoefficient"
|
||||||
|
|
||||||
15: # Spacecraft 3D
|
|
||||||
actuators:
|
|
||||||
- actuator_type: 'motor'
|
|
||||||
group_label: 'Thrust/Motors'
|
|
||||||
count: 'CA_ROTOR_COUNT'
|
|
||||||
per_item_parameters:
|
|
||||||
standard:
|
|
||||||
position: [ 'CA_ROTOR${i}_PX', 'CA_ROTOR${i}_PY', 'CA_ROTOR${i}_PZ' ]
|
|
||||||
extra:
|
|
||||||
- name: 'CA_ROTOR${i}_AX'
|
|
||||||
label: 'Axis X'
|
|
||||||
function: 'axisx'
|
|
||||||
- name: 'CA_ROTOR${i}_AY'
|
|
||||||
label: 'Axis Y'
|
|
||||||
function: 'axisy'
|
|
||||||
- name: 'CA_ROTOR${i}_AZ'
|
|
||||||
label: 'Axis Z'
|
|
||||||
function: 'axisz'
|
|
||||||
- name: 'CA_ROTOR${i}_CT'
|
|
||||||
label: "Thrust\nCoefficient"
|
|
||||||
|
|||||||
Reference in New Issue
Block a user