Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Configuration.h #18

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 25 additions & 17 deletions Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
// #define V6_330_NO_TITAN_TMC 1
//#define V6_330_NO_TITAN_NO_TMC 1
// #define V6_400_TITAN_TMC 1
// #define V6_400_NO_TITAN_TMC 1
#define V6_400_NO_TITAN_TMC 1
//#define V6_500_TITAN_TMC 1

// #define V5_330_TITAN_TMC 1
Expand Down Expand Up @@ -86,7 +86,7 @@
#define WITH_TMC 1
//#define WITH_TITAN 1
#define X_BED_SIZE 400
#define Y_BED_SIZE 400
#define Y_BED_SIZE 365
#define Z_MAX_POS 400
#define CUSTOM_MACHINE_NAME "Tronxy X5SA V6 400 TMC"

Expand Down Expand Up @@ -196,7 +196,7 @@
// @section info

// Author info of this build printed to the host during boot and M115
#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
#define STRING_CONFIG_H_AUTHOR "(Thomas Schaerer X5SA400)" // Who made the changes.
//#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes)

/**
Expand Down Expand Up @@ -585,15 +585,15 @@
// Above this temperature the heater will be switched off.
// This can protect components from overheating, but NOT from shorts and failures.
// (Use MINTEMP for thermistor short/failure protection.)
#define HEATER_0_MAXTEMP 275
#define HEATER_0_MAXTEMP 300
#define HEATER_1_MAXTEMP 275
#define HEATER_2_MAXTEMP 275
#define HEATER_3_MAXTEMP 275
#define HEATER_4_MAXTEMP 275
#define HEATER_5_MAXTEMP 275
#define HEATER_6_MAXTEMP 275
#define HEATER_7_MAXTEMP 275
#define BED_MAXTEMP 150
#define BED_MAXTEMP 100

//===========================================================================
//============================= PID Settings ================================
Expand Down Expand Up @@ -704,7 +704,7 @@
* Note: For Bowden Extruders make this large enough to allow load/unload.
*/
#define PREVENT_LENGTHY_EXTRUDE
#define EXTRUDE_MAXLENGTH 200
#define EXTRUDE_MAXLENGTH 800

//===========================================================================
//======================== Thermal Runaway Protection =======================
Expand Down Expand Up @@ -893,7 +893,7 @@
#if WITH_TMC && WITH_TITAN
#define DEFAULT_AXIS_STEPS_PER_UNIT { 160, 160, 800, 764 }
#elif WITH_TMC && !WITH_TITAN
#define DEFAULT_AXIS_STEPS_PER_UNIT { 160, 160, 800, 186 }
#define DEFAULT_AXIS_STEPS_PER_UNIT { 160.4, 160.4, 1600, 828 }
#elif WITH_TITAN && !WITH_TMC
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 420 }
#else
Expand All @@ -909,7 +909,7 @@
* Override with M203
* X, Y, Z, E0 [, E1[, E2...]]
*/
#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 }
#define DEFAULT_MAX_FEEDRATE { 300, 300, 10, 25 }

//#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
#if ENABLED(LIMITED_MAX_FR_EDITING)
Expand Down Expand Up @@ -1025,6 +1025,7 @@
*/
//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default


/**
* Probe Type
*
Expand All @@ -1047,7 +1048,7 @@
#ifdef XY3_V5_310_NO_TITAN_NO_TMC_NO_ABL
#define PROBE_MANUALLY
#else
#define FIX_MOUNTED_PROBE
//#define FIX_MOUNTED_PROBE
#endif

/**
Expand All @@ -1059,13 +1060,20 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES { 70, 0 } // Z Servo Deploy and Stow angles

/**
* The BLTouch probe uses a Hall effect sensor and emulates a servo.
*/
//#define BLTOUCH
#define BLTOUCH
//#define PROBING_HEATERS_OFF // *option
//#define PROBING_FANS_OFF // *option
#define PROBING_MARGIN 22

#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z / 4
#define Z_CLEARANCE_DEPLOY_PROBE 15 // set up at least 10
#define Z_CLEARANCE_BETWEEN_PROBES 5 // set up at least 5

/**
* Pressure sensor with a BLTouch-like interface
Expand Down Expand Up @@ -1142,17 +1150,17 @@
*
* Specify a Probe position as { X, Y, Z }
*/
#define NOZZLE_TO_PROBE_OFFSET { -35, -0, 0 }
#define NOZZLE_TO_PROBE_OFFSET { 0, -22, -2.35 }

// Most probes should stay away from the edges of the bed, but
// with NOZZLE_AS_PROBE this can be negative for a wider probing area.
#define PROBING_MARGIN 50
//#define PROBING_MARGIN 50

// X and Y axis travel speed (mm/m) between probes
#define XY_PROBE_SPEED 8000

