Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-24 14:13:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix merge glitch (correctly this time)

Browse Source
This commit is contained in:
Rob Giseburt
2023-02-17 21:17:43 -06:00
parent 5d6c31804d
commit 2ee22765d0
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/g2core.h
+6 -1
View File
@@ -59,7 +59,12 @@ typedef uint16_t magic_t; // magic number size
// Note: If you change COORDS you must adjust the entries in cfgArray table in config.c
#define AXES 9 // number of axes supported in this version
#include "hardware.h" // Status code definitions and strings
#ifndef AXES
#define AXES 9 // number of axes supported in this version
#elif (AXES != 6 && AXES != 9)
#error AXES must be undefined (defaulting to 9) or defined as 6 or 9
#endif
#define HOMING_AXES 4 // number of axes that can be homed (assumes Zxyabc sequence)
#define COORDS 6 // number of supported coordinate systems (index starts at 1)
#ifndef TOOLS