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

PFW643 - removed M910-M918, implemented M907

Browse source
This commit is contained in:
Robert Pelnar 2018-11-05 16:15:27 +01:00
parent 7e43b15b54
commit d6b5f5a1c7
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Firmware/Marlin_main.cpp
View file

@ -6617,6 +6617,17 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
case 907: // M907 Set digital trimpot motor current using axis codes.
{
#ifdef TMC2130
for (int i = 0; i < NUM_AXIS; i++)
if(code_seen(axis_codes[i]))
{
long cur = code_value_long();
if (cur > MOTOR_CURRENT_PWM_RANGE) cur = MOTOR_CURRENT_PWM_RANGE;
tmc2130_set_current_h(i, (uint8_t)cur);
tmc2130_set_current_r(i, (uint8_t)cur);
}
#else //TMC2130
#if defined(DIGIPOTSS_PIN) && DIGIPOTSS_PIN > -1
for(int i=0;i<NUM_AXIS;i++) if(code_seen(axis_codes[i])) st_current_set(i,code_value());
if(code_seen('B')) st_current_set(4,code_value());
@ -6631,6 +6642,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
#ifdef MOTOR_CURRENT_PWM_E_PIN
if(code_seen('E')) st_current_set(2, code_value());
#endif
#endif //TMC2130
}
break;
case 908: // M908 Control digital trimpot directly.
@ -6644,7 +6656,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
}
break;
#ifdef TMC2130
#ifdef TMC2130_SERVICE_CODES_M910_M918
case 910: //! M910 - TMC2130 init
{
@ -6669,7 +6681,6 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
if (code_seen('E')) tmc2130_set_current_r(3, code_value());
}
break;
case 913: //! M913 - Print TMC2130 currents
{
tmc2130_print_currents();
@ -6721,7 +6732,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
}
break;
#endif //TMC2130
#endif //TMC2130_SERVICE_CODES_M910_M918
case 350: //! M350 - Set microstepping mode. Warning: Steps per unit remains unchanged. S code sets stepping mode for all drivers.
{

14
Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h
View file

@ -261,6 +261,8 @@
#define TMC2130_STEALTH_Z
//#define TMC2130_SERVICE_CODES_M910_M918
//#define TMC2130_DEBUG
//#define TMC2130_DEBUG_WR
//#define TMC2130_DEBUG_RD
@ -374,16 +376,8 @@
MOTOR CURRENT SETTINGS
*------------------------------------*/
// Motor Current setting for BIG RAMBo
#define DIGIPOT_MOTOR_CURRENT {135,135,135,135,135} // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
#define DIGIPOT_MOTOR_CURRENT_LOUD {135,135,135,135,135}
// Motor Current settings for RAMBo mini PWM value = MotorCurrentSetting * 255 / range
#if MOTHERBOARD == BOARD_RAMBO_MINI_1_0 || MOTHERBOARD == BOARD_RAMBO_MINI_1_3
#define MOTOR_CURRENT_PWM_RANGE 2000
#define DEFAULT_PWM_MOTOR_CURRENT {400, 750, 750} // {XY,Z,E}
#define DEFAULT_PWM_MOTOR_CURRENT_LOUD {400, 750, 750} // {XY,Z,E}
#endif
// Motor Current settings for Einsy/tmc = 0..63
#define MOTOR_CURRENT_PWM_RANGE 63
/*------------------------------------
BED SETTINGS