summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-12-31 03:28:18 +0000
committerQMK Bot <hello@qmk.fm>2021-12-31 03:28:18 +0000
commitcbb51eacb062d4570f46e787b7a5e3ae0f597e53 (patch)
treeb292427c244666d2a4ef5151247bd967ebe3a0df /drivers
parent602b0b14d5d1b67951851c9880dc426411cc65d9 (diff)
parent3b4d5390f2c203b97d1f1c0b542d0f5cd0cfd5c7 (diff)
downloadqmk_firmware-cbb51eacb062d4570f46e787b7a5e3ae0f597e53.tar.gz
qmk_firmware-cbb51eacb062d4570f46e787b7a5e3ae0f597e53.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'drivers')
-rw-r--r--drivers/sensors/analog_joystick.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sensors/analog_joystick.c b/drivers/sensors/analog_joystick.c
index 0f4d1d7a4c..1666bed047 100644
--- a/drivers/sensors/analog_joystick.c
+++ b/drivers/sensors/analog_joystick.c
@@ -30,7 +30,7 @@ int16_t xOrigin, yOrigin;
uint16_t lastCursor = 0;
-int16_t axisCoordinate(uint8_t pin, uint16_t origin) {
+int16_t axisCoordinate(pin_t pin, uint16_t origin) {
int8_t direction;
int16_t distanceFromOrigin;
int16_t range;
@@ -60,7 +60,7 @@ int16_t axisCoordinate(uint8_t pin, uint16_t origin) {
}
}
-int8_t axisToMouseComponent(uint8_t pin, int16_t origin, uint8_t maxSpeed) {
+int8_t axisToMouseComponent(pin_t pin, int16_t origin, uint8_t maxSpeed) {
int16_t coordinate = axisCoordinate(pin, origin);
if (coordinate != 0) {
float percent = (float)coordinate / 100;