From 924a5d0e9bd109cdf1de1e455e5ba38372b483da Mon Sep 17 00:00:00 2001
From: lrepasi <41768113+lrepasi@users.noreply.github.com>
Date: Thu, 26 Mar 2020 14:49:23 -0400
Subject: [PATCH] Small Changes to Arduino Due Board.

---
 g2core/board/ArduinoDue/board_gpio.cpp |  2 +-
 g2core/board/ArduinoDue/board_gpio.h   |  2 +-
 g2core/settings/settings_shapeoko2.h   | 13 ++++---------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/g2core/board/ArduinoDue/board_gpio.cpp b/g2core/board/ArduinoDue/board_gpio.cpp
index f3357f74..f5d3946e 100644
--- a/g2core/board/ArduinoDue/board_gpio.cpp
+++ b/g2core/board/ArduinoDue/board_gpio.cpp
@@ -65,7 +65,7 @@ gpioDigitalInputPin<IRQPin<Motate::kInput6_PinNumber>>  din6  {DI6_ENABLED,  DI6
 gpioDigitalInputPin<IRQPin<Motate::kInput7_PinNumber>>  din7  {DI7_ENABLED,  DI7_POLARITY,  7, DI7_EXTERNAL_NUMBER, Motate::kPinInterruptOnChange|Motate::kPinInterruptPriorityHigh};
 gpioDigitalInputPin<IRQPin<Motate::kInput8_PinNumber>>  din8  {DI8_ENABLED,  DI8_POLARITY,  8, DI8_EXTERNAL_NUMBER, Motate::kPinInterruptOnChange|Motate::kPinInterruptPriorityHigh};
 gpioDigitalInputPin<IRQPin<Motate::kInput9_PinNumber>>  din9  {DI9_ENABLED,  DI9_POLARITY,  9, DI9_EXTERNAL_NUMBER, Motate::kPinInterruptOnChange|Motate::kPinInterruptPriorityHigh};
-gpioDigitalInputPin<IRQPin<Motate::kSocket2_SPISlaveSelectPinNumber>> din10 {DI10_ENABLED, DI10_POLARITY, 10, DI10_EXTERNAL_NUMBER, Motate::kPinInterruptOnChange|Motate::kPinInterruptPriorityHigh};
+gpioDigitalInputPin<IRQPin<Motate::kInput10_PinNumber>> din10 {DI10_ENABLED, DI10_POLARITY, 10, DI10_EXTERNAL_NUMBER, Motate::kPinInterruptOnChange|Motate::kPinInterruptPriorityHigh};
 // gpioDigitalInputPin<IRQPin<Motate::kInput11_PinNumber>> din11 {DI11_ENABLED, DI11_POLARITY, 11, DI11_EXTERNAL_NUMBER, Motate::kPinInterruptOnChange|Motate::kPinInterruptPriorityHigh};
 // gpioDigitalInputPin<IRQPin<Motate::kInput12_PinNumber>> din12 {DI12_ENABLED, DI12_POLARITY, 12, DI12_EXTERNAL_NUMBER, Motate::kPinInterruptOnChange|Motate::kPinInterruptPriorityHigh};
 
diff --git a/g2core/board/ArduinoDue/board_gpio.h b/g2core/board/ArduinoDue/board_gpio.h
index b4418b99..01fb6893 100644
--- a/g2core/board/ArduinoDue/board_gpio.h
+++ b/g2core/board/ArduinoDue/board_gpio.h
@@ -78,7 +78,7 @@ extern gpioDigitalInputPin<IRQPin<Motate::kInput6_PinNumber>>  din6;
 extern gpioDigitalInputPin<IRQPin<Motate::kInput7_PinNumber>>  din7;
 extern gpioDigitalInputPin<IRQPin<Motate::kInput8_PinNumber>>  din8;
 extern gpioDigitalInputPin<IRQPin<Motate::kInput9_PinNumber>>  din9;
-extern gpioDigitalInputPin<IRQPin<Motate::kSocket2_SPISlaveSelectPinNumber>> din10;
+extern gpioDigitalInputPin<IRQPin<Motate::kInput10_PinNumber>> din10;
 // extern gpioDigitalInputPin<IRQPin<Motate::kInput11_PinNumber>> din11;
 // extern gpioDigitalInputPin<IRQPin<Motate::kInput12_PinNumber>> din12;
 
diff --git a/g2core/settings/settings_shapeoko2.h b/g2core/settings/settings_shapeoko2.h
index c51f805f..e8bf3c58 100644
--- a/g2core/settings/settings_shapeoko2.h
+++ b/g2core/settings/settings_shapeoko2.h
@@ -196,52 +196,47 @@ OUTPUTS
     IO_ACTIVE_HIGH   aka NORMALLY_CLOSED
 
 */
-// Xmin on v9 board
 #define DI1_ENABLED                 IO_ENABLED
 #define DI1_POLARITY                NORMALLY_CLOSED
 //#define DI1_ACTION                  INPUT_ACTION_STOP
 #define DI1_ACTION                  INPUT_ACTION_LIMIT
 
-// Xmax
 #define DI2_ENABLED                 IO_ENABLED
 #define DI2_POLARITY                NORMALLY_CLOSED
 //#define DI2_ACTION                  INPUT_ACTION_STOP
 #define DI2_ACTION                  INPUT_ACTION_LIMIT
 
-// Ymin
 #define DI3_ENABLED                 IO_ENABLED
 #define DI3_POLARITY                NORMALLY_CLOSED
 //#define DI3_ACTION                  INPUT_ACTION_STOP
 #define DI3_ACTION                  INPUT_ACTION_LIMIT
 
-// Ymax
 #define DI4_ENABLED                 IO_ENABLED
 #define DI4_POLARITY                NORMALLY_CLOSED
 //#define DI4_ACTION                  INPUT_ACTION_STOP
 #define DI4_ACTION                  INPUT_ACTION_LIMIT
 
-// Zmin
 #define DI5_ENABLED                 IO_ENABLED
 #define DI5_POLARITY                IO_ACTIVE_HIGH   // Z probe
 #define DI5_ACTION                  INPUT_ACTION_NONE
 
-// Zmax
 #define DI6_ENABLED                 IO_ENABLED
 #define DI6_POLARITY                NORMALLY_CLOSED
 //#define DI6_ACTION                  INPUT_ACTION_STOP
 #define DI6_ACTION                  INPUT_ACTION_LIMIT
 
-// Amin
 #define DI7_ENABLED                 IO_DISABLED
 #define DI7_POLARITY                IO_ACTIVE_LOW
 #define DI7_ACTION                  INPUT_ACTION_NONE
 
-// Amax
 #define DI8_ENABLED                 IO_DISABLED
 #define DI8_POLARITY                IO_ACTIVE_LOW
 #define DI8_ACTION                  INPUT_ACTION_NONE
 
-// Hardware interlock input
 #define DI9_ENABLED                 IO_DISABLED
 #define DI9_POLARITY                IO_ACTIVE_LOW
 #define DI9_ACTION                  INPUT_ACTION_NONE
+
+#define DI10_ENABLED                 IO_DISABLED
+#define DI10_POLARITY                IO_ACTIVE_LOW
+#define DI10_ACTION                  INPUT_ACTION_NONE