3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

"disable_z()" for Delta PSU IV

Browse source 
correction for (motor) mode switching
This commit is contained in:
MRprusa3d 2019-06-05 19:22:04 +02:00
parent 4b1fc69088
commit 1d8c24e8a9
4 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Firmware/Marlin.h
View file

@ -174,6 +174,7 @@ void manage_inactivity(bool ignore_stepper_queue=false);
#ifdef PSU_Delta #ifdef PSU_Delta
void init_force_z(); void init_force_z();
void check_force_z();
#undef disable_z() #undef disable_z()
#define disable_z() disable_force_z() #define disable_z() disable_force_z()
void disable_force_z(); void disable_force_z();

13
Firmware/Marlin_main.cpp
View file

@ -1279,6 +1279,9 @@ void setup()
update_mode_profile(); update_mode_profile();
tmc2130_init(); tmc2130_init();
#endif //TMC2130 #endif //TMC2130
#ifdef PSU_Delta
init_force_z(); // ! important for correct Z-axis initialization
#endif // PSU_Delta
setup_photpin(); setup_photpin();
@ -9613,6 +9616,12 @@ bEnableForce_z=true; // "true"-value enforce "disab
disable_force_z(); disable_force_z();
} }
void check_force_z()
{
if(!(bEnableForce_z||eeprom_read_byte((uint8_t*)EEPROM_SILENT)))
init_force_z(); // causes enforced switching into disable-state
}
void disable_force_z() void disable_force_z()
{ {
uint16_t z_microsteps=0; uint16_t z_microsteps=0;
@ -9639,7 +9648,7 @@ st_synchronize();
#ifdef TMC2130 #ifdef TMC2130
tmc2130_mode=TMC2130_MODE_SILENT; tmc2130_mode=TMC2130_MODE_SILENT;
update_mode_profile(); update_mode_profile();
tmc2130_init(); tmc2130_init(true);
#endif // TMC2130 #endif // TMC2130
axis_known_position[Z_AXIS]=false; axis_known_position[Z_AXIS]=false;
@ -9656,7 +9665,7 @@ bEnableForce_z=true;
#ifdef TMC2130 #ifdef TMC2130
tmc2130_mode=eeprom_read_byte((uint8_t*)EEPROM_SILENT)?TMC2130_MODE_SILENT:TMC2130_MODE_NORMAL; tmc2130_mode=eeprom_read_byte((uint8_t*)EEPROM_SILENT)?TMC2130_MODE_SILENT:TMC2130_MODE_NORMAL;
update_mode_profile(); update_mode_profile();
tmc2130_init(); tmc2130_init(true);
#endif // TMC2130 #endif // TMC2130
WRITE(Z_ENABLE_PIN,Z_ENABLE_ON); // slightly redundant ;-p WRITE(Z_ENABLE_PIN,Z_ENABLE_ON); // slightly redundant ;-p

7
Firmware/tmc2130.cpp
View file

@ -143,7 +143,7 @@ uint16_t __tcoolthrs(uint8_t axis)
return 0; return 0;
} }
void tmc2130_init() void tmc2130_init(bool bSupressFlag=false)
{ {
// DBG(_n("tmc2130_init(), mode=%S\n"), tmc2130_mode?_n("STEALTH"):_n("NORMAL")); // DBG(_n("tmc2130_init(), mode=%S\n"), tmc2130_mode?_n("STEALTH"):_n("NORMAL"));
WRITE(X_TMC2130_CS, HIGH); WRITE(X_TMC2130_CS, HIGH);
@ -216,6 +216,11 @@ void tmc2130_init()
tmc2130_set_wave(E_AXIS, 247, tmc2130_wave_fac[E_AXIS]); tmc2130_set_wave(E_AXIS, 247, tmc2130_wave_fac[E_AXIS]);
#endif //TMC2130_LINEARITY_CORRECTION #endif //TMC2130_LINEARITY_CORRECTION
#ifdef PSU_Delta
if(!bSupressFlag)
check_force_z();
#endif // PSU_Delta
} }
uint8_t tmc2130_sample_diag() uint8_t tmc2130_sample_diag()

2
Firmware/tmc2130.h
View file

@ -51,7 +51,7 @@ typedef struct
extern tmc2130_chopper_config_t tmc2130_chopper_config[4]; extern tmc2130_chopper_config_t tmc2130_chopper_config[4];
//initialize tmc2130 //initialize tmc2130
extern void tmc2130_init(); extern void tmc2130_init(bool bSupressFlag=false);
//check diag pins (called from stepper isr) //check diag pins (called from stepper isr)
extern void tmc2130_st_isr(); extern void tmc2130_st_isr();
//update stall guard (called from st_synchronize inside the loop) //update stall guard (called from st_synchronize inside the loop)