Skip to content

Commit

Permalink
Merge branch 'edge-preview' of https://github.com/synthetos/g2 into e…
Browse files Browse the repository at this point in the history 
…dge-preview
  • Loading branch information
@giseburt
giseburt committed Jul 20, 2023
2 parents 9d1eb27 + a847b54 commit 1fb5940
Show file tree
Hide file tree
Showing 2 changed files with 337 additions and 1 deletion.
2 changes: 1 addition & 1 deletion g2core/boards.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ endif

ifeq ("$(CONFIG)","MiniMillrevD")
ifeq ("$(BOARD)","NONE")
BOARD=gquintic-g
BOARD=gquintic-d
endif
SETTINGS_FILE="settings_minimill.h"
endif
Expand Down
336 changes: 336 additions & 0 deletions g2core/settings/settings_riley_minimill.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,336 @@
/*
* settings_minimill.h - OpenBuilds MiniMill support
* This file is part of the g2core project
*
* This file ("the software") is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License, version 2 as published by the
* Free Software Foundation. You should have received a copy of the GNU General Public
* License, version 2 along with the software. If not, see <http://www.gnu.org/licenses/>.
*
* As a special exception, you may use this file as part of a software library without
* restriction. Specifically, if other files instantiate templates or use macros or
* inline functions from this file, or you compile this file and link it with other
* files to produce an executable, this file does not by itself cause the resulting
* executable to be covered by the GNU General Public License. This exception does not
* however invalidate any other reasons why the executable file might be covered by the
* GNU General Public License.
*
* THE SOFTWARE IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT WITHOUT ANY
* WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
* SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
* OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

/***********************************************************************/
/**** Otherlab OtherMill profile ***************************************/
/***********************************************************************/

// ***> NOTE: The init message must be a single line with no CRs or LFs
#define INIT_MESSAGE "Initializing configs to OpenBuilds MiniMill settings"
#define QUINTIC_REVISION 'D'

//**** GLOBAL / GENERAL SETTINGS ******************************************************

#define JUNCTION_INTEGRATION_TIME 0.15 // cornering - between 0.10 and 2.00 (higher is faster)
#define CHORDAL_TOLERANCE 0.01 // chordal accuracy for arc drawing (in mm)

#define HAS_LASER 0 // We have a laser, but no shark (yet)
#define HAS_PRESSURE 0

#define SOFT_LIMIT_ENABLE 0 // 0=off, 1=on
#define HARD_LIMIT_ENABLE 1 // 0=off, 1=on
#define SAFETY_INTERLOCK_ENABLE 0 // 0=off, 1=on

#define SPINDLE_ENABLE_POLARITY 0 // 0=active low, 1=active high
#define SPINDLE_DIR_POLARITY 0 // 0=clockwise is low, 1=clockwise is high
#define SPINDLE_PAUSE_ON_HOLD true
#define SPINDLE_SPINUP_DELAY 1.5 // after unpausing and turning the spindle on, dwell for 1.5s

#if HAS_LASER
// #define LASER_FIRE_PIN_NUMBER Motate::kOutput3_PinNumber // note this is a MOTATE pin number, NOT a GPIO pin number
#define LASER_FIRE_PIN_NUMBER Motate::kOutput7_PinNumber // note this is a MOTATE pin number, NOT a GPIO pin number
#define LASER_ENABLE_OUTPUT_NUMBER 4
#define LASER_TOOL 5 // default tool is 5 - note that TOOLS may be limited to 5!
#define LASER_MIN_S 0.0001 // {th2mns:0.0001}
#define LASER_MAX_S 255.0 // {th2mxs:255.0}
#define LASER_MIN_PPM 100 // {th2mnp:100}
#define LASER_MAX_PPM 2500 // {th2mxp:2500}

#define LASER_PULSE_DURATION 150 // in microseconds {th2pd:150}


/*
M100 ({th2pd:150}) ; laser on period
M100 ({th2mnp:100}) ; laser min pulses per mm
M100 ({th2mxp:1500}) ; laser max pulses per mm
*/

#define KINEMATICS KINE_CARTESIAN // Due to it having the laser
#define BASE_KINEMATICS CartesianKinematics<AXES, MOTORS>
// Another option is CoreXY:
// #define BASE_KINEMATICS CoreXYKinematics<AXES, MOTORS>

// Ensure that we set these - these should match the LASER_FIRE_PIN_NUMBER !!!
#define DO7_ENABLED IO_ENABLED
#define DO7_POLARITY IO_ACTIVE_HIGH
#define DO7_EXTERNAL_NUMBER 7

#else

#define KINEMATICS KINE_CARTESIAN
//#define KINEMATICS KINE_PRESSURE

#endif // HAS_LASER