// Feedrate (mm/m) for the first approach when double-probing (MULTIPLE_PROBING == 2)
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
//#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z

// Feedrate (mm/m) for the "accurate" probe of each point
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
Expand Down Expand Up @@ -1183,7 +1191,7 @@
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle.
*/
#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow
//#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
#define Z_CLEARANCE_MULTI_PROBE 5 // Z Clearance between multiple probes
//#define Z_AFTER_PROBING 5 // Z position after probing is done
Expand Down Expand Up @@ -1264,7 +1272,7 @@
#if WITH_TITAN
#define INVERT_E0_DIR true
#else
#define INVERT_E0_DIR false
#define INVERT_E0_DIR true
#endif
#define INVERT_E1_DIR false
#define INVERT_E2_DIR false
Expand Down Expand Up @@ -1823,7 +1831,7 @@
*
* :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cz':'Czech', 'da':'Danish', 'de':'German', 'el':'Greek', 'el_gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'hu':'Hungarian', 'it':'Italian', 'jp_kana':'Japanese', 'ko_KR':'Korean (South Korea)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt_br':'Portuguese (Brazilian)', 'ru':'Russian', 'sk':'Slovak', 'tr':'Turkish', 'uk':'Ukrainian', 'vi':'Vietnamese', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)', 'test':'TEST' }
*/
#define LCD_LANGUAGE en
#define LCD_LANGUAGE de

/**
* LCD Character Set
Expand Down
8 changes: 4 additions & 4 deletions Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@
* Use the option below to force an eeprom write to a V3.1 probe regardless.
*/
//#define BLTOUCH_SET_5V_MODE

#define ONBOARD_ENDSTOPPULLUPS
/**
* Safety: Activate if connecting a probe with an unknown voltage mode.
* V3.0: Set a probe into mode selected above at Marlin startup. Required for 5V mode on 3.0
Expand Down Expand Up @@ -1551,7 +1551,7 @@
#if ENABLED(BABYSTEPPING)
//#define INTEGRATED_BABYSTEPPING // EXPERIMENTAL integration of babystepping into the Stepper ISR
//#define BABYSTEP_WITHOUT_HOMING
//#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA!
#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA!
#define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way
#define BABYSTEP_MULTIPLICATOR_Z 10 // Babysteps are very small. Increase for faster motion.
#define BABYSTEP_MULTIPLICATOR_XY 1
Expand Down Expand Up @@ -1932,14 +1932,14 @@
* Note that M207 / M208 / M209 settings are saved to EEPROM.
*
*/
//#define FWRETRACT
#define FWRETRACT
#if ENABLED(FWRETRACT)
#define FWRETRACT_AUTORETRACT // Override slicer retractions
#if ENABLED(FWRETRACT_AUTORETRACT)
#define MIN_AUTORETRACT 0.1 // (mm) Don't convert E moves under this length
#define MAX_AUTORETRACT 10.0 // (mm) Don't convert E moves over this length
#endif
#define RETRACT_LENGTH 3 // (mm) Default retract length (positive value)
#define RETRACT_LENGTH 5 // (mm) Default retract length (positive value)
#define RETRACT_LENGTH_SWAP 13 // (mm) Default swap retract length (positive value)
#define RETRACT_FEEDRATE 45 // (mm/s) Default feedrate for retracting
#define RETRACT_ZRAISE 0 // (mm) Default retract Z-raise
Expand Down
6 changes: 4 additions & 2 deletions Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@
//
#define X_STOP_PIN PG10
#define Y_STOP_PIN PA12
#define Z_STOP_PIN PG9
#define Z_STOP_PIN PA14//PG9
//#define Z_STOP_ONPCB_PIN PA14

//
// Steppers
Expand Down Expand Up @@ -108,7 +109,8 @@
//#define LED_PIN PD3
//#define POWER_LOSS_PIN PG2 // PG4 PW_DET
#define FIL_RUNOUT_PIN PA15 // MT_DET

#define SERVO0_PIN PA2 //PA2
#define SERVO0 PA2
//
// TronXY TFT Support
//
Expand Down
2 changes: 1 addition & 1 deletion buildroot/share/PlatformIO/variants/CHITU_F103/board.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
{&gpioa, &timer1, NULL, 8, 1, ADCx}, /* PA8 */
{&gpioa, &timer1, NULL, 9, 2, ADCx}, /* PA9 */
{&gpioa, &timer1, NULL, 10, 3, ADCx}, /* PA10 */
{&gpioa, NULL, NULL, 11, 0, ADCx}, /* PA11 */
{&gpioa, &timer1, NULL, 11, 4, ADCx}, /* PA11 */
{&gpioa, NULL, NULL, 12, 0, ADCx}, /* PA12 */
{&gpioa, NULL, NULL, 13, 0, ADCx}, /* PA13 */
{&gpioa, NULL, NULL, 14, 0, ADCx}, /* PA14 */
Expand Down