more kinematics

This commit is contained in:
PROFERIS - Mi³osz Stocki
2026-07-08 12:32:57 +02:00
parent f898883ff2
commit 61b4a0f185
5 changed files with 71 additions and 66 deletions
+8 -10
View File
@@ -282,11 +282,6 @@ async function executeMove(spot) {
const delta1 = newSteps1 - steps1;
const delta2 = newSteps2 - steps2;
steps1 = newSteps1;
steps2 = newSteps2;
saveSteps();
updatePositionReadout();
const cmd1 = `S1${delta1 >= 0 ? '+' : ''}${delta1}`;
const cmd2 = `S2${delta2 >= 0 ? '+' : ''}${delta2}`;
@@ -300,6 +295,10 @@ async function executeMove(spot) {
UI.log(`BLE error: ${e.message}`, 'error');
}
} else {
steps1 = newSteps1;
steps2 = newSteps2;
saveSteps();
updatePositionReadout();
const simMsg = `[sim] ${cmd1} ${cmd2}`;
console.log(simMsg);
UI.log(simMsg, 'info');
@@ -359,11 +358,6 @@ export default {
isHomed = true;
localStorage.setItem('wiji_homed', 'true');
updateHomingUI();
steps1 = IK.ARM.HOME_STEPS.m1;
steps2 = IK.ARM.HOME_STEPS.m2;
saveSteps();
updatePositionReadout();
UI.log('Homing all motors...', 'info');
if (BLE.isConnected()) {
@@ -373,6 +367,10 @@ export default {
UI.log(e.message, 'error');
}
} else {
steps1 = IK.ARM.HOME_STEPS.m1;
steps2 = IK.ARM.HOME_STEPS.m2;
saveSteps();
updatePositionReadout();
UI.log('[sim] HOMEALL', 'info');
}
});
+8 -10
View File
@@ -280,11 +280,6 @@ async function executeMove(spot) {
const delta1 = newSteps1 - steps1;
const delta2 = newSteps2 - steps2;
steps1 = newSteps1;
steps2 = newSteps2;
saveSteps();
updatePosMarker();
const cmd1 = `S1${delta1 >= 0 ? '+' : ''}${delta1}`;
const cmd2 = `S2${delta2 >= 0 ? '+' : ''}${delta2}`;
@@ -299,6 +294,10 @@ async function executeMove(spot) {
return false;
}
} else {
steps1 = newSteps1;
steps2 = newSteps2;
saveSteps();
updatePosMarker();
console.log(`[sim] ${cmd1} ${cmd2}`);
}
return true;
@@ -404,11 +403,6 @@ export default {
isHomed = true;
localStorage.setItem('wiji_homed', 'true');
updateHomingUI();
steps1 = IK.ARM.HOME_STEPS.m1;
steps2 = IK.ARM.HOME_STEPS.m2;
saveSteps();
updatePosMarker();
UI.log('Homing all motors...', 'info');
if (BLE.isConnected()) {
@@ -418,6 +412,10 @@ export default {
UI.log(e.message, 'error');
}
} else {
steps1 = IK.ARM.HOME_STEPS.m1;
steps2 = IK.ARM.HOME_STEPS.m2;
saveSteps();
updatePosMarker();
UI.log('[sim] HOMEALL', 'info');
}
});
+4 -5
View File
@@ -690,11 +690,6 @@ export default {
isHomed = true;
localStorage.setItem('wiji_homed', 'true');
updateHomingUI();
steps1 = IK.ARM.HOME_STEPS.m1;
steps2 = IK.ARM.HOME_STEPS.m2;
saveSteps();
updatePositionReadout();
UI.log('Homing all motors...', 'info');
if (BLE.isConnected()) {
@@ -704,6 +699,10 @@ export default {
UI.log(e.message, 'error');
}
} else {
steps1 = IK.ARM.HOME_STEPS.m1;
steps2 = IK.ARM.HOME_STEPS.m2;
saveSteps();
updatePositionReadout();
UI.log('[sim] HOMEALL', 'info');
}
});
+6 -7
View File
@@ -69,13 +69,6 @@ export default {
const delta1 = newSteps1 - steps1;
const delta2 = newSteps2 - steps2;
steps1 = newSteps1;
steps2 = newSteps2;
if (onStepComplete) {
onStepComplete(steps1, steps2);
}
const cmd1 = `S1${delta1 >= 0 ? '+' : ''}${delta1}`;
const cmd2 = `S2${delta2 >= 0 ? '+' : ''}${delta2}`;
@@ -91,6 +84,12 @@ export default {
return false;
}
} else {
steps1 = newSteps1;
steps2 = newSteps2;
if (onStepComplete) {
onStepComplete(steps1, steps2);
}
console.log(`[sim] ${cmd1} ${cmd2}`);
}