CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: CMS:077266ef3b885a4c914632689690beefd11fca45
Branches Tags
CMS:taz-6
...
compare: CMS:a9a78a1ebb3cb8f3acda34b0db9df63257cd9422
Branches Tags
CMS:taz-6

5 Commits
077266ef3b ... a9a78a1ebb

Author SHA1 Message Date
Adam Goldsmith
a9a78a1ebb Swap Y and E1 steppers, as the Y stepper driver on our board is blown 2022-10-05 14:10:24 -04:00
Brian Kahl
7c35a28191 Merge branch '79-taz6-standard-tool-head-and-filament-sensor-confliction' into 'master' 
Resolve "TAZ6 Standard Tool Head and filament sensor confliction"

Closes #79

See merge request lulzbot3d/marlin!58
 2022-03-14 19:52:59 +00:00
Brian Kahl
2325bb3861 Creating default status of the TAZ6 to avoid issues with the runout sensor. 2022-03-14 10:56:17 -05:00
Brian Kahl
9d5de79849 Merge branch '78-tazworkhorse-hs-axis-travel' into 'master' 
Resolve "TAZWorkhorse HS+ Axis Travel"

Closes #78

See merge request lulzbot3d/marlin!57
 2022-03-10 17:18:59 +00:00
Brian Kahl
67e3149b48 Changing the max travel for the TAZWorkhorse 2022-03-10 09:30:31 -06:00
3 changed files with 26 additions and 22 deletions
Show Stats Expand all files Collapse all files

8
Marlin/Configuration.h
View File

@ -1,5 +1,5 @@
//#define LULZBOT_Hibiscus_Mini2 //#define LULZBOT_Hibiscus_Mini2
//#define LULZBOT_Oliveoil_TAZ6 #define LULZBOT_Oliveoil_TAZ6
//#define LULZBOT_Redgum_TAZWorkhorse //#define LULZBOT_Redgum_TAZWorkhorse
//#define LULZBOT_Quiver_TAZPro //#define LULZBOT_Quiver_TAZPro
//#define LULZBOT_Gladiator_TAZProXT //#define LULZBOT_Gladiator_TAZProXT
@ -1889,7 +1889,7 @@
#define LULZBOT_X_MIN_POS -50 #define LULZBOT_X_MIN_POS -50
#define LULZBOT_Y_MIN_POS -17 #define LULZBOT_Y_MIN_POS -17
#define LULZBOT_Z_MIN_POS -2 #define LULZBOT_Z_MIN_POS -2
#define LULZBOT_X_MAX_POS 295 #define LULZBOT_X_MAX_POS 293
#define LULZBOT_Y_MAX_POS 308 #define LULZBOT_Y_MAX_POS 308
#define LULZBOT_Z_MAX_POS 297 #define LULZBOT_Z_MAX_POS 297
@ -2026,7 +2026,11 @@
#define FILAMENT_RUNOUT_SENSOR #define FILAMENT_RUNOUT_SENSOR
#endif #endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR) #if ENABLED(FILAMENT_RUNOUT_SENSOR)
#if defined (TAZ6) //Standard Tool Head uses the filament runout port for the X-Max limit switch
#define FIL_RUNOUT_ENABLED_DEFAULT false // Enable the sensor on startup. Override with M412 followed by M500.
#else
#define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500. #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500.
#endif
#define NUM_RUNOUT_SENSORS LULZBOT_EXTRUDERS // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each. #define NUM_RUNOUT_SENSORS LULZBOT_EXTRUDERS // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
#define FIL_RUNOUT_STATE LOW // Pin state indicating that filament is NOT present. #define FIL_RUNOUT_STATE LOW // Pin state indicating that filament is NOT present.

16
Marlin/Configuration_adv.h
View File

