From 78708903e83dfa0f9353e8a2083731b158281249 Mon Sep 17 00:00:00 2001 From: leptun Date: Thu, 12 Sep 2019 07:16:31 +0300 Subject: [PATCH 1/4] Also update eeprom value --- Firmware/stepper.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index 5b102f42b..e75251577 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -1563,7 +1563,10 @@ void EEPROM_read_st(int pos, uint8_t* value, uint8_t size) void st_current_init() //Initialize Digipot Motor Current { uint8_t SilentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT); - if (SilentMode == 0xff) SilentMode = 0; //set power to High Power (MK2.5) or Normal Power (MK3, unused) + if (SilentMode == 0xff){ //set power to High Power (MK2.5) or Normal Power (MK3, unused) + SilentMode = 0; + eeprom_update_byte((uint8_t*)EEPROM_SILENT, SilentMode); + } SilentModeMenu = SilentMode; #ifdef MOTOR_CURRENT_PWM_XY_PIN pinMode(MOTOR_CURRENT_PWM_XY_PIN, OUTPUT); From 444daceca3c5f3e42bf73f1a488bc313535372cf Mon Sep 17 00:00:00 2001 From: leptun Date: Thu, 12 Sep 2019 13:39:04 +0300 Subject: [PATCH 2/4] Move define as requested --- Firmware/stepper.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index e75251577..710b135ec 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -1561,14 +1561,14 @@ void EEPROM_read_st(int pos, uint8_t* value, uint8_t size) void st_current_init() //Initialize Digipot Motor Current -{ +{ +#ifdef MOTOR_CURRENT_PWM_XY_PIN uint8_t SilentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT); if (SilentMode == 0xff){ //set power to High Power (MK2.5) or Normal Power (MK3, unused) - SilentMode = 0; + SilentMode = SILENT_MODE_POWER; eeprom_update_byte((uint8_t*)EEPROM_SILENT, SilentMode); } SilentModeMenu = SilentMode; - #ifdef MOTOR_CURRENT_PWM_XY_PIN pinMode(MOTOR_CURRENT_PWM_XY_PIN, OUTPUT); pinMode(MOTOR_CURRENT_PWM_Z_PIN, OUTPUT); pinMode(MOTOR_CURRENT_PWM_E_PIN, OUTPUT); @@ -1590,7 +1590,7 @@ void st_current_init() //Initialize Digipot Motor Current st_current_set(2, motor_current_setting[2]); //Set timer5 to 31khz so the PWM of the motor power is as constant as possible. (removes a buzzing noise) TCCR5B = (TCCR5B & ~(_BV(CS50) | _BV(CS51) | _BV(CS52))) | _BV(CS50); - #endif +#endif } From b4e0c2f455ff3ec43a4e7e29ae038cbd1592c59b Mon Sep 17 00:00:00 2001 From: michalrudolf <55433770+michalrudolf@users.noreply.github.com> Date: Tue, 17 Sep 2019 10:51:43 +0200 Subject: [PATCH 3/4] Update ultralcd.cpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Menu Support -> XYZ calibration details -> 3. obrazovka "point offset" X value is no longer moved to the left if there’s no negative sign --- Firmware/ultralcd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 608b8c291..a78063ada 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3023,9 +3023,9 @@ static void lcd_menu_xyz_offset() for (uint_least8_t i = 0; i < 2; i++) { - lcd_puts_at_P(11, i + 2, PSTR("")); + lcd_puts_at_P((cntr[i] < 0) ? 10 : 11, i + 2, PSTR("")); lcd_print(cntr[i]); - lcd_puts_at_P((cntr[i] < 0) ? 17 : 16, i + 2, PSTR("mm")); + lcd_puts_at_P(16, i + 2, PSTR("mm")); } menu_back_if_clicked(); } From b660cb39087a1e465d56589fc899817a65b6cc26 Mon Sep 17 00:00:00 2001 From: michalrudolf <55433770+michalrudolf@users.noreply.github.com> Date: Tue, 17 Sep 2019 11:46:29 +0200 Subject: [PATCH 4/4] ultralcd.cpp --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a78063ada..151b4918e 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3023,7 +3023,7 @@ static void lcd_menu_xyz_offset() for (uint_least8_t i = 0; i < 2; i++) { - lcd_puts_at_P((cntr[i] < 0) ? 10 : 11, i + 2, PSTR("")); + lcd_set_cursor((cntr[i] < 0) ? 10 : 11, i+2); lcd_print(cntr[i]); lcd_puts_at_P(16, i + 2, PSTR("mm")); }