// Only used in Bantam mode
#define ESC_BOOT_TIME 5000 // how long the ESC takes to boot, in milliseconds
#define ESC_LOCKOUT_TIME 900 // how long the interlock needs to be engaged before killing power... actually 1s, but be conservative

#define COOLANT_MIST_POLARITY 1 // 0=active low, 1=active high
#define COOLANT_FLOOD_POLARITY 1 // 0=active low, 1=active high
#define COOLANT_PAUSE_ON_HOLD true

#define MIST_ENABLE_OUTPUT_NUMBER 0
#define FLOOD_ENABLE_OUTPUT_NUMBER 0

#define SPINDLE_ENABLE_OUTPUT_NUMBER 4
#define SPINDLE_DIRECTION_OUTPUT_NUMBER 5
#define SPINDLE_PWM_NUMBER 6

#define FEEDHOLD_Z_LIFT 3 // mm to lift Z on feedhold
#define PROBE_REPORT_ENABLE true

#define SPINDLE_SPEED_CHANGE_PER_MS 7 // external non-speed-controlled spindle, but we can use this as a built-in delay

/*
// Switch definitions for interlock & E-stop
#define ENABLE_INTERLOCK_AND_ESTOP
#define INTERLOCK_SWITCH_AXIS AXIS_Y
#define INTERLOCK_SWITCH_POSITION SW_MAX
#define ESTOP_SWITCH_AXIS AXIS_X
#define ESTOP_SWITCH_POSITION SW_MAX
#define PAUSE_DWELL_TIME 1.5 //after unpausing and turning the spindle on, dwell for 1.5s
*/

// Communications and reporting settings

#define USB_SERIAL_PORTS_EXPOSED 1 // Valid options are 1 or 2, only!

#define COMM_MODE JSON_MODE // one of: TEXT_MODE, JSON_MODE
#define XIO_ENABLE_FLOW_CONTROL FLOW_CONTROL_RTS // FLOW_CONTROL_OFF, FLOW_CONTROL_RTS

#define TEXT_VERBOSITY TV_VERBOSE // one of: TV_SILENT, TV_VERBOSE
#define JSON_VERBOSITY JV_MESSAGES // one of: JV_SILENT, JV_FOOTER, JV_CONFIGS, JV_MESSAGES, JV_LINENUM, JV_VERBOSE
#define QUEUE_REPORT_VERBOSITY QR_OFF // one of: QR_OFF, QR_SINGLE, QR_TRIPLE

#define STATUS_REPORT_VERBOSITY SR_FILTERED // one of: SR_OFF, SR_FILTERED, SR_VERBOSE
#define STATUS_REPORT_MIN_MS 100 // milliseconds - enforces a viable minimum
#define STATUS_REPORT_INTERVAL_MS 100 // milliseconds - set $SV=0 to disable
// #define STATUS_REPORT_DEFAULTS "knfc", "stat", "knft", "knht", "prs1", "flow1slm", "flow1vol", "flow1prs", "feed", "knev", "kniv", "kndv", "knec", "knuoc", "knumc", "knpos1"
#define STATUS_REPORT_DEFAULTS "in1", "in2", "in3", "in4","in5","in6","in7","in8","in9","in10","posx", "posy", "posz","unit", "stat", "coor", "momo", "dist","home", "vel", "plan", "line", "path","frmo", "hold", "macs", "cycs", "spc","prbe", "prs1", "feed""in1", "ofsx", "ofsy", "ofsz","g55x", "g55y", "g55z",

// Gcode startup defaults
#define GCODE_DEFAULT_UNITS MILLIMETERS // MILLIMETERS or INCHES
#define GCODE_DEFAULT_PLANE CANON_PLANE_XY // CANON_PLANE_XY, CANON_PLANE_XZ, or CANON_PLANE_YZ
#define GCODE_DEFAULT_COORD_SYSTEM G55 // G54, G55, G56, G57, G58 or G59
#define GCODE_DEFAULT_PATH_CONTROL PATH_CONTINUOUS
#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_DISTANCE_MODE

// *** motor settings ************************************************************************************

// NOTE: Motor numbers are reversed from TinyGv8 in order to maintain compatibility with wiring harnesses

#define MOTOR_POWER_LEVEL_XY 0.6 // default motor power level 0.00 - 1.00
#define MOTOR_POWER_LEVEL_XY_IDLE 0.15
#define MOTOR_POWER_LEVEL_Z 0.375
#define MOTOR_POWER_LEVEL_Z_IDLE 0.15
#define MOTOR_POWER_LEVEL_DISABLED 0.05

#define MOTOR_POWER_MODE MOTOR_POWERED_IN_CYCLE
#define MOTOR_POWER_TIMEOUT 2.00 // motor power timeout in seconds

