control_allocator: add title & help url to geometry UI

This commit is contained in:
Beat Küng 2022-02-16 11:02:53 +01:00
parent cbcae260e4
commit b2dc9ee710
3 changed files with 14 additions and 2 deletions

View File

@ -330,9 +330,11 @@ def get_mixers(yaml_config, output_functions, verbose):
option = select_param + '==' + str(type_index) option = select_param + '==' + str(type_index)
mixer_config = { mixer_config = {
'option': option, 'option': option,
'help-url': 'https://docs.px4.io/master/en/config/actuators.html',
} }
if 'type' in current_type: for optional in ['type', 'title']:
mixer_config['type'] = current_type['type'] if optional in current_type:
mixer_config[optional] = current_type[optional]
actuators = [] actuators = []
for actuator_conf in current_type['actuators']: for actuator_conf in current_type['actuators']:
actuator = { actuator = {

View File

@ -478,6 +478,7 @@ mixer:
types: types:
0: # Multirotor 0: # Multirotor
type: 'multirotor' type: 'multirotor'
title: 'Multirotor'
actuators: actuators:
- actuator_type: 'motor' - actuator_type: 'motor'
count: 'CA_ROTOR_COUNT' count: 'CA_ROTOR_COUNT'
@ -491,6 +492,7 @@ mixer:
show_as: 'true-if-positive' show_as: 'true-if-positive'
1: # Fixed Wing 1: # Fixed Wing
title: 'Fixed Wing'
actuators: actuators:
- actuator_type: 'motor' - actuator_type: 'motor'
group_label: 'Motors' group_label: 'Motors'
@ -520,6 +522,7 @@ mixer:
label: 'Trim' label: 'Trim'
2: # Standard VTOL 2: # Standard VTOL
title: 'Standard VTOL'
actuators: actuators:
- actuator_type: 'motor' - actuator_type: 'motor'
group_label: 'MC Motors' group_label: 'MC Motors'
@ -561,6 +564,7 @@ mixer:
name: VT_ELEV_MC_LOCK name: VT_ELEV_MC_LOCK
3: # Tiltrotor VTOL 3: # Tiltrotor VTOL
title: 'Tiltrotor VTOL'
actuators: actuators:
- actuator_type: 'motor' - actuator_type: 'motor'
group_label: 'MC Motors' group_label: 'MC Motors'
@ -615,6 +619,7 @@ mixer:
label: 'Use for Control' label: 'Use for Control'
4: # Tailsitter VTOL 4: # Tailsitter VTOL
title: 'Tailsitter VTOL'
actuators: actuators:
- actuator_type: 'motor' - actuator_type: 'motor'
group_label: 'MC Motors' group_label: 'MC Motors'
@ -653,6 +658,7 @@ mixer:
name: VT_ELEV_MC_LOCK name: VT_ELEV_MC_LOCK
5: # Rover (Ackermann) 5: # Rover (Ackermann)
title: 'Rover (Ackermann)'
actuators: actuators:
- actuator_type: 'motor' - actuator_type: 'motor'
instances: instances:
@ -664,6 +670,7 @@ mixer:
position: [ 1., 0, 0 ] position: [ 1., 0, 0 ]
6: # Rover (Differential) 6: # Rover (Differential)
title: 'Rover (Differential)'
actuators: actuators:
- actuator_type: 'motor' - actuator_type: 'motor'
instances: instances:
@ -693,6 +700,7 @@ mixer:
label: "Moment\nCoefficient" label: "Moment\nCoefficient"
8: # Multirotor with Tilt 8: # Multirotor with Tilt
title: 'Multirotor with Tilt'
actuators: actuators:
- actuator_type: 'motor' - actuator_type: 'motor'
count: 'CA_ROTOR_COUNT' count: 'CA_ROTOR_COUNT'

View File

@ -524,6 +524,8 @@ mixer:
# show type-specific functionality) # show type-specific functionality)
type: string type: string
allowed: [ multirotor ] allowed: [ multirotor ]
title:
type: string
actuators: actuators:
type: list type: list
minlength: 1 minlength: 1