From 4f264ee64e96f382aa8be303f8646e455ac94db0 Mon Sep 17 00:00:00 2001 From: DarioS Date: Thu, 26 Jan 2023 10:07:05 +0100 Subject: [PATCH] EgtMachKernel 2.5a3 : - correzione calcolo assi rotanti nel caso indeterminato con corsa asse che non comprende lo zero. --- EgtMachKernel.rc | Bin 11774 -> 11774 bytes MachineCalc.cpp | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index f250b583ed2dd248a57e0e1c43c78663f9abf4a1..471d5ce2017b71eeeb0296e2d14e1a2be5916f08 100644 GIT binary patch delta 97 zcmewt{V#gMFE&Qw&A-`fnHh~IKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4 NK<#LXK~l;gTmUD-Bai?9 delta 97 zcmewt{V#gMFE&P_&A-`fnHh~HKa|wnoW?bQ1uSxrY4Qod0+^@}R1`^_2jk{d(jGv4 NK<#LXK~l;gTmU8!BZvS1 diff --git a/MachineCalc.cpp b/MachineCalc.cpp index 687a5f3..775007d 100644 --- a/MachineCalc.cpp +++ b/MachineCalc.cpp @@ -1070,7 +1070,7 @@ Machine::GetMyAngles( const Vector3d& vtDirT, const Vector3d& vtDirA, } if ( nStat >= 1) { // se non riesco ad aggiustare, elimino - if ( ! AdjustAngleInStroke( RotAx1.stroke, dAngA1) || + if ( ( bDet1 && ! AdjustAngleInStroke( RotAx1.stroke, dAngA1)) || ( nNumRotAx == 2 && ! AdjustAngleInStroke( RotAx2.stroke, dAngB1))) { -- nStat ; // riloco eventuale soluzione rimasta