From 2d1292949986a942f892ba7b5e839d06da57ad0b Mon Sep 17 00:00:00 2001 From: Sonny Jeon Date: Fri, 5 Sep 2014 15:38:17 -0600 Subject: [PATCH] Merge branch 'master' of https://github.com/grbl/grbl Conflicts: README.md --- README.md | 4 +- config.h | 2 +- cpu_map.h | 116 ++- defaults.h | 38 + settings.c | 2 +- settings.h | 2 +- test/gcode/HSM_test.nc | 1758 +++++++++++++++++++++++++++++++++++++ test/gcode/braid_cut2d.nc | 3 +- 8 files changed, 1917 insertions(+), 8 deletions(-) create mode 100644 test/gcode/HSM_test.nc diff --git a/README.md b/README.md index 5edbf08..1183789 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ Grbl includes full acceleration management with look ahead. That means the contr *** _**Master Branch:**_ -* [Grbl v0.9g Atmega328p 16mhz 115200baud with generic defaults](http://bit.ly/1m8E1Qa) _(2014-08-17)_ -* [Grbl v0.9g Atmega328p 16mhz 115200baud with ShapeOko2 defaults](http://bit.ly/1kOAzig) _(2014-08-17)_ +* [Grbl v0.9g Atmega328p 16mhz 115200baud with generic defaults](http://bit.ly/1m8E1Qa) _(2014-09-05)_ +* [Grbl v0.9g Atmega328p 16mhz 115200baud with ShapeOko2 defaults](http://bit.ly/1kOAzig) _(2014-09-05)_ - **IMPORTANT INFO WHEN UPGRADING TO GRBL v0.9g:** - Baudrate is now **115200** (Up from 9600). - Settings WILL be overwritten. Please make sure you have a backup. Also, settings have been renumbered and some have changed how they work. See our [Configuring v0.9 Wiki page](https://github.com/grbl/grbl/wiki/Configuring-Grbl-v0.9) for details. diff --git a/config.h b/config.h index 1319519..b3dcbbd 100644 --- a/config.h +++ b/config.h @@ -43,7 +43,7 @@ // Default cpu mappings. Grbl officially supports the Arduino Uno only. Other processor types // may exist from user-supplied templates or directly user-defined in cpu_map.h -#define CPU_MAP_ATMEGA328P // Arduino Uno CPU +#define CPU_MAP_ATMEGA328P_TRADITIONAL // Arduino Uno CPU // Define runtime command special characters. These characters are 'picked-off' directly from the // serial read data stream and are not passed to the grbl line execution parser. Select characters diff --git a/cpu_map.h b/cpu_map.h index 993bcb5..00b799f 100644 --- a/cpu_map.h +++ b/cpu_map.h @@ -28,9 +28,10 @@ #ifndef cpu_map_h #define cpu_map_h + //---------------------------------------------------------------------------------------- -#ifdef CPU_MAP_ATMEGA328P // (Arduino Uno) Officially supported by Grbl. +#ifdef CPU_MAP_ATMEGA328P_TRADITIONAL // (Arduino Uno) Officially supported by Grbl. // Define serial port pins and interrupt vectors. #define SERIAL_RX USART_RX_vect @@ -140,6 +141,119 @@ #endif + +//---------------------------------------------------------------------------------------- + +#ifdef CPU_MAP_ATMEGA328P_NEW // (Arduino Uno) New test pinout configuration. Still subject to change! + + // Define serial port pins and interrupt vectors. + #define SERIAL_RX USART_RX_vect + #define SERIAL_UDRE USART_UDRE_vect + + // Define step pulse output pins. NOTE: All step bit pins must be on the same port. + #define STEP_DDR DDRD + #define STEP_PORT PORTD + #define X_STEP_BIT 2 // Uno Digital Pin 2 + #define Y_STEP_BIT 3 // Uno Digital Pin 3 + #define Z_STEP_BIT 4 // Uno Digital Pin 4 + #define STEP_MASK ((1<