gnea · quangdo1700 · Jan 2, 2018 · Apr 23, 2018 · Apr 23, 2018 · Apr 26, 2018
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: Gauthier
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,11 @@
 *.hex
+*.zip
 *.o
 *.elf
 *.DS_Store
 *.d
+.grbl*
+.vscode
+platformio.ini
 
 README.md
diff --git a/COPYING b/COPYING
@@ -4,6 +4,7 @@ COPYRIGHT NOTICE FOR GRBL:
 
 Grbl - Embedded CNC g-code interpreter and motion-controller
 
+Copyright (c) 2017-2018 Gauthier Briere
 Copyright (c) 2011-2016 Sungeun K. Jeon for Gnea Research LLC
 Copyright (c) 2009-2011 Simen Svale Skogsrud
 Copyright (c) 2011 Jens Geisler

diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
 #  Part of Grbl
 #
+#  Copyright (c) 2017-2022 Gauthier Briere
 #  Copyright (c) 2009-2011 Simen Svale Skogsrud
 #  Copyright (c) 2012-2015 Sungeun K. Jeon
 #
@@ -30,12 +31,17 @@
 
 DEVICE     ?= atmega2560
 CLOCK      = 16000000L
-PROGRAMMER ?= -c avrisp2 -P usb
-SOURCE    = main.c motion_control.c gcode.c spindle_control.c coolant_control.c serial.c \
-             protocol.c stepper.c eeprom.c settings.c planner.c nuts_bolts.c limits.c \
-             print.c probe.c report.c system.c sleep.c jog.c
+
+DEVICE_PORT ?= /dev/ttyUSB0
+PROGRAMMER ?= -D -v -c avrisp2 -P $(DEVICE_PORT)
+
+SOURCE    = main.c motion_control.c gcode.c spindle_control.c coolant_control.c digital_control.c\
+            analog_control.c serial.c protocol.c stepper.c eeprom.c settings.c planner.c nuts_bolts.c\
+            limits.c print.c probe.c report.c system.c sleep.c jog.c
+
 BUILDDIR = build
 SOURCEDIR = grbl
+
 # FUSES      = -U hfuse:w:0xd9:m -U lfuse:w:0x24:m
 FUSES      = -U hfuse:w:0xd2:m -U lfuse:w:0xff:m
 
@@ -47,7 +53,7 @@ AVRDUDE = avrdude $(PROGRAMMER) -p $(DEVICE) -B 10 -F
 # COMPILE = avr-gcc -Wall -Os -DF_CPU=$(CLOCK) -mmcu=$(DEVICE) -I. -ffunction-sections
 
 # Compile flags for avr-gcc v4.9.2 compatible with the IDE. Or if you don't care about the warnings. 
-COMPILE = avr-gcc -Wall -Os -DF_CPU=$(CLOCK) -mmcu=$(DEVICE) -I. -ffunction-sections -flto
+COMPILE = avr-gcc $(CFLAGS) -Wall -Os -DF_CPU=$(CLOCK) -mmcu=$(DEVICE) -I. -ffunction-sections -flto
 
 
 OBJECTS = $(addprefix $(BUILDDIR)/,$(notdir $(SOURCE:.c=.o)))

diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
-![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-Mega/releases)_
+![GitHub Logo](https://github.com/fra589/grbl-Mega-5X/blob/edge/doc/images/Mega-5X-logo.svg)
+
 ***
 
 Grbl is a no-compromise, high performance, low cost alternative to parallel-port-based motion control for CNC milling. This version of Grbl runs on an Arduino Mega2560 only.
@@ -11,19 +10,13 @@ It accepts standards-compliant g-code and has been tested with the output of sev
 
 Grbl includes full acceleration management with look ahead. That means the controller will look up to 24 motions into the future and plan its velocities ahead to deliver smooth acceleration and jerk-free cornering.
 
-* [Licensing](https://github.com/gnea/grbl/wiki/Licensing): Grbl is free software, released under the GPLv3 license.
+* [Licensing](https://github.com/fra589/grbl-Mega-5X/blob/edge/COPYING): Grbl is free software, released under the GPLv3 license.
 
-* For more information and help, check out our **[Wiki pages!](https://github.com/gnea/grbl/wiki)** If you find that the information is out-dated, please to help us keep it updated by editing it or notifying our community! Thanks!
+* For more information and help, check out our **[Wiki pages!](https://github.com/fra589/grbl-Mega-5X/wiki)** If you find that the information is out-dated, please to help us keep it updated by editing it or notifying our community! Thanks!
 
-* Lead Developer: Sungeun "Sonny" Jeon, Ph.D. (USA) aka @chamnit
-
-* Built on the wonderful Grbl v0.6 (2011) firmware written by Simen Svale Skogsrud (Norway).
-
-***
-
-### Official Supporters of the Grbl CNC Project
-![Official Supporters](https://github.com/gnea/gnea-Media/blob/master/Contributors.png?raw=true)
+* Lead Developer: Gauthier Brière (France) aka @fra589
 
+* Built on the wonderful Grbl v1.1f (2017) firmware originally written by Simen Svale Skogsrud (Norway) and maintained by Sungeun "Sonny" Jeon, Ph.D. (USA) aka @chamnit
 
 ***
 
@@ -58,8 +51,6 @@ Grbl includes full acceleration management with look ahead. That means the contr
 - Lots of minor bug fixes and refactoring to make the code more efficient and flexible.
 
 
-
-
 ```
 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
@@ -76,10 +67,8 @@ List of Supported G-Codes in Grbl v1.1:
   - Program Flow: M0, M1, M2, M30*
   - Coolant Control: M7*, M8, M9
   - Spindle Control: M3, M4, M5
-  - Valid Non-Command Words: F, I, J, K, L, N, P, R, S, T, X, Y, Z
+  - Valid Non-Command Words: F, I, J, K, L, N, P, R, S, T, X, Y, Z, A, B, C
 ```
 
 -------------
-Grbl is an open-source project and fueled by the free-time of our intrepid administrators and altruistic users. If you'd like to donate, all proceeds will be used to help fund supporting hardware and testing equipment. Thank you!
-
-[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=CUGXJHXA36BYW)
+Grbl-Mega-5X is an open-source project and fueled by the free-time of our intrepid administrators and altruistic users. If you'd like to donate, all proceeds will be used to help fund supporting hardware and testing equipment. Thank you! [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/donate/?business=CZZN52UPPVHCW&no_recurring=0&item_name=Grbl-Mega-5X+%26+cn5X%2B%2B+donations&currency_code=EUR)
diff --git a/TODO b/TODO
@@ -0,0 +1,10 @@
+Square offset params
+backlash compensation
+#112 => 2 PWM outputs: One on D8 in 0-12V and the other on another port in 0-5V, new commands such as M3.1, M4.1 and M5.1 to control the second output.
+#71 => G0 should find the shortest path on Rotary Axis (wrap-around coordinate system ?)
+CoreXY homing bug correction grbl-Mega-5X #124 / grbl-Mega #49
+Second serial port communications
+Spindle enable (laser enable) did not restore after feed hold, bug #79
+Implementy analog output (PWM output) M67/M68
+
+
diff --git a/doc/csv/alarm_codes_en_US.csv b/doc/csv/alarm_codes_en_US.csv
@@ -8,3 +8,5 @@
 "7","Homing fail","Homing fail. Safety door was opened during homing cycle."
 "8","Homing fail","Homing fail. Pull off travel failed to clear limit switch. Try increasing pull-off setting or check wiring."
 "9","Homing fail","Homing fail. Could not find limit switch within search distances. Try increasing max travel, decreasing pull-off distance, or check wiring."
+"10","Homing fail","Homing fail. Max travel is shorter than the pull off travel."
+"11","Serial overflow","Serial RX buffer overflow."
diff --git a/doc/csv/build_option_codes_en_US.csv b/doc/csv/build_option_codes_en_US.csv
@@ -1,21 +1,23 @@
-"OPT: Code"," Build-Option Description","State"
+"OPT: Code","Build-Option Description","State"
 "V","Variable spindle","Enabled"
 "N","Line numbers","Enabled"
 "M","Mist coolant M7","Enabled"
+"G","Safety door input pin","Enabled"
 "C","CoreXY","Enabled"
 "P","Parking motion","Enabled"
 "Z","Homing force origin","Enabled"
 "H","Homing single axis commands","Enabled"
 "T","Two limit switches on axis","Enabled"
+"S","Use different spindle output pin in laser mode","Enabled"
+"D","Digital input","Enabled"
+"Q","Analog output (PWM)","Enabled"
 "A","Allow feed rate overrides in probe cycles","Enabled"
-"D","Use spindle direction as enable pin","Enabled"
 "0","Spindle enable off when speed is zero","Enabled"
-"S","Software limit pin debouncing","Enabled"
 "R","Parking override control","Enabled"
+"L","Homing initialization auto-lock","Disabled"
 "*","Restore all EEPROM command","Disabled"
 "$","Restore EEPROM `$` settings command","Disabled"
 "#","Restore EEPROM parameter data command","Disabled"
 "I","Build info write user string command","Disabled"
 "E","Force sync upon EEPROM write","Disabled"
 "W","Force sync upon work coordinate offset change","Disabled"
-"L","Homing initialization auto-lock","Disabled"
diff --git a/doc/csv/error_codes_en_US.csv b/doc/csv/error_codes_en_US.csv
@@ -34,4 +34,4 @@
 "35","Invalid gcode ID:35","G2 and G3 arcs require at least one in-plane offset word."
 "36","Invalid gcode ID:36","Unused value words found in block."
 "37","Invalid gcode ID:37","G43.1 dynamic tool length offset is not assigned to configured tool length axis."
-"38","Invalid gcode ID:38","Tool number greater than max supported value."
+"38","Invalid gcode ID:38","Tool number or digital output number greater than max supported value."
diff --git a/doc/csv/setting_codes_en_US.csv b/doc/csv/setting_codes_en_US.csv
@@ -21,15 +21,27 @@
 "30","Maximum spindle speed","RPM","Maximum spindle speed. Sets PWM to 100% duty cycle."
 "31","Minimum spindle speed","RPM","Minimum spindle speed. Sets PWM to 0.4% or lowest duty cycle."
 "32","Laser-mode enable","boolean","Enables laser mode. Consecutive G1/2/3 commands will not halt when spindle speed is changed."
+"33","Maximum laser value","Laser unit","Maximum laser value. Sets PWM to 100% duty cycle."
+"34","Minimum laser value","Laser unit","Minimum laser value. Sets PWM to 0.4% or lowest duty cycle."
+"35","Maximum output value","Volts or other units","Maximum output value. Sets PWM to 100% duty cycle."
+"36","Minimum output value","Volts or other units","Minimum output value. Sets PWM to 0.4% or lowest duty cycle."
 "100","X-axis travel resolution","step/mm","X-axis travel resolution in steps per millimeter."
 "101","Y-axis travel resolution","step/mm","Y-axis travel resolution in steps per millimeter."
 "102","Z-axis travel resolution","step/mm","Z-axis travel resolution in steps per millimeter."
+"103","A-axis travel resolution","step/degre","A-Axis travel resolution in steps per degre"
+"104","B-axis travel resolution","step/degre","B-Axis travel resolution in steps per degre"
 "110","X-axis maximum rate","mm/min","X-axis maximum rate. Used as G0 rapid rate."
 "111","Y-axis maximum rate","mm/min","Y-axis maximum rate. Used as G0 rapid rate."
 "112","Z-axis maximum rate","mm/min","Z-axis maximum rate. Used as G0 rapid rate."
+"113","A-axis maximum rate","degre/min","A-axis maximum rate. Used as G0 rapid rate"
+"114","B-axis maximum rate","degre/min","B-axis maximum rate. Used as G0 rapid rate"
 "120","X-axis acceleration","mm/sec^2","X-axis acceleration. Used for motion planning to not exceed motor torque and lose steps."
 "121","Y-axis acceleration","mm/sec^2","Y-axis acceleration. Used for motion planning to not exceed motor torque and lose steps."
 "122","Z-axis acceleration","mm/sec^2","Z-axis acceleration. Used for motion planning to not exceed motor torque and lose steps."
+"123","A-Axis acceleration","degre/sec^2","A-axis acceleration. Used for motion planning to not exceed motor torque and lose steps."
+"124","B-Axis acceleration","degre/sec^2","B-axis acceleration. Used for motion planning to not exceed motor torque and lose steps."
 "130","X-axis maximum travel","millimeters","Maximum X-axis travel distance from homing switch. Determines valid machine space for soft-limits and homing search distances."
 "131","Y-axis maximum travel","millimeters","Maximum Y-axis travel distance from homing switch. Determines valid machine space for soft-limits and homing search distances."
 "132","Z-axis maximum travel","millimeters","Maximum Z-axis travel distance from homing switch. Determines valid machine space for soft-limits and homing search distances."
+"133","A-axis maximum travel","degres","Maximum A-axis travel distance from homing switch. Determines valid machine space for soft-limits and homing search distances."
+"134","B-axis maximum travel","degres","Maximum B-axis travel distance from homing switch. Determines valid machine space for soft-limits and homing search distances."