@ -3865,30 +3865,30 @@
#define MAIN_MENU_ITEM_9_GCODE "M92E409\nM301P" charH175_DEFAULT_Kp "I" charH175_DEFAULT_Ki "D" charH175_DEFAULT_Kd "\nM906E" E_CURRENT_Aero "\nM500\nM117 H175|0.50mm|NKL-PL CU" #define MAIN_MENU_ITEM_9_GCODE "M92E409\nM301P" charH175_DEFAULT_Kp "I" charH175_DEFAULT_Ki "D" charH175_DEFAULT_Kd "\nM906E" E_CURRENT_Aero "\nM500\nM117 H175|0.50mm|NKL-PL CU"
#else #else
#define MAIN_MENU_ITEM_3_DESC "M175v2|0.50mm|CRB CU" #define MAIN_MENU_ITEM_3_DESC "M175v2|0.50mm|CRB CU"
#define MAIN_MENU_ITEM_3_GCODE "M92E415\nM206Y0\nM301P" charM175_DEFAULT_Kp "I" charM175_DEFAULT_Ki "D" charM175_DEFAULT_Kd "\nM907E" E_CURRENT_BMG "\nM500\nM117 M175v2|0.50mm|CRB CU" #define MAIN_MENU_ITEM_3_GCODE "M92E415\nM206Y0\nM301P" charM175_DEFAULT_Kp "I" charM175_DEFAULT_Ki "D" charM175_DEFAULT_Kd "\nM907E" E_CURRENT_BMG "\nM412 S1\nM500\nM117 M175v2|0.50mm|CRB CU"
#define MAIN_MENU_ITEM_4_DESC "SL|0.25mm|NKL-PL CU" #define MAIN_MENU_ITEM_4_DESC "SL|0.25mm|NKL-PL CU"
#define MAIN_MENU_ITEM_4_GCODE "M92E420\nM206Y0\nM301P" charSLSEHE_DEFAULT_Kp "I" charSLSEHE_DEFAULT_Ki "D" charSLSEHE_DEFAULT_Kd "\nM907E" E_CURRENT_Aero "\nM500\nM117 SL|0.25mm|NKL-PL CU" #define MAIN_MENU_ITEM_4_GCODE "M92E420\nM206Y0\nM301P" charSLSEHE_DEFAULT_Kp "I" charSLSEHE_DEFAULT_Ki "D" charSLSEHE_DEFAULT_Kd "\nM907E" E_CURRENT_Aero "\nM412 S1\nM500\nM117 SL|0.25mm|NKL-PL CU"
#define MAIN_MENU_ITEM_5_DESC "SE|0.50mm|NKL-PL CU" #define MAIN_MENU_ITEM_5_DESC "SE|0.50mm|NKL-PL CU"
#define MAIN_MENU_ITEM_5_GCODE "M92E420\nM206Y0\nM301P" charSLSEHE_DEFAULT_Kp "I" charSLSEHE_DEFAULT_Ki "D" charSLSEHE_DEFAULT_Kd "\nM907E" E_CURRENT_Aero "\nM500\nM117 SE|0.50mm|NKL-PL CU" #define MAIN_MENU_ITEM_5_GCODE "M92E420\nM206Y0\nM301P" charSLSEHE_DEFAULT_Kp "I" charSLSEHE_DEFAULT_Ki "D" charSLSEHE_DEFAULT_Kd "\nM907E" E_CURRENT_Aero "\nM412 S1\nM500\nM117 SE|0.50mm|NKL-PL CU"
#define MAIN_MENU_ITEM_6_DESC "HE|0.50mm|HRD STEEL" #define MAIN_MENU_ITEM_6_DESC "HE|0.50mm|HRD STEEL"
#define MAIN_MENU_ITEM_6_GCODE "M92E420\nM206Y0\nM301P" charSLSEHE_DEFAULT_Kp "I" charSLSEHE_DEFAULT_Ki "D" charSLSEHE_DEFAULT_Kd "\nM907E" E_CURRENT_Aero "\nM500\nM117 HE|0.50mm|HRD STEEL" #define MAIN_MENU_ITEM_6_GCODE "M92E420\nM206Y0\nM301P" charSLSEHE_DEFAULT_Kp "I" charSLSEHE_DEFAULT_Ki "D" charSLSEHE_DEFAULT_Kd "\nM907E" E_CURRENT_Aero "\nM412 S1\nM500\nM117 HE|0.50mm|HRD STEEL"
#define MAIN_MENU_ITEM_7_DESC "HS|0.80mm|HRD STEEL" #define MAIN_MENU_ITEM_7_DESC "HS|0.80mm|HRD STEEL"
#define MAIN_MENU_ITEM_7_GCODE "M92E420\nM206Y0\nM301P" charHSHSPLUS_DEFAULT_Kp "I" charHSHSPLUS_DEFAULT_Ki "D" charHSHSPLUS_DEFAULT_Kd "\nM907E" E_CURRENT_Aero "\nM500\nM117 HS|0.80mm|HRD STEEL" #define MAIN_MENU_ITEM_7_GCODE "M92E420\nM206Y0\nM301P" charHSHSPLUS_DEFAULT_Kp "I" charHSHSPLUS_DEFAULT_Ki "D" charHSHSPLUS_DEFAULT_Kd "\nM907E" E_CURRENT_Aero "\nM412 S1\nM500\nM117 HS|0.80mm|HRD STEEL"
#define MAIN_MENU_ITEM_8_DESC "HS+|1.20mm|HRD STEEL" #define MAIN_MENU_ITEM_8_DESC "HS+|1.20mm|HRD STEEL"
#define MAIN_MENU_ITEM_8_GCODE "M92E420\nM206Y0\nM301P" charHSHSPLUS_DEFAULT_Kp "I" charHSHSPLUS_DEFAULT_Ki "D" charHSHSPLUS_DEFAULT_Kd "\nM907E" E_CURRENT_Aero "\nM500\nM117 HS+|1.20mm|HRD STEEL" #define MAIN_MENU_ITEM_8_GCODE "M92E420\nM206Y0\nM301P" charHSHSPLUS_DEFAULT_Kp "I" charHSHSPLUS_DEFAULT_Ki "D" charHSHSPLUS_DEFAULT_Kd "\nM907E" E_CURRENT_Aero "\nM412 S1\nM500\nM117 HS+|1.20mm|HRD STEEL"
#define MAIN_MENU_ITEM_9_DESC "H175|0.50mm|NKL-PL CU" #define MAIN_MENU_ITEM_9_DESC "H175|0.50mm|NKL-PL CU"
#define MAIN_MENU_ITEM_9_GCODE "M92E409\nM206Y0\nM301P" charH175_DEFAULT_Kp "I" charH175_DEFAULT_Ki "D" charH175_DEFAULT_Kd "\nM906E" E_CURRENT_Aero "\nM500\nM117 H175|0.50mm|NKL-PL CU" #define MAIN_MENU_ITEM_9_GCODE "M92E409\nM206Y0\nM301P" charH175_DEFAULT_Kp "I" charH175_DEFAULT_Ki "D" charH175_DEFAULT_Kd "\nM906E" E_CURRENT_Aero "\nM412 S1\nM500\nM117 H175|0.50mm|NKL-PL CU"
#endif #endif
#if defined(TAZ6) #if defined(TAZ6)
#define MAIN_MENU_ITEM_1_DESC "Standard|0.5mm" #define MAIN_MENU_ITEM_1_DESC "Standard|0.5mm"
#define MAIN_MENU_ITEM_1_GCODE "M92E833\nM206Y4\nM301P" charTAZ6_STD_DEFAULT_Kp "I" charTAZ6_STD_DEFAULT_Ki "D" charTAZ6_STD_DEFAULT_Kd "\nM907E" E_CURRENT_Std "\nM500\nM117 Standard|0.5mm" #define MAIN_MENU_ITEM_1_GCODE "M92E833\nM206Y4\nM301P" charTAZ6_STD_DEFAULT_Kp "I" charTAZ6_STD_DEFAULT_Ki "D" charTAZ6_STD_DEFAULT_Kd "\nM907E" E_CURRENT_Std "\nM412 S0\nM500\nM117 Standard|0.5mm"
#endif #endif
#endif #endif

