diff --git a/src/package.json b/src/package.json index 68a122248..5f612e399 100644 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { "name": "gSender", - "version": "1.4.4-RC2", + "version": "1.4.4", "productName": "gSender", "description": "CNC Milling Controller", "author": { diff --git a/src/server/controllers/Grblhal/GrblHalController.js b/src/server/controllers/Grblhal/GrblHalController.js index 6baea536b..8611b42b9 100644 --- a/src/server/controllers/Grblhal/GrblHalController.js +++ b/src/server/controllers/Grblhal/GrblHalController.js @@ -1926,9 +1926,9 @@ class GrblHalController { } if (direction === 1) { - return Number(maxTravel - position - OFFSET).toFixed(FIXED); + return Number(position - OFFSET).toFixed(FIXED); } else { - return Number(-1 * (position - OFFSET)).toFixed(FIXED); + return Number(-1 * (maxTravel - position - OFFSET)).toFixed(FIXED); } }; diff --git a/src/server/lib/homing.js b/src/server/lib/homing.js index f36fabaf9..84e7606bb 100644 --- a/src/server/lib/homing.js +++ b/src/server/lib/homing.js @@ -112,5 +112,5 @@ export const determineHALMachineZeroFlag = (res, settings) => { return false; } - return isBitSetInNumber(homingMask, 4); + return isBitSetInNumber(homingMask, 3); };