Skip to content

Commit 2101688

Browse files
committed
cleanup: update firmware files to have new firmware parameter names.
1 parent c5650f5 commit 2101688

5 files changed

Lines changed: 13 additions & 16 deletions

File tree

rosflight_firmware

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
# Parameters for using a Fixedwing with ROSflight firmware.
22

3-
- {name: MOTOR_PWM_UPDATE, type: 6, value: 50} # Set pwm update rate for motor.
43
- {name: ARM_SPIN_MOTORS, type: 6, value: 0} # Do not set motors to spin when armed.
54
- {name: MOTOR_IDLE_THR, type: 9, value: .1} # Set motor to not idle at zero throttle.
6-
- {name: ARM_CHANNEL, type: 6, value: 4} # Set to desired arm channel.
5+
- {name: RC_ARM_CHN, type: 6, value: 4} # Set to desired arm channel.
76
- {name: FIXED_WING, type: 6, value: 1} # Configure firmware for fixedwing.
87
- {name: PRIMARY_MIXER, type: 6, value: 10} # Set mixer to inverted vtail mixer
9-
- {name: ELEVATOR_REV, type: 6, value: 1} # Option to reverse elevator.
10-
- {name: AIL_REV, type: 6, value: 0} # Option to reverse Aileron.
11-
- {name: RUDDER_REV, type: 6, value: 0} # Option to reverse rudder.
12-
- {name: CAL_GYRO_ARM, type: 6, value: 0} # Option to calibrate gyro when arming (generally only for multi-rotors).
8+
- {name: REV_ELEVATOR, type: 6, value: 1} # Option to reverse elevator.
9+
- {name: REV_AILERON, type: 6, value: 0} # Option to reverse Aileron.
10+
- {name: REV_RUDDER, type: 6, value: 0} # Option to reverse rudder.
11+
- {name: ARM_CAL_GYRO, type: 6, value: 0} # Option to calibrate gyro when arming (generally only for multi-rotors).
1312
- {name: RC_THR_OVRD_CHN, type: 6, value: 5} # Set pilot override channel for throttle control.
1413
- {name: RC_ATT_OVRD_CHN, type: 6, value: 5} # Set pilot override channel for attitude control.
1514
- {name: RC_ATT_CTRL_CHN, type: 6, value: 8} # TODO this should not be 8.
16-
- {name: MIN_THROTTLE, type: 6, value: 0} # Set to not take the minimum of the commanded throttles.
15+
- {name: TAKE_MIN_THR, type: 6, value: 0} # Set to not take the minimum of the commanded throttles.
1716
- {name: RC_OVRD_DEV, type: 9, value: 1.0} # Ignore any stick inputs when override is enabled.
1817
- {name: RC_NUM_CHN, type: 6, value: 8} # Set the number of RC channels to max.
1918
- {name: RC_F_AXIS, type: 6, value: 0} # Set the RC F axis (for the RC pilot) to be the x axis

rosflight_sim/params/multirotor_firmware/multirotor_combined.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
- {name: FIXED_WING, type: 6, value: 0} # Aircraft is not a fixedwing
22
- {name: RC_NUM_CHN, type: 6, value: 8} # Aircraft has 8 RC channels
3-
- {name: ARM_CHANNEL, type: 6, value: 4} # Set arm channel (0-indexed)
3+
- {name: RC_ARM_CHN, type: 6, value: 4} # Set arm channel (0-indexed)
44
- {name: RC_THR_OVRD_CHN, type: 6, value: 5} # Set pilot override channel for throttle control.
55
- {name: RC_ATT_OVRD_CHN, type: 6, value: 5} # Set pilot override channel for attitude control.
66
- {name: RC_ATT_CTRL_CHN, type: 6, value: 6} # Set channel to switch RC control type
77
- {name: FAILSAFE_THR, type: 9, value: 0.0}
8-
- {name: MIN_THROTTLE, type: 6, value: 0} # Don't take minimum of RC and offboard at all times
8+
- {name: TAKE_MIN_THR, type: 6, value: 0} # Don't take minimum of RC and offboard at all times
99
- {name: RC_F_AXIS, type: 6, value: 2} # RC_F_AXIS is the Z axis for multirotors by default
1010
- {name: PRIMARY_MIXER, type: 6, value: 11} # Custom mixer -- make sure USE_MOTOR_PARAM is set to 1 and
1111
# both motor_parameters and motor_mixer_parameters are set properly
@@ -26,7 +26,7 @@
2626
- {name: PROP_DIAMETER, type: 9, value: 0.381}
2727
- {name: PROP_CT, type: 9, value: 0.075}
2828
- {name: PROP_CQ, type: 9, value: 0.0045}
29-
- {name: VOLT_MAX, type: 9, value: 23.5}
29+
- {name: BATT_VOLT_MAX, type: 9, value: 23.5}
3030
- name: PRI_MIXER_0_0
3131
type: 9
3232
value: -0.0

rosflight_sim/params/multirotor_firmware/multirotor_firmware.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
- {name: FIXED_WING, type: 6, value: 0} # Aircraft is not a fixedwing
22
- {name: RC_NUM_CHN, type: 6, value: 8} # Aircraft has 8 RC channels
3-
- {name: ARM_CHANNEL, type: 6, value: 4}
3+
- {name: RC_ARM_CHN, type: 6, value: 4}
44
- {name: RC_THR_OVRD_CHN, type: 6, value: 5} # Set pilot override channel for throttle control.
55
- {name: RC_ATT_OVRD_CHN, type: 6, value: 5} # Set pilot override channel for attitude control.
66
- {name: RC_ATT_CTRL_CHN, type: 6, value: 6}
77
- {name: FAILSAFE_THR, type: 9, value: 0.0}
8-
- {name: MIN_THROTTLE, type: 6, value: 0} # Don't take minimum of RC and offboard at all times
8+
- {name: TAKE_MIN_THR, type: 6, value: 0} # Don't take minimum of RC and offboard at all times
99
- {name: RC_F_AXIS, type: 6, value: 2} # RC_F_AXIS is the Z axis for multirotors by default
1010
- {name: PRIMARY_MIXER, type: 6, value: 11} # Custom mixer -- make sure USE_MOTOR_PARAM is set to 1 and
1111
# both motor_parameters and motor_mixer_parameters are set properly
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
- {name: NUM_MOTORS, type: 6, value: 4}
2-
- {name: VEHICLE_MASS, type: 9, value: 3.50}
32
- {name: MOTOR_RESISTANCE, type: 9, value: 0.085}
4-
- {name: AIR_DENSITY, type: 9, value: 1.225}
53
- {name: MOTOR_KV, type: 9, value: 0.02894}
64
- {name: NO_LOAD_CURRENT, type: 9, value: 1.01}
75
- {name: PROP_DIAMETER, type: 9, value: 0.381}
86
- {name: PROP_CT, type: 9, value: 0.075}
97
- {name: PROP_CQ, type: 9, value: 0.0045}
10-
- {name: VOLT_MAX, type: 9, value: 25.0}
8+
- {name: BATT_VOLT_MAX, type: 9, value: 23.5}

0 commit comments

Comments
 (0)