Skip to content

Commit 31f4025

Browse files
authored
Fixed mouse range
turns out it's 7FFF, not FFFF
1 parent d6f3152 commit 31f4025

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

SamcoEnhanced/SamcoEnhanced.ino

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1801,7 +1801,7 @@ void ExecCalMode()
18011801
// Set Offset buffer
18021802
profileData[selectedProfile].topOffset = mouseY;
18031803
// Move to bottom calibration point
1804-
AbsMouse5.move(32768/2, 32768);
1804+
AbsMouse5.move(32768/2, 32767);
18051805
break;
18061806

18071807
case Cali_Left:
@@ -1815,7 +1815,7 @@ void ExecCalMode()
18151815
// Set Offset buffer
18161816
profileData[selectedProfile].leftOffset = mouseX;
18171817
// Move to right calibration point
1818-
AbsMouse5.move(32768, 32768/2);
1818+
AbsMouse5.move(32767, 32768/2);
18191819
break;
18201820

18211821
case Cali_Center:
@@ -1945,14 +1945,14 @@ void CaliMousePosMove(uint8_t caseNumber)
19451945
delay(5);
19461946
break;
19471947
case Cali_Bottom:
1948-
for(yPos = 0; yPos < 32768; yPos = yPos + 30) {
1949-
if(yPos > 32768-31) { yPos = 32768; }
1948+
for(yPos = 0; yPos < 32767; yPos = yPos + 30) {
1949+
if(yPos > 32767-31) { yPos = 32767; }
19501950
AbsMouse5.move(32768/2, yPos);
19511951
}
19521952
delay(5);
19531953
break;
19541954
case Cali_Left:
1955-
yPos = 32768;
1955+
yPos = 32767;
19561956
for(xPos = 32768/2; xPos > 0; xPos = xPos - 30) {
19571957
if(xPos < 31) { xPos = 0; }
19581958
if(yPos > 32768/2) { yPos = yPos - 30; }
@@ -1962,14 +1962,14 @@ void CaliMousePosMove(uint8_t caseNumber)
19621962
delay(5);
19631963
break;
19641964
case Cali_Right:
1965-
for(xPos = 0; xPos < 32768; xPos = xPos + 30) {
1966-
if(xPos > 32768-31) { xPos = 32768; }
1965+
for(xPos = 0; xPos < 32767; xPos = xPos + 30) {
1966+
if(xPos > 32767-31) { xPos = 32767; }
19671967
AbsMouse5.move(xPos, 32768/2);
19681968
}
19691969
delay(5);
19701970
break;
19711971
case Cali_Center:
1972-
for(xPos = 32768; xPos > 32768/2; xPos = xPos - 30) {
1972+
for(xPos = 32767; xPos > 32768/2; xPos = xPos - 30) {
19731973
if(xPos < 32768/2) { xPos = 32768/2; }
19741974
AbsMouse5.move(xPos, 32768/2);
19751975
}
@@ -2042,25 +2042,25 @@ void GetPosition()
20422042
int32_t conMoveY = constrain(mouseY, 0, res_y);
20432043

20442044
// Output mapped to Mouse resolution
2045-
conMoveX = map(conMoveX, 0, res_x, 0, 32768);
2046-
conMoveY = map(conMoveY, 0, res_y, 0, 32768);
2045+
conMoveX = map(conMoveX, 0, res_x, 0, 32767);
2046+
conMoveY = map(conMoveY, 0, res_y, 0, 32767);
20472047

20482048
if(gunMode == GunMode_Run) {
20492049
UpdateLastSeen();
20502050

20512051
if(serialARcorrection) {
2052-
conMoveX = map(conMoveX, 4147, 28697, 0, 32768);
2053-
conMoveX = constrain(conMoveX, 0, 32768);
2052+
conMoveX = map(conMoveX, 4147, 28697, 0, 32767);
2053+
conMoveX = constrain(conMoveX, 0, 32767);
20542054
}
20552055

20562056
bool offXAxis = false;
20572057
bool offYAxis = false;
20582058

2059-
if(conMoveX == 0 || conMoveX == 32768) {
2059+
if(conMoveX == 0 || conMoveX == 32767) {
20602060
offXAxis = true;
20612061
}
20622062

2063-
if(conMoveY == 0 || conMoveY == 32768) {
2063+
if(conMoveY == 0 || conMoveY == 32767) {
20642064
offYAxis = true;
20652065
}
20662066

0 commit comments

Comments
 (0)