asaril/marlin2_i2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move stepper settings to "Advanced Settings" menu (#13063)

Browse source
This commit is contained in:
Marcio Teixeira 2019-02-01 17:07:04 -07:00 committed by Scott Lahteine
parent 68bbac207e
commit f6edd2c472
2 changed files with 58 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
Marlin/src/lcd/menu/menu_advanced.cpp
View file

@ -46,6 +46,53 @@
#include "../../module/temperature.h" #include "../../module/temperature.h"
#endif #endif
void menu_tmc();
#if ENABLED(DAC_STEPPER_CURRENT)
#include "../../feature/dac/stepper_dac.h"
uint8_t driverPercent[XYZE];
inline void dac_driver_getValues() { LOOP_XYZE(i) driverPercent[i] = dac_current_get_percent((AxisEnum)i); }
static void dac_driver_commit() { dac_current_set_percents(driverPercent); }
void menu_dac() {
dac_driver_getValues();
START_MENU();
MENU_BACK(MSG_CONTROL);
#define EDIT_DAC_PERCENT(N) MENU_ITEM_EDIT_CALLBACK(uint8, MSG_##N " " MSG_DAC_PERCENT, &driverPercent[_AXIS(N)], 0, 100, dac_driver_commit)
EDIT_DAC_PERCENT(X);
EDIT_DAC_PERCENT(Y);
EDIT_DAC_PERCENT(Z);
EDIT_DAC_PERCENT(E);
MENU_ITEM(function, MSG_DAC_EEPROM_WRITE, dac_commit_eeprom);
END_MENU();
}
#endif
#if HAS_MOTOR_CURRENT_PWM
#include "../../module/stepper.h"
void menu_pwm() {
START_MENU();
MENU_BACK(MSG_CONTROL);
#define EDIT_CURRENT_PWM(LABEL,I) MENU_ITEM_EDIT_CALLBACK(long5, LABEL, &stepper.motor_current_setting[I], 100, 2000, stepper.refresh_motor_power)
#if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
EDIT_CURRENT_PWM(MSG_X MSG_Y, 0);
#endif
#if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
EDIT_CURRENT_PWM(MSG_Z, 1);
#endif
#if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
EDIT_CURRENT_PWM(MSG_E, 2);
#endif
END_MENU();
}
#endif
#if HAS_M206_COMMAND #if HAS_M206_COMMAND
// //
// Set the home offset based on the current_position // Set the home offset based on the current_position
@ -580,9 +627,19 @@ void menu_advanced_settings() {
// M92 - Steps Per mm // M92 - Steps Per mm
MENU_ITEM(submenu, MSG_STEPS_PER_MM, menu_advanced_steps_per_mm); MENU_ITEM(submenu, MSG_STEPS_PER_MM, menu_advanced_steps_per_mm);
} }
#endif // !SLIM_LCD_MENUS #endif // !SLIM_LCD_MENUS
#if ENABLED(DAC_STEPPER_CURRENT)
MENU_ITEM(submenu, MSG_DRIVE_STRENGTH, menu_dac);
#endif
#if HAS_MOTOR_CURRENT_PWM
MENU_ITEM(submenu, MSG_DRIVE_STRENGTH, menu_pwm);
#endif
#if HAS_TRINAMIC
MENU_ITEM(submenu, MSG_TMC_DRIVERS, menu_tmc);
#endif
MENU_ITEM(submenu, MSG_TEMPERATURE, menu_advanced_temperature); MENU_ITEM(submenu, MSG_TEMPERATURE, menu_advanced_temperature);
#if DISABLED(NO_VOLUMETRICS) || ENABLED(ADVANCED_PAUSE_FEATURE) #if DISABLED(NO_VOLUMETRICS) || ENABLED(ADVANCED_PAUSE_FEATURE)

56
Marlin/src/lcd/menu/menu_configuration.cpp
View file

@ -48,7 +48,6 @@
void menu_advanced_settings(); void menu_advanced_settings();
void menu_delta_calibrate(); void menu_delta_calibrate();
void menu_tmc();
static void lcd_factory_settings() { static void lcd_factory_settings() {
settings.reset(); settings.reset();
@ -210,51 +209,6 @@ static void lcd_factory_settings() {
#endif #endif
#if ENABLED(DAC_STEPPER_CURRENT)
#include "../../feature/dac/stepper_dac.h"
uint8_t driverPercent[XYZE];
inline void dac_driver_getValues() { LOOP_XYZE(i) driverPercent[i] = dac_current_get_percent((AxisEnum)i); }
static void dac_driver_commit() { dac_current_set_percents(driverPercent); }
void menu_dac() {
dac_driver_getValues();
START_MENU();
MENU_BACK(MSG_CONTROL);
#define EDIT_DAC_PERCENT(N) MENU_ITEM_EDIT_CALLBACK(uint8, MSG_##N " " MSG_DAC_PERCENT, &driverPercent[_AXIS(N)], 0, 100, dac_driver_commit)
EDIT_DAC_PERCENT(X);
EDIT_DAC_PERCENT(Y);
EDIT_DAC_PERCENT(Z);
EDIT_DAC_PERCENT(E);
MENU_ITEM(function, MSG_DAC_EEPROM_WRITE, dac_commit_eeprom);
END_MENU();
}
#endif
#if HAS_MOTOR_CURRENT_PWM
#include "../../module/stepper.h"
void menu_pwm() {
START_MENU();
MENU_BACK(MSG_CONTROL);
#define EDIT_CURRENT_PWM(LABEL,I) MENU_ITEM_EDIT_CALLBACK(long5, LABEL, &stepper.motor_current_setting[I], 100, 2000, stepper.refresh_motor_power)
#if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
EDIT_CURRENT_PWM(MSG_X MSG_Y, 0);
#endif
#if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
EDIT_CURRENT_PWM(MSG_Z, 1);
#endif
#if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
EDIT_CURRENT_PWM(MSG_E, 2);
#endif
END_MENU();
}
#endif
#if DISABLED(SLIM_LCD_MENUS) #if DISABLED(SLIM_LCD_MENUS)
void _menu_configuration_preheat_settings(const uint8_t material) { void _menu_configuration_preheat_settings(const uint8_t material) {
@ -357,16 +311,6 @@ void menu_configuration() {
#if ENABLED(FWRETRACT) #if ENABLED(FWRETRACT)
MENU_ITEM(submenu, MSG_RETRACT, menu_config_retract); MENU_ITEM(submenu, MSG_RETRACT, menu_config_retract);
#endif #endif
#if ENABLED(DAC_STEPPER_CURRENT)
MENU_ITEM(submenu, MSG_DRIVE_STRENGTH, menu_dac);
#endif
#if HAS_MOTOR_CURRENT_PWM
MENU_ITEM(submenu, MSG_DRIVE_STRENGTH, menu_pwm);
#endif
#if HAS_TRINAMIC
MENU_ITEM(submenu, MSG_TMC_DRIVERS, menu_tmc);
#endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR) #if ENABLED(FILAMENT_RUNOUT_SENSOR)
MENU_ITEM_EDIT_CALLBACK(bool, MSG_RUNOUT_SENSOR_ENABLE, &runout.enabled, runout.reset); MENU_ITEM_EDIT_CALLBACK(bool, MSG_RUNOUT_SENSOR_ENABLE, &runout.enabled, runout.reset);