eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

avoid float functions to compute range mapping for axis adc reading

This commit is contained in:
a-chol 2020-03-20 19:59:23 +01:00
parent 801be60473
commit 6fd7f9d12f
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
quantum/process_keycode/process_joystick.c
View File

@ -114,15 +114,20 @@ bool process_joystick_analogread_quantum() {
int16_t axis_val = joystick_axes[axis_index].mid_digit; int16_t axis_val = joystick_axes[axis_index].mid_digit;
# endif # endif
// test the converted value against the lower range //test the converted value against the lower range
uint16_t ref = joystick_axes[axis_index].mid_digit; int32_t ref = joystick_axes[axis_index].mid_digit;
uint16_t range = joystick_axes[axis_index].min_digit; int32_t range = joystick_axes[axis_index].min_digit;
int16_t ranged_val = -127 * fminf(1.f, (axis_val - (float)(ref)) / (range - (float)ref)); int32_t ranged_val = ((axis_val - ref)* -127)/(range - ref) ;
if (ranged_val > 0) {
// the value is in the higher range if (ranged_val > 0){
range = joystick_axes[axis_index].max_digit; //the value is in the higher range
ranged_val = 127 * fminf(1.f, (axis_val - (float)(ref)) / (range - (float)ref)); range = joystick_axes[axis_index].max_digit;
ranged_val = ((axis_val - ref)* 127)/(range - ref);
} }
//clamp the result in the valid range
ranged_val = ranged_val<-127 ? -127 : ranged_val;
ranged_val = ranged_val>127 ? 127 : ranged_val;
if (ranged_val != joystick_status.axes[axis_index]) { if (ranged_val != joystick_status.axes[axis_index]) {
joystick_status.axes[axis_index] = ranged_val; joystick_status.axes[axis_index] = ranged_val;