Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
cbb51eacb0
1 changed files with 2 additions and 2 deletions
|
@ -30,7 +30,7 @@ int16_t xOrigin, yOrigin;
|
||||||
|
|
||||||
uint16_t lastCursor = 0;
|
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;
|
int8_t direction;
|
||||||
int16_t distanceFromOrigin;
|
int16_t distanceFromOrigin;
|
||||||
int16_t range;
|
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);
|
int16_t coordinate = axisCoordinate(pin, origin);
|
||||||
if (coordinate != 0) {
|
if (coordinate != 0) {
|
||||||
float percent = (float)coordinate / 100;
|
float percent = (float)coordinate / 100;
|
||||||
|
|
Loading…
Reference in a new issue