cm/cmdr-joystick
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Christoffer Martinsson 2023-06-05 12:59:27 +02:00
parent 248c95cd60
commit 8ba920c0d3
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
firmware/src/cmdr_joystick.cpp
View File

@ -373,11 +373,13 @@ int apply_calibration_12bit(int gimbal_value, int min_value, int max_value, int
if (gimbal_value > (center_value + deadband_value)) if (gimbal_value > (center_value + deadband_value))
{ {
calibrated_value = constrain(map(gimbal_value, (center_value + deadband_value), max_value, AXIS_12BIT_CENTER, AXIS_12BIT_MAX), AXIS_12BIT_CENTER, AXIS_12BIT_MAX); calibrated_value = constrain(map(gimbal_value, (center_value + deadband_value), max_value, AXIS_12BIT_CENTER, AXIS_12BIT_MAX),
AXIS_12BIT_CENTER, AXIS_12BIT_MAX);
} }
else if (gimbal_value < (center_value - deadband_value)) else if (gimbal_value < (center_value - deadband_value))
{ {
calibrated_value = constrain(map(gimbal_value, min_value, (center_value - deadband_value), AXIS_12BIT_MIN, AXIS_12BIT_CENTER), AXIS_12BIT_MIN, AXIS_12BIT_CENTER); calibrated_value = constrain(map(gimbal_value, min_value, (center_value - deadband_value), AXIS_12BIT_MIN, AXIS_12BIT_CENTER),
AXIS_12BIT_MIN, AXIS_12BIT_CENTER);
} }
if (expo_value != 0) if (expo_value != 0)
@ -422,10 +424,14 @@ void process_input_data()
return; return;
} }
joystick_x1_12bit = apply_calibration_12bit(analog_x1_gimbal_value, joystick_x1_12bit_min, joystick_x1_12bit_max, joystick_x1_12bit_center, DEADZONE_X, exp_constant); joystick_x1_12bit = apply_calibration_12bit(analog_x1_gimbal_value, joystick_x1_12bit_min, joystick_x1_12bit_max,
joystick_y1_12bit = apply_calibration_12bit(analog_y1_gimbal_value, joystick_y1_12bit_min, joystick_y1_12bit_max, joystick_y1_12bit_center, DEADZONE_Y, 0); joystick_x1_12bit_center, DEADZONE_X, exp_constant);
joystick_x2_12bit = apply_calibration_12bit(analog_x2_gimbal_value, joystick_x2_12bit_min, joystick_x2_12bit_max, joystick_x2_12bit_center, DEADZONE_X, exp_constant); joystick_y1_12bit = apply_calibration_12bit(analog_y1_gimbal_value, joystick_y1_12bit_min, joystick_y1_12bit_max,
joystick_y2_12bit = apply_calibration_12bit(analog_y2_gimbal_value, joystick_y2_12bit_min, joystick_y2_12bit_max, joystick_y2_12bit_center, DEADZONE_Y, exp_constant); joystick_y1_12bit_center, DEADZONE_Y, 0);
joystick_x2_12bit = apply_calibration_12bit(analog_x2_gimbal_value, joystick_x2_12bit_min, joystick_x2_12bit_max,
joystick_x2_12bit_center, DEADZONE_X, exp_constant);
joystick_y2_12bit = apply_calibration_12bit(analog_y2_gimbal_value, joystick_y2_12bit_min, joystick_y2_12bit_max,
joystick_y2_12bit_center, DEADZONE_Y, exp_constant);
// Check fn mode // Check fn mode
fn_mode = 0; fn_mode = 0;
@ -575,7 +581,8 @@ void loop()
button_led_1.off(); button_led_1.off();
button_led_2.blink(); button_led_2.blink();
} }
else if ((joystick_x1_12bit != AXIS_12BIT_CENTER) || (joystick_y1_12bit != AXIS_12BIT_MIN) || (joystick_x2_12bit != AXIS_12BIT_CENTER) || (joystick_y2_12bit != AXIS_12BIT_CENTER)) else if ((joystick_x1_12bit != AXIS_12BIT_CENTER) || (joystick_y1_12bit != AXIS_12BIT_MIN) ||
(joystick_x2_12bit != AXIS_12BIT_CENTER) || (joystick_y2_12bit != AXIS_12BIT_CENTER))
{ {
button_led_1.on(); button_led_1.on();
button_led_2.on(); button_led_2.on();