22
Marlin/src/pins/rambo/pins_RAMBO.h
View File

@ -90,9 +90,9 @@
#define X_DIR_PIN 48 #define X_DIR_PIN 48
#define X_ENABLE_PIN 29 #define X_ENABLE_PIN 29
#define Y_STEP_PIN 36 #define Y_STEP_PIN 33
#define Y_DIR_PIN 49 #define Y_DIR_PIN 42
#define Y_ENABLE_PIN 28 #define Y_ENABLE_PIN 25
#define Z_STEP_PIN 35 #define Z_STEP_PIN 35
#define Z_DIR_PIN 47 #define Z_DIR_PIN 47
@ -102,24 +102,24 @@
#define E0_DIR_PIN 43 #define E0_DIR_PIN 43
#define E0_ENABLE_PIN 26 #define E0_ENABLE_PIN 26
#define E1_STEP_PIN 33 #define E1_STEP_PIN 36
#define E1_DIR_PIN 42 #define E1_DIR_PIN 49
#define E1_ENABLE_PIN 25 #define E1_ENABLE_PIN 28
// Microstepping pins - Mapping not from fastio.h (?) // Microstepping pins - Mapping not from fastio.h (?)
#define X_MS1_PIN 40 #define X_MS1_PIN 40
#define X_MS2_PIN 41 #define X_MS2_PIN 41
#define Y_MS1_PIN 69 #define Y_MS1_PIN 63
#define Y_MS2_PIN 39 #define Y_MS2_PIN 64
#define Z_MS1_PIN 68 #define Z_MS1_PIN 68
#define Z_MS2_PIN 67 #define Z_MS2_PIN 67
#define E0_MS1_PIN 65 #define E0_MS1_PIN 65
#define E0_MS2_PIN 66 #define E0_MS2_PIN 66
#define E1_MS1_PIN 63 #define E1_MS1_PIN 69
#define E1_MS2_PIN 64 #define E1_MS2_PIN 39
#define DIGIPOTSS_PIN 38 #define DIGIPOTSS_PIN 38
#define DIGIPOT_CHANNELS { 4, 5, 3, 0, 1 } // X Y Z E0 E1 digipot channels to stepper driver mapping #define DIGIPOT_CHANNELS { 4, 1, 3, 0, 5 } // X Y Z E0 E1 digipot channels to stepper driver mapping
#ifndef DIGIPOT_MOTOR_CURRENT #ifndef DIGIPOT_MOTOR_CURRENT
#define DIGIPOT_MOTOR_CURRENT { 135,135,135,135,135 } // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A) #define DIGIPOT_MOTOR_CURRENT { 135,135,135,135,135 } // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
#endif #endif