#define M1_MOTOR_MAP AXIS_X_EXTERNAL // 1ma
#define M1_STEP_ANGLE 1.8 // 1sa
#define M1_TRAVEL_PER_REV 8 // 1tr
#define M1_MICROSTEPS 64 // 1mi 1,2,4,8,16,32
#define M1_POLARITY 0 // 1po 0=normal, 1=reversed
#define M1_POWER_MODE MOTOR_POWER_MODE // 1pm See enum cmMotorPowerMode in stepper.h
#define M1_POWER_LEVEL MOTOR_POWER_LEVEL_XY // 0.00=off, 1.00=max
#define M1_POWER_LEVEL_IDLE MOTOR_POWER_LEVEL_XY_IDLE

#define M2_MOTOR_MAP AXIS_Y_EXTERNAL
#define M2_STEP_ANGLE 1.8
#define M2_TRAVEL_PER_REV 8
#define M2_MICROSTEPS 64
#define M2_POLARITY 1
#define M2_POWER_MODE MOTOR_POWER_MODE
#define M2_POWER_LEVEL MOTOR_POWER_LEVEL_XY
#define M2_POWER_LEVEL_IDLE MOTOR_POWER_LEVEL_XY_IDLE

#define M3_MOTOR_MAP AXIS_Z_EXTERNAL
#define M3_STEP_ANGLE 1.8
#define M3_TRAVEL_PER_REV 8
#define M3_MICROSTEPS 32
#define M3_POLARITY 0
#define M3_POWER_MODE MOTOR_POWER_MODE
#define M3_POWER_LEVEL MOTOR_POWER_LEVEL_Z
#define M3_POWER_LEVEL_IDLE MOTOR_POWER_LEVEL_Z_IDLE

#define M4_MOTOR_MAP AXIS_A_EXTERNAL
#define M4_STEP_ANGLE 1.8
#define M4_TRAVEL_PER_REV 360 // degrees moved per motor rev
#define M4_MICROSTEPS 8
#define M4_POLARITY 1
#define M4_POWER_MODE MOTOR_DISABLED
#define M4_POWER_LEVEL MOTOR_POWER_LEVEL_DISABLED
#define M4_POWER_LEVEL_IDLE MOTOR_POWER_LEVEL_DISABLED

#define M5_MOTOR_MAP AXIS_B_EXTERNAL
#define M5_STEP_ANGLE 1.8
#define M5_TRAVEL_PER_REV 360 // degrees moved per motor rev
#define M5_MICROSTEPS 8
#define M5_POLARITY 0
#define M5_POWER_MODE MOTOR_DISABLED
#define M5_POWER_LEVEL MOTOR_POWER_LEVEL_DISABLED
#define M5_POWER_LEVEL_IDLE MOTOR_POWER_LEVEL_DISABLED

#define M6_MOTOR_MAP AXIS_C_EXTERNAL
#define M6_STEP_ANGLE 1.8
#define M6_TRAVEL_PER_REV 360 // degrees moved per motor rev
#define M6_MICROSTEPS 8
#define M6_POLARITY 0
#define M6_POWER_MODE MOTOR_DISABLED
#define M6_POWER_LEVEL MOTOR_POWER_LEVEL_DISABLED
#define M6_POWER_LEVEL_IDLE MOTOR_POWER_LEVEL_DISABLED

// *** axis settings **********************************************************************************

#define JERK_MAX 800 // 500 million mm/(min^3)
#define JERK_HIGH_SPEED 4000 // 1000 million mm/(min^3) // Jerk during homing needs to stop *fast*
#define VELOCITY_MAX 9000
#define LATCH_VELOCITY 500 // reeeeally slow for accuracy

#define X_AXIS_MODE AXIS_STANDARD // xam see canonical_machine.h cmAxisMode for valid values
#define X_VELOCITY_MAX VELOCITY_MAX // xvm G0 max velocity in mm/min
#define X_FEEDRATE_MAX X_VELOCITY_MAX // xfr G1 max feed rate in mm/min
#define X_TRAVEL_MIN -5 // xtn minimum travel for soft limits
#define X_TRAVEL_MAX 67 // xtr travel between switches or crashes
#define X_JERK_MAX JERK_MAX // xjm
#define X_JERK_HIGH_SPEED JERK_HIGH_SPEED // xjh
#define X_HOMING_INPUT 1 // xhi input used for homing or 0 to disable
#define X_HOMING_DIRECTION 1 // xhd 0=search moves negative, 1= search moves positive
#define X_SEARCH_VELOCITY 500 // xsv
#define X_LATCH_VELOCITY LATCH_VELOCITY // xlv mm/min
#define X_LATCH_BACKOFF 3 // xlb mm
#define X_ZERO_BACKOFF 1 // xzb mm

