Skip to content

Commit

Permalink
hwdef: Carbonix: move servo limits out of common
Browse files Browse the repository at this point in the history
We are no longer allowing redefinition of parameters in defaults files.
This can too easily lead to confusion and mistakes.
  • Loading branch information
robertlong13 committed Oct 15, 2024
1 parent 16b3afa commit ef2efa1
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 34 deletions.
32 changes: 0 additions & 32 deletions libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/defaults.parm
Original file line number Diff line number Diff line change
Expand Up @@ -121,47 +121,15 @@ SCR_ENABLE,1
SCR_HEAP_SIZE,200000
SCR_VM_I_COUNT,100000
SERVO1_FUNCTION,33 # Motor 1
SERVO1_MAX,2000 # Setting all servos to 2000/1000, overriding in platforms if needed
SERVO1_MIN,1000
SERVO10_FUNCTION,4 # Aileron
SERVO10_MAX,2000
SERVO10_MIN,1000
SERVO11_FUNCTION,21 # Rudder
SERVO11_MAX,2000
SERVO11_MIN,1000
SERVO12_MAX,2000
SERVO12_MIN,1000
SERVO13_MAX,2000
SERVO13_MIN,1000
SERVO14_FUNCTION,0 # PLB Servo/GPIO
SERVO14_MAX,2000
SERVO14_MIN,1000
SERVO15_MAX,2000
SERVO15_MIN,1000
SERVO16_MAX,2000
SERVO16_MIN,1000
SERVO2_FUNCTION,34 # Motor 2
SERVO2_MAX,2000
SERVO2_MIN,1000
SERVO3_FUNCTION,35 # Motor 3
SERVO3_MAX,2000
SERVO3_MIN,1000
SERVO4_FUNCTION,36 # Motor 4
SERVO4_MAX,2000
SERVO4_MIN,1000
SERVO5_FUNCTION,70 # Pusher throttle
SERVO5_MAX,2000
SERVO5_MIN,1000
SERVO6_FUNCTION,19 # Elevator
SERVO6_MAX,2000
SERVO6_MIN,1000
SERVO7_FUNCTION,0 # PLB Servo/GPIO
SERVO7_MAX,2000
SERVO7_MIN,1000
SERVO8_FUNCTION,-1 # IGN relay GPIO
SERVO8_MAX,2000
SERVO8_MIN,1000
SERVO9_FUNCTION,94 # Scripting function for LEDs
SERVO9_MAX,2000
SERVO9_MIN,1000
TERRAIN_FOLLOW,72 # Enabled Auto and Guided (the command being executed must have the terrain frame though)
35 changes: 33 additions & 2 deletions libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-Ottano/defaults.parm
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,39 @@ SERIAL4_PROTOCOL,2
SERIAL5_PROTOCOL,28
SERIAL6_BAUD,115
SERIAL6_PROTOCOL,2
SERVO5_MAX,1950
SERVO5_MIN,980
# Defaulting servos to 1000-2000us except throttle
SERVO1_MAX,2000
SERVO1_MIN,1000
SERVO10_MAX,2000
SERVO10_MIN,1000
SERVO11_MAX,2000
SERVO11_MIN,1000
SERVO12_MAX,2000
SERVO12_MIN,1000
SERVO13_MAX,2000
SERVO13_MIN,1000
SERVO14_MAX,2000
SERVO14_MIN,1000
SERVO15_MAX,2000
SERVO15_MIN,1000
SERVO16_MAX,2000
SERVO16_MIN,1000
SERVO2_MAX,2000
SERVO2_MIN,1000
SERVO3_MAX,2000
SERVO3_MIN,1000
SERVO4_MAX,2000
SERVO4_MIN,1000
SERVO5_MAX,1950 # Throttle servo endpoints
SERVO5_MIN,980 # Throttle servo endpoints
SERVO6_MAX,2000
SERVO6_MIN,1000
SERVO7_MAX,2000
SERVO7_MIN,1000
SERVO8_MAX,2000
SERVO8_MIN,1000
SERVO9_MAX,2000
SERVO9_MIN,1000
TECS_CLMB_MAX,4
TECS_INTEG_GAIN,0.15
TECS_LAND_ARSPD,24
Expand Down
33 changes: 33 additions & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-Volanti/defaults.parm
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,39 @@ SERIAL5_BAUD,115
SERIAL5_PROTOCOL,2
SERIAL6_BAUD,115
SERIAL6_PROTOCOL,2
# Defaulting servos to 1000-2000us
SERVO1_MAX,2000
SERVO1_MIN,1000
SERVO10_MAX,2000
SERVO10_MIN,1000
SERVO11_MAX,2000
SERVO11_MIN,1000
SERVO12_MAX,2000
SERVO12_MIN,1000
SERVO13_MAX,2000
SERVO13_MIN,1000
SERVO14_MAX,2000
SERVO14_MIN,1000
SERVO15_MAX,2000
SERVO15_MIN,1000
SERVO16_MAX,2000
SERVO16_MIN,1000
SERVO2_MAX,2000
SERVO2_MIN,1000
SERVO3_MAX,2000
SERVO3_MIN,1000
SERVO4_MAX,2000
SERVO4_MIN,1000
SERVO5_MAX,2000
SERVO5_MIN,1000
SERVO6_MAX,2000
SERVO6_MIN,1000
SERVO7_MAX,2000
SERVO7_MIN,1000
SERVO8_MAX,2000
SERVO8_MIN,1000
SERVO9_MAX,2000
SERVO9_MIN,1000
TECS_CLMB_MAX,3.1
TECS_PITCH_MAX,10
TECS_PITCH_MIN,-10
Expand Down

0 comments on commit ef2efa1

Please sign in to comment.