From c8c76e0e85efbaf7365ff043338c0c9b81cb6278 Mon Sep 17 00:00:00 2001 From: Todd Fleming Date: Wed, 4 Jan 2017 13:50:50 -0500 Subject: [PATCH] Move hacks from smoother/main to grbl/main --- grbl/main.c | 8 ++++++++ smoother/src/main.cpp | 10 ---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/grbl/main.c b/grbl/main.c index 4db693c..e703440 100644 --- a/grbl/main.c +++ b/grbl/main.c @@ -75,6 +75,14 @@ DummyReg UDR0; // Declare system global variable structure system_t sys; +int32_t sys_position[N_AXIS]; // Real-time machine (aka home) position vector in steps. +int32_t sys_probe_position[N_AXIS]; // Last probe position in machine coordinates and steps. + +volatile uint8_t sys_probe_state; // Probing state value. Used to coordinate the probing cycle with stepper ISR. +volatile uint8_t sys_rt_exec_state; // Global realtime executor bitflag variable for state management. See EXEC bitmasks. +volatile uint8_t sys_rt_exec_alarm; // Global realtime executor bitflag variable for setting various alarms. +volatile uint8_t sys_rt_exec_motion_override; // Global realtime executor bitflag variable for motion-based overrides. +volatile uint8_t sys_rt_exec_accessory_override; // Global realtime executor bitflag variable for spindle/coolant overrides. int main(void) { diff --git a/smoother/src/main.cpp b/smoother/src/main.cpp index 7995754..3e62939 100644 --- a/smoother/src/main.cpp +++ b/smoother/src/main.cpp @@ -1,15 +1,5 @@ -#include "../grbl/grbl.h" #include "mbed.h" -int32_t sys_position[N_AXIS]; // Real-time machine (aka home) position vector in steps. -int32_t sys_probe_position[N_AXIS]; // Last probe position in machine coordinates and steps. - -volatile uint8_t sys_probe_state; // Probing state value. Used to coordinate the probing cycle with stepper ISR. -volatile uint8_t sys_rt_exec_state; // Global realtime executor bitflag variable for state management. See EXEC bitmasks. -volatile uint8_t sys_rt_exec_alarm; // Global realtime executor bitflag variable for setting various alarms. -volatile uint8_t sys_rt_exec_motion_override; // Global realtime executor bitflag variable for motion-based overrides. -volatile uint8_t sys_rt_exec_accessory_override; // Global realtime executor bitflag variable for spindle/coolant overrides. - DigitalOut myled(LED1); int main() {