#define Y_AXIS_MODE AXIS_STANDARD
#define Y_VELOCITY_MAX VELOCITY_MAX
#define Y_FEEDRATE_MAX Y_VELOCITY_MAX
#define Y_TRAVEL_MIN 0
#define Y_TRAVEL_MAX 180
#define Y_JERK_MAX JERK_MAX
#define Y_JERK_HIGH_SPEED JERK_HIGH_SPEED
#define Y_HOMING_INPUT 3
#define Y_HOMING_DIRECTION 1
#define Y_SEARCH_VELOCITY 500
#define Y_LATCH_VELOCITY LATCH_VELOCITY
#define Y_LATCH_BACKOFF 5
#define Y_ZERO_BACKOFF 1

#define Z_AXIS_MODE AXIS_STANDARD
#define Z_VELOCITY_MAX 7000
#define Z_FEEDRATE_MAX Z_VELOCITY_MAX
#define Z_TRAVEL_MIN 0
#define Z_TRAVEL_MAX 87
#define Z_JERK_MAX 1000
#define Z_JERK_HIGH_SPEED Z_JERK_MAX
#define Z_HOMING_INPUT 9
#define Z_HOMING_DIRECTION 1
#define Z_SEARCH_VELOCITY 500
#define Z_LATCH_VELOCITY LATCH_VELOCITY
#define Z_LATCH_BACKOFF 4
#define Z_ZERO_BACKOFF 1

//*** Input / output settings ***
/*
See gpio.h GPIO defines for options
Homing and probing settings are independent of ACTION and FUNCTION settings
but rely on proper switch MODE setting (i.e. NC or NO)
IO_MODE_DISABLED
IO_ACTIVE_LOW aka NORMALLY_OPEN
IO_ACTIVE_HIGH aka NORMALLY_CLOSED
INPUT_ACTION_NONE
INPUT_ACTION_STOP
INPUT_ACTION_FAST_STOP
INPUT_ACTION_HALT
INPUT_ACTION_RESET
INPUT_FUNCTION_NONE
INPUT_FUNCTION_LIMIT
INPUT_FUNCTION_INTERLOCK
INPUT_FUNCTION_SHUTDOWN
INPUT_FUNCTION_PANIC
*/

// Xmin on v9 board // X homing - see X axis setup
#define DI1_POLARITY IO_ACTIVE_HIGH // Normally Open
#define DI1_ACTION INPUT_ACTION_NONE

// Xmax // External ESTOP
#define DI2_POLARITY IO_ACTIVE_HIGH
#define DI2_ACTION INPUT_ACTION_SHUTDOWN

// Ymin // Y homing - see Y axis setup
#define DI3_POLARITY IO_ACTIVE_HIGH
#define DI3_ACTION INPUT_ACTION_NONE

// Ymax // Safety interlock
#define DI4_POLARITY IO_ACTIVE_HIGH
#define DI4_ACTION INPUT_ACTION_INTERLOCK

// Zmin // Z probe
#define DI9_POLARITY IO_ACTIVE_HIGH // Normally Open
#define DI9_ACTION INPUT_ACTION_NONE
#define PROBING_INPUT 6

// Zmax // Z homing - see Z axis for setup
#define DI6_POLARITY IO_ACTIVE_HIGH
#define DI6_ACTION INPUT_ACTION_NONE

// Amin // Unused
#define DI7_ENABLED IO_DISABLED
#define DI7_ACTION INPUT_ACTION_NONE

// Amax // Unused
#define DI8_ENABLED IO_DISABLED
#define DI8_ACTION INPUT_ACTION_NONE

// Safety line w/HW timer // Unused
#define DI9_ENABLED IO_ENABLED
#define DI9_ACTION INPUT_ACTION_NONE
#define DI9_POLARITY IO_ACTIVE_HIGH


// *** PWM SPINDLE CONTROL ***

#define P1_PWM_FREQUENCY 100 // in Hz
#define P1_CW_SPEED_LO 10500 // in RPM (arbitrary units)
#define P1_CW_SPEED_HI 16400
#define P1_CW_PHASE_LO 0.13 // phase [0..1]
#define P1_CW_PHASE_HI 0.17
#define P1_CCW_SPEED_LO 0
#define P1_CCW_SPEED_HI 0
#define P1_CCW_PHASE_LO 0.1
#define P1_CCW_PHASE_HI 0.1
#define P1_PWM_PHASE_OFF 0.1

// {"tt5":{"x":0,"y":-2,"z":38.1,"a":0,"b":0,"c":0}}
#define TT5_X_OFFSET 0
#define TT5_Y_OFFSET -2
#define TT5_Z_OFFSET 38.1

0 comments on commit 1fb5940

Please sign in to comment.