Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-23 21:38:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

v9k: Cleanup spindle/coolant pin assignmentsFixes #24

Browse Source
This commit is contained in:
Rob Giseburt
2020-01-10 19:24:10 -06:00
parent 29d8293562
commit c187f94bc7
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/board/G2v9/G2v9k-pinout.h
+4 -4
View File
@@ -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
g2core/board/G2v9/board_gpio.h
+9
View File
@@ -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!
*/
g2core/board/G2v9/hardware.h
-7
View File
@@ -143,13 +143,6 @@ static OutputPin<Motate::kGRBL_FeedHoldPinNumber> grbl_feedhold_pin;
static OutputPin<Motate::kGRBL_CycleStartPinNumber> grbl_cycle_start_pin;
static OutputPin<Motate::kGRBL_CommonEnablePinNumber> motor_common_enable_pin;
static OutputPin<Motate::kSpindle_EnablePinNumber> spindle_enable_pin;
static OutputPin<Motate::kSpindle_DirPinNumber> spindle_dir_pin;
// NOTE: In the v9 and the Due the flood and mist coolants are mapped to a the same pin
//static OutputPin<kCoolant_EnablePinNumber> coolant_enable_pin;
static OutputPin<Motate::kCoolant_EnablePinNumber> flood_enable_pin;
static OutputPin<Motate::kCoolant_EnablePinNumber> mist_enable_pin;
// Input pins are defined in gpio.cpp
g2core/board/G2v9/motate_pin_assignments.h
+9 -8
View File
@@ -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; // <unassigned, available out>
pin_number kOutput10_PinNumber = 139; // DO_10: Fan2B_PWM