- '0.8c1' and '0.8c2' -> bug fixed for using V, W or B, C

- update  'Readme'

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

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
 //==============================================================================

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"

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

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)
 

CodeBlocks/Grbl-8c2Mega-c/src/motion_control.c

@@ -32,7 +32,8 @@
 #include <math.h>
 #include <stdlib.h>
 #include "settings.h"
-#include "config.h"
+// #include "config.h"
+#include "defaults.h"
 #include "gcode.h"
 #include "motion_control.h"
 #include "spindle_control.h"

CodeBlocks/Grbl-8c2Mega-c/src/nuts_bolts.h

@@ -33,8 +33,8 @@
 #include <string.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include "config.h"
-
+//#include "config.h"
+#include "defaults.h"
 #include "pin_map.h"
 
 #define false 0

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

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"

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

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

CodeBlocks/Grbl-8c2Mega-c/src/stepper.c

@@ -32,7 +32,8 @@
 
 #include <avr/interrupt.h>
 #include "stepper.h"
-#include "config.h"          /// AXIS_T_TYPE
+//#include "config.h"          /// AXIS_T_TYPE
+#include "defaults.h"
 #include "settings.h"
 #include "planner.h"
 

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]