From c187f94bc744cab660408527aa988852adf8d74b Mon Sep 17 00:00:00 2001 From: Rob Giseburt Date: Tue, 29 Oct 2019 10:49:11 -0500 Subject: [PATCH] v9k: Cleanup spindle/coolant pin assignmentsFixes #24 --- g2core/board/G2v9/G2v9k-pinout.h | 8 ++++---- g2core/board/G2v9/board_gpio.h | 9 +++++++++ g2core/board/G2v9/hardware.h | 7 ------- g2core/board/G2v9/motate_pin_assignments.h | 17 +++++++++-------- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/g2core/board/G2v9/G2v9k-pinout.h b/g2core/board/G2v9/G2v9k-pinout.h index eb518939..e587095a 100644 --- a/g2core/board/G2v9/G2v9k-pinout.h +++ b/g2core/board/G2v9/G2v9k-pinout.h @@ -111,14 +111,14 @@ namespace Motate { // Pin name and function _MAKE_MOTATE_PIN(kUnassigned1, 'A', 0); // unassigned and disconnected -_MAKE_MOTATE_PIN(kCoolant_EnablePinNumber, 'A', 1); // Coolant_EnablePinNumber +_MAKE_MOTATE_PIN(kOutput4_PinNumber, 'A', 1); // Coolant_EnablePinNumber _MAKE_MOTATE_PIN(kSocket4_VrefPinNumber, 'A', 2); // Socket4_VrefPinNumber _MAKE_MOTATE_PIN(kSocket5_VrefPinNumber, 'A', 3); // Socket5_VrefPinNumber _MAKE_MOTATE_PIN(kSocket2_Microstep_2PinNumber, 'A', 4); // Socket2_Microstep_2PinNumber -_MAKE_MOTATE_PIN(kSpindle_EnablePinNumber, 'A', 5); // Spindle_EnablePinNumber +_MAKE_MOTATE_PIN(kOutput1_PinNumber , 'A', 5); // Spindle_EnablePinNumber _MAKE_MOTATE_PIN(kSocket1_DirPinNumber, 'A', 6); // Socket1_DirPinNumber -_MAKE_MOTATE_PIN(kSpindle_DirPinNumber, 'A', 7); // Spindle_DirPinNumber -_MAKE_MOTATE_PIN(kSpindle_PwmPinNumber, 'A', 8); // Spindle_PwmPinNumber +_MAKE_MOTATE_PIN(kOutput2_PinNumber, 'A', 7); // Spindle_DirPinNumber +_MAKE_MOTATE_PIN(kOutput3_PinNumber, 'A', 8); // Spindle_PwmPinNumber _MAKE_MOTATE_PIN(kInput2_PinNumber, 'A', 9); // XAxis_MaxPinNumber _MAKE_MOTATE_PIN(kInput3_PinNumber, 'A', 10); // YAxis_MinPinNumber _MAKE_MOTATE_PIN(kInput4_PinNumber, 'A', 11); // YAxis_MaxPinNumber diff --git a/g2core/board/G2v9/board_gpio.h b/g2core/board/G2v9/board_gpio.h index 940894fa..82b196ab 100644 --- a/g2core/board/G2v9/board_gpio.h +++ b/g2core/board/G2v9/board_gpio.h @@ -44,6 +44,15 @@ #define INPUT_LOCKOUT_MS 10 // milliseconds to go dead after input firing +// Setup spindle and coolant pin assignments +#define SPINDLE_ENABLE_OUTPUT_NUMBER 1 +#define SPINDLE_DIRECTION_OUTPUT_NUMBER 2 +#define SPINDLE_PWM_NUMBER 3 +#define MIST_ENABLE_OUTPUT_NUMBER 4 + +#define FLOOD_ENABLE_OUTPUT_NUMBER 0 +#define SECONDARY_PWM_OUTPUT_NUMBER 0 + /* * The GPIO objects themselves - this must match up with board_gpio.cpp! */ diff --git a/g2core/board/G2v9/hardware.h b/g2core/board/G2v9/hardware.h index 2555c26c..66e20d5a 100644 --- a/g2core/board/G2v9/hardware.h +++ b/g2core/board/G2v9/hardware.h @@ -143,13 +143,6 @@ static OutputPin grbl_feedhold_pin; static OutputPin grbl_cycle_start_pin; static OutputPin motor_common_enable_pin; -static OutputPin spindle_enable_pin; -static OutputPin spindle_dir_pin; - -// NOTE: In the v9 and the Due the flood and mist coolants are mapped to a the same pin -//static OutputPin coolant_enable_pin; -static OutputPin flood_enable_pin; -static OutputPin mist_enable_pin; // Input pins are defined in gpio.cpp diff --git a/g2core/board/G2v9/motate_pin_assignments.h b/g2core/board/G2v9/motate_pin_assignments.h index ffcdb8ec..a4ff996d 100644 --- a/g2core/board/G2v9/motate_pin_assignments.h +++ b/g2core/board/G2v9/motate_pin_assignments.h @@ -140,11 +140,12 @@ pin_number kInput10_PinNumber = 109; pin_number kInput11_PinNumber = 110; pin_number kInput12_PinNumber = 111; -pin_number kSpindle_EnablePinNumber = 112; -pin_number kSpindle_DirPinNumber = 113; -pin_number kSpindle_PwmPinNumber = 114; -pin_number kSpindle_Pwm2PinNumber = 115; -pin_number kCoolant_EnablePinNumber = 116; +// REMOVED: See board_gpio.h for new defines +// pin_number kSpindle_EnablePinNumber = 112; +// pin_number kSpindle_DirPinNumber = 113; +// pin_number kSpindle_PwmPinNumber = 114; +// pin_number kSpindle_Pwm2PinNumber = 115; +// pin_number kCoolant_EnablePinNumber = 116; // START DEBUG PINS - Convenient pins to hijack for hardware debugging // To reuse a pin for debug change the original pin number to -1 @@ -180,9 +181,9 @@ pin_number kOutput3_PinNumber = 132; // DO_3: Fan1A_PWM pin_number kOutput4_PinNumber = 133; // DO_4: Fan1B_PWM pin_number kOutput5_PinNumber = 134; // DO_5: Fan2A_PWM -pin_number kOutput6_PinNumber = -1; // 135; // See Spindle Enable -pin_number kOutput7_PinNumber = -1; // 136; // See Spindle Direction -pin_number kOutput8_PinNumber = -1; // 137; // See Coolant Enable +pin_number kOutput6_PinNumber = 135; // See Spindle Enable +pin_number kOutput7_PinNumber = 136; // See Spindle Direction +pin_number kOutput8_PinNumber = 137; // See Coolant Enable pin_number kOutput9_PinNumber = 138; // pin_number kOutput10_PinNumber = 139; // DO_10: Fan2B_PWM