Skip to content

Commit 87d8f4e

Browse files
authored
Merge pull request #4676 from grandixximo/posemath-consolidate
genserkins: use posemath, remove gomath
2 parents 536d1ba + bee44a7 commit 87d8f4e

22 files changed

Lines changed: 592 additions & 5236 deletions

‎include/posemath.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ __attribute__((always_inline)) static inline double pmSq(double x) { return x*x;
178178
extern int pmCartMag(PmCartesian const * const, double * const);
179179
extern int pmCartMagSq(PmCartesian const * const, double * const);
180180
extern int pmCartCartDisp(PmCartesian const * const v1, PmCartesian const * const v2, double *d);
181+
extern int pmCartCartParallel(PmCartesian const * const u1, PmCartesian const * const u2, double tol);
182+
extern int pmCartCartAntiParallel(PmCartesian const * const u1, PmCartesian const * const u2, double tol);
181183
extern int pmCartCartAdd(PmCartesian const * const, PmCartesian const * const, PmCartesian * const);
182184
extern int pmCartCartSub(PmCartesian const * const, PmCartesian const * const, PmCartesian * const);
183185
extern int pmCartScalMult(PmCartesian const * const, double, PmCartesian * const);

‎src/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,7 @@ genhexkins-objs += $(USERKFUNCS)
11471147
obj-m += genserkins.o
11481148
genserkins-objs := emc/kinematics/genserkins.o
11491149
genserkins-objs += emc/kinematics/genserfuncs.o
1150-
genserkins-objs += libposemath/gomath.o
1150+
genserkins-objs += libposemath/_posemath.o
11511151
genserkins-objs += $(MATHSTUB)
11521152
genserkins-objs += emc/kinematics/kins_util.o
11531153
genserkins-objs += emc/kinematics/switchkins.o

0 commit comments

Comments
 (0)