From b120ad07ee34671622ec686abfe19131ee6f16c3 Mon Sep 17 00:00:00 2001 From: NepEgor Date: Wed, 4 May 2022 22:55:45 +0600 Subject: [PATCH] fix typo --- lib/touch_controls/include/touch_mouse_joystick.h | 2 +- lib/touch_controls/src/touch_mouse_joystick.cpp | 10 +++++----- src/input_mapper.cpp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/touch_controls/include/touch_mouse_joystick.h b/lib/touch_controls/include/touch_mouse_joystick.h index 0fb7075..37a55ab 100644 --- a/lib/touch_controls/include/touch_mouse_joystick.h +++ b/lib/touch_controls/include/touch_mouse_joystick.h @@ -3,7 +3,7 @@ #include "touch_joystick.h" -class TouchMouseJoustick : public TouchJoystick +class TouchMouseJoystick : public TouchJoystick { protected: diff --git a/lib/touch_controls/src/touch_mouse_joystick.cpp b/lib/touch_controls/src/touch_mouse_joystick.cpp index 7d174e6..9353238 100644 --- a/lib/touch_controls/src/touch_mouse_joystick.cpp +++ b/lib/touch_controls/src/touch_mouse_joystick.cpp @@ -2,7 +2,7 @@ #include -void TouchMouseJoustick::init(int32_t pos_x, int32_t pos_y, int32_t pos_r, int16_t usb_x, int16_t usb_y, int16_t usb_r) +void TouchMouseJoystick::init(int32_t pos_x, int32_t pos_y, int32_t pos_r, int16_t usb_x, int16_t usb_y, int16_t usb_r) { TouchJoystick::init(pos_x, pos_y, pos_r, usb_x, usb_y, usb_r); @@ -17,17 +17,17 @@ void TouchMouseJoustick::init(int32_t pos_x, int32_t pos_y, int32_t pos_r, int16 this->time0 = 0; } -void TouchMouseJoustick::setSensitivity(float sensitivity) +void TouchMouseJoystick::setSensitivity(float sensitivity) { this->sensitivity = this->pos2usb * sensitivity; } -void TouchMouseJoustick::setTrackballFriction(float trackball_friction) +void TouchMouseJoystick::setTrackballFriction(float trackball_friction) { this->trackball_friction = trackball_friction; } -int8_t TouchMouseJoustick::touch(int8_t fid, int32_t tx, int32_t ty, int32_t tdx, int32_t tdy, uint32_t time) +int8_t TouchMouseJoystick::touch(int8_t fid, int32_t tx, int32_t ty, int32_t tdx, int32_t tdy, uint32_t time) { if (finger_id != -1 && finger_id != fid) { @@ -93,7 +93,7 @@ int8_t TouchMouseJoustick::touch(int8_t fid, int32_t tx, int32_t ty, int32_t tdx return touching; } -void TouchMouseJoustick::updateTrackball(uint32_t time) +void TouchMouseJoystick::updateTrackball(uint32_t time) { if (trackball_friction > 0 && !touching) { diff --git a/src/input_mapper.cpp b/src/input_mapper.cpp index d04a60e..9dfdd1f 100644 --- a/src/input_mapper.cpp +++ b/src/input_mapper.cpp @@ -9,7 +9,7 @@ namespace InputMapper { USB_Device device; - TouchMouseJoustick tjoystick_right; + TouchMouseJoystick tjoystick_right; TouchJoystick tjoystick_left; TouchDpad tdpad_right; TouchDpad tdpad_left; @@ -200,7 +200,7 @@ namespace InputMapper case TouchControl::CT_MOUSE_JOYSTICK: { - TouchMouseJoustick* tmjoy = (TouchMouseJoustick*)tcontrols[id][c]; + TouchMouseJoystick* tmjoy = (TouchMouseJoystick*)tcontrols[id][c]; res = tmjoy->touch(fid, x, y, dx, dy, time); @@ -241,7 +241,7 @@ namespace InputMapper { case TouchControl::CT_MOUSE_JOYSTICK: { - TouchMouseJoustick* tmjoy = (TouchMouseJoustick*)tcontrols[id][c]; + TouchMouseJoystick* tmjoy = (TouchMouseJoystick*)tcontrols[id][c]; tmjoy->updateTrackball(time);