andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

PSU + Update config

pull/38/head
X-Dron 4 years ago
parent
0196149b59
commit
92a2c1d62d
4 changed files with 45 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 37
      Marlin/Configuration.h
  2. 18
      Marlin/Configuration_adv.h
  3. 16
      Marlin/src/MarlinCore.cpp
  4. 10
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h

37
Marlin/Configuration.h
View File

@ -499,9 +499,10 @@
#define DEFAULT_Ki_LIST { 1.08, 1.0 } #define DEFAULT_Ki_LIST { 1.08, 1.0 }
#define DEFAULT_Kd_LIST { 114.00, 112.0 } #define DEFAULT_Kd_LIST { 114.00, 112.0 }
#else #else
#define DEFAULT_Kp 17.04 // 50Вт
#define DEFAULT_Ki 1.31 #define DEFAULT_Kp 11.1
#define DEFAULT_Kd 55.34 #define DEFAULT_Ki 0.55
#define DEFAULT_Kd 56.1
#endif #endif
#endif // PIDTEMP #endif // PIDTEMP
@ -686,8 +687,8 @@
* :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
*/ */
#define X_DRIVER_TYPE TMC2209 #define X_DRIVER_TYPE TMC2209
#define Y_DRIVER_TYPE TMC2208 #define Y_DRIVER_TYPE TMC2209
#define Z_DRIVER_TYPE TMC2208 #define Z_DRIVER_TYPE TMC2209
//#define X2_DRIVER_TYPE A4988 //#define X2_DRIVER_TYPE A4988
//#define Y2_DRIVER_TYPE A4988 //#define Y2_DRIVER_TYPE A4988
//#define Z2_DRIVER_TYPE A4988 //#define Z2_DRIVER_TYPE A4988
@ -748,7 +749,7 @@
* Override with M92 * Override with M92
* X, Y, Z, E0 [, E1[, E2...]] * X, Y, Z, E0 [, E1[, E2...]]
*/ */
#define DEFAULT_AXIS_STEPS_PER_UNIT { 161.0, 161.0, 800, 820 } #define DEFAULT_AXIS_STEPS_PER_UNIT { 160.0, 160.0, 400, 205.0 }
/** /**
* Default Max Feed Rate (mm/s) * Default Max Feed Rate (mm/s)
@ -784,7 +785,7 @@
* M204 T Travel Acceleration * M204 T Travel Acceleration
*/ */
// @efim-a-efim - decreased E0 acceleration to make it less noisy (yes, even with TMC2208 drivers) // @efim-a-efim - decreased E0 acceleration to make it less noisy (yes, even with TMC2208 drivers)
#define DEFAULT_ACCELERATION 1100 // X, Y, Z and E acceleration for printing moves #define DEFAULT_ACCELERATION 1200 // X, Y, Z and E acceleration for printing moves
#define DEFAULT_RETRACT_ACCELERATION 800 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 800 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1200 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1200 // X, Y, Z acceleration for travel (non printing) moves
@ -1018,8 +1019,8 @@
* A total of 2 does fast/slow probes with a weighted average. * A total of 2 does fast/slow probes with a weighted average.
* A total of 3 or more adds more slow probes, taking the average. * A total of 3 or more adds more slow probes, taking the average.
*/ */
#define MULTIPLE_PROBING 2 #define MULTIPLE_PROBING 3
//#define EXTRA_PROBING 1 #define EXTRA_PROBING 1
/** /**
* Z probes require clearance when deploying, stowing, and moving between * Z probes require clearance when deploying, stowing, and moving between
@ -1043,8 +1044,8 @@
#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping #define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping
// For M851 give a range for adjusting the Z probe offset // For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20 #define Z_PROBE_OFFSET_RANGE_MIN -5
#define Z_PROBE_OFFSET_RANGE_MAX 20 #define Z_PROBE_OFFSET_RANGE_MAX 5
// Enable the M48 repeatability test to test probe accuracy // Enable the M48 repeatability test to test probe accuracy
#define Z_MIN_PROBE_REPEATABILITY_TEST #define Z_MIN_PROBE_REPEATABILITY_TEST
@ -1268,8 +1269,8 @@
*/ */
//#define AUTO_BED_LEVELING_3POINT //#define AUTO_BED_LEVELING_3POINT
//#define AUTO_BED_LEVELING_LINEAR //#define AUTO_BED_LEVELING_LINEAR
#define AUTO_BED_LEVELING_BILINEAR //#define AUTO_BED_LEVELING_BILINEAR
//#define AUTO_BED_LEVELING_UBL #define AUTO_BED_LEVELING_UBL
//#define MESH_BED_LEVELING //#define MESH_BED_LEVELING
/** /**
@ -1347,7 +1348,7 @@
//#define MESH_EDIT_GFX_OVERLAY // Display a graphics overlay while editing the mesh //#define MESH_EDIT_GFX_OVERLAY // Display a graphics overlay while editing the mesh
#define MESH_INSET 20 // Set Mesh bounds as an inset region of the bed #define MESH_INSET 5 // Set Mesh bounds as an inset region of the bed
#define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited. #define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited.
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
@ -1427,8 +1428,8 @@
#endif #endif
// Homing speeds (mm/m) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*50) #define HOMING_FEEDRATE_XY (60*60)
#define HOMING_FEEDRATE_Z (50*50) #define HOMING_FEEDRATE_Z (4*60)
// Validate that endstops are triggered on homing moves // Validate that endstops are triggered on homing moves
#define VALIDATE_HOMING_ENDSTOPS #define VALIDATE_HOMING_ENDSTOPS
@ -1775,7 +1776,7 @@ EEPROM_W25Q
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */
#define DISPLAY_CHARSET_HD44780 JAPANESE #define DISPLAY_CHARSET_HD44780 CYRILLIC
/** /**
* Info Screen Style (0:Classic, 1:Průša) * Info Screen Style (0:Classic, 1:Průša)
@ -1824,7 +1825,7 @@ EEPROM_W25Q
// This option overrides the default number of encoder pulses needed to // This option overrides the default number of encoder pulses needed to
// produce one step. Should be increased for high-resolution encoders. // produce one step. Should be increased for high-resolution encoders.
// //
//#define ENCODER_PULSES_PER_STEP 4 #define ENCODER_PULSES_PER_STEP 4
// //
// Use this option to override the number of step signals required to // Use this option to override the number of step signals required to

18
Marlin/Configuration_adv.h
View File

@ -1703,10 +1703,10 @@
#if EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL) #if EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL)
// Override the mesh area if the automatic (max) area is too large // Override the mesh area if the automatic (max) area is too large
//#define MESH_MIN_X MESH_INSET #define MESH_MIN_X MESH_INSET
//#define MESH_MIN_Y MESH_INSET #define MESH_MIN_Y MESH_INSET
//#define MESH_MAX_X X_BED_SIZE - (MESH_INSET) #define MESH_MAX_X X_BED_SIZE - (MESH_INSET)
//#define MESH_MAX_Y Y_BED_SIZE - (MESH_INSET) #define MESH_MAX_Y Y_BED_SIZE - (MESH_INSET)
#endif #endif
/** /**
@ -2096,7 +2096,7 @@
// This short retract is done immediately, before parking the nozzle. // This short retract is done immediately, before parking the nozzle.
#define FILAMENT_CHANGE_UNLOAD_FEEDRATE 10 // (mm/s) Unload filament feedrate. This can be pretty fast. #define FILAMENT_CHANGE_UNLOAD_FEEDRATE 10 // (mm/s) Unload filament feedrate. This can be pretty fast.
#define FILAMENT_CHANGE_UNLOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate. #define FILAMENT_CHANGE_UNLOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate.
#define FILAMENT_CHANGE_UNLOAD_LENGTH 710 // (mm) The length of filament for a complete unload. #define FILAMENT_CHANGE_UNLOAD_LENGTH 100 // (mm) The length of filament for a complete unload.
// For Bowden, the full length of the tube and nozzle. // For Bowden, the full length of the tube and nozzle.
// For direct drive, the full length of the nozzle. // For direct drive, the full length of the nozzle.
// Set to 0 for manual unloading. // Set to 0 for manual unloading.
@ -2105,7 +2105,7 @@
// 0 to disable start loading and skip to fast load only // 0 to disable start loading and skip to fast load only
#define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE 6 // (mm/s) Load filament feedrate. This can be pretty fast. #define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE 6 // (mm/s) Load filament feedrate. This can be pretty fast.
#define FILAMENT_CHANGE_FAST_LOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate. #define FILAMENT_CHANGE_FAST_LOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate.
#define FILAMENT_CHANGE_FAST_LOAD_LENGTH 710 // (mm) Load length of filament, from extruder gear to nozzle. #define FILAMENT_CHANGE_FAST_LOAD_LENGTH 100 // (mm) Load length of filament, from extruder gear to nozzle.
// For Bowden, the full length of the tube and nozzle. // For Bowden, the full length of the tube and nozzle.
// For direct drive, the full length of the nozzle. // For direct drive, the full length of the nozzle.
#define ADVANCED_PAUSE_CONTINUOUS_PURGE // Purge continuously up to the purge length until interrupted. #define ADVANCED_PAUSE_CONTINUOUS_PURGE // Purge continuously up to the purge length until interrupted.
@ -2300,7 +2300,7 @@
#if AXIS_IS_TMC(Z) #if AXIS_IS_TMC(Z)
#define Z_CURRENT 800 #define Z_CURRENT 800
#define Z_CURRENT_HOME Z_CURRENT #define Z_CURRENT_HOME Z_CURRENT
#define Z_MICROSTEPS 32 #define Z_MICROSTEPS 16
#define Z_RSENSE 0.11 #define Z_RSENSE 0.11
#define Z_CHAIN_POS -1 #define Z_CHAIN_POS -1
#endif #endif
@ -2330,8 +2330,8 @@
#endif #endif
#if AXIS_IS_TMC(E0) #if AXIS_IS_TMC(E0)
#define E0_CURRENT 800 #define E0_CURRENT 650
#define E0_MICROSTEPS 32 #define E0_MICROSTEPS 8
#define E0_RSENSE 0.11 #define E0_RSENSE 0.11
#define E0_CHAIN_POS -1 #define E0_CHAIN_POS -1
#endif #endif

16
Marlin/src/MarlinCore.cpp
View File

@ -549,7 +549,7 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
// key kill key press // key kill key press
// ------------------------------------------------------------------------------- // -------------------------------------------------------------------------------
static int killCount = 0; // make the inactivity button a bit less responsive static int killCount = 0; // make the inactivity button a bit less responsive
const int KILL_DELAY = 750; const int KILL_DELAY = 100000;
if (kill_state()) if (kill_state())
killCount++; killCount++;
else if (killCount > 0) else if (killCount > 0)
@ -566,16 +566,16 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
#ifdef LED_SW_PIN #ifdef LED_SW_PIN
static int LedSw_Count = 0; // make the inactivity button a bit less responsive static int LedSw_Count = 0; // make the inactivity button a bit less responsive
const int LED_SW_DELAY = 100; const int LED_SW_DELAY = 1000;
bool led_pin_status = !READ(LED_SW_PIN); bool led_pin_status = READ(LED_SW_PIN);
if (led_pin_status && LedSw_Count <= LED_SW_DELAY) if (LedSw_Count == LED_SW_DELAY && !led_pin_status){
LedSw_Count++;
else if (!led_pin_status)
LedSw_Count = 0;
if (LedSw_Count == LED_SW_DELAY){
caselight.on = !caselight.on; caselight.on = !caselight.on;
caselight.update(true); caselight.update(true);
} }
if (led_pin_status && LedSw_Count < LED_SW_DELAY)
LedSw_Count++;
else if (!led_pin_status)
LedSw_Count = 0;
#endif #endif
#if HAS_HOME #if HAS_HOME

10
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
View File

@ -202,6 +202,14 @@ https://easyeda.com/sst78rust/fb4s-led-control
#define FAN_PIN PB1 // FAN #define FAN_PIN PB1 // FAN
/*
Управление питанием
*/
#define SUICIDE_PIN PB2
#define SUICIDE_PIN_INVERTING false
#define KILL_PIN PA2 // Enable MKSPWC DET PIN
#define KILL_PIN_STATE true // Enable MKSPWC PIN STATE
// //
// Thermocouples // Thermocouples
// //
@ -237,7 +245,7 @@ https://easyeda.com/sst78rust/fb4s-led-control
//#define PS_ON_PIN PB2 // PW_OFF //#define PS_ON_PIN PB2 // PW_OFF
#define FIL_RUNOUT_PIN PA4 #define FIL_RUNOUT_PIN PA4
#ifdef CASE_LED_INSTEAD_E1 #ifdef CASE_LED_INSTEAD_E1
#define LED_SW_PIN PE6 #define LED_SW_PIN PA2//PE6
#endif #endif
#ifndef LED_SW_PIN #ifndef LED_SW_PIN
#define FIL_RUNOUT2_PIN PE6 #define FIL_RUNOUT2_PIN PE6

Write Preview
Loading…
Cancel
Save