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

Minor prep

Browse Source
This commit is contained in:
Alden Hart
2016-12-08 14:33:33 -05:00
parent e934cfda8e
commit 58a615358f
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/canonical_machine.cpp
+1 -1
View File
@@ -112,7 +112,7 @@
**** STRUCTURE ALLOCATIONS ********************************************************
***********************************************************************************/
cmSingleton_t cm; // canonical machine controller singleton
cmMachine_t cm; // canonical machine master structure
/***********************************************************************************
**** GENERIC STATIC FUNCTIONS AND VARIABLES ***************************************
g2core/canonical_machine.h
Executable → Regular
+2 -3
View File
@@ -497,7 +497,6 @@ typedef struct cmAxis {
float travel_min; // min work envelope for soft limits
float jerk_max; // max jerk (Jm) in mm/min^3 divided by 1 million
float jerk_high; // high speed deceleration jerk (Jh) in mm/min^3 divided by 1 million
//float recip_jerk; // stored reciprocal of current jerk value - has the million in it
float max_junction_accel; // high speed deceleration jerk (Jh) in mm/min^3 divided by 1 million
float junction_dev; // aka cornering delta -- DEPRICATED!
float radius; // radius in mm for rotary axis modes
@@ -579,11 +578,11 @@ typedef struct cmSingleton { // struct to manage cm globals and c
GCodeFlags_t gf; // gcode input flags - transient
magic_t magic_end;
} cmSingleton_t;
} cmMachine_t;
/**** Externs - See canonical_machine.c for allocation ****/
extern cmSingleton_t cm; // canonical machine controller singleton
extern cmMachine_t cm; // canonical machine controller singleton
/*****************************************************************************
* FUNCTION PROTOTYPES