Skip to content

Commit 04c21e2

Browse files
aldenhartaldenhart
authored
Merge pull request #211 from synthetos/dev-109-tool-offset
Dev 109 tool offset - plus a number of small fixes: - [Tool selection and offsets](https://github.com/synthetos/g2/wiki/Tool-Selection-and-Offsets) - Issue #208 - text mode line numbers - Issue #213 - G28/G30 fixes - Many fixes to range checking settings values
2 parents a647d3a + 79f8e1e commit 04c21e2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1868
-636
lines changed

‎g2core/board/Archim/hardware.h

+7-6
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,12 @@ enum hwPlatform {
5555
// Axes, motors & PWM channels must be defines (not enums) so expressions like this:
5656
// #if (MOTORS >= 6) will work
5757

58-
#define AXES 6 // number of axes supported in this version
59-
#define HOMING_AXES 4 // number of axes that can be homed (assumes Zxyabc sequence)
60-
#define MOTORS 4 // number of motors on the board
61-
#define COORDS 6 // number of supported coordinate systems (1-6)
62-
#define PWMS 2 // number of supported PWM channels
58+
#define AXES 6 // number of axes supported in this version
59+
#define HOMING_AXES 4 // number of axes that can be homed (assumes Zxyabc sequence)
60+
#define MOTORS 4 // number of motors on the board
61+
#define COORDS 6 // number of supported coordinate systems (index starts at 1)
62+
#define PWMS 2 // number of supported PWM channels
63+
#define TOOLS 32 // number of entries in tool table (index starts at 1)
6364

6465

6566
////////////////////////////
@@ -84,7 +85,7 @@ using Motate::OutputPin;
8485

8586
#define MILLISECONDS_PER_TICK 1 // MS for system tick (systick * N)
8687
#define SYS_ID_DIGITS 12 // actual digits in system ID (up to 16)
87-
#define SYS_ID_LEN 16 // total length including dashes and NUL
88+
#define SYS_ID_LEN 24 // total length including dashes and NUL
8889

8990
/************************************************************************************
9091
**** ARM SAM3X8E SPECIFIC HARDWARE *************************************************

‎g2core/board/ArduinoDue/hardware.h

+7-6
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,12 @@ enum hwPlatform {
5555
// Axes, motors & PWM channels must be defines (not enums) so expressions like this:
5656
// #if (MOTORS >= 6) will work
5757

58-
#define AXES 6 // number of axes supported in this version
59-
#define HOMING_AXES 4 // number of axes that can be homed (assumes Zxyabc sequence)
60-
#define MOTORS 4 // number of motors on the board
61-
#define COORDS 6 // number of supported coordinate systems (1-6)
62-
#define PWMS 2 // number of supported PWM channels
58+
#define AXES 6 // number of axes supported in this version
59+
#define HOMING_AXES 4 // number of axes that can be homed (assumes Zxyabc sequence)
60+
#define MOTORS 4 // number of motors on the board
61+
#define COORDS 6 // number of supported coordinate systems (index starts at 1)
62+
#define PWMS 2 // number of supported PWM channels
63+
#define TOOLS 32 // number of entries in tool table (index starts at 1)
6364

6465

6566
////////////////////////////
@@ -86,7 +87,7 @@ using Motate::OutputPin;
8687

8788
#define MILLISECONDS_PER_TICK 1 // MS for system tick (systick * N)
8889
#define SYS_ID_DIGITS 12 // actual digits in system ID (up to 16)
89-
#define SYS_ID_LEN 16 // total length including dashes and NUL
90+
#define SYS_ID_LEN 24 // total length including dashes and NUL
9091

9192
/************************************************************************************
9293
**** ARM SAM3X8E SPECIFIC HARDWARE *************************************************

‎g2core/board/G2v9/G2v9k-pinout.h

100755100644
File mode changed.

‎g2core/board/G2v9/hardware.h

+7-6
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,12 @@ enum hwPlatform {
5555
// Axes, motors & PWM channels must be defines (not enums) so expressions like this:
5656
// #if (MOTORS >= 6) will work
5757

58-
#define AXES 6 // number of axes supported in this version
59-
#define HOMING_AXES 4 // number of axes that can be homed (assumes Zxyabc sequence)
60-
#define MOTORS 4 // number of motors on the board
61-
#define COORDS 6 // number of supported coordinate systems (1-6)
62-
#define PWMS 2 // number of supported PWM channels
58+
#define AXES 6 // number of axes supported in this version
59+
#define HOMING_AXES 4 // number of axes that can be homed (assumes Zxyabc sequence)
60+
#define MOTORS 4 // number of motors on the board
61+
#define COORDS 6 // number of supported coordinate systems (index starts at 1)
62+
#define PWMS 2 // number of supported PWM channels
63+
#define TOOLS 32 // number of entries in tool table (index starts at 1)
6364

6465

6566
////////////////////////////
@@ -86,7 +87,7 @@ using Motate::OutputPin;
8687

8788
#define MILLISECONDS_PER_TICK 1 // MS for system tick (systick * N)
8889
#define SYS_ID_DIGITS 12 // actual digits in system ID (up to 16)
89-
#define SYS_ID_LEN 16 // total length including dashes and NUL
90+
#define SYS_ID_LEN 24 // total length including dashes and NUL
9091

9192
/************************************************************************************
9293
**** ARM SAM3X8E SPECIFIC HARDWARE *************************************************

‎g2core/board/G2v9/motate_pin_assignments.h

100755100644
+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ pin_number kOutput8_PinNumber = -1; // 137; // See Coolant Enable
183183
pin_number kOutput9_PinNumber = 138; // <unassigned, available out>
184184
pin_number kOutput10_PinNumber = 139; // DO_10: Fan2B_PWM
185185

186-
pin_number kOutput11_PinNumber = 140; // DO_11: Heted Bed FET
186+
pin_number kOutput11_PinNumber = 140; // DO_11: Heated Bed FET
187187
pin_number kOutput12_PinNumber = 141; // DO_12: Indicator_LED
188188
pin_number kOutput13_PinNumber = -1; // 142;
189189
pin_number kOutput14_PinNumber = -1; // 143;

‎g2core/board/gquadratic/hardware.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ enum hwPlatform {
5656
// Axes, motors & PWM channels must be defines (not enums) so expressions like this:
5757
// #if (MOTORS >= 6) will work
5858

59-
#define AXES 6 // number of axes supported in this version
60-
#define HOMING_AXES 4 // number of axes that can be homed (assumes Zxyabc sequence)
61-
#define MOTORS 3 // number of motors on the board
62-
#define COORDS 6 // number of supported coordinate systems (1-6)
63-
#define PWMS 2 // number of supported PWM channels
64-
59+
#define AXES 6 // number of axes supported in this version
60+
#define HOMING_AXES 4 // number of axes that can be homed (assumes Zxyabc sequence)
61+
#define MOTORS 2 // number of motors on the board
62+
#define COORDS 6 // number of supported coordinate systems (index starts at 1)
63+
#define PWMS 2 // number of supported PWM channels
64+
#define TOOLS 32 // number of entries in tool table (index starts at 1)
6565

6666
////////////////////////////
6767
/////// ARM VERSION ////////
@@ -87,7 +87,7 @@ using Motate::OutputPin;
8787

8888
#define MILLISECONDS_PER_TICK 1 // MS for system tick (systick * N)
8989
#define SYS_ID_DIGITS 12 // actual digits in system ID (up to 16)
90-
#define SYS_ID_LEN 16 // total length including dashes and NUL
90+
#define SYS_ID_LEN 24 // total length including dashes and NUL
9191

9292
/************************************************************************************
9393
**** ARM SAM3X8E SPECIFIC HARDWARE *************************************************

‎g2core/board/gquintic/hardware.h

100755100644
+3-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@ enum hwPlatform {
5959
#define AXES 6 // number of axes supported in this version
6060
#define HOMING_AXES 4 // number of axes that can be homed (assumes Zxyabc sequence)
6161
#define MOTORS 5 // number of motors on the board
62-
#define COORDS 6 // number of supported coordinate systems (1-6)
62+
#define COORDS 6 // number of supported coordinate systems (index starts at 1)
6363
#define PWMS 2 // number of supported PWM channels
64+
#define TOOLS 32 // number of entries in tool table (index starts at 1)
6465

6566

6667
////////////////////////////
@@ -85,7 +86,7 @@ using Motate::OutputPin;
8586

8687
#define MILLISECONDS_PER_TICK 1 // MS for system tick (systick * N)
8788
#define SYS_ID_DIGITS 12 // actual digits in system ID (up to 16)
88-
#define SYS_ID_LEN 16 // total length including dashes and NUL
89+
#define SYS_ID_LEN 24 // total length including dashes and NUL
8990

9091
/************************************************************************************
9192
**** ARM SAM3X8E SPECIFIC HARDWARE *************************************************

‎g2core/board/printrboardg2/hardware.h

100755100644
+3-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@ enum hwPlatform {
5858
#define AXES 6 // number of axes supported in this version
5959
#define HOMING_AXES 4 // number of axes that can be homed (assumes Zxyabc sequence)
6060
#define MOTORS 4 // number of motors on the board
61-
#define COORDS 6 // number of supported coordinate systems (1-6)
61+
#define COORDS 6 // number of supported coordinate systems (index starts at 1)
6262
#define PWMS 2 // number of supported PWM channels
63+
#define TOOLS 32 // number of entries in tool table (index starts at 1)
6364

6465

6566
////////////////////////////
@@ -84,7 +85,7 @@ using Motate::OutputPin;
8485

8586
#define MILLISECONDS_PER_TICK 1 // MS for system tick (systick * N)
8687
#define SYS_ID_DIGITS 12 // actual digits in system ID (up to 16)
87-
#define SYS_ID_LEN 16 // total length including dashes and NUL
88+
#define SYS_ID_LEN 24 // total length including dashes and NUL
8889

8990
/************************************************************************************
9091
**** ARM SAM3X8E SPECIFIC HARDWARE *************************************************

‎g2core/board/sbv300/hardware.h

100755100644
+8-8
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ enum hwPlatform {
5555
// Axes, motors & PWM channels must be defines (not enums) so expressions like this:
5656
// #if (MOTORS >= 6) will work
5757

58-
#define AXES 6 // number of axes supported in this version
59-
#define HOMING_AXES 4 // number of axes that can be homed (assumes Zxyabc sequence)
60-
#define MOTORS 4 // number of motors on the board
61-
#define COORDS 6 // number of supported coordinate systems (1-6)
62-
#define PWMS 2 // number of supported PWM channels
63-
58+
#define AXES 6 // number of axes supported in this version
59+
#define HOMING_AXES 4 // number of axes that can be homed (assumes Zxyabc sequence)
60+
#define MOTORS 4 // number of motors on the board
61+
#define COORDS 6 // number of supported coordinate systems (index starts at 1)
62+
#define PWMS 2 // number of supported PWM channels
63+
#define TOOLS 32 // number of entries in tool table (index starts at 1)
6464

6565
////////////////////////////
66-
/////// ARM VERSION ////////
66+
/////// ARM SETTINGS ///////
6767
////////////////////////////
6868

6969
#include "MotatePins.h"
@@ -84,7 +84,7 @@ using Motate::OutputPin;
8484

8585
#define MILLISECONDS_PER_TICK 1 // MS for system tick (systick * N)
8686
#define SYS_ID_DIGITS 12 // actual digits in system ID (up to 16)
87-
#define SYS_ID_LEN 16 // total length including dashes and NUL
87+
#define SYS_ID_LEN 24 // total length including dashes and NUL
8888

8989
/************************************************************************************
9090
**** ARM SAM3X8E SPECIFIC HARDWARE *************************************************

0 commit comments

Comments
 (0)