diff --git a/CodeBlocks/Grbl-8c2Mega-c/readme.textile b/CodeBlocks/Grbl-8c2Mega-c/readme.textile index af28e31..066fe1b 100644 --- a/CodeBlocks/Grbl-8c2Mega-c/readme.textile +++ b/CodeBlocks/Grbl-8c2Mega-c/readme.textile @@ -1,10 +1,16 @@ -///------------------------------------------------------------------------------ +///------------------------------------------------------------------------------ These versions 0.8cxx are adaptations 4 axes of "Mega2560-grbl-0.8c" for 3 axes ///----------------------------------------------------------------------------- ==> This code is an EXPERIMENTAL code for 4 axes with Mega2560 <== -v0.8c2 June 06, 2014 +v0.8c1 August 19, 2014 : bug fixed for using V, W, B, C + + - Choice the type of fourth axis in the "config.h" file : + - linear : U or V or W + - rotary : A or B or C + - Choice the fourth axis in the "defaults.h" file : + - AXIS_T = AXIS_U or V or W or A or B or C - Creating a new pinout, different '0.8c1', which is derived from '0.8c Mega2560' - #define PIN_MAP_ARDUINO_MEGA_2560_4 /// mapping 0.8c Mega2560 + T axis @@ -44,7 +50,40 @@ v0.8c2 June 06, 2014 - Possibility always upload defaults parameters with a macro in 'config.h' - '#define ALWAYS_DEFAULTS_SETTINGS 1 /// 0 normal' - - The modified files lines are marked '/// 8c2'* + - The modified files lines are marked '/// 8c2' + +//------------------------------------------------------------------------------ + +v0.8c1 August 19, 2014 : bug fixed for use V, W, B, C + + - Choice the type of fourth axis in the "config.h" file : + - linear : U or V or W + - rotary : A or B or C + - Choice the fourth axis in the "defaults.h" file : + - AXIS_T = AXIS_U or V or W or A or B or C + + - Pinout in 'pin_map.h' for 'MEGA2560' + - X_STEP_BIT Pin 22 + - Y_STEP_BIT Pin 24 + - Z_STEP_BIT Pin 26 + - T_STEP_BIT Pin 28 + + - X_DIRECTION_BIT Pin 23 + - Y_DIRECTION_BIT Pin 25 + - Z_DIRECTION_BIT Pin 27 + - T_DIRECTION_BIT Pin 29 + + - The text provided at initialization, where T in [A, B, C, U, V, W] + ---------------------------- + MEGA2560with 4 axes (X, Y, C, T) + Grbl 0.8c1 + "$" to dump current settings + ---------------------------- + + - Files are changed from '0.8c', changed lines are marked '/// 8c1' + - config_h, defaults.h, pin_map.h + - gcode.*, limits.c, motion_control.*, nuts_bolts.*, planner.*, + protocol.h, report.*, stepper.c - The tests were performed using "GrblController-3.6.1-T1" after connection, paired with the fourth axis Grbl diff --git a/CodeBlocks/Grbl-8c2Mega-c/src/config.h b/CodeBlocks/Grbl-8c2Mega-c/src/config.h index 72f2133..75c6441 100644 --- a/CodeBlocks/Grbl-8c2Mega-c/src/config.h +++ b/CodeBlocks/Grbl-8c2Mega-c/src/config.h @@ -45,7 +45,7 @@ #define BAUD_RATE 57600 /// 8c2 always upload defaults parameter -> 1 -#define ALWAYS_DEFAULTS_SETTINGS 1 /// 0 normal +#define ALWAYS_DEFAULTS_SETTINGS 0 /// 0 normal /// 8c1 //============================================================================== diff --git a/CodeBlocks/Grbl-8c2Mega-c/src/defaults.h b/CodeBlocks/Grbl-8c2Mega-c/src/defaults.h index 2884e4e..77eb8e0 100644 --- a/CodeBlocks/Grbl-8c2Mega-c/src/defaults.h +++ b/CodeBlocks/Grbl-8c2Mega-c/src/defaults.h @@ -55,7 +55,7 @@ #define AXIS_B 8 #define AXIS_C 9 // rotary axis - #define AXIS_T AXIS_A /// ==> You must choose your rotary fourth axis <== + #define AXIS_T AXIS_C /// ==> You must choose your rotary fourth axis <== #else /// -> (X, Y, Z) #error "The macro "AXIS_T" is not initialized" diff --git a/CodeBlocks/Grbl-8c2Mega-c/src/gcode.c b/CodeBlocks/Grbl-8c2Mega-c/src/gcode.c index ce22dfe..2ff9147 100644 --- a/CodeBlocks/Grbl-8c2Mega-c/src/gcode.c +++ b/CodeBlocks/Grbl-8c2Mega-c/src/gcode.c @@ -42,7 +42,7 @@ #include "protocol.h" #include "report.h" /// 8c1 -#include "config.h" /// AXIS_T_TYPE +#include "defaults.h" /// AXIS_T_TYPE #ifndef N_AXIS #error diff --git a/CodeBlocks/Grbl-8c2Mega-c/src/limits.c b/CodeBlocks/Grbl-8c2Mega-c/src/limits.c index 3619305..924f4b1 100644 --- a/CodeBlocks/Grbl-8c2Mega-c/src/limits.c +++ b/CodeBlocks/Grbl-8c2Mega-c/src/limits.c @@ -43,7 +43,7 @@ /// 8c1 #include "gcode.h" /// to_degrees() -#include "config.h" /// AXIS_T_TYPE +#include "defaults.h" /// AXIS_T_TYPE #define MICROSECONDS_PER_ACCELERATION_TICK (1000000/ACCELERATION_TICKS_PER_SECOND) diff --git a/CodeBlocks/Grbl-8c2Mega-c/src/motion_control.c b/CodeBlocks/Grbl-8c2Mega-c/src/motion_control.c index 3ac2b33..9a695e2 100644 --- a/CodeBlocks/Grbl-8c2Mega-c/src/motion_control.c +++ b/CodeBlocks/Grbl-8c2Mega-c/src/motion_control.c @@ -32,7 +32,8 @@ #include #include #include "settings.h" -#include "config.h" +// #include "config.h" +#include "defaults.h" #include "gcode.h" #include "motion_control.h" #include "spindle_control.h" diff --git a/CodeBlocks/Grbl-8c2Mega-c/src/nuts_bolts.h b/CodeBlocks/Grbl-8c2Mega-c/src/nuts_bolts.h index 2c5814d..a784eb1 100644 --- a/CodeBlocks/Grbl-8c2Mega-c/src/nuts_bolts.h +++ b/CodeBlocks/Grbl-8c2Mega-c/src/nuts_bolts.h @@ -33,8 +33,8 @@ #include #include #include -#include "config.h" - +//#include "config.h" +#include "defaults.h" #include "pin_map.h" #define false 0 diff --git a/CodeBlocks/Grbl-8c2Mega-c/src/planner.c b/CodeBlocks/Grbl-8c2Mega-c/src/planner.c index eef14e7..adb2041 100644 --- a/CodeBlocks/Grbl-8c2Mega-c/src/planner.c +++ b/CodeBlocks/Grbl-8c2Mega-c/src/planner.c @@ -35,7 +35,8 @@ #include "nuts_bolts.h" #include "stepper.h" #include "settings.h" -#include "config.h" +//#include "config.h" +#include "defaults.h" #include "protocol.h" /// 8c1 #ifndef AXIS_T_TYPE diff --git a/CodeBlocks/Grbl-8c2Mega-c/src/protocol.c b/CodeBlocks/Grbl-8c2Mega-c/src/protocol.c index 448c958..0635b49 100644 --- a/CodeBlocks/Grbl-8c2Mega-c/src/protocol.c +++ b/CodeBlocks/Grbl-8c2Mega-c/src/protocol.c @@ -35,6 +35,7 @@ #include "print.h" #include "settings.h" #include "config.h" // LINE_BUFFER_SIZE +#include "defaults.h" #include "nuts_bolts.h" #include "stepper.h" #include "report.h" diff --git a/CodeBlocks/Grbl-8c2Mega-c/src/readme.textile b/CodeBlocks/Grbl-8c2Mega-c/src/readme.textile index 5b20eb4..066fe1b 100644 --- a/CodeBlocks/Grbl-8c2Mega-c/src/readme.textile +++ b/CodeBlocks/Grbl-8c2Mega-c/src/readme.textile @@ -4,7 +4,13 @@ These versions 0.8cxx are adaptations 4 axes of "Mega2560-grbl-0.8c" for 3 axes ==> This code is an EXPERIMENTAL code for 4 axes with Mega2560 <== -v0.8c2 June 06, 2014 +v0.8c1 August 19, 2014 : bug fixed for using V, W, B, C + + - Choice the type of fourth axis in the "config.h" file : + - linear : U or V or W + - rotary : A or B or C + - Choice the fourth axis in the "defaults.h" file : + - AXIS_T = AXIS_U or V or W or A or B or C - Creating a new pinout, different '0.8c1', which is derived from '0.8c Mega2560' - #define PIN_MAP_ARDUINO_MEGA_2560_4 /// mapping 0.8c Mega2560 + T axis @@ -48,11 +54,13 @@ v0.8c2 June 06, 2014 //------------------------------------------------------------------------------ -v0.8c1 May 15, 2014 +v0.8c1 August 19, 2014 : bug fixed for use V, W, B, C - - Choice of fourth axis in the "config.h" file : + - Choice the type of fourth axis in the "config.h" file : - linear : U or V or W - rotary : A or B or C + - Choice the fourth axis in the "defaults.h" file : + - AXIS_T = AXIS_U or V or W or A or B or C - Pinout in 'pin_map.h' for 'MEGA2560' - X_STEP_BIT Pin 22 diff --git a/CodeBlocks/Grbl-8c2Mega-c/src/report.c b/CodeBlocks/Grbl-8c2Mega-c/src/report.c index 37346ed..21ad507 100644 --- a/CodeBlocks/Grbl-8c2Mega-c/src/report.c +++ b/CodeBlocks/Grbl-8c2Mega-c/src/report.c @@ -44,7 +44,8 @@ #include "coolant_control.h" /// 8c1 -#include "config.h" /// AXIS_T_TYPE +//#include "config.h" /// AXIS_T_TYPE +#include "defaults.h" // the axes -> GRBL_AXIS #if (AXIS_T_TYPE == LINEAR) #if AXIS_T == AXIS_U diff --git a/CodeBlocks/Grbl-8c2Mega-c/src/stepper.c b/CodeBlocks/Grbl-8c2Mega-c/src/stepper.c index 3ce87c3..72c9846 100644 --- a/CodeBlocks/Grbl-8c2Mega-c/src/stepper.c +++ b/CodeBlocks/Grbl-8c2Mega-c/src/stepper.c @@ -32,7 +32,8 @@ #include #include "stepper.h" -#include "config.h" /// AXIS_T_TYPE +//#include "config.h" /// AXIS_T_TYPE +#include "defaults.h" #include "settings.h" #include "planner.h" diff --git a/CodeBlocks/README.md b/CodeBlocks/README.md index 2aa892f..a9098fe 100644 --- a/CodeBlocks/README.md +++ b/CodeBlocks/README.md @@ -8,6 +8,8 @@ This directory 'devGrbl\CodeBlocks' contains the last versions July 29, 2014 These are projects Code::Block to build Grbl-xxx +August 19, 2014 : Grbl-8c1-c and Grbl-8c2-c -> BUG FIXED FOR using V,W or B, C + ================================================================================ A- OFFICIAL VERSIONS updated from the site Grbl : 3 axes @@ -82,6 +84,7 @@ To interact with Grbl 4 axes from "https://github.com/zapmaker/GrblHoming" B7- Grbl-8c1-c : grbl-0.8c1 for Mega2560 57600 bauds 4 axes X, Y, Z, T + August 19, 2014 : BUG FIXEDusing V,W or B, C - it's official 0.8c + ... - with T in [A, B, C, U, V, W] @@ -90,6 +93,7 @@ B7- Grbl-8c1-c : grbl-0.8c1 for Mega2560 57600 bauds 4 axes X, Y, Z, T https://github.com/LETARTARE/GrblHoming/tree/Letartare/GC-3.6.1-T1 B8- Grbl-8c2-c : grbl-0.8c1 for Mega2560 57600 bauds 4 axes X, Y, Z, T + August 19, 2014 : BUG FIXEDusing V,W or B, C - it's official 0.8c + différent pinout for 4 axes - with T in [A, B, C, U, V, W]