Skip to content

Commit 66ab707

Browse files
committed
Send angles in actual range instead of hardcoded angles
1 parent bc0c3fe commit 66ab707

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

ROMFS/px4fmu_common/init.d-posix/airframes/4011_gz_lawnmower

+6-6
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,17 @@ param set-default SIM_GZ_WH_REV 0 # no need to reverse any wheels
6262

6363
# Cutter deck blades clutch, PCA9685 servo channel 3, "RC FLAPS" (406) - leftmost switch, or "Servo 3" (203):
6464
param set-default SIM_GZ_SV_FUNC3 203
65-
param set-default SIM_GZ_SV_MIN3 0
66-
param set-default SIM_GZ_SV_MAX3 1000
67-
param set-default SIM_GZ_SV_DIS3 500
65+
param set-default SIM_GZ_SV_MIN3 9000
66+
param set-default SIM_GZ_SV_MAX3 27000
67+
param set-default SIM_GZ_SV_DIS3 18000
6868
param set-default SIM_GZ_SV_FAIL3 500
6969

7070
# Gas engine throttle, PCA9685 servo channel 4, "RC AUX1" (407) - left knob, or "Servo 4" (204):
7171
# - on minimum when disarmed or failed:
7272
param set-default SIM_GZ_SV_FUNC4 204
73-
param set-default SIM_GZ_SV_MIN4 0
74-
param set-default SIM_GZ_SV_MAX4 1000
75-
param set-default SIM_GZ_SV_DIS4 500
73+
param set-default SIM_GZ_SV_MIN4 9000
74+
param set-default SIM_GZ_SV_MAX4 27000
75+
param set-default SIM_GZ_SV_DIS4 18000
7676
param set-default SIM_GZ_SV_FAIL4 500
7777

7878
# Controlling PCA9685 servos 5,6,7,8 directly via "Servo 5..8" setting, by publishing actuator_servos.control[]:

src/modules/simulation/gz_bridge/GZMixingInterfaceServo.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ bool GZMixingInterfaceServo::updateOutputs(bool stop_motors, uint16_t outputs[MA
6464
for (auto &servo_pub : _servos_pub) {
6565
if (_mixing_output.isFunctionSet(i)) {
6666
gz::msgs::Double servo_output;
67-
///TODO: Normalize output data
68-
double output = (outputs[i] - 500) / 500.0;
67+
double output = math::radians((double)outputs[i] / 100. - 180.);;
68+
6969
// std::cout << "outputs[" << i << "]: " << outputs[i] << std::endl;
7070
// std::cout << " output: " << output << std::endl;
7171
servo_output.set_data(output);

src/modules/simulation/gz_bridge/module.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ actuator_output:
2020
group_label: 'Servos'
2121
channel_label: 'Servo'
2222
standard_params:
23-
disarmed: { min: 0, max: 1000, default: 500 }
24-
min: { min: 0, max: 1000, default: 0 }
25-
max: { min: 0, max: 1000, default: 1000 }
23+
disarmed: { min: 0, max: 36000, default: 18000 }
24+
min: { min: 0, max: 36000, default: 15000 }
25+
max: { min: 0, max: 36000, default: 21000 }
2626
failsafe: { min: 0, max: 1000 }
2727
num_channels: 8
2828
- param_prefix: SIM_GZ_WH

0 commit comments

Comments
 (0)