diff --git a/README.md b/README.md index 911542b..1b4f808 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -![GitHub Logo](/doc/media/Grbl Logo 250px.png) +![GitHub Logo](https://github.com/gnea/gnea-Media/blob/master/Grbl%20Logo/Grbl%20Logo%20250px.png?raw=true) + *** _Click the `Release` tab to download pre-compiled `.hex` files or just [click here](https://github.com/gnea/grbl/releases)_ *** @@ -26,7 +27,7 @@ Grbl includes full acceleration management with look ahead. That means the contr *** -##Update Summary for v1.1 +## Update Summary for v1.1 - **IMPORTANT:** Your EEPROM will be wiped and restored with new settings. This is due to the addition of two new spindle speed '$' settings. - **Real-time Overrides** : Alters the machine running state immediately with feed, rapid, spindle speed, spindle stop, and coolant toggle controls. This awesome new feature is common only on industrial machines, often used to optimize speeds and feeds while a job is running. Most hobby CNC's try to mimic this behavior, but usually have large amounts of lag. Grbl executes overrides in realtime and within tens of milliseconds. @@ -59,8 +60,6 @@ Grbl includes full acceleration management with look ahead. That means the contr - **NOTE:** Arduino Mega2560 support has been moved to an active, official Grbl-Mega [project](http://www.github.com/gnea/grbl-Mega/). All new developments here and there will be synced when it makes sense to. -- - ``` List of Supported G-Codes in Grbl v1.1: - Non-Modal Commands: G4, G10L2, G10L20, G28, G30, G28.1, G30.1, G53, G92, G92.1 diff --git a/doc/media/COPYING b/doc/media/COPYING deleted file mode 100644 index ee26e19..0000000 --- a/doc/media/COPYING +++ /dev/null @@ -1,2 +0,0 @@ - -Copyright (c) 2015 Gnea Research LLC. All Rights Reserved. diff --git a/doc/media/Grbl Logo 150px.png b/doc/media/Grbl Logo 150px.png deleted file mode 100644 index 999886e..0000000 Binary files a/doc/media/Grbl Logo 150px.png and /dev/null differ diff --git a/doc/media/Grbl Logo 250px.png b/doc/media/Grbl Logo 250px.png deleted file mode 100644 index bc9319b..0000000 Binary files a/doc/media/Grbl Logo 250px.png and /dev/null differ diff --git a/doc/media/Grbl Logo 320px.png b/doc/media/Grbl Logo 320px.png deleted file mode 100644 index 0a2f201..0000000 Binary files a/doc/media/Grbl Logo 320px.png and /dev/null differ diff --git a/doc/media/Grbl Logo 640px.png b/doc/media/Grbl Logo 640px.png deleted file mode 100644 index 96a386a..0000000 Binary files a/doc/media/Grbl Logo 640px.png and /dev/null differ diff --git a/doc/media/Grbl Logo.pdf b/doc/media/Grbl Logo.pdf deleted file mode 100644 index 99a83ce..0000000 Binary files a/doc/media/Grbl Logo.pdf and /dev/null differ diff --git a/doc/media/Grbl Logo.svg b/doc/media/Grbl Logo.svg deleted file mode 100644 index df083eb..0000000 --- a/doc/media/Grbl Logo.svg +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - image/svg+xml - - - - - - - /Users/chamnit/Dropbox/documents/OHS/Logo/Grbl.DXF - scale = 58.043118, origin = (0.000000, 0.000000), auto = True - - - - - - - - - - - - - - - - - - - - - - - diff --git a/grbl/defaults.h b/grbl/defaults.h index 84508f2..dbbbb93 100644 --- a/grbl/defaults.h +++ b/grbl/defaults.h @@ -107,6 +107,44 @@ #define DEFAULT_HOMING_PULLOFF 1.0 // mm #endif +#ifdef DEFAULTS_POCKETNC_FR4 + // Description: Pocket NC FR4 CNC mill. + #define DEFAULT_X_STEPS_PER_MM 800.0 + #define DEFAULT_Y_STEPS_PER_MM 800.0 + #define DEFAULT_Z_STEPS_PER_MM 800.0 + #define DEFAULT_X_MAX_RATE 300.0 // mm/min + #define DEFAULT_Y_MAX_RATE 300.0 // mm/min + #define DEFAULT_Z_MAX_RATE 300.0 // mm/min + #define DEFAULT_X_ACCELERATION (30.0*60*60) // 15*60*60 mm/min^2 = 15 mm/sec^2 + #define DEFAULT_Y_ACCELERATION (30.0*60*60) // 15*60*60 mm/min^2 = 15 mm/sec^2 + #define DEFAULT_Z_ACCELERATION (30.0*60*60) // 15*60*60 mm/min^2 = 15 mm/sec^2 + #define DEFAULT_X_MAX_TRAVEL 225.0 // mm NOTE: Must be a positive value. + #define DEFAULT_Y_MAX_TRAVEL 125.0 // mm NOTE: Must be a positive value. + #define DEFAULT_Z_MAX_TRAVEL 170.0 // mm NOTE: Must be a positive value. + #define DEFAULT_SPINDLE_RPM_MAX 7000.0 // rpm + #define DEFAULT_SPINDLE_RPM_MIN 0.0 // rpm + #define DEFAULT_STEP_PULSE_MICROSECONDS 10 + #define DEFAULT_STEPPING_INVERT_MASK 0 + #define DEFAULT_DIRECTION_INVERT_MASK ((1<