Skip to content

Commit 3d04de5

Browse files
author
Luca Toniolo
committed
attempt at fixing arm build
1 parent 8b3434a commit 3d04de5

File tree

6 files changed

+8
-5
lines changed

6 files changed

+8
-5
lines changed

src/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,7 @@ SRCHEADERS := \
372372
emc/kinematics/genserkins.h \
373373
emc/kinematics/pentakins.h \
374374
emc/kinematics/pumakins.h \
375+
emc/motion_planning/bezier9.h \
375376
emc/tp/tc.h \
376377
emc/tp/tc_types.h \
377378
emc/tp/tcq.h \
@@ -902,7 +903,7 @@ EXTRA_CFLAGS := $(filter-out -ffast-math,$(RTFLAGS)) -D__MODULE__ -I$(BASEPWD)/.
902903
-I$(BASEPWD)/libnml/cms -I$(BASEPWD)/libnml/rcs -I$(BASEPWD)/libnml/inifile \
903904
-I$(BASEPWD)/libnml/os_intf -I$(BASEPWD)/libnml/nml -I$(BASEPWD)/libnml/buffer \
904905
-I$(BASEPWD)/libnml/posemath -I$(BASEPWD)/rtapi -I$(BASEPWD)/hal \
905-
-I$(BASEPWD)/emc/nml_intf -I$(BASEPWD)/emc/kinematics -I$(BASEPWD)/emc/tp -I$(BASEPWD)/emc/motion \
906+
-I$(BASEPWD)/emc/nml_intf -I$(BASEPWD)/emc/kinematics -I$(BASEPWD)/emc/tp -I$(BASEPWD)/emc/motion -I$(BASEPWD)/emc/motion_planning \
906907
-DSEQUENTIAL_SUPPORT -DHAL_SUPPORT -DDYNAMIC_PLCSIZE -DRT_SUPPORT -DOLD_TIMERS_MONOS_SUPPORT -DMODBUS_IO_MASTER \
907908
-fno-fast-math $(call cc-option,-mieee-fp) -fno-unsafe-math-optimizations \
908909
-Wno-declaration-after-statement \

src/emc/kinematics/kinematics.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ extern KINEMATICS_TYPE kinematicsType(void);
105105
/* Return the kinematics module name (e.g., "trivkins", "5axiskins").
106106
This must match the module filename without extension.
107107
Returns NULL if no name is available. */
108-
extern const char* kinematicsGetName(void);
108+
extern const char* kinematicsGetName(void) __attribute__((weak));
109109

110110
/* parameters for use with switchkins.c */
111111
typedef struct kinematics_parms {

src/emc/motion-logger/motion-logger.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,8 @@ int main(int argc, char* argv[]) {
705705
c->probe_home_err_inhibit);
706706
break;
707707

708+
case EMCMOT_SET_EMULATE_LEGACY_MOVE_COMMANDS:
709+
break;
708710

709711
default:
710712
log_print("ERROR: unknown command %d\n", c->command);

src/emc/motion/motion.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,7 @@ static int init_comm_buffers(void)
905905

906906
/* record the kinematics module name for userspace access */
907907
{
908-
const char *kins_name = kinematicsGetName();
908+
const char *kins_name = kinematicsGetName ? kinematicsGetName() : NULL;
909909
if (kins_name) {
910910
rtapi_strxcpy(emcmotConfig->kins_module_name, kins_name);
911911
} else {

tests/motion-logger/basic/expected.builtin-startup.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ ENABLE
206206
# and aborts.
207207
#
208208

209-
COORD
210209
JOG_ABORT joint=0
211210
JOG_ABORT joint=1
212211
JOG_ABORT joint=2
@@ -224,3 +223,4 @@ JOG_ABORT joint=13
224223
JOG_ABORT joint=14
225224
JOG_ABORT joint=15
226225
ABORT
226+
COORD

tests/motion-logger/mountaindew/expected.motion-logger

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ JOG_ABORT joint=15
9898
ABORT
9999
SPINDLE_OFF
100100
ENABLE
101-
COORD
102101
JOG_ABORT joint=0
103102
JOG_ABORT joint=1
104103
JOG_ABORT joint=2
@@ -116,6 +115,7 @@ JOG_ABORT joint=13
116115
JOG_ABORT joint=14
117116
JOG_ABORT joint=15
118117
ABORT
118+
COORD
119119
SET_LINE x=2, y=0, z=0, a=0, b=0, c=0, u=0, v=0, w=0, id=4, motion_type=2, vel=0.666667, ini_maxvel=400, acc=1000, turn=-1
120120
SET_LINE x=3, y=0, z=0, a=0, b=0, c=0, u=0, v=0, w=0, id=5, motion_type=2, vel=0.666667, ini_maxvel=400, acc=1000, turn=-1
121121
SET_LINE x=3, y=4, z=0, a=0, b=0, c=0, u=0, v=0, w=0, id=6, motion_type=2, vel=0.666667, ini_maxvel=400, acc=1000, turn=-1

0 commit comments

Comments
 (0)