From ff09f5ce23be3fcd67fef2bd67cfea1097026082 Mon Sep 17 00:00:00 2001 From: Alden Hart Date: Fri, 23 Dec 2016 07:56:59 -0500 Subject: [PATCH] Interim commit --- g2core/canonical_machine.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/g2core/canonical_machine.cpp b/g2core/canonical_machine.cpp index b4065a48..d309b53c 100644 --- a/g2core/canonical_machine.cpp +++ b/g2core/canonical_machine.cpp @@ -698,8 +698,8 @@ stat_t cm_test_soft_limits(const float target[]) void canonical_machine_init() { + // NoteL cm* was assignd in main() // If you can assume all memory has been zeroed by a hard reset you don't need this code: -// memset(&cm, 0, sizeof(cm)); // do not reset canonicalMachineSingleton once it's been initialized memset(cm, 0, sizeof(cm0)); // do not reset canonicalMachineSingleton once it's been initialized memset(&cm->gm, 0, sizeof(GCodeState_t)); // clear all values, pointers and status memset(&gc.gn, 0, sizeof(GCodeInput_t)); @@ -2131,11 +2131,7 @@ cmAxisType cm_get_axis_type(const index_t index) if (axis == -1) { return (AXIS_TYPE_UNDEFINED); } return (AXIS_TYPE_LINEAR); } -/* -cmAxisType cm_get_axis_type_by_axis(const int8_t axis) -{ -} -*/ + /**** Functions called directly from cfgArray table - mostly wrappers **** * _get_msg_helper() - helper to get string values *