mirror of
https://github.com/grblHAL/core.git
synced 2026-03-23 11:32:44 +08:00
Added initial/enhanced support for toolsetter and second probe input.
Moved inbuilt G65 macros to the core and added macro G65P5Q<n> for selecting probe. Added probe id to real time report: |P:<n> will be reported on probe select when more than one probe is available. Fix for WCO and Ov real time status report elements not beeing reported as they should in some circumstances.
This commit is contained in:
@@ -29,6 +29,11 @@
|
||||
|
||||
#include "hal.h"
|
||||
#include "nuts_bolts.h"
|
||||
|
||||
#define MODBUS_RTU_ENABLED 0b001
|
||||
#define MODBUS_RTU_DIR_ENABLED 0b010
|
||||
#define MODBUS_TCP_ENABLED 0b100
|
||||
|
||||
#include "expanders_init.h"
|
||||
|
||||
#ifdef OPTS_POSTPROCESSING
|
||||
@@ -393,10 +398,6 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define MODBUS_RTU_ENABLED 0b001
|
||||
#define MODBUS_RTU_DIR_ENABLED 0b010
|
||||
#define MODBUS_TCP_ENABLED 0b100
|
||||
|
||||
#if MODBUS_ENABLE == 2
|
||||
#undef MODBUS_ENABLE
|
||||
#define MODBUS_ENABLE 0b011
|
||||
@@ -476,6 +477,14 @@
|
||||
#define LIMITS_OVERRIDE_ENABLE 0
|
||||
#endif
|
||||
|
||||
#ifndef PROBE2_ENABLE
|
||||
#define PROBE2_ENABLE 0
|
||||
#endif
|
||||
|
||||
#ifndef TOOLSETTER_ENABLE
|
||||
#define TOOLSETTER_ENABLE 0
|
||||
#endif
|
||||
|
||||
#if SAFETY_DOOR_ENABLE && defined(NO_SAFETY_DOOR_SUPPORT)
|
||||
#error "Driver does not support safety door functionality!"
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user