From 993c83d1c86f1006d0b681d125bd35dc9238b226 Mon Sep 17 00:00:00 2001 From: Sonny Jeon Date: Sat, 23 May 2015 12:43:52 -0600 Subject: [PATCH] Moved cpu_map. - Moved cpu_map files to a cpu_map directory, like the defaults file organization. --- {grbl => Grbl/cpu_map}/cpu_map_atmega2560.h | 3 ++- {grbl => Grbl/cpu_map}/cpu_map_atmega328p.h | 10 ++++---- doc/log/commit_log_v0.9i.txt | 19 +++++++++++++++ grbl/cpu_map.h | 27 ++++++--------------- 4 files changed, 33 insertions(+), 26 deletions(-) rename {grbl => Grbl/cpu_map}/cpu_map_atmega2560.h (99%) rename {grbl => Grbl/cpu_map}/cpu_map_atmega328p.h (96%) diff --git a/grbl/cpu_map_atmega2560.h b/Grbl/cpu_map/cpu_map_atmega2560.h similarity index 99% rename from grbl/cpu_map_atmega2560.h rename to Grbl/cpu_map/cpu_map_atmega2560.h index b8a0aa2..8c2cebc 100644 --- a/grbl/cpu_map_atmega2560.h +++ b/Grbl/cpu_map/cpu_map_atmega2560.h @@ -20,10 +20,12 @@ /* This cpu_map file serves as a central pin mapping settings file for AVR Mega 2560 */ + #ifdef GRBL_PLATFORM #error "cpu_map already defined: GRBL_PLATFORM=" GRBL_PLATFORM #endif + #define GRBL_PLATFORM "Atmega2560" // Serial port pins @@ -133,4 +135,3 @@ #define SPINDLE_PWM_PORT PORTH #define SPINDLE_PWM_BIT 4 // MEGA2560 Digital Pin 97 #endif // End of VARIABLE_SPINDLE - diff --git a/grbl/cpu_map_atmega328p.h b/Grbl/cpu_map/cpu_map_atmega328p.h similarity index 96% rename from grbl/cpu_map_atmega328p.h rename to Grbl/cpu_map/cpu_map_atmega328p.h index 8bb071d..ea233f9 100644 --- a/grbl/cpu_map_atmega328p.h +++ b/Grbl/cpu_map/cpu_map_atmega328p.h @@ -18,16 +18,17 @@ along with Grbl. If not, see . */ -/* This cpu_map file serves as a central pin mapping settings file for AVR 328p - used on the Arduino Uno */ - - +/* Grbl officially supports the Arduino Uno, but the other supplied pin mappings are + supplied by users, so your results may vary. This cpu_map file serves as a central + pin mapping settings file for AVR 328p used on the Arduino Uno. */ + #ifdef GRBL_PLATFORM #error "cpu_map already defined: GRBL_PLATFORM=" GRBL_PLATFORM #endif #define GRBL_PLATFORM "Atmega328p" + // Define serial port pins and interrupt vectors. #define SERIAL_RX USART_RX_vect #define SERIAL_UDRE USART_UDRE_vect @@ -143,4 +144,3 @@ #define SPINDLE_PWM_PORT PORTB #define SPINDLE_PWM_BIT 3 // Uno Digital Pin 11 #endif // End of VARIABLE_SPINDLE - diff --git a/doc/log/commit_log_v0.9i.txt b/doc/log/commit_log_v0.9i.txt index de40f68..4cd5b97 100644 --- a/doc/log/commit_log_v0.9i.txt +++ b/doc/log/commit_log_v0.9i.txt @@ -1,3 +1,22 @@ +---------------- +Date: 2015-05-23 +Author: Sonny Jeon +Subject: Homing and limit updates. Minor bug fixes. + +- Updated new homing cycle to error out when a pull-off motion detects +the limit is still active. + +- Created a limits_get_state() function to centralize it. It reports +state as a bit-wise booleans according to axis numbering. + +- Updated the print uint8 functions. Generalized it to allow both base2 +and base10 printouts, while allowing base2 prints with N_AXIS digits +for limit state status reports. Doing this saved about 100bytes of +flash as well. + +- Applied CoreXY status reporting bug fix by @phd0. Thanks! + + ---------------- Date: 2015-05-22 Author: Sonny Jeon diff --git a/grbl/cpu_map.h b/grbl/cpu_map.h index 1781795..1804d25 100644 --- a/grbl/cpu_map.h +++ b/grbl/cpu_map.h @@ -18,43 +18,30 @@ along with Grbl. If not, see . */ -/* The cpu_map.h file serves as a central pin mapping selection file for different processor +/* The cpu_map.h files serve as a central pin mapping selection file for different processor types, i.e. AVR 328p or AVR Mega 2560. Each processor has its own pin mapping file. (i.e. cpu_map_atmega328p.h) Grbl officially supports the Arduino Uno, but the other supplied pin mappings are supplied by users, so your results may vary. */ -// NOTE: This is still a work in progress. We are still centralizing the configurations to -// this file, so your success may vary for other CPUs. +// NOTE: With new processors, only add the define name and filename to use. #ifndef cpu_map_h #define cpu_map_h -//---------------------------------------------------------------------------------------- - #ifdef CPU_MAP_ATMEGA328P // (Arduino Uno) Officially supported by Grbl. - - #include "cpu_map_atmega328p.h" - + #include "cpu_map/cpu_map_atmega328p.h" #endif - -//---------------------------------------------------------------------------------------- - #ifdef CPU_MAP_ATMEGA2560 // (Arduino Mega 2560) Working @EliteEng - - #include "cpu_map_atmega2560.h" - + #include "cpu_map/cpu_map_atmega2560.h" #endif -//---------------------------------------------------------------------------------------- - /* #ifdef CPU_MAP_CUSTOM_PROC - // For a custom pin map or different processor, copy and edit ne of the default cpu map - // files above and modify it to your needs. Then, copy and paste one of the sections above - // and change the #defined name and included file. Make sure the defined name is also - // changed in the config.h file. + // For a custom pin map or different processor, copy and edit one of the available cpu + // map files and modify it to your needs. Make sure the defined name is also changed in + // the config.h file. #endif */