From 1b3f4e5871143b007ca0300bdf8f1a10a131799b Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 10 Oct 2017 16:17:52 +0200 Subject: [PATCH] fixed typo --- Firmware/Marlin_main.cpp | 44 +++------------------------------------ Firmware/language_all.cpp | 6 +++--- Firmware/language_all.h | 4 ++-- Firmware/language_en.h | 2 +- 4 files changed, 9 insertions(+), 47 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 98cfb0364..f7ab5dbc8 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1099,6 +1099,8 @@ void setup() tp_init(); // Initialize temperature loop plan_init(); // Initialize planner; watchdog_init(); + lcd_print_at_PGM(0, 1, PSTR(" Original Prusa ")); // we need to do this again for some reason, no time to research + lcd_print_at_PGM(0, 2, PSTR(" 3D Printers ")); st_init(); // Initialize stepper, this enables interrupts! setup_photpin(); servo_init(); @@ -1195,8 +1197,6 @@ void setup() card.ToshibaFlashAir_enable(eeprom_read_byte((unsigned char*)EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY) == 1); // Force SD card update. Otherwise the SD card update is done from loop() on card.checkautostart(false), // but this times out if a blocking dialog is shown in setup(). - lcd_print_at_PGM(0, 1, PSTR(" Original Prusa ")); // we need to do this again for some reason, no time to research - lcd_print_at_PGM(0, 2, PSTR(" 3D Printers ")); card.initsd(); if (eeprom_read_dword((uint32_t*)(EEPROM_TOP - 4)) == 0x0ffffffff && @@ -5964,52 +5964,14 @@ void ClearToSend() SERIAL_PROTOCOLLNRPGM(MSG_OK); } -update_currents() { - float current_high[3] = DEFAULT_PWM_MOTOR_CURRENT_LOUD; - float current_low[3] = DEFAULT_PWM_MOTOR_CURRENT; - float tmp_motor[3]; - - //SERIAL_ECHOLNPGM("Currents updated: "); - - if (destination[Z_AXIS] < Z_SILENT) { - //SERIAL_ECHOLNPGM("LOW"); - for (uint8_t i = 0; i < 3; i++) { - digipot_current(i, current_low[i]); - /*MYSERIAL.print(int(i)); - SERIAL_ECHOPGM(": "); - MYSERIAL.println(current_low[i]);*/ - } - } - else if (destination[Z_AXIS] > Z_HIGH_POWER) { - //SERIAL_ECHOLNPGM("HIGH"); - for (uint8_t i = 0; i < 3; i++) { - digipot_current(i, current_high[i]); - /*MYSERIAL.print(int(i)); - SERIAL_ECHOPGM(": "); - MYSERIAL.println(current_high[i]);*/ - } - } - else { - for (uint8_t i = 0; i < 3; i++) { - float q = current_low[i] - Z_SILENT*((current_high[i] - current_low[i]) / (Z_HIGH_POWER - Z_SILENT)); - tmp_motor[i] = ((current_high[i] - current_low[i]) / (Z_HIGH_POWER - Z_SILENT))*destination[Z_AXIS] + q; - digipot_current(i, tmp_motor[i]); - /*MYSERIAL.print(int(i)); - SERIAL_ECHOPGM(": "); - MYSERIAL.println(tmp_motor[i]);*/ - } - } -} - void get_coordinates() { bool seen[4]={false,false,false,false}; for(int8_t i=0; i < NUM_AXIS; i++) { if(code_seen(axis_codes[i])) { - destination[i] = (float)code_value() + (axis_relative_modes[i] || relative_mode)*current_position[i]; + destination[i] = (float)code_value() + (axis_relative_modes[i] || relative_mode)*current_position[i]; seen[i]=true; - if (i == Z_AXIS && SilentModeMenu == 2) update_currents(); } else destination[i] = current_position[i]; //Are these else lines really needed? } diff --git a/Firmware/language_all.cpp b/Firmware/language_all.cpp index 909610dc3..be66b7187 100644 --- a/Firmware/language_all.cpp +++ b/Firmware/language_all.cpp @@ -3557,9 +3557,9 @@ const char * const MSG_WIZARD_QUIT_LANG_TABLE[1] PROGMEM = { MSG_WIZARD_QUIT_EN }; -const char MSG_WIZARD_REPEAT_V2_CA_EN[] PROGMEM = "Do you want to repeat last step to readjust distance between nozzle and heatbed?"; -const char * const MSG_WIZARD_REPEAT_V2_CA_LANG_TABLE[1] PROGMEM = { - MSG_WIZARD_REPEAT_V2_CA_EN +const char MSG_WIZARD_REPEAT_V2_CAL_EN[] PROGMEM = "Do you want to repeat last step to readjust distance between nozzle and heatbed?"; +const char * const MSG_WIZARD_REPEAT_V2_CAL_LANG_TABLE[1] PROGMEM = { + MSG_WIZARD_REPEAT_V2_CAL_EN }; const char MSG_WIZARD_RERUN_EN[] PROGMEM = "Running Wizard will delete current calibration results and start from the beginning. Continue?"; diff --git a/Firmware/language_all.h b/Firmware/language_all.h index f8ae168ae..31da60eed 100644 --- a/Firmware/language_all.h +++ b/Firmware/language_all.h @@ -672,8 +672,8 @@ extern const char* const MSG_WIZARD_PLA_FILAMENT_LANG_TABLE[1]; #define MSG_WIZARD_PLA_FILAMENT LANG_TABLE_SELECT_EXPLICIT(MSG_WIZARD_PLA_FILAMENT_LANG_TABLE, 0) extern const char* const MSG_WIZARD_QUIT_LANG_TABLE[1]; #define MSG_WIZARD_QUIT LANG_TABLE_SELECT_EXPLICIT(MSG_WIZARD_QUIT_LANG_TABLE, 0) -extern const char* const MSG_WIZARD_REPEAT_V2_CA_LANG_TABLE[1]; -#define MSG_WIZARD_REPEAT_V2_CA LANG_TABLE_SELECT_EXPLICIT(MSG_WIZARD_REPEAT_V2_CA_LANG_TABLE, 0) +extern const char* const MSG_WIZARD_REPEAT_V2_CAL_LANG_TABLE[1]; +#define MSG_WIZARD_REPEAT_V2_CAL LANG_TABLE_SELECT_EXPLICIT(MSG_WIZARD_REPEAT_V2_CAL_LANG_TABLE, 0) extern const char* const MSG_WIZARD_RERUN_LANG_TABLE[1]; #define MSG_WIZARD_RERUN LANG_TABLE_SELECT_EXPLICIT(MSG_WIZARD_RERUN_LANG_TABLE, 0) extern const char* const MSG_WIZARD_SELFTEST_LANG_TABLE[1]; diff --git a/Firmware/language_en.h b/Firmware/language_en.h index f1ed2662f..561567df6 100644 --- a/Firmware/language_en.h +++ b/Firmware/language_en.h @@ -334,7 +334,7 @@ #define(lenght=20, lines=8) MSG_WIZARD_DONE "All is done. Happy printing!" #define(lenght=20, lines=8) MSG_WIZARD_LOAD_FILAMENT "Please insert PLA filament to the extruder, then press knob to load it." #define(lenght=20, lines=7) MSG_WIZARD_RERUN "Running Wizard will delete current calibration results and start from the beginning. Continue?" -#define(lenght=20, lines=7) MSG_WIZARD_REPEAT_V2_CA "Do you want to repeat last step to readjust distance between nozzle and heatbed?" +#define(lenght=20, lines=7) MSG_WIZARD_REPEAT_V2_CAL "Do you want to repeat last step to readjust distance between nozzle and heatbed?" #define(lenght=20, lines=8) MSG_WIZARD_CLEAN_HEATBED "Please clean heatbed and then press the knob." #define(lenght=20, lines=2) MSG_WIZARD_PLA_FILAMENT "Is it PLA filament?" #define(lenght=20, lines=8) MSG_WIZARD_INSERT_CORRECT_FILAMENT "Please load PLA filament and then resume Wizard by rebooting the printer."