From b46953c790e8c045cf261547b50e8613dfcce272 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 19 Jul 2018 16:57:31 +0200 Subject: [PATCH 1/9] LCD menu optimalization - lcd_draw_edit removed --- Firmware/lcd.cpp | 38 ------ Firmware/lcd.h | 2 - Firmware/menu.cpp | 14 ++ Firmware/menu.h | 8 ++ Firmware/ultralcd.cpp | 293 +++++++++++++++++++++--------------------- 5 files changed, 172 insertions(+), 183 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 19f18bd74..f564be869 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -844,44 +844,6 @@ void lcd_buttons_update(void) } - - - - - - - - - - -void lcd_drawedit(const char* pstr, char* value) -{ - lcd_set_cursor(1, 1); - lcd_puts_P(pstr); - lcd_print(':'); - #if LCD_WIDTH < 20 - lcd_set_cursor(LCD_WIDTH - strlen(value), 1); - #else - lcd_set_cursor(LCD_WIDTH -1 - strlen(value), 1); - #endif - lcd_print(value); -} - -void lcd_drawedit_2(const char* pstr, char* value) -{ - lcd_set_cursor(0, 1); - lcd_puts_P(pstr); - lcd_print(':'); - - lcd_set_cursor((LCD_WIDTH - strlen(value))/2, 3); - - lcd_print(value); - lcd_print(" mm"); -} - - - - //////////////////////////////////////////////////////////////////////////////// // Custom character data diff --git a/Firmware/lcd.h b/Firmware/lcd.h index d472e6946..4cbac4b85 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -217,8 +217,6 @@ extern void lcd_set_custom_characters_progress(void); extern void lcd_set_custom_characters_nextpage(void); extern void lcd_set_custom_characters_degree(void); -extern void lcd_drawedit(const char* pstr, char* value); -extern void lcd_drawedit_2(const char* pstr, char* value); #endif //_LCD_H diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 7b6be855c..6ab47070c 100644 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -225,7 +225,11 @@ uint8_t menu_item_gcode_P(const char* str, const char* str_gcode) } const char menu_20x_space[] PROGMEM = " "; + const char menu_fmt_int3[] PROGMEM = "%c%.15S:%s%3d"; + +const char menu_fmt_float31[] PROGMEM = "%c%.12S:%s%+06.3f"; + void menu_draw_int3(char chr, const char* str, int16_t val) { int text_len = strlen_P(str); @@ -236,6 +240,15 @@ void menu_draw_int3(char chr, const char* str, int16_t val) lcd_printf_P(menu_fmt_int3, chr, str, spaces, val); } +void menu_draw_float31(char chr, const char* str, float val) +{ + int text_len = strlen_P(str); + if (text_len > 12) text_len = 12; + char spaces[21]; + strcpy_P(spaces, menu_20x_space); + spaces[12 - text_len] = 0; + lcd_printf_P(menu_draw_float31, chr, str, spaces, val); +} #define _menu_data (*((menu_data_edit_t*)menu_data)) void _menu_edit_int3(void) @@ -277,6 +290,7 @@ uint8_t menu_item_edit_int3(const char* str, int16_t* pval, int16_t min_val, int menu_item++; return 0; } + #undef _menu_data diff --git a/Firmware/menu.h b/Firmware/menu.h index 01d07f5b3..2f066b825 100644 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -89,7 +89,15 @@ extern uint8_t menu_item_gcode_P(const char* str, const char* str_gcode); extern const char menu_fmt_int3[]; + +extern const char menu_fmt_float31[]; + +extern void menu_draw_int3(char chr, const char* str, int16_t val); + +extern void menu_draw_float31(char chr, const char* str, float val); + extern void _menu_edit_int3(void); + #define MENU_ITEM_EDIT_int3_P(str, pval, minval, maxval) do { if (menu_item_edit_int3(str, pval, minval, maxval)) return; } while (0) //#define MENU_ITEM_EDIT_int3_P(str, pval, minval, maxval) MENU_ITEM_EDIT(int3, str, pval, minval, maxval) extern uint8_t menu_item_edit_int3(const char* str, int16_t* pval, int16_t min_val, int16_t max_val); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 9de09fa2f..903d5e8ce 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2616,67 +2616,75 @@ void lcd_menu_statistics() } -static void _lcd_move(const char *name, int axis, int min, int max) { - if (!menuData._lcd_moveMenu.initialized) - { - menuData._lcd_moveMenu.endstopsEnabledPrevious = enable_endstops(false); - menuData._lcd_moveMenu.initialized = true; - } - - if (lcd_encoder != 0) { - refresh_cmd_timeout(); - if (! planner_queue_full()) { - current_position[axis] += float((int)lcd_encoder) * move_menu_scale; - if (min_software_endstops && current_position[axis] < min) current_position[axis] = min; - if (max_software_endstops && current_position[axis] > max) current_position[axis] = max; - lcd_encoder = 0; - world2machine_clamp(current_position[X_AXIS], current_position[Y_AXIS]); - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], manual_feedrate[axis] / 60, active_extruder); - lcd_draw_update = 1; - } - } - if (lcd_draw_update) lcd_drawedit(name, ftostr31(current_position[axis])); - if (menuExiting || LCD_CLICKED) (void)enable_endstops(menuData._lcd_moveMenu.endstopsEnabledPrevious); - if (LCD_CLICKED) menu_back(); +static void _lcd_move(const char *name, int axis, int min, int max) +{ + if (!menuData._lcd_moveMenu.initialized) + { + menuData._lcd_moveMenu.endstopsEnabledPrevious = enable_endstops(false); + menuData._lcd_moveMenu.initialized = true; + } + if (lcd_encoder != 0) + { + refresh_cmd_timeout(); + if (! planner_queue_full()) + { + current_position[axis] += float((int)lcd_encoder) * move_menu_scale; + if (min_software_endstops && current_position[axis] < min) current_position[axis] = min; + if (max_software_endstops && current_position[axis] > max) current_position[axis] = max; + lcd_encoder = 0; + world2machine_clamp(current_position[X_AXIS], current_position[Y_AXIS]); + plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], manual_feedrate[axis] / 60, active_extruder); + lcd_draw_update = 1; + } + } + if (lcd_draw_update) + { + lcd_set_cursor(0, 1); + menu_draw_float31(' ', name, current_position[axis]); + } + if (menuExiting || LCD_CLICKED) (void)enable_endstops(menuData._lcd_moveMenu.endstopsEnabledPrevious); + if (LCD_CLICKED) menu_back(); } static void lcd_move_e() { - if (degHotend0() > EXTRUDE_MINTEMP) { - if (lcd_encoder != 0) - { - refresh_cmd_timeout(); - if (! planner_queue_full()) { - current_position[E_AXIS] += float((int)lcd_encoder) * move_menu_scale; - lcd_encoder = 0; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], manual_feedrate[E_AXIS] / 60, active_extruder); - lcd_draw_update = 1; - } - } - if (lcd_draw_update) - { - lcd_drawedit(PSTR("Extruder"), ftostr31(current_position[E_AXIS])); - } - if (LCD_CLICKED) menu_back(); -} - else { + if (degHotend0() > EXTRUDE_MINTEMP) + { + if (lcd_encoder != 0) + { + refresh_cmd_timeout(); + if (! planner_queue_full()) + { + current_position[E_AXIS] += float((int)lcd_encoder) * move_menu_scale; + lcd_encoder = 0; + plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], manual_feedrate[E_AXIS] / 60, active_extruder); + lcd_draw_update = 1; + } + } + if (lcd_draw_update) + { + lcd_set_cursor(0, 1); + menu_draw_float31(' ', name, current_position[E_AXIS]); + } + if (LCD_CLICKED) menu_back(); + } + else + { lcd_clear(); lcd_set_cursor(0, 0); lcd_puts_P(_T(MSG_ERROR)); lcd_set_cursor(0, 2); lcd_puts_P(_T(MSG_PREHEAT_NOZZLE)); - delay(2000); lcd_return_to_status(); } } -/** - * @brief Show measured Y distance of front calibration points from Y_MIN_POS - * - * If those points are detected too close to edge of reachable area, their confidence is lowered. - * This functionality is applied more often for MK2 printers. - */ + + +//@brief Show measured Y distance of front calibration points from Y_MIN_POS +//If those points are detected too close to edge of reachable area, their confidence is lowered. +//This functionality is applied more often for MK2 printers. static void lcd_menu_xyz_y_min() { //|01234567890123456789| @@ -2708,9 +2716,8 @@ static void lcd_menu_xyz_y_min() if (lcd_clicked()) menu_goto(lcd_menu_xyz_skew, 0, true, true); } -/** - * @brief Show measured axis skewness - */ + +//@brief Show measured axis skewness float _deg(float rad) { return rad * 180 / M_PI; @@ -2807,56 +2814,58 @@ static void lcd_move_z() { */ static void _lcd_babystep(int axis, const char *msg) { - if (menuData.babyStep.status == 0) { - // Menu was entered. - // Initialize its status. - menuData.babyStep.status = 1; + if (menuData.babyStep.status == 0) + { + // Menu was entered. + // Initialize its status. + menuData.babyStep.status = 1; check_babystep(); EEPROM_read_B(EEPROM_BABYSTEP_X, &menuData.babyStep.babystepMem[0]); - EEPROM_read_B(EEPROM_BABYSTEP_Y, &menuData.babyStep.babystepMem[1]); - EEPROM_read_B(EEPROM_BABYSTEP_Z, &menuData.babyStep.babystepMem[2]); - - menuData.babyStep.babystepMemMM[0] = menuData.babyStep.babystepMem[0]/axis_steps_per_unit[X_AXIS]; - menuData.babyStep.babystepMemMM[1] = menuData.babyStep.babystepMem[1]/axis_steps_per_unit[Y_AXIS]; - menuData.babyStep.babystepMemMM[2] = menuData.babyStep.babystepMem[2]/axis_steps_per_unit[Z_AXIS]; - lcd_draw_update = 1; + EEPROM_read_B(EEPROM_BABYSTEP_Y, &menuData.babyStep.babystepMem[1]); + EEPROM_read_B(EEPROM_BABYSTEP_Z, &menuData.babyStep.babystepMem[2]); + + menuData.babyStep.babystepMemMM[0] = menuData.babyStep.babystepMem[0]/axis_steps_per_unit[X_AXIS]; + menuData.babyStep.babystepMemMM[1] = menuData.babyStep.babystepMem[1]/axis_steps_per_unit[Y_AXIS]; + menuData.babyStep.babystepMemMM[2] = menuData.babyStep.babystepMem[2]/axis_steps_per_unit[Z_AXIS]; + lcd_draw_update = 1; //SERIAL_ECHO("Z baby step: "); //SERIAL_ECHO(menuData.babyStep.babystepMem[2]); - // Wait 90 seconds before closing the live adjust dialog. - lcd_timeoutToStatus = millis() + 90000; - } - - if (lcd_encoder != 0) - { - if (homing_flag) lcd_encoder = 0; - - menuData.babyStep.babystepMem[axis] += (int)lcd_encoder; - if (axis == 2) { - if (menuData.babyStep.babystepMem[axis] < Z_BABYSTEP_MIN) menuData.babyStep.babystepMem[axis] = Z_BABYSTEP_MIN; //-3999 -> -9.99 mm - else if (menuData.babyStep.babystepMem[axis] > Z_BABYSTEP_MAX) menuData.babyStep.babystepMem[axis] = Z_BABYSTEP_MAX; //0 - else { - CRITICAL_SECTION_START - babystepsTodo[axis] += (int)lcd_encoder; - CRITICAL_SECTION_END - } + // Wait 90 seconds before closing the live adjust dialog. + lcd_timeoutToStatus = millis() + 90000; } - menuData.babyStep.babystepMemMM[axis] = menuData.babyStep.babystepMem[axis]/axis_steps_per_unit[axis]; - delay(50); - lcd_encoder = 0; - lcd_draw_update = 1; - } - if (lcd_draw_update) - lcd_drawedit_2(msg, ftostr13ns(menuData.babyStep.babystepMemMM[axis])); - if (LCD_CLICKED || menuExiting) { - // Only update the EEPROM when leaving the menu. - EEPROM_save_B( - (axis == X_AXIS) ? EEPROM_BABYSTEP_X : ((axis == Y_AXIS) ? EEPROM_BABYSTEP_Y : EEPROM_BABYSTEP_Z), - &menuData.babyStep.babystepMem[axis]); - if(Z_AXIS == axis) calibration_status_store(CALIBRATION_STATUS_CALIBRATED); - } - if (LCD_CLICKED) menu_back(); + if (lcd_encoder != 0) + { + if (homing_flag) lcd_encoder = 0; + menuData.babyStep.babystepMem[axis] += (int)lcd_encoder; + if (axis == 2) + { + if (menuData.babyStep.babystepMem[axis] < Z_BABYSTEP_MIN) menuData.babyStep.babystepMem[axis] = Z_BABYSTEP_MIN; //-3999 -> -9.99 mm + else if (menuData.babyStep.babystepMem[axis] > Z_BABYSTEP_MAX) menuData.babyStep.babystepMem[axis] = Z_BABYSTEP_MAX; //0 + else + { + CRITICAL_SECTION_START + babystepsTodo[axis] += (int)lcd_encoder; + CRITICAL_SECTION_END + } + } + menuData.babyStep.babystepMemMM[axis] = menuData.babyStep.babystepMem[axis]/axis_steps_per_unit[axis]; + delay(50); + lcd_encoder = 0; + lcd_draw_update = 1; + } + if (lcd_draw_update) + lcd_drawedit_2(msg, ftostr13ns(menuData.babyStep.babystepMemMM[axis])); + if (LCD_CLICKED || menuExiting) + { + // Only update the EEPROM when leaving the menu. + EEPROM_save_B( + (axis == X_AXIS) ? EEPROM_BABYSTEP_X : ((axis == Y_AXIS) ? EEPROM_BABYSTEP_Y : EEPROM_BABYSTEP_Z), + &menuData.babyStep.babystepMem[axis]); + if(Z_AXIS == axis) calibration_status_store(CALIBRATION_STATUS_CALIBRATED); + } + if (LCD_CLICKED) menu_back(); } static void lcd_babystep_x() { @@ -7515,60 +7524,58 @@ void menu_lcd_charsetup_func(void) void menu_lcd_lcdupdate_func(void) { #if (SDCARDDETECT > 0) - if ((IS_SD_INSERTED != lcd_oldcardstatus)) - { - lcd_draw_update = 2; - lcd_oldcardstatus = IS_SD_INSERTED; - lcd_refresh(); // to maybe revive the LCD if static electricity killed it. - - if (lcd_oldcardstatus) - { - card.initsd(); - LCD_MESSAGERPGM(_i("Card inserted"));////MSG_SD_INSERTED c=0 r=0 - //get_description(); - } - else - { - card.release(); - LCD_MESSAGERPGM(_i("Card removed"));////MSG_SD_REMOVED c=0 r=0 - } - } + if ((IS_SD_INSERTED != lcd_oldcardstatus)) + { + lcd_draw_update = 2; + lcd_oldcardstatus = IS_SD_INSERTED; + lcd_refresh(); // to maybe revive the LCD if static electricity killed it. + if (lcd_oldcardstatus) + { + card.initsd(); + LCD_MESSAGERPGM(_i("Card inserted"));////MSG_SD_INSERTED c=0 r=0 + //get_description(); + } + else + { + card.release(); + LCD_MESSAGERPGM(_i("Card removed"));////MSG_SD_REMOVED c=0 r=0 + } + } #endif//CARDINSERTED + if (lcd_next_update_millis < millis()) + { + if (abs(lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) + { + if (lcd_draw_update == 0) + lcd_draw_update = 1; + lcd_encoder += lcd_encoder_diff / ENCODER_PULSES_PER_STEP; + lcd_encoder_diff = 0; + lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; + } - if (lcd_next_update_millis < millis()) - { + if (LCD_CLICKED) lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; - if (abs(lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) - { - if (lcd_draw_update == 0) - lcd_draw_update = 1; - lcd_encoder += lcd_encoder_diff / ENCODER_PULSES_PER_STEP; - lcd_encoder_diff = 0; - lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; - } + (*menu_menu)(); - if (LCD_CLICKED) lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; - - (*menu_menu)(); - - if (lcd_timeoutToStatus < millis() && menu_menu != lcd_status_screen) - { - // Exiting a menu. Let's call the menu function the last time with menuExiting flag set to true - // to give it a chance to save its state. - // This is useful for example, when the babystep value has to be written into EEPROM. - if (menu_menu != NULL) { - menuExiting = true; - (*menu_menu)(); - menuExiting = false; - } - lcd_clear(); - lcd_return_to_status(); - lcd_draw_update = 2; - } - if (lcd_draw_update == 2) lcd_clear(); - if (lcd_draw_update) lcd_draw_update--; - lcd_next_update_millis = millis() + LCD_UPDATE_INTERVAL; - } + if (lcd_timeoutToStatus < millis() && menu_menu != lcd_status_screen) + { + // Exiting a menu. Let's call the menu function the last time with menuExiting flag set to true + // to give it a chance to save its state. + // This is useful for example, when the babystep value has to be written into EEPROM. + if (menu_menu != NULL) + { + menuExiting = true; + (*menu_menu)(); + menuExiting = false; + } + lcd_clear(); + lcd_return_to_status(); + lcd_draw_update = 2; + } + if (lcd_draw_update == 2) lcd_clear(); + if (lcd_draw_update) lcd_draw_update--; + lcd_next_update_millis = millis() + LCD_UPDATE_INTERVAL; + } if (!SdFatUtil::test_stack_integrity()) stack_error(); lcd_ping(); //check that we have received ping command if we are in farm mode lcd_send_status(); From c3e28b490ce7e78102e849bc66d310c3bab41f06 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 19 Jul 2018 17:42:59 +0200 Subject: [PATCH 2/9] TMC2130 old style limits removed +menu draw_edit fix --- Firmware/menu.cpp | 2 +- Firmware/planner.cpp | 66 +------------------ Firmware/ultralcd.cpp | 7 +- .../variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 21 +++--- 4 files changed, 16 insertions(+), 80 deletions(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 6ab47070c..38dda5e77 100644 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -247,7 +247,7 @@ void menu_draw_float31(char chr, const char* str, float val) char spaces[21]; strcpy_P(spaces, menu_20x_space); spaces[12 - text_len] = 0; - lcd_printf_P(menu_draw_float31, chr, str, spaces, val); + lcd_printf_P(menu_fmt_float31, chr, str, spaces, val); } #define _menu_data (*((menu_data_edit_t*)menu_data)) diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index e1cd09b70..cdc3b14e2 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -953,32 +953,8 @@ Having the real displacement of the head, we can calculate the total movement le for(int i=0; i < 4; i++) { current_speed[i] = delta_mm[i] * inverse_second; -#ifdef TMC2130 -#ifdef FEEDRATE_LIMIT - float max_fr = max_feedrate[i]; - if (i < 2) // X, Y - { - if (tmc2130_mode == TMC2130_MODE_SILENT) - { - if (max_fr > SILENT_MAX_FEEDRATE) - max_fr = SILENT_MAX_FEEDRATE; - } - else - { - if (max_fr > NORMAL_MAX_FEEDRATE) - max_fr = NORMAL_MAX_FEEDRATE; - } - } - if(fabs(current_speed[i]) > max_fr) - speed_factor = min(speed_factor, max_fr / fabs(current_speed[i])); -#else //FEEDRATE_LIMIT - if(fabs(current_speed[i]) > max_feedrate[i]) + if(fabs(current_speed[i]) > max_feedrate[i]) speed_factor = min(speed_factor, max_feedrate[i] / fabs(current_speed[i])); -#endif //FEEDRATE_LIMIT -#else //TMC2130 - if(fabs(current_speed[i]) > max_feedrate[i]) - speed_factor = min(speed_factor, max_feedrate[i] / fabs(current_speed[i])); -#endif //TMC2130 } // Correct the speed @@ -1003,45 +979,6 @@ Having the real displacement of the head, we can calculate the total movement le else { block->acceleration_st = ceil(acceleration * steps_per_mm); // convert to: acceleration steps/sec^2 -#ifdef TMC2130 -#ifdef SIMPLE_ACCEL_LIMIT // in some cases can be acceleration limited inproperly - if (tmc2130_mode == TMC2130_MODE_SILENT) - { - if (block->steps_x.wide || block->steps_y.wide) - if (block->acceleration_st > SILENT_MAX_ACCEL_ST) block->acceleration_st = SILENT_MAX_ACCEL_ST; - } - else - { - if (block->steps_x.wide || block->steps_y.wide) - if (block->acceleration_st > NORMAL_MAX_ACCEL_ST) block->acceleration_st = NORMAL_MAX_ACCEL_ST; - } - if (block->steps_x.wide && (block->acceleration_st > axis_steps_per_sqr_second[X_AXIS])) block->acceleration_st = axis_steps_per_sqr_second[X_AXIS]; - if (block->steps_y.wide && (block->acceleration_st > axis_steps_per_sqr_second[Y_AXIS])) block->acceleration_st = axis_steps_per_sqr_second[Y_AXIS]; - if (block->steps_z.wide && (block->acceleration_st > axis_steps_per_sqr_second[Z_AXIS])) block->acceleration_st = axis_steps_per_sqr_second[Z_AXIS]; - if (block->steps_e.wide && (block->acceleration_st > axis_steps_per_sqr_second[E_AXIS])) block->acceleration_st = axis_steps_per_sqr_second[E_AXIS]; -#else // SIMPLE_ACCEL_LIMIT -#ifdef ACCEL_LIMIT - if (tmc2130_mode == TMC2130_MODE_SILENT) - { - if ((block->steps_x.wide > block->step_event_count.wide / 2) || (block->steps_y.wide > block->step_event_count.wide / 2)) - if (block->acceleration_st > SILENT_MAX_ACCEL_ST) block->acceleration_st = SILENT_MAX_ACCEL_ST; - } - else - { - if ((block->steps_x.wide > block->step_event_count.wide / 2) || (block->steps_y.wide > block->step_event_count.wide / 2)) - if (block->acceleration_st > NORMAL_MAX_ACCEL_ST) block->acceleration_st = NORMAL_MAX_ACCEL_ST; - } - if(((float)block->acceleration_st * (float)block->steps_x.wide / (float)block->step_event_count.wide) > axis_steps_per_sqr_second[X_AXIS]) - block->acceleration_st = axis_steps_per_sqr_second[X_AXIS]; - if(((float)block->acceleration_st * (float)block->steps_y.wide / (float)block->step_event_count.wide) > axis_steps_per_sqr_second[Y_AXIS]) - block->acceleration_st = axis_steps_per_sqr_second[Y_AXIS]; - if(((float)block->acceleration_st * (float)block->steps_z.wide / (float)block->step_event_count.wide) > axis_steps_per_sqr_second[Z_AXIS]) - block->acceleration_st = axis_steps_per_sqr_second[Z_AXIS]; - if(((float)block->acceleration_st * (float)block->steps_e.wide / (float)block->step_event_count.wide) > axis_steps_per_sqr_second[E_AXIS]) - block->acceleration_st = axis_steps_per_sqr_second[E_AXIS]; -#endif // ACCEL_LIMIT -#endif // SIMPLE_ACCEL_LIMIT -#else //TMC2130 // Limit acceleration per axis //FIXME Vojtech: One shall rather limit a projection of the acceleration vector instead of using the limit. if(((float)block->acceleration_st * (float)block->steps_x.wide / (float)block->step_event_count.wide) > axis_steps_per_sqr_second[X_AXIS]) @@ -1052,7 +989,6 @@ Having the real displacement of the head, we can calculate the total movement le block->acceleration_st = axis_steps_per_sqr_second[E_AXIS]; if(((float)block->acceleration_st * (float)block->steps_z.wide / (float)block->step_event_count.wide ) > axis_steps_per_sqr_second[Z_AXIS]) block->acceleration_st = axis_steps_per_sqr_second[Z_AXIS]; -#endif //TMC2130 } // Acceleration of the segment, in mm/sec^2 block->acceleration = block->acceleration_st / steps_per_mm; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 903d5e8ce..240c41186 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2665,7 +2665,7 @@ static void lcd_move_e() if (lcd_draw_update) { lcd_set_cursor(0, 1); - menu_draw_float31(' ', name, current_position[E_AXIS]); + menu_draw_float31(' ', PSTR("Extruder"), current_position[E_AXIS]); } if (LCD_CLICKED) menu_back(); } @@ -2856,7 +2856,10 @@ static void _lcd_babystep(int axis, const char *msg) lcd_draw_update = 1; } if (lcd_draw_update) - lcd_drawedit_2(msg, ftostr13ns(menuData.babyStep.babystepMemMM[axis])); + { + lcd_set_cursor(0, 1); + menu_draw_float31(' ', msg, menuData.babyStep.babystepMemMM[axis]); + } if (LCD_CLICKED || menuExiting) { // Only update the EEPROM when leaving the menu. diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index ca8c00f14..5b78f1d9a 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -86,8 +86,11 @@ */ #define SHEET_PRINT_ZERO_REF_Y -2.f -#define DEFAULT_MAX_FEEDRATE {200, 200, 12, 120} // (mm/sec) max feedrate (M203) -#define DEFAULT_MAX_ACCELERATION {1000, 1000, 200, 5000} // (mm/sec^2) max acceleration (M201) +#define DEFAULT_MAX_FEEDRATE {200, 200, 12, 120} // (mm/sec) max feedrate (M203) +#define DEFAULT_MAX_FEEDRATE_SILENT {172, 172, 12, 120} // (mm/sec) max feedrate (M203), silent mode + +#define DEFAULT_MAX_ACCELERATION {1000, 1000, 200, 5000} // (mm/sec^2) max acceleration (M201) +#define DEFAULT_MAX_ACCELERATION_SILENT {960, 960, 200, 5000} // (mm/sec^2) max acceleration (M201), silent mode #define DEFAULT_ACCELERATION 1250 // X, Y, Z and E max acceleration in mm/s^2 for printing moves (M204S) @@ -96,18 +99,12 @@ #define MANUAL_FEEDRATE {2700, 2700, 1000, 100} // set the speeds for manual moves (mm/min) //Silent mode limits -//#define SILENT_MAX_ACCEL 960 // max axxeleration in silent mode in mm/s^2 -//#define SILENT_MAX_ACCEL_ST (100*SILENT_MAX_ACCEL) // max accel in steps/s^2 -//#define SILENT_MAX_FEEDRATE 172 //max feedrate in mm/s, because mode switched to normal for homming , this value limits also homing, it should be greater (172mm/s=9600mm/min>2700mm/min) +#define SILENT_MAX_ACCEL_XY 960 // max acceleration in silent mode in mm/s^2 +#define SILENT_MAX_FEEDRATE_XY 172 // max feedrate in mm/s //Normal mode limits -//#define NORMAL_MAX_ACCEL 2500 // Y-axis max axxeleration in normal mode in mm/s^2 -//#define NORMAL_MAX_ACCEL_ST (100*NORMAL_MAX_ACCEL) // max accel in steps/s^2 -//#define NORMAL_MAX_FEEDRATE 200 //max feedrate in mm/s, because mode switched to normal for homming , this value limits also homing, it should be greater (172mm/s=9600mm/min>2700mm/min) - -//#define FEEDRATE_LIMIT //limitation method for normal/silent -//#define ACCEL_LIMIT //limitation method for normal/silent -//#define SIMPLE_ACCEL_LIMIT //new limitation method for normal/silent +#define NORMAL_MAX_ACCEL_XY 2500 // max acceleration in normal mode in mm/s^2 +#define NORMAL_MAX_FEEDRATE_XY 200 // max feedrate in mm/s //number of bytes from end of the file to start check #define END_FILE_SECTION 10000 From 2ce210a8bb6539fa32ef789f5b00747d6c9f7ee5 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 19 Jul 2018 18:56:01 +0200 Subject: [PATCH 3/9] TMC2130 feedrate and acceleration limitation - separate profiles for normal and stealth mode --- Firmware/ConfigurationStore.cpp | 58 ++++++++++++++++++++++++--------- Firmware/Marlin_main.cpp | 5 ++- Firmware/planner.cpp | 38 ++++++++++++++++++--- Firmware/planner.h | 17 ++++++++-- Firmware/ultralcd.cpp | 3 +- 5 files changed, 96 insertions(+), 25 deletions(-) diff --git a/Firmware/ConfigurationStore.cpp b/Firmware/ConfigurationStore.cpp index 89312ab98..ea9d0bca6 100644 --- a/Firmware/ConfigurationStore.cpp +++ b/Firmware/ConfigurationStore.cpp @@ -56,8 +56,8 @@ void Config_StoreSettings(uint16_t offset, uint8_t level) int i = offset; EEPROM_WRITE_VAR(i,ver); // invalidate data first EEPROM_WRITE_VAR(i,axis_steps_per_unit); - EEPROM_WRITE_VAR(i,max_feedrate); - EEPROM_WRITE_VAR(i,max_acceleration_units_per_sq_second); + EEPROM_WRITE_VAR(i,max_feedrate_normal); + EEPROM_WRITE_VAR(i,max_acceleration_units_per_sq_second_normal); EEPROM_WRITE_VAR(i,acceleration); EEPROM_WRITE_VAR(i,retract_acceleration); EEPROM_WRITE_VAR(i,minimumfeedrate); @@ -126,12 +126,9 @@ void Config_StoreSettings(uint16_t offset, uint8_t level) } #endif //LIN_ADVANCE -/* MYSERIAL.print("Top address used:\n"); - MYSERIAL.print(i); - MYSERIAL.print("; (0x"); - MYSERIAL.print(i, HEX); - MYSERIAL.println(")"); -*/ + EEPROM_WRITE_VAR(i,max_feedrate_silent); + EEPROM_WRITE_VAR(i,max_acceleration_units_per_sq_second_silent); + char ver2[4]=EEPROM_VERSION; i=offset; EEPROM_WRITE_VAR(i,ver2); // validate data @@ -144,10 +141,30 @@ void Config_StoreSettings(uint16_t offset, uint8_t level) #ifndef DISABLE_M503 void Config_PrintSettings(uint8_t level) { // Always have this function, even with EEPROM_SETTINGS disabled, the current values will be shown +#ifdef TMC2130 + printf_P(PSTR( + "%SSteps per unit:\n%S M92 X%.2f Y%.2f Z%.2f E%.2f\n" + "%SMaximum feedrates - normal (mm/s):\n%S M203 X%.2f Y%.2f Z%.2f E%.2f\n" + "%SMaximum feedrates - stealth (mm/s):\n%S M203 X%.2f Y%.2f Z%.2f E%.2f\n" + "%SMaximum acceleration - normal (mm/s2):\n%S M201 X%lu Y%lu Z%lu E%lu\n" + "%SMaximum acceleration - stealth (mm/s2):\n%S M201 X%lu Y%lu Z%lu E%lu\n" + "%SAcceleration: S=acceleration, T=retract acceleration\n%S M204 S%.2f T%.2f\n" + "%SAdvanced variables: S=Min feedrate (mm/s), T=Min travel feedrate (mm/s), B=minimum segment time (ms), X=maximum XY jerk (mm/s), Z=maximum Z jerk (mm/s), E=maximum E jerk (mm/s)\n%S M205 S%.2f T%.2f B%.2f X%.2f Y%.2f Z%.2f E%.2f\n" + "%SHome offset (mm):\n%S M206 X%.2f Y%.2f Z%.2f\n" + ), + echomagic, echomagic, axis_steps_per_unit[X_AXIS], axis_steps_per_unit[Y_AXIS], axis_steps_per_unit[Z_AXIS], axis_steps_per_unit[E_AXIS], + echomagic, echomagic, max_feedrate_normal[X_AXIS], max_feedrate_normal[Y_AXIS], max_feedrate_normal[Z_AXIS], max_feedrate_normal[E_AXIS], + echomagic, echomagic, max_feedrate_silent[X_AXIS], max_feedrate_silent[Y_AXIS], max_feedrate_silent[Z_AXIS], max_feedrate_silent[E_AXIS], + echomagic, echomagic, max_acceleration_units_per_sq_second_normal[X_AXIS], max_acceleration_units_per_sq_second_normal[Y_AXIS], max_acceleration_units_per_sq_second_normal[Z_AXIS], max_acceleration_units_per_sq_second_normal[E_AXIS], + echomagic, echomagic, max_acceleration_units_per_sq_second_silent[X_AXIS], max_acceleration_units_per_sq_second_silent[Y_AXIS], max_acceleration_units_per_sq_second_silent[Z_AXIS], max_acceleration_units_per_sq_second_silent[E_AXIS], + echomagic, echomagic, acceleration, retract_acceleration, + echomagic, echomagic, minimumfeedrate, mintravelfeedrate, minsegmenttime, max_jerk[X_AXIS], max_jerk[Y_AXIS], max_jerk[Z_AXIS], max_jerk[E_AXIS], + echomagic, echomagic, add_homing[X_AXIS], add_homing[Y_AXIS], add_homing[Z_AXIS] +#else //TMC2130 printf_P(PSTR( "%SSteps per unit:\n%S M92 X%.2f Y%.2f Z%.2f E%.2f\n" "%SMaximum feedrates (mm/s):\n%S M203 X%.2f Y%.2f Z%.2f E%.2f\n" - "%SMaximum Acceleration (mm/s2):\n%S M201 X%.2f Y%.2f Z%.2f E%.2f\n" + "%SMaximum acceleration (mm/s2):\n%S M201 X%lu Y%lu Z%lu E%lu\n" "%SAcceleration: S=acceleration, T=retract acceleration\n%S M204 S%.2f T%.2f\n" "%SAdvanced variables: S=Min feedrate (mm/s), T=Min travel feedrate (mm/s), B=minimum segment time (ms), X=maximum XY jerk (mm/s), Z=maximum Z jerk (mm/s), E=maximum E jerk (mm/s)\n%S M205 S%.2f T%.2f B%.2f X%.2f Y%.2f Z%.2f E%.2f\n" "%SHome offset (mm):\n%S M206 X%.2f Y%.2f Z%.2f\n" @@ -158,6 +175,7 @@ void Config_PrintSettings(uint8_t level) echomagic, echomagic, acceleration, retract_acceleration, echomagic, echomagic, minimumfeedrate, mintravelfeedrate, minsegmenttime, max_jerk[X_AXIS], max_jerk[Y_AXIS], max_jerk[Z_AXIS], max_jerk[E_AXIS], echomagic, echomagic, add_homing[X_AXIS], add_homing[Y_AXIS], add_homing[Z_AXIS] +#endif //TMC2130 ); #ifdef PIDTEMP printf_P(PSTR("%SPID settings:\n%S M301 P%.2f I%.2f D%.2f\n"), @@ -219,11 +237,10 @@ bool Config_RetrieveSettings(uint16_t offset, uint8_t level) { // version number match EEPROM_READ_VAR(i,axis_steps_per_unit); - EEPROM_READ_VAR(i,max_feedrate); - EEPROM_READ_VAR(i,max_acceleration_units_per_sq_second); + EEPROM_READ_VAR(i,max_feedrate_normal); + EEPROM_READ_VAR(i,max_acceleration_units_per_sq_second_normal); // steps per sq second need to be updated to agree with the units per sq second (as they are what is used in the planner) - reset_acceleration_rates(); EEPROM_READ_VAR(i,acceleration); EEPROM_READ_VAR(i,retract_acceleration); @@ -293,6 +310,11 @@ bool Config_RetrieveSettings(uint16_t offset, uint8_t level) #endif //LIN_ADVANCE calculate_extruder_multipliers(); + EEPROM_READ_VAR(i,max_feedrate_silent); + EEPROM_READ_VAR(i,max_acceleration_units_per_sq_second_silent); + + reset_acceleration_rates(); + // Call updatePID (similar to when we have processed M301) updatePID(); SERIAL_ECHO_START; @@ -321,14 +343,18 @@ void Config_ResetDefault() float tmp1[]=DEFAULT_AXIS_STEPS_PER_UNIT; float tmp2[]=DEFAULT_MAX_FEEDRATE; long tmp3[]=DEFAULT_MAX_ACCELERATION; + float tmp4[]=DEFAULT_MAX_FEEDRATE_SILENT; + long tmp5[]=DEFAULT_MAX_ACCELERATION_SILENT; for (short i=0;i<4;i++) { axis_steps_per_unit[i]=tmp1[i]; - max_feedrate[i]=tmp2[i]; - max_acceleration_units_per_sq_second[i]=tmp3[i]; + max_feedrate_normal[i]=tmp2[i]; + max_acceleration_units_per_sq_second_normal[i]=tmp3[i]; + max_feedrate_silent[i]=tmp4[i]; + max_acceleration_units_per_sq_second_silent[i]=tmp5[i]; } - - // steps per sq second need to be updated to agree with the units per sq second + + // steps per sq second need to be updated to agree with the units per sq second reset_acceleration_rates(); acceleration=DEFAULT_ACCELERATION; diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a41f9f6f8..ca4ad1d44 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1378,7 +1378,6 @@ void setup() #ifdef TMC2130 uint8_t silentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT); if (silentMode == 0xff) silentMode = 0; -// tmc2130_mode = silentMode?TMC2130_MODE_SILENT:TMC2130_MODE_NORMAL; tmc2130_mode = TMC2130_MODE_NORMAL; uint8_t crashdet = eeprom_read_byte((uint8_t*)EEPROM_CRASH_DET); if (crashdet && !farm_mode) @@ -1432,6 +1431,7 @@ void setup() #ifdef TMC2130 tmc2130_mode = silentMode?TMC2130_MODE_SILENT:TMC2130_MODE_NORMAL; + update_mode_profile(); tmc2130_init(); #endif //TMC2130 @@ -2600,6 +2600,7 @@ void force_high_power_mode(bool start_high_power_section) { st_synchronize(); cli(); tmc2130_mode = (start_high_power_section == true) ? TMC2130_MODE_NORMAL : TMC2130_MODE_SILENT; + update_mode_profile(); tmc2130_init(); // We may have missed a stepper timer interrupt due to the time spent in the tmc2130_init() routine. // Be safe than sorry, reset the stepper timer before re-enabling interrupts. @@ -6910,6 +6911,7 @@ Sigma_Exit: case 914: // M914 Set normal mode { tmc2130_mode = TMC2130_MODE_NORMAL; + update_mode_profile(); tmc2130_init(); } break; @@ -6917,6 +6919,7 @@ Sigma_Exit: case 915: // M915 Set silent mode { tmc2130_mode = TMC2130_MODE_SILENT; + update_mode_profile(); tmc2130_init(); } break; diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index cdc3b14e2..9b08ea67f 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -72,9 +72,20 @@ //=========================================================================== unsigned long minsegmenttime; -float max_feedrate[NUM_AXIS]; // set the max speeds + +// Use M203 to override by software +float max_feedrate_normal[NUM_AXIS]; // max speeds for normal mode +float max_feedrate_silent[NUM_AXIS]; // max speeds for silent mode +float* max_feedrate = max_feedrate_normal; + +// Use M92 to override by software float axis_steps_per_unit[NUM_AXIS]; -unsigned long max_acceleration_units_per_sq_second[NUM_AXIS]; // Use M201 to override by software + +// Use M201 to override by software +unsigned long max_acceleration_units_per_sq_second_normal[NUM_AXIS]; +unsigned long max_acceleration_units_per_sq_second_silent[NUM_AXIS]; +unsigned long* max_acceleration_units_per_sq_second = max_acceleration_units_per_sq_second_normal; + float minimumfeedrate; float acceleration; // Normal acceleration mm/s^2 THIS IS THE DEFAULT ACCELERATION for all moves. M204 SXXXX float retract_acceleration; // mm/s^2 filament pull-pack and push-forward while standing still in the other axis M204 TXXXX @@ -1283,11 +1294,28 @@ void set_extrude_min_temp(float temp) void reset_acceleration_rates() { for(int8_t i=0; i < NUM_AXIS; i++) - { axis_steps_per_sqr_second[i] = max_acceleration_units_per_sq_second[i] * axis_steps_per_unit[i]; - } } -unsigned char number_of_blocks() { + +#ifdef TMC2130 +void update_mode_profile() +{ + if (tmc2130_mode == TMC2130_MODE_NORMAL) + { + max_feedrate = max_feedrate_normal; + max_acceleration_units_per_sq_second = max_acceleration_units_per_sq_second_normal; + } + else if (tmc2130_mode == TMC2130_MODE_SILENT) + { + max_feedrate = max_feedrate_silent; + max_acceleration_units_per_sq_second = max_acceleration_units_per_sq_second_silent; + } + reset_acceleration_rates(); +} +#endif //TMC2130 + +unsigned char number_of_blocks() +{ return (block_buffer_head + BLOCK_BUFFER_SIZE - block_buffer_tail) & (BLOCK_BUFFER_SIZE - 1); } #ifdef PLANNER_DIAGNOSTICS diff --git a/Firmware/planner.h b/Firmware/planner.h index 53f9bad78..779fc79b1 100644 --- a/Firmware/planner.h +++ b/Firmware/planner.h @@ -159,9 +159,20 @@ void plan_set_e_position(const float &e); void check_axes_activity(); extern unsigned long minsegmenttime; -extern float max_feedrate[NUM_AXIS]; // set the max speeds + +// Use M203 to override by software +extern float max_feedrate_normal[NUM_AXIS]; +extern float max_feedrate_silent[NUM_AXIS]; +extern float* max_feedrate; + +// Use M92 to override by software extern float axis_steps_per_unit[NUM_AXIS]; -extern unsigned long max_acceleration_units_per_sq_second[NUM_AXIS]; // Use M201 to override by software + +// Use M201 to override by software +extern unsigned long max_acceleration_units_per_sq_second_normal[NUM_AXIS]; +extern unsigned long max_acceleration_units_per_sq_second_silent[NUM_AXIS]; +extern unsigned long* max_acceleration_units_per_sq_second; + extern float minimumfeedrate; extern float acceleration; // Normal acceleration mm/s^2 THIS IS THE DEFAULT ACCELERATION for all moves. M204 SXXXX extern float retract_acceleration; // mm/s^2 filament pull-pack and push-forward while standing still in the other axis M204 TXXXX @@ -241,6 +252,8 @@ void set_extrude_min_temp(float temp); void reset_acceleration_rates(); #endif +void update_mode_profile(); + unsigned char number_of_blocks(); // #define PLANNER_DIAGNOSTICS diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 240c41186..899943ab9 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4066,8 +4066,9 @@ static void lcd_silent_mode_set() { // MYSERIAL.print("standstill OK"); // else // MYSERIAL.print("standstill NG!"); - cli(); + cli(); tmc2130_mode = (SilentModeMenu != SILENT_MODE_NORMAL)?TMC2130_MODE_SILENT:TMC2130_MODE_NORMAL; + update_mode_profile(); tmc2130_init(); // We may have missed a stepper timer interrupt due to the time spent in tmc2130_init. // Be safe than sorry, reset the stepper timer before re-enabling interrupts. From fd0b7c25e56fb87c6730acdb19e27de872205f5f Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 19 Jul 2018 19:12:46 +0200 Subject: [PATCH 4/9] TMC2130 speed and accel limitation (M201, M203) for stealth and normal mode --- Firmware/Marlin_main.cpp | 58 ++++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ca4ad1d44..d7ca2e93f 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5765,16 +5765,29 @@ Sigma_Exit: } break; case 201: // M201 - for(int8_t i=0; i < NUM_AXIS; i++) - { - if(code_seen(axis_codes[i])) - { - max_acceleration_units_per_sq_second[i] = code_value(); - } - } - // steps per sq second need to be updated to agree with the units per sq second (as they are what is used in the planner) - reset_acceleration_rates(); - break; + for (int8_t i = 0; i < NUM_AXIS; i++) + { + if (code_seen(axis_codes[i])) + { + int val = code_value(); +#ifdef TMC2130 + if ((i == X_AXIS) || (i == Y_AXIS)) + { + int max_val = 0; + if (tmc2130_mode == TMC2130_MODE_NORMAL) + max_val = NORMAL_MAX_ACCEL_XY; + else if (tmc2130_mode == TMC2130_MODE_SILENT) + max_val = SILENT_MAX_ACCEL_XY; + if (val > max_val) + val = max_val; + } +#endif + max_acceleration_units_per_sq_second[i] = val; + } + } + // steps per sq second need to be updated to agree with the units per sq second (as they are what is used in the planner) + reset_acceleration_rates(); + break; #if 0 // Not used for Sprinter/grbl gen6 case 202: // M202 for(int8_t i=0; i < NUM_AXIS; i++) { @@ -5783,10 +5796,27 @@ Sigma_Exit: break; #endif case 203: // M203 max feedrate mm/sec - for(int8_t i=0; i < NUM_AXIS; i++) { - if(code_seen(axis_codes[i])) max_feedrate[i] = code_value(); - } - break; + for (int8_t i = 0; i < NUM_AXIS; i++) + { + if (code_seen(axis_codes[i])) + { + float val = code_value(); +#ifdef TMC2130 + if ((i == X_AXIS) || (i == Y_AXIS)) + { + float max_val = 0; + if (tmc2130_mode == TMC2130_MODE_NORMAL) + max_val = NORMAL_MAX_FEEDRATE_XY; + else if (tmc2130_mode == TMC2130_MODE_SILENT) + max_val = SILENT_MAX_FEEDRATE_XY; + if (val > max_val) + val = max_val; + } +#endif //TMC2130 + max_feedrate[i] = val; + } + } + break; case 204: // M204 acclereration S normal moves T filmanent only moves { if(code_seen('S')) acceleration = code_value() ; From 2a66251170659810a6b26acf9be13346f7e31ef8 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 19 Jul 2018 19:33:28 +0200 Subject: [PATCH 5/9] _DISABLE_M42_M226 removed --- Firmware/Marlin_main.cpp | 6 ------ Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 2 -- 2 files changed, 8 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index d7ca2e93f..38b225870 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -484,9 +484,7 @@ static float feedrate = 1500.0, next_feedrate, saved_feedrate; // Also there is bool axis_relative_modes[] per axis flag. static bool relative_mode = false; -#ifndef _DISABLE_M42_M226 const int sensitive_pins[] = SENSITIVE_PINS; // Sensitive pin list for M42 -#endif //_DISABLE_M42_M226 //static float tt = 0; //static float bt = 0; @@ -4871,7 +4869,6 @@ void process_commands() autotempShutdown(); } break; -#ifndef _DISABLE_M42_M226 case 42: //M42 -Change pin status via gcode if (code_seen('S')) { @@ -4899,7 +4896,6 @@ void process_commands() } } break; -#endif //_DISABLE_M42_M226 case 44: // M44: Prusa3D: Reset the bed skew and offset calibration. // Reset the baby step value and the baby step applied flag. @@ -5963,7 +5959,6 @@ Sigma_Exit: } break; -#ifndef _DISABLE_M42_M226 case 226: // M226 P S- Wait until the specified pin reaches the state required { if(code_seen('P')){ @@ -6015,7 +6010,6 @@ Sigma_Exit: } } break; -#endif //_DISABLE_M42_M226 #if NUM_SERVOS > 0 case 280: // M280 - set servo position absolute. P: servo index, S: angle or microseconds diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 5b78f1d9a..0711d3c7d 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -138,8 +138,6 @@ //#define BACKLASH_X //#define BACKLASH_Y -// Disable some commands -#define _DISABLE_M42_M226 // Minimum ambient temperature limit to start triggering MINTEMP errors [C] // this value is litlebit higher that real limit, because ambient termistor is on the board and is temperated from it, From 5483bee885a99d604e5d350717979353ba4477ba Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 19 Jul 2018 20:55:38 +0200 Subject: [PATCH 6/9] FSensor - meassuring filament optical quality --- Firmware/Marlin_main.cpp | 28 +++++++++---- Firmware/fsensor.cpp | 87 ++++++++++++++++++++-------------------- Firmware/fsensor.h | 21 ++++++---- Firmware/ultralcd.cpp | 10 +---- 4 files changed, 79 insertions(+), 67 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 38b225870..74719f723 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -856,7 +856,7 @@ void factory_reset(char level, bool quiet) eeprom_update_word((uint16_t *)EEPROM_POWER_COUNT_TOT, 0); fsensor_enable(); - fautoload_set(true); + fsensor_autoload_set(true); WRITE(BEEPER, HIGH); _delay_ms(100); @@ -3107,6 +3107,8 @@ void gcode_M114() void gcode_M701() { + printf_P(PSTR("gcode_M701 begin\n")); + #if defined (SNMM) || defined (SNMM_V2) extr_adj(snmm_extruder);//loads current extruder #else @@ -3114,7 +3116,13 @@ void gcode_M701() custom_message = true; custom_message_type = 2; - + bool old_watch_runout = fsensor_watch_runout; + fsensor_watch_runout = false; + fsensor_st_sum = 0; + fsensor_yd_sum = 0; + fsensor_er_sum = 0; + fsensor_yd_min = 255; + fsensor_yd_max = 0; lcd_setstatuspgm(_T(MSG_LOADING_FILAMENT)); current_position[E_AXIS] += 40; @@ -3156,6 +3164,11 @@ void gcode_M701() custom_message_type = 0; #endif + fsensor_err_cnt = 0; + fsensor_watch_runout = old_watch_runout; + printf_P(_N("\nFSENSOR st_sum=%lu yd_sum=%lu er_sum=%lu\n"), fsensor_st_sum, fsensor_yd_sum, fsensor_er_sum); + printf_P(_N("\nFSENSOR yd_min=%hhu yd_max=%hhu yd_avg=%hhu\n"), fsensor_yd_min, fsensor_yd_max, fsensor_yd_sum * FSENSOR_CHUNK_LEN / fsensor_st_sum); + printf_P(PSTR("gcode_M701 end\n")); } /** * @brief Get serial number from 32U2 processor @@ -6543,15 +6556,14 @@ Sigma_Exit: KEEPALIVE_STATE(PAUSED_FOR_USER); #ifdef PAT9125 - if (filament_autoload_enabled && (old_fsensor_enabled || fsensor_M600)) fsensor_autoload_check_start(); + if (filament_autoload_enabled && (old_fsensor_enabled || !fsensor_watch_runout)) fsensor_autoload_check_start(); #endif //PAT9125 -// printf_P(PSTR("M600 PAT9125 filament_autoload_enabled=%d, old_fsensor_enabled=%d, fsensor_M600=%d"), filament_autoload_enabled, old_fsensor_enabled, fsensor_M600); while(!lcd_clicked()) { manage_heater(); manage_inactivity(true); #ifdef PAT9125 - if (filament_autoload_enabled && (old_fsensor_enabled || fsensor_M600) && fsensor_check_autoload()) + if (filament_autoload_enabled && (old_fsensor_enabled || !fsensor_watch_runout) && fsensor_check_autoload()) { tone(BEEPER, 1000); delay_keep_alive(50); @@ -6567,7 +6579,7 @@ Sigma_Exit: } #ifdef PAT9125 - if (filament_autoload_enabled && (old_fsensor_enabled || fsensor_M600)) fsensor_autoload_check_stop(); + if (filament_autoload_enabled && (old_fsensor_enabled || !fsensor_watch_runout)) fsensor_autoload_check_stop(); #endif //PAT9125 //WRITE(BEEPER, LOW); KEEPALIVE_STATE(IN_HANDLER); @@ -6717,6 +6729,7 @@ Sigma_Exit: custom_message_type = 0; #ifdef PAT9125 +/* // fsensor_enabled = old_fsensor_enabled; //temporary solution for unexpected restarting if (fsensor_M600) @@ -6733,6 +6746,7 @@ Sigma_Exit: fsensor_restore_print_and_continue(); } fsensor_M600 = false; +*/ #endif //PAT9125 } @@ -7659,7 +7673,7 @@ static void handleSafetyTimer() void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument set in Marlin.h { #ifdef PAT9125 - if (fsensor_enabled && filament_autoload_enabled && !fsensor_M600 && !moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL)) + if (fsensor_enabled && filament_autoload_enabled && fsensor_watch_runout && !moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL)) { if (fsensor_autoload_enabled) { diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp index 4ce8db187..c2291235a 100644 --- a/Firmware/fsensor.cpp +++ b/Firmware/fsensor.cpp @@ -16,8 +16,6 @@ const char ERRMSG_PAT9125_NOT_RESP[] PROGMEM = "PAT9125 not responding (%d)!\n"; #define FSENSOR_ERR_MAX 10 //filament sensor max error count #define FSENSOR_INT_PIN 63 //filament sensor interrupt pin PK1 #define FSENSOR_INT_PIN_MSK 0x02 //filament sensor interrupt pin mask (bit1) -//#define FSENSOR_CHUNK_LEN 280 //filament sensor chunk length in steps - 1mm -#define FSENSOR_CHUNK_LEN 180 //filament sensor chunk length in steps - 0.64mm extern void stop_and_save_print_to_ram(float z_move, float e_move); extern void restore_print_from_ram_and_continue(float e_move); @@ -36,11 +34,15 @@ void fsensor_restore_print_and_continue() //uint8_t fsensor_int_pin = FSENSOR_INT_PIN; uint8_t fsensor_int_pin_old = 0; int16_t fsensor_chunk_len = FSENSOR_CHUNK_LEN; + bool fsensor_enabled = true; +bool fsensor_watch_runout = true; bool fsensor_not_responding = false; -bool fsensor_M600 = false; + uint8_t fsensor_err_cnt = 0; int16_t fsensor_st_cnt = 0; + + uint8_t fsensor_log = 1; //autoload enable/disable flag @@ -53,15 +55,8 @@ uint8_t fsensor_autoload_sum = 0; uint32_t fsensor_st_sum = 0; uint32_t fsensor_yd_sum = 0; uint32_t fsensor_er_sum = 0; - -void fsensor_block() -{ - fsensor_enabled = false; -} - -void fsensor_unblock() { - fsensor_enabled = (eeprom_read_byte((uint8_t*)EEPROM_FSENSOR) == 0x01); -} +uint8_t fsensor_yd_min = 255; +uint8_t fsensor_yd_max = 0; bool fsensor_enable() { @@ -73,7 +68,7 @@ bool fsensor_enable() else fsensor_not_responding = true; fsensor_enabled = pat9125?true:false; - fsensor_M600 = false; + fsensor_watch_runout = true; fsensor_err_cnt = 0; eeprom_update_byte((uint8_t*)EEPROM_FSENSOR, fsensor_enabled?0x01:0x00); FSensorStateMenu = fsensor_enabled?1:0; @@ -94,7 +89,7 @@ void fsensor_disable() FSensorStateMenu = 0; } -void fautoload_set(bool State) +void fsensor_autoload_set(bool State) { filament_autoload_enabled = State; eeprom_update_byte((unsigned char *)EEPROM_FSENS_AUTOLOAD_ENABLED, filament_autoload_enabled); @@ -211,9 +206,14 @@ ISR(PCINT2_vect) { if (fsensor_err_cnt) fsensor_err_cnt--; - fsensor_st_sum += st_cnt; - fsensor_yd_sum += pat9125_y; + if (st_cnt == FSENSOR_CHUNK_LEN) + { + if (fsensor_yd_min > pat9125_y) fsensor_yd_min = pat9125_y; + if (fsensor_yd_max < pat9125_y) fsensor_yd_max = pat9125_y; + } } + fsensor_st_sum += st_cnt; + fsensor_yd_sum += pat9125_y; } else //negative movement { @@ -264,36 +264,35 @@ void fsensor_st_block_chunk(block_t* bl, int cnt) void fsensor_update() { - if (!fsensor_enabled || fsensor_M600) return; - if (fsensor_err_cnt > FSENSOR_ERR_MAX) - { - fsensor_stop_and_save_print(); - - fsensor_err_cnt = 0; - - enquecommand_front_P((PSTR("G1 E-3 F200"))); - process_commands(); - cmdqueue_pop_front(); - st_synchronize(); - - enquecommand_front_P((PSTR("G1 E3 F200"))); - process_commands(); - cmdqueue_pop_front(); - st_synchronize(); - - if (fsensor_err_cnt == 0) + if (fsensor_enabled && fsensor_watch_runout) + if (fsensor_err_cnt > FSENSOR_ERR_MAX) { - fsensor_restore_print_and_continue(); + fsensor_stop_and_save_print(); + + fsensor_err_cnt = 0; + + enquecommand_front_P((PSTR("G1 E-3 F200"))); + process_commands(); + cmdqueue_pop_front(); + st_synchronize(); + + enquecommand_front_P((PSTR("G1 E3 F200"))); + process_commands(); + cmdqueue_pop_front(); + st_synchronize(); + + if (fsensor_err_cnt == 0) + { + fsensor_restore_print_and_continue(); + } + else + { + eeprom_update_byte((uint8_t*)EEPROM_FERROR_COUNT, eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT) + 1); + eeprom_update_word((uint16_t*)EEPROM_FERROR_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) + 1); + enquecommand_front_P((PSTR("M600"))); + fsensor_watch_runout = false; + } } - else - { - eeprom_update_byte((uint8_t*)EEPROM_FERROR_COUNT, eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT) + 1); - eeprom_update_word((uint16_t*)EEPROM_FERROR_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) + 1); - enquecommand_front_P((PSTR("M600"))); - fsensor_M600 = true; -// fsensor_enabled = false; - } - } } #endif //PAT9125 diff --git a/Firmware/fsensor.h b/Firmware/fsensor.h index 486331a0e..eda8d43fe 100644 --- a/Firmware/fsensor.h +++ b/Firmware/fsensor.h @@ -3,20 +3,19 @@ #include "planner.h" +//#define FSENSOR_CHUNK_LEN 280 //filament sensor chunk length in steps - 1mm +#define FSENSOR_CHUNK_LEN 180 //filament sensor chunk length in steps - 0.64mm + //save restore printing extern void fsensor_stop_and_save_print(); extern void fsensor_restore_print_and_continue(); -//temporarily enable/disable without writing to eeprom -extern void fsensor_block(); -extern void fsensor_unblock(); - //enable/disable extern bool fsensor_enable(); extern void fsensor_disable(); extern bool filament_autoload_enabled; -extern void fautoload_set(bool State); +extern void fsensor_autoload_set(bool State); //update (perform M600 on filament runout) extern void fsensor_update(); @@ -39,15 +38,23 @@ extern void fsensor_st_block_chunk(block_t* bl, int cnt); //minimum meassured chunk length in steps extern int16_t fsensor_chunk_len; -//M600 in progress -extern bool fsensor_M600; //enable/disable flag extern bool fsensor_enabled; +//watch runout flag +extern bool fsensor_watch_runout; //not responding flag extern bool fsensor_not_responding; +extern uint8_t fsensor_err_cnt; + //autoload enable/disable flag extern bool fsensor_autoload_enabled; +extern uint32_t fsensor_st_sum; +extern uint32_t fsensor_yd_sum; +extern uint32_t fsensor_er_sum; +extern uint8_t fsensor_yd_min; +extern uint8_t fsensor_yd_max; + #endif //FSENSOR_H diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 899943ab9..6ea1b5f15 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -146,8 +146,6 @@ int8_t FSensorStateMenu = 1; int8_t CrashDetectMenu = 1; -extern void fsensor_block(); -extern void fsensor_unblock(); extern bool fsensor_enable(); extern void fsensor_disable(); @@ -2282,7 +2280,7 @@ void lcd_set_fan_check() { } void lcd_set_filament_autoload() { - fautoload_set(!filament_autoload_enabled); + fsensor_autoload_set(!filament_autoload_enabled); } void lcd_unLoadFilament() @@ -4465,9 +4463,6 @@ void lcd_wizard(int state) { state = 7; break; case 7: //load filament -#ifdef PAT9125 - fsensor_block(); -#endif //PAT9125 lcd_show_fullscreen_message_and_wait_P(_i("Please insert PLA filament to the extruder, then press knob to load it."));////MSG_WIZARD_LOAD_FILAMENT c=20 r=8 lcd_update_enable(false); lcd_clear(); @@ -4476,9 +4471,6 @@ void lcd_wizard(int state) { change_extr(0); #endif gcode_M701(); -#ifdef PAT9125 - fsensor_unblock(); -#endif //PAT9125 state = 9; break; case 8: From a09d44b869d5488908868cbd667b14f0b587bc8b Mon Sep 17 00:00:00 2001 From: MRprusa3d Date: Fri, 20 Jul 2018 04:47:33 +0200 Subject: [PATCH 7/9] PowerPanic experimental --- Firmware/Configuration.h | 5 + Firmware/Marlin.h | 10 +- Firmware/Marlin_main.cpp | 312 +++++++++++++++++++-------------------- 3 files changed, 157 insertions(+), 170 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 469386e5f..1ad38e1a0 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -181,6 +181,11 @@ #define EEPROM_EXTRUDEMULTIPLY (EEPROM_EXTRUDER_MULTIPLIER_2 - 2) // uint16 +// +#define EEPROM_UVLO_TINY_CURRENT_POSITION_Z (EEPROM_EXTRUDEMULTIPLY-4) // float +#define EEPROM_UVLO_TINY_Z_MICROSTEPS (EEPROM_UVLO_TINY_CURRENT_POSITION_Z-2) // uint16 + + //TMC2130 configuration #define EEPROM_TMC_AXIS_SIZE //axis configuration block size #define EEPROM_TMC_X (EEPROM_TMC + 0 * EEPROM_TMC_AXIS_SIZE) //X axis configuration blok diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 11e35a102..064d96d4e 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -396,6 +396,7 @@ void serialecho_temperatures(); bool check_commands(); void uvlo_(); +void uvlo_tiny(); void recover_print(uint8_t automatic); void setup_uvlo_interrupt(); @@ -403,7 +404,8 @@ void setup_uvlo_interrupt(); void setup_fan_interrupt(); #endif -extern void recover_machine_state_after_power_panic(); +//extern void recover_machine_state_after_power_panic(); +extern void recover_machine_state_after_power_panic(bool bTiny); extern void restore_print_from_eeprom(); extern void position_menu(); @@ -464,8 +466,4 @@ void gcode_M701(); #define UVLO !(PINE & (1<<4)) -void proc_commands(); - -bool mmu_get_reponse(); -void mmu_not_responding(); -void mmu_load_to_nozzle(); \ No newline at end of file +void proc_commands(); \ No newline at end of file diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 74719f723..fe0bc6592 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -484,7 +484,9 @@ static float feedrate = 1500.0, next_feedrate, saved_feedrate; // Also there is bool axis_relative_modes[] per axis flag. static bool relative_mode = false; +#ifndef _DISABLE_M42_M226 const int sensitive_pins[] = SENSITIVE_PINS; // Sensitive pin list for M42 +#endif //_DISABLE_M42_M226 //static float tt = 0; //static float bt = 0; @@ -856,7 +858,7 @@ void factory_reset(char level, bool quiet) eeprom_update_word((uint16_t *)EEPROM_POWER_COUNT_TOT, 0); fsensor_enable(); - fsensor_autoload_set(true); + fautoload_set(true); WRITE(BEEPER, HIGH); _delay_ms(100); @@ -1376,6 +1378,7 @@ void setup() #ifdef TMC2130 uint8_t silentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT); if (silentMode == 0xff) silentMode = 0; +// tmc2130_mode = silentMode?TMC2130_MODE_SILENT:TMC2130_MODE_NORMAL; tmc2130_mode = TMC2130_MODE_NORMAL; uint8_t crashdet = eeprom_read_byte((uint8_t*)EEPROM_CRASH_DET); if (crashdet && !farm_mode) @@ -1429,7 +1432,6 @@ void setup() #ifdef TMC2130 tmc2130_mode = silentMode?TMC2130_MODE_SILENT:TMC2130_MODE_NORMAL; - update_mode_profile(); tmc2130_init(); #endif //TMC2130 @@ -1723,7 +1725,11 @@ void setup() #endif //TMC2130 #ifdef UVLO_SUPPORT - if (eeprom_read_byte((uint8_t*)EEPROM_UVLO) == 1) { //previous print was terminated by UVLO +//-// +MYSERIAL.println(">>> Setup"); +MYSERIAL.println(eeprom_read_byte((uint8_t*)EEPROM_UVLO),DEC); +// if (eeprom_read_byte((uint8_t*)EEPROM_UVLO) == 1) { //previous print was terminated by UVLO + if (eeprom_read_byte((uint8_t*)EEPROM_UVLO) != 0) { //previous print was terminated by UVLO /* if (lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_RECOVER_PRINT), false)) recover_print(); else { @@ -1749,7 +1755,8 @@ void setup() #endif if ( lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_RECOVER_PRINT), false) ) recover_print(0); else { - eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0); +//-// +// eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0); lcd_update_enable(true); lcd_update(2); lcd_setstatuspgm(_T(WELCOME_MSG)); @@ -2598,7 +2605,6 @@ void force_high_power_mode(bool start_high_power_section) { st_synchronize(); cli(); tmc2130_mode = (start_high_power_section == true) ? TMC2130_MODE_NORMAL : TMC2130_MODE_SILENT; - update_mode_profile(); tmc2130_init(); // We may have missed a stepper timer interrupt due to the time spent in the tmc2130_init() routine. // Be safe than sorry, reset the stepper timer before re-enabling interrupts. @@ -3107,22 +3113,14 @@ void gcode_M114() void gcode_M701() { - printf_P(PSTR("gcode_M701 begin\n")); - -#if defined (SNMM) || defined (SNMM_V2) +#ifdef SNMM extr_adj(snmm_extruder);//loads current extruder #else enable_z(); custom_message = true; custom_message_type = 2; - bool old_watch_runout = fsensor_watch_runout; - fsensor_watch_runout = false; - fsensor_st_sum = 0; - fsensor_yd_sum = 0; - fsensor_er_sum = 0; - fsensor_yd_min = 255; - fsensor_yd_max = 0; + lcd_setstatuspgm(_T(MSG_LOADING_FILAMENT)); current_position[E_AXIS] += 40; @@ -3164,11 +3162,6 @@ void gcode_M701() custom_message_type = 0; #endif - fsensor_err_cnt = 0; - fsensor_watch_runout = old_watch_runout; - printf_P(_N("\nFSENSOR st_sum=%lu yd_sum=%lu er_sum=%lu\n"), fsensor_st_sum, fsensor_yd_sum, fsensor_er_sum); - printf_P(_N("\nFSENSOR yd_min=%hhu yd_max=%hhu yd_avg=%hhu\n"), fsensor_yd_min, fsensor_yd_max, fsensor_yd_sum * FSENSOR_CHUNK_LEN / fsensor_st_sum); - printf_P(PSTR("gcode_M701 end\n")); } /** * @brief Get serial number from 32U2 processor @@ -3376,13 +3369,7 @@ void process_commands() } else if (code_seen("thx")) { no_response = false; - } - else if (code_seen("MMURES")) { - fprintf_P(uart2io, PSTR("X0")); - bool response = mmu_get_reponse(); - if (!response) mmu_not_responding(); - } - else if (code_seen("RESET")) { + } else if (code_seen("RESET")) { // careful! if (farm_mode) { #ifdef WATCHDOG @@ -4779,6 +4766,8 @@ void process_commands() card.openFile(strchr_pointer + 4,true); break; case 24: //M24 - Start SD print +//-// +eeprom_update_byte((uint8_t*)EEPROM_UVLO,0); if (!card.paused) failstats_reset_print(); card.startFileprint(); @@ -4882,6 +4871,7 @@ void process_commands() autotempShutdown(); } break; +#ifndef _DISABLE_M42_M226 case 42: //M42 -Change pin status via gcode if (code_seen('S')) { @@ -4909,6 +4899,7 @@ void process_commands() } } break; +#endif //_DISABLE_M42_M226 case 44: // M44: Prusa3D: Reset the bed skew and offset calibration. // Reset the baby step value and the baby step applied flag. @@ -5774,29 +5765,16 @@ Sigma_Exit: } break; case 201: // M201 - for (int8_t i = 0; i < NUM_AXIS; i++) - { - if (code_seen(axis_codes[i])) - { - int val = code_value(); -#ifdef TMC2130 - if ((i == X_AXIS) || (i == Y_AXIS)) - { - int max_val = 0; - if (tmc2130_mode == TMC2130_MODE_NORMAL) - max_val = NORMAL_MAX_ACCEL_XY; - else if (tmc2130_mode == TMC2130_MODE_SILENT) - max_val = SILENT_MAX_ACCEL_XY; - if (val > max_val) - val = max_val; - } -#endif - max_acceleration_units_per_sq_second[i] = val; - } - } - // steps per sq second need to be updated to agree with the units per sq second (as they are what is used in the planner) - reset_acceleration_rates(); - break; + for(int8_t i=0; i < NUM_AXIS; i++) + { + if(code_seen(axis_codes[i])) + { + max_acceleration_units_per_sq_second[i] = code_value(); + } + } + // steps per sq second need to be updated to agree with the units per sq second (as they are what is used in the planner) + reset_acceleration_rates(); + break; #if 0 // Not used for Sprinter/grbl gen6 case 202: // M202 for(int8_t i=0; i < NUM_AXIS; i++) { @@ -5805,27 +5783,10 @@ Sigma_Exit: break; #endif case 203: // M203 max feedrate mm/sec - for (int8_t i = 0; i < NUM_AXIS; i++) - { - if (code_seen(axis_codes[i])) - { - float val = code_value(); -#ifdef TMC2130 - if ((i == X_AXIS) || (i == Y_AXIS)) - { - float max_val = 0; - if (tmc2130_mode == TMC2130_MODE_NORMAL) - max_val = NORMAL_MAX_FEEDRATE_XY; - else if (tmc2130_mode == TMC2130_MODE_SILENT) - max_val = SILENT_MAX_FEEDRATE_XY; - if (val > max_val) - val = max_val; - } -#endif //TMC2130 - max_feedrate[i] = val; - } - } - break; + for(int8_t i=0; i < NUM_AXIS; i++) { + if(code_seen(axis_codes[i])) max_feedrate[i] = code_value(); + } + break; case 204: // M204 acclereration S normal moves T filmanent only moves { if(code_seen('S')) acceleration = code_value() ; @@ -5972,6 +5933,7 @@ Sigma_Exit: } break; +#ifndef _DISABLE_M42_M226 case 226: // M226 P S- Wait until the specified pin reaches the state required { if(code_seen('P')){ @@ -6023,6 +5985,7 @@ Sigma_Exit: } } break; +#endif //_DISABLE_M42_M226 #if NUM_SERVOS > 0 case 280: // M280 - set servo position absolute. P: servo index, S: angle or microseconds @@ -6265,7 +6228,7 @@ Sigma_Exit: { #ifdef PAT9125 bool old_fsensor_enabled = fsensor_enabled; -// fsensor_enabled = false; //temporary solution for unexpected restarting + fsensor_enabled = false; //temporary solution for unexpected restarting #endif //PAT9125 st_synchronize(); @@ -6516,22 +6479,13 @@ Sigma_Exit: //finish moves st_synchronize(); + lcd_display_message_fullscreen_P(_T(MSG_PULL_OUT_FILAMENT)); + //disable extruder steppers so filament can be removed disable_e0(); disable_e1(); disable_e2(); delay(100); - -#ifdef SNMM_V2 - fprintf_P(uart2io, PSTR("U0\n")); - - // get response - bool response = mmu_get_reponse(); - if (!response) mmu_not_responding(); -#else - lcd_display_message_fullscreen_P(_T(MSG_PULL_OUT_FILAMENT)); - - WRITE(BEEPER, HIGH); @@ -6542,7 +6496,6 @@ Sigma_Exit: counterBeep++; } WRITE(BEEPER, LOW); -#endif KEEPALIVE_STATE(PAUSED_FOR_USER); lcd_change_fil_state = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Was filament unload successful?"), false, true);////MSG_UNLOAD_SUCCESSFUL c=20 r=2 @@ -6556,14 +6509,15 @@ Sigma_Exit: KEEPALIVE_STATE(PAUSED_FOR_USER); #ifdef PAT9125 - if (filament_autoload_enabled && (old_fsensor_enabled || !fsensor_watch_runout)) fsensor_autoload_check_start(); + if (filament_autoload_enabled && (old_fsensor_enabled || fsensor_M600)) fsensor_autoload_check_start(); #endif //PAT9125 +// printf_P(PSTR("M600 PAT9125 filament_autoload_enabled=%d, old_fsensor_enabled=%d, fsensor_M600=%d"), filament_autoload_enabled, old_fsensor_enabled, fsensor_M600); while(!lcd_clicked()) { manage_heater(); manage_inactivity(true); #ifdef PAT9125 - if (filament_autoload_enabled && (old_fsensor_enabled || !fsensor_watch_runout) && fsensor_check_autoload()) + if (filament_autoload_enabled && (old_fsensor_enabled || fsensor_M600) && fsensor_check_autoload()) { tone(BEEPER, 1000); delay_keep_alive(50); @@ -6579,7 +6533,7 @@ Sigma_Exit: } #ifdef PAT9125 - if (filament_autoload_enabled && (old_fsensor_enabled || !fsensor_watch_runout)) fsensor_autoload_check_stop(); + if (filament_autoload_enabled && (old_fsensor_enabled || fsensor_M600)) fsensor_autoload_check_stop(); #endif //PAT9125 //WRITE(BEEPER, LOW); KEEPALIVE_STATE(IN_HANDLER); @@ -6611,19 +6565,14 @@ Sigma_Exit: plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 400, active_extruder); target[E_AXIS] += 10; plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 50, active_extruder); - //Extrude some filament - target[E_AXIS]+= FILAMENTCHANGE_FINALFEED ; - plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], FILAMENTCHANGE_EXFEED, active_extruder); #else target[E_AXIS] += FILAMENTCHANGE_FIRSTFEED; plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], FILAMENTCHANGE_EFEED, active_extruder); - //Extrude some filament - target[E_AXIS]+= FILAMENTCHANGE_FINALFEED ; - plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], FILAMENTCHANGE_EXFEED, active_extruder); - #endif // SNMM - + //Extrude some filament + target[E_AXIS]+= FILAMENTCHANGE_FINALFEED ; + plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], FILAMENTCHANGE_EXFEED, active_extruder); //Wait for user to check the state lcd_change_fil_state = 0; @@ -6729,8 +6678,7 @@ Sigma_Exit: custom_message_type = 0; #ifdef PAT9125 -/* -// fsensor_enabled = old_fsensor_enabled; //temporary solution for unexpected restarting + fsensor_enabled = old_fsensor_enabled; //temporary solution for unexpected restarting if (fsensor_M600) { @@ -6742,11 +6690,10 @@ Sigma_Exit: cmdqueue_pop_front(); } KEEPALIVE_STATE(IN_HANDLER); -// fsensor_enable(); + fsensor_enable(); fsensor_restore_print_and_continue(); } - fsensor_M600 = false; -*/ + #endif //PAT9125 } @@ -6949,7 +6896,6 @@ Sigma_Exit: case 914: // M914 Set normal mode { tmc2130_mode = TMC2130_MODE_NORMAL; - update_mode_profile(); tmc2130_init(); } break; @@ -6957,7 +6903,6 @@ Sigma_Exit: case 915: // M915 Set silent mode { tmc2130_mode = TMC2130_MODE_SILENT; - update_mode_profile(); tmc2130_init(); } break; @@ -7049,20 +6994,12 @@ Sigma_Exit: break; case 701: //M701: load filament { - #ifdef SNMM_V2 - if (code_seen('E')) - { - snmm_extruder = code_value(); - } - #endif - - gcode_M701(); } break; case 702: { -#if defined (SNMM) || defined (SNMM_V2) +#ifdef SNMM if (code_seen('U')) { extr_unload_used(); //unload all filaments which were used in current print } @@ -7070,12 +7007,12 @@ Sigma_Exit: extr_unload(); //unload just current filament } else { - extr_unload_all(); //unload all filaments + extr_unload_all(); //unload all filaments } #else #ifdef PAT9125 bool old_fsensor_enabled = fsensor_enabled; -// fsensor_enabled = false; + fsensor_enabled = false; #endif //PAT9125 custom_message = true; custom_message_type = 2; @@ -7119,7 +7056,7 @@ Sigma_Exit: custom_message = false; custom_message_type = 0; #ifdef PAT9125 -// fsensor_enabled = old_fsensor_enabled; + fsensor_enabled = old_fsensor_enabled; #endif //PAT9125 #endif } @@ -7181,15 +7118,16 @@ Sigma_Exit: break; } - bool response = mmu_get_reponse(); - if (!response) mmu_not_responding(); + - snmm_extruder = tmp_extruder; //filament change is finished - - if (*(strchr_pointer + index) == '?') { // for single material usage with mmu - mmu_load_to_nozzle(); - - } + + // get response + uart2_rx_clr(); + while (!uart2_rx_ok()) + { + //printf_P(PSTR("waiting..\n")); + delay_keep_alive(100); + } #endif #ifdef SNMM @@ -7673,7 +7611,7 @@ static void handleSafetyTimer() void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument set in Marlin.h { #ifdef PAT9125 - if (fsensor_enabled && filament_autoload_enabled && fsensor_watch_runout && !moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL)) + if (fsensor_enabled && filament_autoload_enabled && !fsensor_M600 && !moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL)) { if (fsensor_autoload_enabled) { @@ -8510,6 +8448,8 @@ void uvlo_() { unsigned long time_start = millis(); bool sd_print = card.sdprinting; +//-// +MYSERIAL.println(">>> uvlo()"); // Conserve power as soon as possible. disable_x(); disable_y(); @@ -8666,6 +8606,51 @@ void uvlo_() }; } + + +void uvlo_tiny() +{ +uint16_t z_microsteps=0; +bool sd_print=card.sdprinting; + +MYSERIAL.println(">>> uvloTiny()"); +// Conserve power as soon as possible. +disable_x(); +disable_y(); +disable_e0(); + +#ifdef TMC2130 +tmc2130_set_current_h(Z_AXIS, 20); +tmc2130_set_current_r(Z_AXIS, 20); +#endif //TMC2130 + +// Read out the current Z motor microstep counter +#ifdef TMC2130 +z_microsteps=tmc2130_rd_MSCNT(Z_TMC2130_CS); +#endif //TMC2130 + +planner_abort_hard(); +sei(); +plan_buffer_line( + current_position[X_AXIS], + current_position[Y_AXIS], + current_position[Z_AXIS]+UVLO_Z_AXIS_SHIFT+float((1024-z_microsteps+7)>>4)/axis_steps_per_unit[Z_AXIS], + current_position[E_AXIS], + 40, active_extruder); +st_synchronize(); +disable_z(); + +// Finaly store the "power outage" flag. +//if(sd_print) + eeprom_update_byte((uint8_t*)EEPROM_UVLO,2); + +eeprom_update_word((uint16_t*)(EEPROM_UVLO_TINY_Z_MICROSTEPS),z_microsteps); +eeprom_update_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z), current_position[Z_AXIS]); + +// Increment power failure counter +eeprom_update_byte((uint8_t*)EEPROM_POWER_COUNT, eeprom_read_byte((uint8_t*)EEPROM_POWER_COUNT) + 1); +eeprom_update_word((uint16_t*)EEPROM_POWER_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_POWER_COUNT_TOT) + 1); +} #endif //UVLO_SUPPORT #if (defined(FANCHECK) && defined(TACH_1) && (TACH_1 >-1)) @@ -8718,7 +8703,20 @@ void setup_uvlo_interrupt() { ISR(INT4_vect) { EIMSK &= ~(1 << 4); //disable INT4 interrupt to make sure that this code will be executed just once SERIAL_ECHOLNPGM("INT4"); - if (IS_SD_PRINTING) uvlo_(); +//-// +// if (IS_SD_PRINTING) uvlo_(); +//if(IS_SD_PRINTING && (!(eeprom_read_byte((uint8_t*)EEPROM_UVLO))) ) uvlo_(); +if(IS_SD_PRINTING && (!(eeprom_read_byte((uint8_t*)EEPROM_UVLO))) ) uvlo_(); +if(eeprom_read_byte((uint8_t*)EEPROM_UVLO)) uvlo_tiny(); +/* +if(IS_SD_PRINTING) + { +MYSERIAL.println(">>> "); + if(!(eeprom_read_byte((uint8_t*)EEPROM_UVLO))) + uvlo_(); + else uvlo_tiny(); + } +*/ } void recover_print(uint8_t automatic) { @@ -8727,10 +8725,17 @@ void recover_print(uint8_t automatic) { lcd_update(2); lcd_setstatuspgm(_i("Recovering print "));////MSG_RECOVERING_PRINT c=20 r=1 - recover_machine_state_after_power_panic(); //recover position, temperatures and extrude_multipliers +//-// +// recover_machine_state_after_power_panic(); //recover position, temperatures and extrude_multipliers +MYSERIAL.println(">>> RecoverPrint"); +MYSERIAL.println(eeprom_read_byte((uint8_t*)EEPROM_UVLO),DEC); +bool bTiny=(eeprom_read_byte((uint8_t*)EEPROM_UVLO)==2); +recover_machine_state_after_power_panic(bTiny); //recover position, temperatures and extrude_multipliers // Lift the print head, so one may remove the excess priming material. - if (current_position[Z_AXIS] < 25) +//-// +//if (current_position[Z_AXIS] < 25) +if(!bTiny&&(current_position[Z_AXIS]<25)) enquecommand_P(PSTR("G1 Z25 F800")); // Home X and Y axes. Homing just X and Y shall not touch the babystep and the world2machine transformation status. enquecommand_P(PSTR("G28 X Y")); @@ -8748,7 +8753,10 @@ void recover_print(uint8_t automatic) { enquecommand_P(PSTR("G1 E" STRINGIFY(-DEFAULT_RETRACTION)" F480")); // Mark the power panic status as inactive. - eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0); +//-// +MYSERIAL.println("===== before"); +// eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0); +MYSERIAL.println("===== after"); /*while ((abs(degHotend(0)- target_temperature[0])>5) || (abs(degBed() -target_temperature_bed)>3)) { //wait for heater and bed to reach target temp delay_keep_alive(1000); }*/ @@ -8759,9 +8767,10 @@ void recover_print(uint8_t automatic) { restore_print_from_eeprom(); printf_P(_N("Current pos Z_AXIS:%.3f\nCurrent pos E_AXIS:%.3f\n"), current_position[Z_AXIS], current_position[E_AXIS]); +MYSERIAL.println("===== konec"); } -void recover_machine_state_after_power_panic() +void recover_machine_state_after_power_panic(bool bTiny) { char cmd[30]; // 1) Recover the logical cordinates at the time of the power panic. @@ -8770,8 +8779,16 @@ void recover_machine_state_after_power_panic() current_position[Y_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4)); // Recover the logical coordinate of the Z axis at the time of the power panic. // The current position after power panic is moved to the next closest 0th full step. - current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) + +//-// +// current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) + +// UVLO_Z_AXIS_SHIFT + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS)) + 7) >> 4) / axis_steps_per_unit[Z_AXIS]; + if(bTiny) + current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z)) + + UVLO_Z_AXIS_SHIFT + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_TINY_Z_MICROSTEPS)) + 7) >> 4) / axis_steps_per_unit[Z_AXIS]; + else + current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) + UVLO_Z_AXIS_SHIFT + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS)) + 7) >> 4) / axis_steps_per_unit[Z_AXIS]; +//-// if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_E_ABS)) { current_position[E_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E)); sprintf_P(cmd, PSTR("G92 E")); @@ -8904,6 +8921,8 @@ void restore_print_from_eeprom() { // Set a position in the file. sprintf_P(cmd, PSTR("M26 S%lu"), position); enquecommand(cmd); +//-// +enquecommand_P(PSTR("G4 S0")); // Start SD print. enquecommand_P(PSTR("M24")); } @@ -9182,39 +9201,4 @@ static void print_time_remaining_init() { print_percent_done_silent = PRINT_PERCENT_DONE_INIT; } -bool mmu_get_reponse() { - bool response = true; - LongTimer mmu_get_reponse_timeout; - uart2_rx_clr(); - - mmu_get_reponse_timeout.start(); - while (!uart2_rx_ok()) - { - delay_keep_alive(100); - if (mmu_get_reponse_timeout.expired(30 * 1000ul)) { //PINDA cooling from 60 C to 35 C takes about 7 minutes - response = false; - break; - } - } - return response; -} - -void mmu_not_responding() { - printf_P(PSTR("MMU not responding")); -} - -void mmu_load_to_nozzle() { - bool saved_e_relative_mode = axis_relative_modes[E_AXIS]; - if (!saved_e_relative_mode) { - enquecommand_front_P(PSTR("M82")); // set extruder to relative mode - } - enquecommand_front_P((PSTR("G1 E7.2000 F562"))); - enquecommand_front_P((PSTR("G1 E14.4000 F871"))); - enquecommand_front_P((PSTR("G1 E36.0000 F1393"))); - enquecommand_front_P((PSTR("G1 E14.4000 F871"))); - if (!saved_e_relative_mode) { - enquecommand_front_P(PSTR("M83")); // set extruder to relative mode - } -} - #define FIL_LOAD_LENGTH 60 From bbec1ccfd41034fa0423cf2c009b5117fce3744b Mon Sep 17 00:00:00 2001 From: MRprusa3d <38257799+MRprusa3d@users.noreply.github.com> Date: Fri, 20 Jul 2018 04:34:12 +0000 Subject: [PATCH 8/9] Add files via upload --- Firmware/Configuration.h | 176 +------------------- Firmware/Marlin_main.cpp | 337 ++++++++++++++++++++++----------------- Firmware/eeprom.h | 182 +++++++++++++++++++++ Firmware/lcd.cpp | 6 + Firmware/sound.cpp | 105 ++++++++++++ Firmware/sound.h | 34 ++++ Firmware/ultralcd.cpp | 38 ++++- 7 files changed, 549 insertions(+), 329 deletions(-) create mode 100644 Firmware/eeprom.h create mode 100644 Firmware/sound.cpp create mode 100644 Firmware/sound.h diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 1ad38e1a0..3fa648f7a 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -44,182 +44,8 @@ #define FW_PRUSA3D_MAGIC "PRUSA3DFW" #define FW_PRUSA3D_MAGIC_LEN 10 -// The total size of the EEPROM is -// 4096 for the Atmega2560 -#define EEPROM_TOP 4096 -#define EEPROM_SILENT 4095 -#define EEPROM_LANG 4094 -#define EEPROM_BABYSTEP_X 4092 -#define EEPROM_BABYSTEP_Y 4090 -#define EEPROM_BABYSTEP_Z 4088 -#define EEPROM_CALIBRATION_STATUS 4087 -#define EEPROM_BABYSTEP_Z0 4085 -#define EEPROM_FILAMENTUSED 4081 -// uint32_t -#define EEPROM_TOTALTIME 4077 -#define EEPROM_BED_CALIBRATION_CENTER (EEPROM_TOTALTIME-2*4) -#define EEPROM_BED_CALIBRATION_VEC_X (EEPROM_BED_CALIBRATION_CENTER-2*4) -#define EEPROM_BED_CALIBRATION_VEC_Y (EEPROM_BED_CALIBRATION_VEC_X-2*4) - -// Offsets of the Z heiths of the calibration points from the first point. -// The offsets are saved as 16bit signed int, scaled to tenths of microns. -#define EEPROM_BED_CALIBRATION_Z_JITTER (EEPROM_BED_CALIBRATION_VEC_Y-2*8) -#define EEPROM_FARM_MODE (EEPROM_BED_CALIBRATION_Z_JITTER-1) -#define EEPROM_FARM_NUMBER (EEPROM_FARM_MODE-3) - -// Correction of the bed leveling, in micrometers. -// Maximum 50 micrometers allowed. -// Bed correction is valid if set to 1. If set to zero or 255, the successive 4 bytes are invalid. -#define EEPROM_BED_CORRECTION_VALID (EEPROM_FARM_NUMBER-1) -#define EEPROM_BED_CORRECTION_LEFT (EEPROM_BED_CORRECTION_VALID-1) -#define EEPROM_BED_CORRECTION_RIGHT (EEPROM_BED_CORRECTION_LEFT-1) -#define EEPROM_BED_CORRECTION_FRONT (EEPROM_BED_CORRECTION_RIGHT-1) -#define EEPROM_BED_CORRECTION_REAR (EEPROM_BED_CORRECTION_FRONT-1) -#define EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY (EEPROM_BED_CORRECTION_REAR-1) -#define EEPROM_PRINT_FLAG (EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY-1) -#define EEPROM_PROBE_TEMP_SHIFT (EEPROM_PRINT_FLAG - 2*5) //5 x int for storing pinda probe temp shift relative to 50 C; unit: motor steps -#define EEPROM_TEMP_CAL_ACTIVE (EEPROM_PROBE_TEMP_SHIFT - 1) -#define EEPROM_BOWDEN_LENGTH (EEPROM_TEMP_CAL_ACTIVE - 2*4) //4 x int for bowden lengths for multimaterial -#define EEPROM_CALIBRATION_STATUS_PINDA (EEPROM_BOWDEN_LENGTH - 1) //0 - not calibrated; 1 - calibrated -#define EEPROM_UVLO (EEPROM_CALIBRATION_STATUS_PINDA - 1) //1 - uvlo during print -#define EEPROM_UVLO_CURRENT_POSITION (EEPROM_UVLO-2*4) // 2 x float for current_position in X and Y axes -#define EEPROM_FILENAME (EEPROM_UVLO_CURRENT_POSITION - 8) //8chars to store filename without extension -#define EEPROM_FILE_POSITION (EEPROM_FILENAME - 4) //32 bit for uint32_t file position -#define EEPROM_UVLO_CURRENT_POSITION_Z (EEPROM_FILE_POSITION - 4) //float for current position in Z -#define EEPROM_UVLO_TARGET_HOTEND (EEPROM_UVLO_CURRENT_POSITION_Z - 1) -#define EEPROM_UVLO_TARGET_BED (EEPROM_UVLO_TARGET_HOTEND - 1) -#define EEPROM_UVLO_FEEDRATE (EEPROM_UVLO_TARGET_BED - 2) -#define EEPROM_UVLO_FAN_SPEED (EEPROM_UVLO_FEEDRATE - 1) -#define EEPROM_FAN_CHECK_ENABLED (EEPROM_UVLO_FAN_SPEED - 1) -#define EEPROM_UVLO_MESH_BED_LEVELING (EEPROM_FAN_CHECK_ENABLED - 9*2) - -#define EEPROM_UVLO_Z_MICROSTEPS (EEPROM_UVLO_MESH_BED_LEVELING - 2) -#define EEPROM_UVLO_E_ABS (EEPROM_UVLO_Z_MICROSTEPS - 1) -#define EEPROM_UVLO_CURRENT_POSITION_E (EEPROM_UVLO_E_ABS - 4) //float for current position in E - -// Crash detection mode EEPROM setting -#define EEPROM_CRASH_DET (EEPROM_UVLO_CURRENT_POSITION_E - 5) // float (orig EEPROM_UVLO_MESH_BED_LEVELING-12) -// Crash detection counter Y (last print) -#define EEPROM_CRASH_COUNT_Y (EEPROM_CRASH_DET - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-15) -// Filament sensor on/off EEPROM setting -#define EEPROM_FSENSOR (EEPROM_CRASH_COUNT_Y - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-14) -// Crash detection counter X (last print) -#define EEPROM_CRASH_COUNT_X (EEPROM_FSENSOR - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-15) -// Filament runout/error coutner (last print) -#define EEPROM_FERROR_COUNT (EEPROM_CRASH_COUNT_X - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-16) -// Power loss errors (last print) -#define EEPROM_POWER_COUNT (EEPROM_FERROR_COUNT - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-17) - -#define EEPROM_XYZ_CAL_SKEW (EEPROM_POWER_COUNT - 4) // float for skew backup -#define EEPROM_WIZARD_ACTIVE (EEPROM_XYZ_CAL_SKEW - 1) -#define EEPROM_BELTSTATUS_X (EEPROM_WIZARD_ACTIVE - 2) // uint16 -#define EEPROM_BELTSTATUS_Y (EEPROM_BELTSTATUS_X - 2) // uint16 - -#define EEPROM_DIR_DEPTH (EEPROM_BELTSTATUS_Y-1) -#define EEPROM_DIRS (EEPROM_DIR_DEPTH-80) //8 chars for each dir name, max 10 levels -#define EEPROM_SD_SORT (EEPROM_DIRS - 1) //0 -time, 1-alpha, 2-none -#define EEPROM_SECOND_SERIAL_ACTIVE (EEPROM_SD_SORT - 1) - -#define EEPROM_FSENS_AUTOLOAD_ENABLED (EEPROM_SECOND_SERIAL_ACTIVE - 1) - -// Crash detection counter X (total) -#define EEPROM_CRASH_COUNT_X_TOT (EEPROM_FSENS_AUTOLOAD_ENABLED - 2) // uint16 -// Crash detection counter Y (total) -#define EEPROM_CRASH_COUNT_Y_TOT (EEPROM_CRASH_COUNT_X_TOT - 2) // uint16 -// Filament runout/error coutner (total) -#define EEPROM_FERROR_COUNT_TOT (EEPROM_CRASH_COUNT_Y_TOT - 2) // uint16 -// Power loss errors (total) -#define EEPROM_POWER_COUNT_TOT (EEPROM_FERROR_COUNT_TOT - 2) // uint16 - -//////////////////////////////////////// -// TMC2130 Accurate sensorless homing - -// X-axis home origin (stepper phase in microsteps, 0..63 for 16ustep resolution) -#define EEPROM_TMC2130_HOME_X_ORIGIN (EEPROM_POWER_COUNT_TOT - 1) // uint8 -// X-axis home bsteps (number of microsteps backward) -#define EEPROM_TMC2130_HOME_X_BSTEPS (EEPROM_TMC2130_HOME_X_ORIGIN - 1) // uint8 -// X-axis home fsteps (number of microsteps forward) -#define EEPROM_TMC2130_HOME_X_FSTEPS (EEPROM_TMC2130_HOME_X_BSTEPS - 1) // uint8 -// Y-axis home origin (stepper phase in microsteps, 0..63 for 16ustep resolution) -#define EEPROM_TMC2130_HOME_Y_ORIGIN (EEPROM_TMC2130_HOME_X_FSTEPS - 1) // uint8 -// X-axis home bsteps (number of microsteps backward) -#define EEPROM_TMC2130_HOME_Y_BSTEPS (EEPROM_TMC2130_HOME_Y_ORIGIN - 1) // uint8 -// X-axis home fsteps (number of microsteps forward) -#define EEPROM_TMC2130_HOME_Y_FSTEPS (EEPROM_TMC2130_HOME_Y_BSTEPS - 1) // uint8 -// Accurate homing enabled -#define EEPROM_TMC2130_HOME_ENABLED (EEPROM_TMC2130_HOME_Y_FSTEPS - 1) // uint8 - - -//////////////////////////////////////// -// TMC2130 uStep linearity correction - -// Linearity correction factor (XYZE) -#define EEPROM_TMC2130_WAVE_X_FAC (EEPROM_TMC2130_HOME_ENABLED - 1) // uint8 -#define EEPROM_TMC2130_WAVE_Y_FAC (EEPROM_TMC2130_WAVE_X_FAC - 1) // uint8 -#define EEPROM_TMC2130_WAVE_Z_FAC (EEPROM_TMC2130_WAVE_Y_FAC - 1) // uint8 -#define EEPROM_TMC2130_WAVE_E_FAC (EEPROM_TMC2130_WAVE_Z_FAC - 1) // uint8 - - -//////////////////////////////////////// -// TMC2130 uStep resolution - -// microstep resolution (XYZE): usteps = (256 >> mres) -#define EEPROM_TMC2130_X_MRES (EEPROM_TMC2130_WAVE_E_FAC - 1) // uint8 -#define EEPROM_TMC2130_Y_MRES (EEPROM_TMC2130_X_MRES - 1) // uint8 -#define EEPROM_TMC2130_Z_MRES (EEPROM_TMC2130_Y_MRES - 1) // uint8 -#define EEPROM_TMC2130_E_MRES (EEPROM_TMC2130_Z_MRES - 1) // uint8 - -// HW -#define EEPROM_PRINTER_TYPE (EEPROM_TMC2130_E_MRES - 2) // uint16 -#define EEPROM_BOARD_TYPE (EEPROM_PRINTER_TYPE - 2) // uint16 - -// Extruder multiplier for power panic -#define EEPROM_EXTRUDER_MULTIPLIER_0 (EEPROM_BOARD_TYPE - 4) //float -#define EEPROM_EXTRUDER_MULTIPLIER_1 (EEPROM_EXTRUDER_MULTIPLIER_0 - 4) //float -#define EEPROM_EXTRUDER_MULTIPLIER_2 (EEPROM_EXTRUDER_MULTIPLIER_1 - 4) //float -#define EEPROM_EXTRUDEMULTIPLY (EEPROM_EXTRUDER_MULTIPLIER_2 - 2) // uint16 - - -// -#define EEPROM_UVLO_TINY_CURRENT_POSITION_Z (EEPROM_EXTRUDEMULTIPLY-4) // float -#define EEPROM_UVLO_TINY_Z_MICROSTEPS (EEPROM_UVLO_TINY_CURRENT_POSITION_Z-2) // uint16 - - -//TMC2130 configuration -#define EEPROM_TMC_AXIS_SIZE //axis configuration block size -#define EEPROM_TMC_X (EEPROM_TMC + 0 * EEPROM_TMC_AXIS_SIZE) //X axis configuration blok -#define EEPROM_TMC_Y (EEPROM_TMC + 1 * EEPROM_TMC_AXIS_SIZE) //Y axis -#define EEPROM_TMC_Z (EEPROM_TMC + 2 * EEPROM_TMC_AXIS_SIZE) //Z axis -#define EEPROM_TMC_E (EEPROM_TMC + 3 * EEPROM_TMC_AXIS_SIZE) //E axis -//TMC2130 - X axis -#define EEPROM_TMC_X_USTEPS_INTPOL (EEPROM_TMC_X + 0) // 1byte, bit 0..4 USTEPS, bit 7 INTPOL -#define EEPROM_TMC_X_PWM_AMPL (EEPROM_TMC_X + 1) // 1byte (0..255) -#define EEPROM_TMC_X_PWM_GRAD_FREQ (EEPROM_TMC_X + 2) // 1byte, bit 0..3 GRAD, bit 4..5 FREQ -#define EEPROM_TMC_X_TCOOLTHRS (EEPROM_TMC_X + 3) // 2bytes (0..) -#define EEPROM_TMC_X_SG_THRS (EEPROM_TMC_X + 5) // 1byte, (-64..+63) -#define EEPROM_TMC_X_CURRENT_H (EEPROM_TMC_X + 6) // 1byte, (0..63) -#define EEPROM_TMC_X_CURRENT_R (EEPROM_TMC_X + 7) // 1byte, (0..63) -#define EEPROM_TMC_X_HOME_SG_THRS (EEPROM_TMC_X + 8) // 1byte, (-64..+63) -#define EEPROM_TMC_X_HOME_CURRENT_R (EEPROM_TMC_X + 9) // 1byte, (-64..+63) -#define EEPROM_TMC_X_HOME_DTCOOLTHRS (EEPROM_TMC_X + 10) // 1byte (-128..+127) -#define EEPROM_TMC_X_DTCOOLTHRS_LOW (EEPROM_TMC_X + 11) // 1byte (-128..+127) -#define EEPROM_TMC_X_DTCOOLTHRS_HIGH (EEPROM_TMC_X + 12) // 1byte (-128..+127) -#define EEPROM_TMC_X_SG_THRS_LOW (EEPROM_TMC_X + 13) // 1byte, (-64..+63) -#define EEPROM_TMC_X_SG_THRS_HIGH (EEPROM_TMC_X + 14) // 1byte, (-64..+63) - -// Currently running firmware, each digit stored as uint16_t. -// The flavor differentiates a dev, alpha, beta, release candidate or a release version. -#define EEPROM_FIRMWARE_VERSION_END (FW_PRUSA3D_MAGIC_LEN+8) -#define EEPROM_FIRMWARE_VERSION_FLAVOR (FW_PRUSA3D_MAGIC_LEN+6) -#define EEPROM_FIRMWARE_VERSION_REVISION (FW_PRUSA3D_MAGIC_LEN+4) -#define EEPROM_FIRMWARE_VERSION_MINOR (FW_PRUSA3D_MAGIC_LEN+2) -#define EEPROM_FIRMWARE_VERSION_MAJOR FW_PRUSA3D_MAGIC_LEN -// Magic string, indicating that the current or the previous firmware running was the Prusa3D firmware. -#define EEPROM_FIRMWARE_PRUSA_MAGIC 0 - -#define EEPROM_OFFSET 20 //offset for storing settings using M500 -//#define EEPROM_OFFSET +#include "eeprom.h" // This configuration file contains the basic settings. // Advanced settings can be found in Configuration_adv.h diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index fe0bc6592..1ae770129 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -126,6 +126,8 @@ #include "ultralcd.h" +//-// +#include "sound.h" #include "cmdqueue.h" @@ -484,9 +486,7 @@ static float feedrate = 1500.0, next_feedrate, saved_feedrate; // Also there is bool axis_relative_modes[] per axis flag. static bool relative_mode = false; -#ifndef _DISABLE_M42_M226 const int sensitive_pins[] = SENSITIVE_PINS; // Sensitive pin list for M42 -#endif //_DISABLE_M42_M226 //static float tt = 0; //static float bt = 0; @@ -858,7 +858,7 @@ void factory_reset(char level, bool quiet) eeprom_update_word((uint16_t *)EEPROM_POWER_COUNT_TOT, 0); fsensor_enable(); - fautoload_set(true); + fsensor_autoload_set(true); WRITE(BEEPER, HIGH); _delay_ms(100); @@ -1151,6 +1151,8 @@ void setup() spi_init(); lcd_splash(); +//-// + Sound_Init(); #ifdef W25X20CL // Enter an STK500 compatible Optiboot boot loader waiting for flashing the languages to an external flash memory. @@ -1378,7 +1380,6 @@ void setup() #ifdef TMC2130 uint8_t silentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT); if (silentMode == 0xff) silentMode = 0; -// tmc2130_mode = silentMode?TMC2130_MODE_SILENT:TMC2130_MODE_NORMAL; tmc2130_mode = TMC2130_MODE_NORMAL; uint8_t crashdet = eeprom_read_byte((uint8_t*)EEPROM_CRASH_DET); if (crashdet && !farm_mode) @@ -1432,6 +1433,7 @@ void setup() #ifdef TMC2130 tmc2130_mode = silentMode?TMC2130_MODE_SILENT:TMC2130_MODE_NORMAL; + update_mode_profile(); tmc2130_init(); #endif //TMC2130 @@ -1725,11 +1727,7 @@ void setup() #endif //TMC2130 #ifdef UVLO_SUPPORT -//-// -MYSERIAL.println(">>> Setup"); -MYSERIAL.println(eeprom_read_byte((uint8_t*)EEPROM_UVLO),DEC); -// if (eeprom_read_byte((uint8_t*)EEPROM_UVLO) == 1) { //previous print was terminated by UVLO - if (eeprom_read_byte((uint8_t*)EEPROM_UVLO) != 0) { //previous print was terminated by UVLO + if (eeprom_read_byte((uint8_t*)EEPROM_UVLO) == 1) { //previous print was terminated by UVLO /* if (lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_RECOVER_PRINT), false)) recover_print(); else { @@ -1755,8 +1753,7 @@ MYSERIAL.println(eeprom_read_byte((uint8_t*)EEPROM_UVLO),DEC); #endif if ( lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_RECOVER_PRINT), false) ) recover_print(0); else { -//-// -// eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0); + eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0); lcd_update_enable(true); lcd_update(2); lcd_setstatuspgm(_T(WELCOME_MSG)); @@ -2605,6 +2602,7 @@ void force_high_power_mode(bool start_high_power_section) { st_synchronize(); cli(); tmc2130_mode = (start_high_power_section == true) ? TMC2130_MODE_NORMAL : TMC2130_MODE_SILENT; + update_mode_profile(); tmc2130_init(); // We may have missed a stepper timer interrupt due to the time spent in the tmc2130_init() routine. // Be safe than sorry, reset the stepper timer before re-enabling interrupts. @@ -3113,14 +3111,22 @@ void gcode_M114() void gcode_M701() { -#ifdef SNMM + printf_P(PSTR("gcode_M701 begin\n")); + +#if defined (SNMM) || defined (SNMM_V2) extr_adj(snmm_extruder);//loads current extruder #else enable_z(); custom_message = true; custom_message_type = 2; - + bool old_watch_runout = fsensor_watch_runout; + fsensor_watch_runout = false; + fsensor_st_sum = 0; + fsensor_yd_sum = 0; + fsensor_er_sum = 0; + fsensor_yd_min = 255; + fsensor_yd_max = 0; lcd_setstatuspgm(_T(MSG_LOADING_FILAMENT)); current_position[E_AXIS] += 40; @@ -3162,6 +3168,11 @@ void gcode_M701() custom_message_type = 0; #endif + fsensor_err_cnt = 0; + fsensor_watch_runout = old_watch_runout; + printf_P(_N("\nFSENSOR st_sum=%lu yd_sum=%lu er_sum=%lu\n"), fsensor_st_sum, fsensor_yd_sum, fsensor_er_sum); + printf_P(_N("\nFSENSOR yd_min=%hhu yd_max=%hhu yd_avg=%hhu\n"), fsensor_yd_min, fsensor_yd_max, fsensor_yd_sum * FSENSOR_CHUNK_LEN / fsensor_st_sum); + printf_P(PSTR("gcode_M701 end\n")); } /** * @brief Get serial number from 32U2 processor @@ -3369,7 +3380,13 @@ void process_commands() } else if (code_seen("thx")) { no_response = false; - } else if (code_seen("RESET")) { + } + else if (code_seen("MMURES")) { + fprintf_P(uart2io, PSTR("X0")); + bool response = mmu_get_reponse(); + if (!response) mmu_not_responding(); + } + else if (code_seen("RESET")) { // careful! if (farm_mode) { #ifdef WATCHDOG @@ -4766,8 +4783,6 @@ void process_commands() card.openFile(strchr_pointer + 4,true); break; case 24: //M24 - Start SD print -//-// -eeprom_update_byte((uint8_t*)EEPROM_UVLO,0); if (!card.paused) failstats_reset_print(); card.startFileprint(); @@ -4871,7 +4886,6 @@ eeprom_update_byte((uint8_t*)EEPROM_UVLO,0); autotempShutdown(); } break; -#ifndef _DISABLE_M42_M226 case 42: //M42 -Change pin status via gcode if (code_seen('S')) { @@ -4899,7 +4913,6 @@ eeprom_update_byte((uint8_t*)EEPROM_UVLO,0); } } break; -#endif //_DISABLE_M42_M226 case 44: // M44: Prusa3D: Reset the bed skew and offset calibration. // Reset the baby step value and the baby step applied flag. @@ -5765,16 +5778,29 @@ Sigma_Exit: } break; case 201: // M201 - for(int8_t i=0; i < NUM_AXIS; i++) - { - if(code_seen(axis_codes[i])) - { - max_acceleration_units_per_sq_second[i] = code_value(); - } - } - // steps per sq second need to be updated to agree with the units per sq second (as they are what is used in the planner) - reset_acceleration_rates(); - break; + for (int8_t i = 0; i < NUM_AXIS; i++) + { + if (code_seen(axis_codes[i])) + { + int val = code_value(); +#ifdef TMC2130 + if ((i == X_AXIS) || (i == Y_AXIS)) + { + int max_val = 0; + if (tmc2130_mode == TMC2130_MODE_NORMAL) + max_val = NORMAL_MAX_ACCEL_XY; + else if (tmc2130_mode == TMC2130_MODE_SILENT) + max_val = SILENT_MAX_ACCEL_XY; + if (val > max_val) + val = max_val; + } +#endif + max_acceleration_units_per_sq_second[i] = val; + } + } + // steps per sq second need to be updated to agree with the units per sq second (as they are what is used in the planner) + reset_acceleration_rates(); + break; #if 0 // Not used for Sprinter/grbl gen6 case 202: // M202 for(int8_t i=0; i < NUM_AXIS; i++) { @@ -5783,10 +5809,27 @@ Sigma_Exit: break; #endif case 203: // M203 max feedrate mm/sec - for(int8_t i=0; i < NUM_AXIS; i++) { - if(code_seen(axis_codes[i])) max_feedrate[i] = code_value(); - } - break; + for (int8_t i = 0; i < NUM_AXIS; i++) + { + if (code_seen(axis_codes[i])) + { + float val = code_value(); +#ifdef TMC2130 + if ((i == X_AXIS) || (i == Y_AXIS)) + { + float max_val = 0; + if (tmc2130_mode == TMC2130_MODE_NORMAL) + max_val = NORMAL_MAX_FEEDRATE_XY; + else if (tmc2130_mode == TMC2130_MODE_SILENT) + max_val = SILENT_MAX_FEEDRATE_XY; + if (val > max_val) + val = max_val; + } +#endif //TMC2130 + max_feedrate[i] = val; + } + } + break; case 204: // M204 acclereration S normal moves T filmanent only moves { if(code_seen('S')) acceleration = code_value() ; @@ -5933,7 +5976,6 @@ Sigma_Exit: } break; -#ifndef _DISABLE_M42_M226 case 226: // M226 P S- Wait until the specified pin reaches the state required { if(code_seen('P')){ @@ -5985,7 +6027,6 @@ Sigma_Exit: } } break; -#endif //_DISABLE_M42_M226 #if NUM_SERVOS > 0 case 280: // M280 - set servo position absolute. P: servo index, S: angle or microseconds @@ -6228,7 +6269,7 @@ Sigma_Exit: { #ifdef PAT9125 bool old_fsensor_enabled = fsensor_enabled; - fsensor_enabled = false; //temporary solution for unexpected restarting +// fsensor_enabled = false; //temporary solution for unexpected restarting #endif //PAT9125 st_synchronize(); @@ -6322,6 +6363,8 @@ Sigma_Exit: unsigned long waiting_start_time = millis(); uint8_t wait_for_user_state = 0; lcd_display_message_fullscreen_P(_T(MSG_PRESS_TO_UNLOAD)); +//-// +bool bFirst=true; while (!(wait_for_user_state == 0 && lcd_clicked())){ //cnt++; @@ -6342,7 +6385,13 @@ Sigma_Exit: } SET_OUTPUT(BEEPER); if (counterBeep == 0) { +//-// +//if(eSoundMode==e_SOUND_MODE_LOUD) +if((eSoundMode==e_SOUND_MODE_LOUD)||((eSoundMode==e_SOUND_MODE_ONCE)&&bFirst)) +{ +bFirst=false; WRITE(BEEPER, HIGH); +} } if (counterBeep == 20) { WRITE(BEEPER, LOW); @@ -6479,13 +6528,22 @@ Sigma_Exit: //finish moves st_synchronize(); - lcd_display_message_fullscreen_P(_T(MSG_PULL_OUT_FILAMENT)); - //disable extruder steppers so filament can be removed disable_e0(); disable_e1(); disable_e2(); delay(100); + +#ifdef SNMM_V2 + fprintf_P(uart2io, PSTR("U0\n")); + + // get response + bool response = mmu_get_reponse(); + if (!response) mmu_not_responding(); +#else + lcd_display_message_fullscreen_P(_T(MSG_PULL_OUT_FILAMENT)); + + WRITE(BEEPER, HIGH); @@ -6496,6 +6554,7 @@ Sigma_Exit: counterBeep++; } WRITE(BEEPER, LOW); +#endif KEEPALIVE_STATE(PAUSED_FOR_USER); lcd_change_fil_state = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Was filament unload successful?"), false, true);////MSG_UNLOAD_SUCCESSFUL c=20 r=2 @@ -6509,15 +6568,14 @@ Sigma_Exit: KEEPALIVE_STATE(PAUSED_FOR_USER); #ifdef PAT9125 - if (filament_autoload_enabled && (old_fsensor_enabled || fsensor_M600)) fsensor_autoload_check_start(); + if (filament_autoload_enabled && (old_fsensor_enabled || !fsensor_watch_runout)) fsensor_autoload_check_start(); #endif //PAT9125 -// printf_P(PSTR("M600 PAT9125 filament_autoload_enabled=%d, old_fsensor_enabled=%d, fsensor_M600=%d"), filament_autoload_enabled, old_fsensor_enabled, fsensor_M600); while(!lcd_clicked()) { manage_heater(); manage_inactivity(true); #ifdef PAT9125 - if (filament_autoload_enabled && (old_fsensor_enabled || fsensor_M600) && fsensor_check_autoload()) + if (filament_autoload_enabled && (old_fsensor_enabled || !fsensor_watch_runout) && fsensor_check_autoload()) { tone(BEEPER, 1000); delay_keep_alive(50); @@ -6533,7 +6591,7 @@ Sigma_Exit: } #ifdef PAT9125 - if (filament_autoload_enabled && (old_fsensor_enabled || fsensor_M600)) fsensor_autoload_check_stop(); + if (filament_autoload_enabled && (old_fsensor_enabled || !fsensor_watch_runout)) fsensor_autoload_check_stop(); #endif //PAT9125 //WRITE(BEEPER, LOW); KEEPALIVE_STATE(IN_HANDLER); @@ -6565,14 +6623,19 @@ Sigma_Exit: plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 400, active_extruder); target[E_AXIS] += 10; plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 50, active_extruder); + //Extrude some filament + target[E_AXIS]+= FILAMENTCHANGE_FINALFEED ; + plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], FILAMENTCHANGE_EXFEED, active_extruder); #else target[E_AXIS] += FILAMENTCHANGE_FIRSTFEED; plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], FILAMENTCHANGE_EFEED, active_extruder); -#endif // SNMM - - //Extrude some filament + //Extrude some filament target[E_AXIS]+= FILAMENTCHANGE_FINALFEED ; plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], FILAMENTCHANGE_EXFEED, active_extruder); + +#endif // SNMM + + //Wait for user to check the state lcd_change_fil_state = 0; @@ -6678,7 +6741,8 @@ Sigma_Exit: custom_message_type = 0; #ifdef PAT9125 - fsensor_enabled = old_fsensor_enabled; //temporary solution for unexpected restarting +/* +// fsensor_enabled = old_fsensor_enabled; //temporary solution for unexpected restarting if (fsensor_M600) { @@ -6690,10 +6754,11 @@ Sigma_Exit: cmdqueue_pop_front(); } KEEPALIVE_STATE(IN_HANDLER); - fsensor_enable(); +// fsensor_enable(); fsensor_restore_print_and_continue(); } - + fsensor_M600 = false; +*/ #endif //PAT9125 } @@ -6896,6 +6961,7 @@ Sigma_Exit: case 914: // M914 Set normal mode { tmc2130_mode = TMC2130_MODE_NORMAL; + update_mode_profile(); tmc2130_init(); } break; @@ -6903,6 +6969,7 @@ Sigma_Exit: case 915: // M915 Set silent mode { tmc2130_mode = TMC2130_MODE_SILENT; + update_mode_profile(); tmc2130_init(); } break; @@ -6994,12 +7061,20 @@ Sigma_Exit: break; case 701: //M701: load filament { + #ifdef SNMM_V2 + if (code_seen('E')) + { + snmm_extruder = code_value(); + } + #endif + + gcode_M701(); } break; case 702: { -#ifdef SNMM +#if defined (SNMM) || defined (SNMM_V2) if (code_seen('U')) { extr_unload_used(); //unload all filaments which were used in current print } @@ -7007,12 +7082,12 @@ Sigma_Exit: extr_unload(); //unload just current filament } else { - extr_unload_all(); //unload all filaments + extr_unload_all(); //unload all filaments } #else #ifdef PAT9125 bool old_fsensor_enabled = fsensor_enabled; - fsensor_enabled = false; +// fsensor_enabled = false; #endif //PAT9125 custom_message = true; custom_message_type = 2; @@ -7038,7 +7113,11 @@ Sigma_Exit: disable_e2(); delay(100); - +//-// +//if(eSoundMode==e_SOUND_MODE_LOUD) +// Sound_MakeSound_tmp(); +Sound_MakeSound(e_SOUND_CLASS_Prompt,e_SOUND_TYPE_StandardPrompt); +/* WRITE(BEEPER, HIGH); uint8_t counterBeep = 0; while (!lcd_clicked() && (counterBeep < 50)) { @@ -7047,6 +7126,13 @@ Sigma_Exit: counterBeep++; } WRITE(BEEPER, LOW); +*/ +uint8_t counterBeep = 0; +while (!lcd_clicked() && (counterBeep < 50)) { + delay_keep_alive(100); + counterBeep++; +} +//-// st_synchronize(); while (lcd_clicked()) delay_keep_alive(100); @@ -7056,7 +7142,7 @@ Sigma_Exit: custom_message = false; custom_message_type = 0; #ifdef PAT9125 - fsensor_enabled = old_fsensor_enabled; +// fsensor_enabled = old_fsensor_enabled; #endif //PAT9125 #endif } @@ -7118,16 +7204,15 @@ Sigma_Exit: break; } - + bool response = mmu_get_reponse(); + if (!response) mmu_not_responding(); - - // get response - uart2_rx_clr(); - while (!uart2_rx_ok()) - { - //printf_P(PSTR("waiting..\n")); - delay_keep_alive(100); - } + snmm_extruder = tmp_extruder; //filament change is finished + + if (*(strchr_pointer + index) == '?') { // for single material usage with mmu + mmu_load_to_nozzle(); + + } #endif #ifdef SNMM @@ -7611,7 +7696,7 @@ static void handleSafetyTimer() void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument set in Marlin.h { #ifdef PAT9125 - if (fsensor_enabled && filament_autoload_enabled && !fsensor_M600 && !moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL)) + if (fsensor_enabled && filament_autoload_enabled && fsensor_watch_runout && !moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL)) { if (fsensor_autoload_enabled) { @@ -8448,8 +8533,6 @@ void uvlo_() { unsigned long time_start = millis(); bool sd_print = card.sdprinting; -//-// -MYSERIAL.println(">>> uvlo()"); // Conserve power as soon as possible. disable_x(); disable_y(); @@ -8606,51 +8689,6 @@ MYSERIAL.println(">>> uvlo()"); }; } - - -void uvlo_tiny() -{ -uint16_t z_microsteps=0; -bool sd_print=card.sdprinting; - -MYSERIAL.println(">>> uvloTiny()"); -// Conserve power as soon as possible. -disable_x(); -disable_y(); -disable_e0(); - -#ifdef TMC2130 -tmc2130_set_current_h(Z_AXIS, 20); -tmc2130_set_current_r(Z_AXIS, 20); -#endif //TMC2130 - -// Read out the current Z motor microstep counter -#ifdef TMC2130 -z_microsteps=tmc2130_rd_MSCNT(Z_TMC2130_CS); -#endif //TMC2130 - -planner_abort_hard(); -sei(); -plan_buffer_line( - current_position[X_AXIS], - current_position[Y_AXIS], - current_position[Z_AXIS]+UVLO_Z_AXIS_SHIFT+float((1024-z_microsteps+7)>>4)/axis_steps_per_unit[Z_AXIS], - current_position[E_AXIS], - 40, active_extruder); -st_synchronize(); -disable_z(); - -// Finaly store the "power outage" flag. -//if(sd_print) - eeprom_update_byte((uint8_t*)EEPROM_UVLO,2); - -eeprom_update_word((uint16_t*)(EEPROM_UVLO_TINY_Z_MICROSTEPS),z_microsteps); -eeprom_update_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z), current_position[Z_AXIS]); - -// Increment power failure counter -eeprom_update_byte((uint8_t*)EEPROM_POWER_COUNT, eeprom_read_byte((uint8_t*)EEPROM_POWER_COUNT) + 1); -eeprom_update_word((uint16_t*)EEPROM_POWER_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_POWER_COUNT_TOT) + 1); -} #endif //UVLO_SUPPORT #if (defined(FANCHECK) && defined(TACH_1) && (TACH_1 >-1)) @@ -8703,20 +8741,7 @@ void setup_uvlo_interrupt() { ISR(INT4_vect) { EIMSK &= ~(1 << 4); //disable INT4 interrupt to make sure that this code will be executed just once SERIAL_ECHOLNPGM("INT4"); -//-// -// if (IS_SD_PRINTING) uvlo_(); -//if(IS_SD_PRINTING && (!(eeprom_read_byte((uint8_t*)EEPROM_UVLO))) ) uvlo_(); -if(IS_SD_PRINTING && (!(eeprom_read_byte((uint8_t*)EEPROM_UVLO))) ) uvlo_(); -if(eeprom_read_byte((uint8_t*)EEPROM_UVLO)) uvlo_tiny(); -/* -if(IS_SD_PRINTING) - { -MYSERIAL.println(">>> "); - if(!(eeprom_read_byte((uint8_t*)EEPROM_UVLO))) - uvlo_(); - else uvlo_tiny(); - } -*/ + if (IS_SD_PRINTING) uvlo_(); } void recover_print(uint8_t automatic) { @@ -8725,17 +8750,10 @@ void recover_print(uint8_t automatic) { lcd_update(2); lcd_setstatuspgm(_i("Recovering print "));////MSG_RECOVERING_PRINT c=20 r=1 -//-// -// recover_machine_state_after_power_panic(); //recover position, temperatures and extrude_multipliers -MYSERIAL.println(">>> RecoverPrint"); -MYSERIAL.println(eeprom_read_byte((uint8_t*)EEPROM_UVLO),DEC); -bool bTiny=(eeprom_read_byte((uint8_t*)EEPROM_UVLO)==2); -recover_machine_state_after_power_panic(bTiny); //recover position, temperatures and extrude_multipliers + recover_machine_state_after_power_panic(); //recover position, temperatures and extrude_multipliers // Lift the print head, so one may remove the excess priming material. -//-// -//if (current_position[Z_AXIS] < 25) -if(!bTiny&&(current_position[Z_AXIS]<25)) + if (current_position[Z_AXIS] < 25) enquecommand_P(PSTR("G1 Z25 F800")); // Home X and Y axes. Homing just X and Y shall not touch the babystep and the world2machine transformation status. enquecommand_P(PSTR("G28 X Y")); @@ -8753,10 +8771,7 @@ if(!bTiny&&(current_position[Z_AXIS]<25)) enquecommand_P(PSTR("G1 E" STRINGIFY(-DEFAULT_RETRACTION)" F480")); // Mark the power panic status as inactive. -//-// -MYSERIAL.println("===== before"); -// eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0); -MYSERIAL.println("===== after"); + eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0); /*while ((abs(degHotend(0)- target_temperature[0])>5) || (abs(degBed() -target_temperature_bed)>3)) { //wait for heater and bed to reach target temp delay_keep_alive(1000); }*/ @@ -8767,10 +8782,9 @@ MYSERIAL.println("===== after"); restore_print_from_eeprom(); printf_P(_N("Current pos Z_AXIS:%.3f\nCurrent pos E_AXIS:%.3f\n"), current_position[Z_AXIS], current_position[E_AXIS]); -MYSERIAL.println("===== konec"); } -void recover_machine_state_after_power_panic(bool bTiny) +void recover_machine_state_after_power_panic() { char cmd[30]; // 1) Recover the logical cordinates at the time of the power panic. @@ -8779,16 +8793,8 @@ void recover_machine_state_after_power_panic(bool bTiny) current_position[Y_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4)); // Recover the logical coordinate of the Z axis at the time of the power panic. // The current position after power panic is moved to the next closest 0th full step. -//-// -// current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) + -// UVLO_Z_AXIS_SHIFT + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS)) + 7) >> 4) / axis_steps_per_unit[Z_AXIS]; - if(bTiny) - current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z)) + - UVLO_Z_AXIS_SHIFT + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_TINY_Z_MICROSTEPS)) + 7) >> 4) / axis_steps_per_unit[Z_AXIS]; - else - current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) + + current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) + UVLO_Z_AXIS_SHIFT + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS)) + 7) >> 4) / axis_steps_per_unit[Z_AXIS]; -//-// if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_E_ABS)) { current_position[E_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E)); sprintf_P(cmd, PSTR("G92 E")); @@ -8921,8 +8927,6 @@ void restore_print_from_eeprom() { // Set a position in the file. sprintf_P(cmd, PSTR("M26 S%lu"), position); enquecommand(cmd); -//-// -enquecommand_P(PSTR("G4 S0")); // Start SD print. enquecommand_P(PSTR("M24")); } @@ -9201,4 +9205,39 @@ static void print_time_remaining_init() { print_percent_done_silent = PRINT_PERCENT_DONE_INIT; } +bool mmu_get_reponse() { + bool response = true; + LongTimer mmu_get_reponse_timeout; + uart2_rx_clr(); + + mmu_get_reponse_timeout.start(); + while (!uart2_rx_ok()) + { + delay_keep_alive(100); + if (mmu_get_reponse_timeout.expired(30 * 1000ul)) { //PINDA cooling from 60 C to 35 C takes about 7 minutes + response = false; + break; + } + } + return response; +} + +void mmu_not_responding() { + printf_P(PSTR("MMU not responding")); +} + +void mmu_load_to_nozzle() { + bool saved_e_relative_mode = axis_relative_modes[E_AXIS]; + if (!saved_e_relative_mode) { + enquecommand_front_P(PSTR("M82")); // set extruder to relative mode + } + enquecommand_front_P((PSTR("G1 E7.2000 F562"))); + enquecommand_front_P((PSTR("G1 E14.4000 F871"))); + enquecommand_front_P((PSTR("G1 E36.0000 F1393"))); + enquecommand_front_P((PSTR("G1 E14.4000 F871"))); + if (!saved_e_relative_mode) { + enquecommand_front_P(PSTR("M83")); // set extruder to relative mode + } +} + #define FIL_LOAD_LENGTH 60 diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h new file mode 100644 index 000000000..f6af7037e --- /dev/null +++ b/Firmware/eeprom.h @@ -0,0 +1,182 @@ +#ifndef EEPROM_H +#define EEPROM_H + +// The total size of the EEPROM is +// 4096 for the Atmega2560 +#define EEPROM_TOP 4096 +#define EEPROM_SILENT 4095 +#define EEPROM_LANG 4094 +#define EEPROM_BABYSTEP_X 4092 +#define EEPROM_BABYSTEP_Y 4090 +#define EEPROM_BABYSTEP_Z 4088 +#define EEPROM_CALIBRATION_STATUS 4087 +#define EEPROM_BABYSTEP_Z0 4085 +#define EEPROM_FILAMENTUSED 4081 +// uint32_t +#define EEPROM_TOTALTIME 4077 + +#define EEPROM_BED_CALIBRATION_CENTER (EEPROM_TOTALTIME-2*4) +#define EEPROM_BED_CALIBRATION_VEC_X (EEPROM_BED_CALIBRATION_CENTER-2*4) +#define EEPROM_BED_CALIBRATION_VEC_Y (EEPROM_BED_CALIBRATION_VEC_X-2*4) + +// Offsets of the Z heiths of the calibration points from the first point. +// The offsets are saved as 16bit signed int, scaled to tenths of microns. +#define EEPROM_BED_CALIBRATION_Z_JITTER (EEPROM_BED_CALIBRATION_VEC_Y-2*8) +#define EEPROM_FARM_MODE (EEPROM_BED_CALIBRATION_Z_JITTER-1) +#define EEPROM_FARM_NUMBER (EEPROM_FARM_MODE-3) + +// Correction of the bed leveling, in micrometers. +// Maximum 50 micrometers allowed. +// Bed correction is valid if set to 1. If set to zero or 255, the successive 4 bytes are invalid. +#define EEPROM_BED_CORRECTION_VALID (EEPROM_FARM_NUMBER-1) +#define EEPROM_BED_CORRECTION_LEFT (EEPROM_BED_CORRECTION_VALID-1) +#define EEPROM_BED_CORRECTION_RIGHT (EEPROM_BED_CORRECTION_LEFT-1) +#define EEPROM_BED_CORRECTION_FRONT (EEPROM_BED_CORRECTION_RIGHT-1) +#define EEPROM_BED_CORRECTION_REAR (EEPROM_BED_CORRECTION_FRONT-1) +#define EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY (EEPROM_BED_CORRECTION_REAR-1) +#define EEPROM_PRINT_FLAG (EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY-1) +#define EEPROM_PROBE_TEMP_SHIFT (EEPROM_PRINT_FLAG - 2*5) //5 x int for storing pinda probe temp shift relative to 50 C; unit: motor steps +#define EEPROM_TEMP_CAL_ACTIVE (EEPROM_PROBE_TEMP_SHIFT - 1) +#define EEPROM_BOWDEN_LENGTH (EEPROM_TEMP_CAL_ACTIVE - 2*4) //4 x int for bowden lengths for multimaterial +#define EEPROM_CALIBRATION_STATUS_PINDA (EEPROM_BOWDEN_LENGTH - 1) //0 - not calibrated; 1 - calibrated +#define EEPROM_UVLO (EEPROM_CALIBRATION_STATUS_PINDA - 1) //1 - uvlo during print +#define EEPROM_UVLO_CURRENT_POSITION (EEPROM_UVLO-2*4) // 2 x float for current_position in X and Y axes +#define EEPROM_FILENAME (EEPROM_UVLO_CURRENT_POSITION - 8) //8chars to store filename without extension +#define EEPROM_FILE_POSITION (EEPROM_FILENAME - 4) //32 bit for uint32_t file position +#define EEPROM_UVLO_CURRENT_POSITION_Z (EEPROM_FILE_POSITION - 4) //float for current position in Z +#define EEPROM_UVLO_TARGET_HOTEND (EEPROM_UVLO_CURRENT_POSITION_Z - 1) +#define EEPROM_UVLO_TARGET_BED (EEPROM_UVLO_TARGET_HOTEND - 1) +#define EEPROM_UVLO_FEEDRATE (EEPROM_UVLO_TARGET_BED - 2) +#define EEPROM_UVLO_FAN_SPEED (EEPROM_UVLO_FEEDRATE - 1) +#define EEPROM_FAN_CHECK_ENABLED (EEPROM_UVLO_FAN_SPEED - 1) +#define EEPROM_UVLO_MESH_BED_LEVELING (EEPROM_FAN_CHECK_ENABLED - 9*2) + +#define EEPROM_UVLO_Z_MICROSTEPS (EEPROM_UVLO_MESH_BED_LEVELING - 2) +#define EEPROM_UVLO_E_ABS (EEPROM_UVLO_Z_MICROSTEPS - 1) +#define EEPROM_UVLO_CURRENT_POSITION_E (EEPROM_UVLO_E_ABS - 4) //float for current position in E + +// Crash detection mode EEPROM setting +#define EEPROM_CRASH_DET (EEPROM_UVLO_CURRENT_POSITION_E - 5) // float (orig EEPROM_UVLO_MESH_BED_LEVELING-12) +// Crash detection counter Y (last print) +#define EEPROM_CRASH_COUNT_Y (EEPROM_CRASH_DET - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-15) +// Filament sensor on/off EEPROM setting +#define EEPROM_FSENSOR (EEPROM_CRASH_COUNT_Y - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-14) +// Crash detection counter X (last print) +#define EEPROM_CRASH_COUNT_X (EEPROM_FSENSOR - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-15) +// Filament runout/error coutner (last print) +#define EEPROM_FERROR_COUNT (EEPROM_CRASH_COUNT_X - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-16) +// Power loss errors (last print) +#define EEPROM_POWER_COUNT (EEPROM_FERROR_COUNT - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-17) + +#define EEPROM_XYZ_CAL_SKEW (EEPROM_POWER_COUNT - 4) // float for skew backup +#define EEPROM_WIZARD_ACTIVE (EEPROM_XYZ_CAL_SKEW - 1) +#define EEPROM_BELTSTATUS_X (EEPROM_WIZARD_ACTIVE - 2) // uint16 +#define EEPROM_BELTSTATUS_Y (EEPROM_BELTSTATUS_X - 2) // uint16 + +#define EEPROM_DIR_DEPTH (EEPROM_BELTSTATUS_Y-1) +#define EEPROM_DIRS (EEPROM_DIR_DEPTH-80) //8 chars for each dir name, max 10 levels +#define EEPROM_SD_SORT (EEPROM_DIRS - 1) //0 -time, 1-alpha, 2-none +#define EEPROM_SECOND_SERIAL_ACTIVE (EEPROM_SD_SORT - 1) + +#define EEPROM_FSENS_AUTOLOAD_ENABLED (EEPROM_SECOND_SERIAL_ACTIVE - 1) + +// Crash detection counter X (total) +#define EEPROM_CRASH_COUNT_X_TOT (EEPROM_FSENS_AUTOLOAD_ENABLED - 2) // uint16 +// Crash detection counter Y (total) +#define EEPROM_CRASH_COUNT_Y_TOT (EEPROM_CRASH_COUNT_X_TOT - 2) // uint16 +// Filament runout/error coutner (total) +#define EEPROM_FERROR_COUNT_TOT (EEPROM_CRASH_COUNT_Y_TOT - 2) // uint16 +// Power loss errors (total) +#define EEPROM_POWER_COUNT_TOT (EEPROM_FERROR_COUNT_TOT - 2) // uint16 + +//////////////////////////////////////// +// TMC2130 Accurate sensorless homing + +// X-axis home origin (stepper phase in microsteps, 0..63 for 16ustep resolution) +#define EEPROM_TMC2130_HOME_X_ORIGIN (EEPROM_POWER_COUNT_TOT - 1) // uint8 +// X-axis home bsteps (number of microsteps backward) +#define EEPROM_TMC2130_HOME_X_BSTEPS (EEPROM_TMC2130_HOME_X_ORIGIN - 1) // uint8 +// X-axis home fsteps (number of microsteps forward) +#define EEPROM_TMC2130_HOME_X_FSTEPS (EEPROM_TMC2130_HOME_X_BSTEPS - 1) // uint8 +// Y-axis home origin (stepper phase in microsteps, 0..63 for 16ustep resolution) +#define EEPROM_TMC2130_HOME_Y_ORIGIN (EEPROM_TMC2130_HOME_X_FSTEPS - 1) // uint8 +// X-axis home bsteps (number of microsteps backward) +#define EEPROM_TMC2130_HOME_Y_BSTEPS (EEPROM_TMC2130_HOME_Y_ORIGIN - 1) // uint8 +// X-axis home fsteps (number of microsteps forward) +#define EEPROM_TMC2130_HOME_Y_FSTEPS (EEPROM_TMC2130_HOME_Y_BSTEPS - 1) // uint8 +// Accurate homing enabled +#define EEPROM_TMC2130_HOME_ENABLED (EEPROM_TMC2130_HOME_Y_FSTEPS - 1) // uint8 + + +//////////////////////////////////////// +// TMC2130 uStep linearity correction + +// Linearity correction factor (XYZE) +#define EEPROM_TMC2130_WAVE_X_FAC (EEPROM_TMC2130_HOME_ENABLED - 1) // uint8 +#define EEPROM_TMC2130_WAVE_Y_FAC (EEPROM_TMC2130_WAVE_X_FAC - 1) // uint8 +#define EEPROM_TMC2130_WAVE_Z_FAC (EEPROM_TMC2130_WAVE_Y_FAC - 1) // uint8 +#define EEPROM_TMC2130_WAVE_E_FAC (EEPROM_TMC2130_WAVE_Z_FAC - 1) // uint8 + + +//////////////////////////////////////// +// TMC2130 uStep resolution + +// microstep resolution (XYZE): usteps = (256 >> mres) +#define EEPROM_TMC2130_X_MRES (EEPROM_TMC2130_WAVE_E_FAC - 1) // uint8 +#define EEPROM_TMC2130_Y_MRES (EEPROM_TMC2130_X_MRES - 1) // uint8 +#define EEPROM_TMC2130_Z_MRES (EEPROM_TMC2130_Y_MRES - 1) // uint8 +#define EEPROM_TMC2130_E_MRES (EEPROM_TMC2130_Z_MRES - 1) // uint8 + +// HW +#define EEPROM_PRINTER_TYPE (EEPROM_TMC2130_E_MRES - 2) // uint16 +#define EEPROM_BOARD_TYPE (EEPROM_PRINTER_TYPE - 2) // uint16 + +// Extruder multiplier for power panic +#define EEPROM_EXTRUDER_MULTIPLIER_0 (EEPROM_BOARD_TYPE - 4) //float +#define EEPROM_EXTRUDER_MULTIPLIER_1 (EEPROM_EXTRUDER_MULTIPLIER_0 - 4) //float +#define EEPROM_EXTRUDER_MULTIPLIER_2 (EEPROM_EXTRUDER_MULTIPLIER_1 - 4) //float +#define EEPROM_EXTRUDEMULTIPLY (EEPROM_EXTRUDER_MULTIPLIER_2 - 2) // uint16 + +// Sound Mode +#define EEPROM_SOUND_MODE (EEPROM_EXTRUDEMULTIPLY-1) // uint8 + +// !!!!! +// !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!! +// !!!!! + +//TMC2130 configuration +#define EEPROM_TMC_AXIS_SIZE //axis configuration block size +#define EEPROM_TMC_X (EEPROM_TMC + 0 * EEPROM_TMC_AXIS_SIZE) //X axis configuration blok +#define EEPROM_TMC_Y (EEPROM_TMC + 1 * EEPROM_TMC_AXIS_SIZE) //Y axis +#define EEPROM_TMC_Z (EEPROM_TMC + 2 * EEPROM_TMC_AXIS_SIZE) //Z axis +#define EEPROM_TMC_E (EEPROM_TMC + 3 * EEPROM_TMC_AXIS_SIZE) //E axis +//TMC2130 - X axis +#define EEPROM_TMC_X_USTEPS_INTPOL (EEPROM_TMC_X + 0) // 1byte, bit 0..4 USTEPS, bit 7 INTPOL +#define EEPROM_TMC_X_PWM_AMPL (EEPROM_TMC_X + 1) // 1byte (0..255) +#define EEPROM_TMC_X_PWM_GRAD_FREQ (EEPROM_TMC_X + 2) // 1byte, bit 0..3 GRAD, bit 4..5 FREQ +#define EEPROM_TMC_X_TCOOLTHRS (EEPROM_TMC_X + 3) // 2bytes (0..) +#define EEPROM_TMC_X_SG_THRS (EEPROM_TMC_X + 5) // 1byte, (-64..+63) +#define EEPROM_TMC_X_CURRENT_H (EEPROM_TMC_X + 6) // 1byte, (0..63) +#define EEPROM_TMC_X_CURRENT_R (EEPROM_TMC_X + 7) // 1byte, (0..63) +#define EEPROM_TMC_X_HOME_SG_THRS (EEPROM_TMC_X + 8) // 1byte, (-64..+63) +#define EEPROM_TMC_X_HOME_CURRENT_R (EEPROM_TMC_X + 9) // 1byte, (-64..+63) +#define EEPROM_TMC_X_HOME_DTCOOLTHRS (EEPROM_TMC_X + 10) // 1byte (-128..+127) +#define EEPROM_TMC_X_DTCOOLTHRS_LOW (EEPROM_TMC_X + 11) // 1byte (-128..+127) +#define EEPROM_TMC_X_DTCOOLTHRS_HIGH (EEPROM_TMC_X + 12) // 1byte (-128..+127) +#define EEPROM_TMC_X_SG_THRS_LOW (EEPROM_TMC_X + 13) // 1byte, (-64..+63) +#define EEPROM_TMC_X_SG_THRS_HIGH (EEPROM_TMC_X + 14) // 1byte, (-64..+63) + +// Currently running firmware, each digit stored as uint16_t. +// The flavor differentiates a dev, alpha, beta, release candidate or a release version. +#define EEPROM_FIRMWARE_VERSION_END (FW_PRUSA3D_MAGIC_LEN+8) +#define EEPROM_FIRMWARE_VERSION_FLAVOR (FW_PRUSA3D_MAGIC_LEN+6) +#define EEPROM_FIRMWARE_VERSION_REVISION (FW_PRUSA3D_MAGIC_LEN+4) +#define EEPROM_FIRMWARE_VERSION_MINOR (FW_PRUSA3D_MAGIC_LEN+2) +#define EEPROM_FIRMWARE_VERSION_MAJOR FW_PRUSA3D_MAGIC_LEN +// Magic string, indicating that the current or the previous firmware running was the Prusa3D firmware. +#define EEPROM_FIRMWARE_PRUSA_MAGIC 0 + +#define EEPROM_OFFSET 20 //offset for storing settings using M500 +//#define EEPROM_OFFSET + +#endif // EEPROM_H diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index f564be869..b68b943bc 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -13,6 +13,8 @@ //#include #include "Marlin.h" #include "fastio.h" +//-// +#include "sound.h" // commands @@ -689,6 +691,9 @@ uint8_t lcd_clicked(void) void lcd_beeper_quick_feedback(void) { SET_OUTPUT(BEEPER); +//-// +Sound_MakeSound(e_SOUND_CLASS_Echo,e_SOUND_TYPE_ButtonEcho); +/* for(int8_t i = 0; i < 10; i++) { WRITE(BEEPER,HIGH); @@ -696,6 +701,7 @@ void lcd_beeper_quick_feedback(void) WRITE(BEEPER,LOW); delayMicroseconds(100); } +*/ } void lcd_quick_feedback(void) diff --git a/Firmware/sound.cpp b/Firmware/sound.cpp new file mode 100644 index 000000000..90e6ab93e --- /dev/null +++ b/Firmware/sound.cpp @@ -0,0 +1,105 @@ +#include "sound.h" + +#include "Marlin.h" + +//#include +//#include +//#include "eeprom.h" + + +//eSOUND_MODE eSoundMode=e_SOUND_MODE_LOUD; +// nema vyznam, pokud se bude volat Sound_Init (tzn. poc. hodnota je v EEPROM) +// !?! eSOUND_MODE eSoundMode; v ultraldc.cpp :: cd_settings_menu() se takto jevi jako lokalni promenna +eSOUND_MODE eSoundMode; //=e_SOUND_MODE_DEFAULT; + + +static void Sound_SaveMode(void); +static void Sound_DoSound_Echo(void); +static void Sound_DoSound_Prompt(void); + + +void Sound_Init(void) +{ +eSoundMode=(eSOUND_MODE)eeprom_read_byte((uint8_t*)EEPROM_SOUND_MODE); +if(eSoundMode==e_SOUND_MODE_NULL) + Sound_Default(); // je potreba provest i ulozeni do EEPROM +} + +void Sound_Default(void) +{ +eSoundMode=e_SOUND_MODE_DEFAULT; +Sound_SaveMode(); +} + +void Sound_SaveMode(void) +{ +eeprom_update_byte((uint8_t*)EEPROM_SOUND_MODE,(uint8_t)eSoundMode); +} + +void Sound_CycleState(void) +{ +switch(eSoundMode) + { + case e_SOUND_MODE_LOUD: + eSoundMode=e_SOUND_MODE_ONCE; + break; + case e_SOUND_MODE_ONCE: + eSoundMode=e_SOUND_MODE_SILENT; + break; + case e_SOUND_MODE_SILENT: + eSoundMode=e_SOUND_MODE_MUTE; + break; + case e_SOUND_MODE_MUTE: + eSoundMode=e_SOUND_MODE_LOUD; + break; + default: + eSoundMode=e_SOUND_MODE_LOUD; + } +Sound_SaveMode(); +} + +void Sound_MakeSound(eSOUND_CLASS eSoundClass,eSOUND_TYPE eSoundType) +{ +switch(eSoundMode) + { + case e_SOUND_MODE_LOUD: + if(eSoundType==e_SOUND_TYPE_ButtonEcho) + Sound_DoSound_Echo(); + if(eSoundType==e_SOUND_TYPE_StandardPrompt) + Sound_DoSound_Prompt(); + break; + case e_SOUND_MODE_ONCE: + if(eSoundType==e_SOUND_TYPE_ButtonEcho) + Sound_DoSound_Echo(); + if(eSoundType==e_SOUND_TYPE_StandardPrompt) + Sound_DoSound_Prompt(); + break; + case e_SOUND_MODE_SILENT: + break; + case e_SOUND_MODE_MUTE: + break; + default: + ; + } +} + + +static void Sound_DoSound_Echo(void) +{ +uint8_t nI; + +for(nI=0;nI<10;nI++) + { + WRITE(BEEPER,HIGH); + delayMicroseconds(100); + WRITE(BEEPER,LOW); + delayMicroseconds(100); + } +} + +static void Sound_DoSound_Prompt(void) +{ +WRITE(BEEPER,HIGH); +delay_keep_alive(500); +WRITE(BEEPER,LOW); +} diff --git a/Firmware/sound.h b/Firmware/sound.h new file mode 100644 index 000000000..9415b7634 --- /dev/null +++ b/Firmware/sound.h @@ -0,0 +1,34 @@ +#ifndef SOUND_H +#define SOUND_H + + +#define MSG_SOUND_MODE_LOUD "Sound [loud]" +#define MSG_SOUND_MODE_ONCE "Sound [once]" +#define MSG_SOUND_MODE_SILENT "Sound [silent]" +#define MSG_SOUND_MODE_MUTE "Sound [mute]" + + +#define e_SOUND_MODE_NULL 0xFF +typedef enum + {e_SOUND_MODE_LOUD,e_SOUND_MODE_ONCE,e_SOUND_MODE_SILENT,e_SOUND_MODE_MUTE} eSOUND_MODE; +#define e_SOUND_MODE_DEFAULT e_SOUND_MODE_LOUD + +typedef enum + {e_SOUND_TYPE_ButtonEcho,e_SOUND_TYPE_EncoderEcho,e_SOUND_TYPE_StandardPrompt,e_SOUND_TYPE_StandardConfirm,e_SOUND_TYPE_StandardWarning,e_SOUND_TYPE_StandardAlert} eSOUND_TYPE; +typedef enum + {e_SOUND_CLASS_Echo,e_SOUND_CLASS_Prompt,e_SOUND_CLASS_Confirm,e_SOUND_CLASS_Warning,e_SOUND_CLASS_Alert} eSOUND_CLASS; + + +extern eSOUND_MODE eSoundMode; + + +extern void Sound_Init(void); +extern void Sound_Default(void); +extern void Sound_Save(void); +extern void Sound_CycleState(void); +extern void Sound_MakeSound(eSOUND_CLASS eSoundClass,eSOUND_TYPE eSoundType); + +//static void Sound_DoSound_Echo(void); +//static void Sound_DoSound_Prompt(void); + +#endif // SOUND_H diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6ea1b5f15..8543d5a2b 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -31,6 +31,9 @@ #include "tmc2130.h" #endif //TMC2130 +//-// +#include "sound.h" + #ifdef SNMM_V2 #include "uart2.h" #endif //SNMM_V2 @@ -4112,6 +4115,11 @@ static void lcd_fsensor_state_set() } #endif //PAT9125 +//-// +static void lcd_sound_state_set(void) +{ +Sound_CycleState(); +} #if !SDSORT_USES_RAM void lcd_set_degree() { @@ -4668,7 +4676,7 @@ static void lcd_settings_menu() #endif //(LANG_MODE != 0) if (card.ToshibaFlashAir_isEnabled()) { - MENU_ITEM_FUNCTION_P(_i("SD card [FlshAir]"), lcd_toshiba_flash_air_compatibility_toggle);////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 + MENU_ITEM_FUNCTION_P(_i("SD card [flshAir]"), lcd_toshiba_flash_air_compatibility_toggle);////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 } else { MENU_ITEM_FUNCTION_P(_i("SD card [normal]"), lcd_toshiba_flash_air_compatibility_toggle);////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 } @@ -4678,13 +4686,33 @@ static void lcd_settings_menu() uint8_t sdSort; EEPROM_read(EEPROM_SD_SORT, (uint8_t*)&sdSort, sizeof(sdSort)); switch (sdSort) { - case SD_SORT_TIME: MENU_ITEM_FUNCTION_P(_i("Sort: [Time]"), lcd_sort_type_set); break;////MSG_SORT_TIME c=17 r=1 - case SD_SORT_ALPHA: MENU_ITEM_FUNCTION_P(_i("Sort: [Alphabet]"), lcd_sort_type_set); break;////MSG_SORT_ALPHA c=17 r=1 - default: MENU_ITEM_FUNCTION_P(_i("Sort: [None]"), lcd_sort_type_set);////MSG_SORT_NONE c=17 r=1 + case SD_SORT_TIME: MENU_ITEM_FUNCTION_P(_i("Sort: [time]"), lcd_sort_type_set); break;////MSG_SORT_TIME c=17 r=1 + case SD_SORT_ALPHA: MENU_ITEM_FUNCTION_P(_i("Sort: [alphabet]"), lcd_sort_type_set); break;////MSG_SORT_ALPHA c=17 r=1 + default: MENU_ITEM_FUNCTION_P(_i("Sort: [none]"), lcd_sort_type_set);////MSG_SORT_NONE c=17 r=1 } } #endif // SDCARD_SORT_ALPHA - + +//-// +switch(eSoundMode) + { + case e_SOUND_MODE_LOUD: + MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set); + break; + case e_SOUND_MODE_ONCE: + MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_ONCE),lcd_sound_state_set); + break; + case e_SOUND_MODE_SILENT: + MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_SILENT),lcd_sound_state_set); + break; + case e_SOUND_MODE_MUTE: + MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_MUTE),lcd_sound_state_set); + break; + default: + MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set); + } +//-// + if (farm_mode) { MENU_ITEM_SUBMENU_P(PSTR("Farm number"), lcd_farm_no); From 5fd1acaf81c796768273936b459f3dce166e2bdd Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 20 Jul 2018 15:20:57 +0200 Subject: [PATCH 9/9] Revert "PowerPanic" --- Firmware/Configuration.h | 171 +++++++++++++++++++++++++++++++++++- Firmware/Marlin.h | 10 ++- Firmware/Marlin_main.cpp | 25 +----- Firmware/eeprom.h | 182 --------------------------------------- Firmware/lcd.cpp | 6 -- Firmware/sound.cpp | 105 ---------------------- Firmware/sound.h | 34 -------- Firmware/ultralcd.cpp | 38 ++------ 8 files changed, 182 insertions(+), 389 deletions(-) delete mode 100644 Firmware/eeprom.h delete mode 100644 Firmware/sound.cpp delete mode 100644 Firmware/sound.h diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 3fa648f7a..469386e5f 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -44,8 +44,177 @@ #define FW_PRUSA3D_MAGIC "PRUSA3DFW" #define FW_PRUSA3D_MAGIC_LEN 10 +// The total size of the EEPROM is +// 4096 for the Atmega2560 +#define EEPROM_TOP 4096 +#define EEPROM_SILENT 4095 +#define EEPROM_LANG 4094 +#define EEPROM_BABYSTEP_X 4092 +#define EEPROM_BABYSTEP_Y 4090 +#define EEPROM_BABYSTEP_Z 4088 +#define EEPROM_CALIBRATION_STATUS 4087 +#define EEPROM_BABYSTEP_Z0 4085 +#define EEPROM_FILAMENTUSED 4081 +// uint32_t +#define EEPROM_TOTALTIME 4077 -#include "eeprom.h" +#define EEPROM_BED_CALIBRATION_CENTER (EEPROM_TOTALTIME-2*4) +#define EEPROM_BED_CALIBRATION_VEC_X (EEPROM_BED_CALIBRATION_CENTER-2*4) +#define EEPROM_BED_CALIBRATION_VEC_Y (EEPROM_BED_CALIBRATION_VEC_X-2*4) + +// Offsets of the Z heiths of the calibration points from the first point. +// The offsets are saved as 16bit signed int, scaled to tenths of microns. +#define EEPROM_BED_CALIBRATION_Z_JITTER (EEPROM_BED_CALIBRATION_VEC_Y-2*8) +#define EEPROM_FARM_MODE (EEPROM_BED_CALIBRATION_Z_JITTER-1) +#define EEPROM_FARM_NUMBER (EEPROM_FARM_MODE-3) + +// Correction of the bed leveling, in micrometers. +// Maximum 50 micrometers allowed. +// Bed correction is valid if set to 1. If set to zero or 255, the successive 4 bytes are invalid. +#define EEPROM_BED_CORRECTION_VALID (EEPROM_FARM_NUMBER-1) +#define EEPROM_BED_CORRECTION_LEFT (EEPROM_BED_CORRECTION_VALID-1) +#define EEPROM_BED_CORRECTION_RIGHT (EEPROM_BED_CORRECTION_LEFT-1) +#define EEPROM_BED_CORRECTION_FRONT (EEPROM_BED_CORRECTION_RIGHT-1) +#define EEPROM_BED_CORRECTION_REAR (EEPROM_BED_CORRECTION_FRONT-1) +#define EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY (EEPROM_BED_CORRECTION_REAR-1) +#define EEPROM_PRINT_FLAG (EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY-1) +#define EEPROM_PROBE_TEMP_SHIFT (EEPROM_PRINT_FLAG - 2*5) //5 x int for storing pinda probe temp shift relative to 50 C; unit: motor steps +#define EEPROM_TEMP_CAL_ACTIVE (EEPROM_PROBE_TEMP_SHIFT - 1) +#define EEPROM_BOWDEN_LENGTH (EEPROM_TEMP_CAL_ACTIVE - 2*4) //4 x int for bowden lengths for multimaterial +#define EEPROM_CALIBRATION_STATUS_PINDA (EEPROM_BOWDEN_LENGTH - 1) //0 - not calibrated; 1 - calibrated +#define EEPROM_UVLO (EEPROM_CALIBRATION_STATUS_PINDA - 1) //1 - uvlo during print +#define EEPROM_UVLO_CURRENT_POSITION (EEPROM_UVLO-2*4) // 2 x float for current_position in X and Y axes +#define EEPROM_FILENAME (EEPROM_UVLO_CURRENT_POSITION - 8) //8chars to store filename without extension +#define EEPROM_FILE_POSITION (EEPROM_FILENAME - 4) //32 bit for uint32_t file position +#define EEPROM_UVLO_CURRENT_POSITION_Z (EEPROM_FILE_POSITION - 4) //float for current position in Z +#define EEPROM_UVLO_TARGET_HOTEND (EEPROM_UVLO_CURRENT_POSITION_Z - 1) +#define EEPROM_UVLO_TARGET_BED (EEPROM_UVLO_TARGET_HOTEND - 1) +#define EEPROM_UVLO_FEEDRATE (EEPROM_UVLO_TARGET_BED - 2) +#define EEPROM_UVLO_FAN_SPEED (EEPROM_UVLO_FEEDRATE - 1) +#define EEPROM_FAN_CHECK_ENABLED (EEPROM_UVLO_FAN_SPEED - 1) +#define EEPROM_UVLO_MESH_BED_LEVELING (EEPROM_FAN_CHECK_ENABLED - 9*2) + +#define EEPROM_UVLO_Z_MICROSTEPS (EEPROM_UVLO_MESH_BED_LEVELING - 2) +#define EEPROM_UVLO_E_ABS (EEPROM_UVLO_Z_MICROSTEPS - 1) +#define EEPROM_UVLO_CURRENT_POSITION_E (EEPROM_UVLO_E_ABS - 4) //float for current position in E + +// Crash detection mode EEPROM setting +#define EEPROM_CRASH_DET (EEPROM_UVLO_CURRENT_POSITION_E - 5) // float (orig EEPROM_UVLO_MESH_BED_LEVELING-12) +// Crash detection counter Y (last print) +#define EEPROM_CRASH_COUNT_Y (EEPROM_CRASH_DET - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-15) +// Filament sensor on/off EEPROM setting +#define EEPROM_FSENSOR (EEPROM_CRASH_COUNT_Y - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-14) +// Crash detection counter X (last print) +#define EEPROM_CRASH_COUNT_X (EEPROM_FSENSOR - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-15) +// Filament runout/error coutner (last print) +#define EEPROM_FERROR_COUNT (EEPROM_CRASH_COUNT_X - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-16) +// Power loss errors (last print) +#define EEPROM_POWER_COUNT (EEPROM_FERROR_COUNT - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-17) + +#define EEPROM_XYZ_CAL_SKEW (EEPROM_POWER_COUNT - 4) // float for skew backup +#define EEPROM_WIZARD_ACTIVE (EEPROM_XYZ_CAL_SKEW - 1) +#define EEPROM_BELTSTATUS_X (EEPROM_WIZARD_ACTIVE - 2) // uint16 +#define EEPROM_BELTSTATUS_Y (EEPROM_BELTSTATUS_X - 2) // uint16 + +#define EEPROM_DIR_DEPTH (EEPROM_BELTSTATUS_Y-1) +#define EEPROM_DIRS (EEPROM_DIR_DEPTH-80) //8 chars for each dir name, max 10 levels +#define EEPROM_SD_SORT (EEPROM_DIRS - 1) //0 -time, 1-alpha, 2-none +#define EEPROM_SECOND_SERIAL_ACTIVE (EEPROM_SD_SORT - 1) + +#define EEPROM_FSENS_AUTOLOAD_ENABLED (EEPROM_SECOND_SERIAL_ACTIVE - 1) + +// Crash detection counter X (total) +#define EEPROM_CRASH_COUNT_X_TOT (EEPROM_FSENS_AUTOLOAD_ENABLED - 2) // uint16 +// Crash detection counter Y (total) +#define EEPROM_CRASH_COUNT_Y_TOT (EEPROM_CRASH_COUNT_X_TOT - 2) // uint16 +// Filament runout/error coutner (total) +#define EEPROM_FERROR_COUNT_TOT (EEPROM_CRASH_COUNT_Y_TOT - 2) // uint16 +// Power loss errors (total) +#define EEPROM_POWER_COUNT_TOT (EEPROM_FERROR_COUNT_TOT - 2) // uint16 + +//////////////////////////////////////// +// TMC2130 Accurate sensorless homing + +// X-axis home origin (stepper phase in microsteps, 0..63 for 16ustep resolution) +#define EEPROM_TMC2130_HOME_X_ORIGIN (EEPROM_POWER_COUNT_TOT - 1) // uint8 +// X-axis home bsteps (number of microsteps backward) +#define EEPROM_TMC2130_HOME_X_BSTEPS (EEPROM_TMC2130_HOME_X_ORIGIN - 1) // uint8 +// X-axis home fsteps (number of microsteps forward) +#define EEPROM_TMC2130_HOME_X_FSTEPS (EEPROM_TMC2130_HOME_X_BSTEPS - 1) // uint8 +// Y-axis home origin (stepper phase in microsteps, 0..63 for 16ustep resolution) +#define EEPROM_TMC2130_HOME_Y_ORIGIN (EEPROM_TMC2130_HOME_X_FSTEPS - 1) // uint8 +// X-axis home bsteps (number of microsteps backward) +#define EEPROM_TMC2130_HOME_Y_BSTEPS (EEPROM_TMC2130_HOME_Y_ORIGIN - 1) // uint8 +// X-axis home fsteps (number of microsteps forward) +#define EEPROM_TMC2130_HOME_Y_FSTEPS (EEPROM_TMC2130_HOME_Y_BSTEPS - 1) // uint8 +// Accurate homing enabled +#define EEPROM_TMC2130_HOME_ENABLED (EEPROM_TMC2130_HOME_Y_FSTEPS - 1) // uint8 + + +//////////////////////////////////////// +// TMC2130 uStep linearity correction + +// Linearity correction factor (XYZE) +#define EEPROM_TMC2130_WAVE_X_FAC (EEPROM_TMC2130_HOME_ENABLED - 1) // uint8 +#define EEPROM_TMC2130_WAVE_Y_FAC (EEPROM_TMC2130_WAVE_X_FAC - 1) // uint8 +#define EEPROM_TMC2130_WAVE_Z_FAC (EEPROM_TMC2130_WAVE_Y_FAC - 1) // uint8 +#define EEPROM_TMC2130_WAVE_E_FAC (EEPROM_TMC2130_WAVE_Z_FAC - 1) // uint8 + + +//////////////////////////////////////// +// TMC2130 uStep resolution + +// microstep resolution (XYZE): usteps = (256 >> mres) +#define EEPROM_TMC2130_X_MRES (EEPROM_TMC2130_WAVE_E_FAC - 1) // uint8 +#define EEPROM_TMC2130_Y_MRES (EEPROM_TMC2130_X_MRES - 1) // uint8 +#define EEPROM_TMC2130_Z_MRES (EEPROM_TMC2130_Y_MRES - 1) // uint8 +#define EEPROM_TMC2130_E_MRES (EEPROM_TMC2130_Z_MRES - 1) // uint8 + +// HW +#define EEPROM_PRINTER_TYPE (EEPROM_TMC2130_E_MRES - 2) // uint16 +#define EEPROM_BOARD_TYPE (EEPROM_PRINTER_TYPE - 2) // uint16 + +// Extruder multiplier for power panic +#define EEPROM_EXTRUDER_MULTIPLIER_0 (EEPROM_BOARD_TYPE - 4) //float +#define EEPROM_EXTRUDER_MULTIPLIER_1 (EEPROM_EXTRUDER_MULTIPLIER_0 - 4) //float +#define EEPROM_EXTRUDER_MULTIPLIER_2 (EEPROM_EXTRUDER_MULTIPLIER_1 - 4) //float +#define EEPROM_EXTRUDEMULTIPLY (EEPROM_EXTRUDER_MULTIPLIER_2 - 2) // uint16 + + +//TMC2130 configuration +#define EEPROM_TMC_AXIS_SIZE //axis configuration block size +#define EEPROM_TMC_X (EEPROM_TMC + 0 * EEPROM_TMC_AXIS_SIZE) //X axis configuration blok +#define EEPROM_TMC_Y (EEPROM_TMC + 1 * EEPROM_TMC_AXIS_SIZE) //Y axis +#define EEPROM_TMC_Z (EEPROM_TMC + 2 * EEPROM_TMC_AXIS_SIZE) //Z axis +#define EEPROM_TMC_E (EEPROM_TMC + 3 * EEPROM_TMC_AXIS_SIZE) //E axis +//TMC2130 - X axis +#define EEPROM_TMC_X_USTEPS_INTPOL (EEPROM_TMC_X + 0) // 1byte, bit 0..4 USTEPS, bit 7 INTPOL +#define EEPROM_TMC_X_PWM_AMPL (EEPROM_TMC_X + 1) // 1byte (0..255) +#define EEPROM_TMC_X_PWM_GRAD_FREQ (EEPROM_TMC_X + 2) // 1byte, bit 0..3 GRAD, bit 4..5 FREQ +#define EEPROM_TMC_X_TCOOLTHRS (EEPROM_TMC_X + 3) // 2bytes (0..) +#define EEPROM_TMC_X_SG_THRS (EEPROM_TMC_X + 5) // 1byte, (-64..+63) +#define EEPROM_TMC_X_CURRENT_H (EEPROM_TMC_X + 6) // 1byte, (0..63) +#define EEPROM_TMC_X_CURRENT_R (EEPROM_TMC_X + 7) // 1byte, (0..63) +#define EEPROM_TMC_X_HOME_SG_THRS (EEPROM_TMC_X + 8) // 1byte, (-64..+63) +#define EEPROM_TMC_X_HOME_CURRENT_R (EEPROM_TMC_X + 9) // 1byte, (-64..+63) +#define EEPROM_TMC_X_HOME_DTCOOLTHRS (EEPROM_TMC_X + 10) // 1byte (-128..+127) +#define EEPROM_TMC_X_DTCOOLTHRS_LOW (EEPROM_TMC_X + 11) // 1byte (-128..+127) +#define EEPROM_TMC_X_DTCOOLTHRS_HIGH (EEPROM_TMC_X + 12) // 1byte (-128..+127) +#define EEPROM_TMC_X_SG_THRS_LOW (EEPROM_TMC_X + 13) // 1byte, (-64..+63) +#define EEPROM_TMC_X_SG_THRS_HIGH (EEPROM_TMC_X + 14) // 1byte, (-64..+63) + +// Currently running firmware, each digit stored as uint16_t. +// The flavor differentiates a dev, alpha, beta, release candidate or a release version. +#define EEPROM_FIRMWARE_VERSION_END (FW_PRUSA3D_MAGIC_LEN+8) +#define EEPROM_FIRMWARE_VERSION_FLAVOR (FW_PRUSA3D_MAGIC_LEN+6) +#define EEPROM_FIRMWARE_VERSION_REVISION (FW_PRUSA3D_MAGIC_LEN+4) +#define EEPROM_FIRMWARE_VERSION_MINOR (FW_PRUSA3D_MAGIC_LEN+2) +#define EEPROM_FIRMWARE_VERSION_MAJOR FW_PRUSA3D_MAGIC_LEN +// Magic string, indicating that the current or the previous firmware running was the Prusa3D firmware. +#define EEPROM_FIRMWARE_PRUSA_MAGIC 0 + +#define EEPROM_OFFSET 20 //offset for storing settings using M500 +//#define EEPROM_OFFSET // This configuration file contains the basic settings. // Advanced settings can be found in Configuration_adv.h diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 064d96d4e..11e35a102 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -396,7 +396,6 @@ void serialecho_temperatures(); bool check_commands(); void uvlo_(); -void uvlo_tiny(); void recover_print(uint8_t automatic); void setup_uvlo_interrupt(); @@ -404,8 +403,7 @@ void setup_uvlo_interrupt(); void setup_fan_interrupt(); #endif -//extern void recover_machine_state_after_power_panic(); -extern void recover_machine_state_after_power_panic(bool bTiny); +extern void recover_machine_state_after_power_panic(); extern void restore_print_from_eeprom(); extern void position_menu(); @@ -466,4 +464,8 @@ void gcode_M701(); #define UVLO !(PINE & (1<<4)) -void proc_commands(); \ No newline at end of file +void proc_commands(); + +bool mmu_get_reponse(); +void mmu_not_responding(); +void mmu_load_to_nozzle(); \ No newline at end of file diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 1ae770129..74719f723 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -126,8 +126,6 @@ #include "ultralcd.h" -//-// -#include "sound.h" #include "cmdqueue.h" @@ -1151,8 +1149,6 @@ void setup() spi_init(); lcd_splash(); -//-// - Sound_Init(); #ifdef W25X20CL // Enter an STK500 compatible Optiboot boot loader waiting for flashing the languages to an external flash memory. @@ -6363,8 +6359,6 @@ Sigma_Exit: unsigned long waiting_start_time = millis(); uint8_t wait_for_user_state = 0; lcd_display_message_fullscreen_P(_T(MSG_PRESS_TO_UNLOAD)); -//-// -bool bFirst=true; while (!(wait_for_user_state == 0 && lcd_clicked())){ //cnt++; @@ -6385,13 +6379,7 @@ bool bFirst=true; } SET_OUTPUT(BEEPER); if (counterBeep == 0) { -//-// -//if(eSoundMode==e_SOUND_MODE_LOUD) -if((eSoundMode==e_SOUND_MODE_LOUD)||((eSoundMode==e_SOUND_MODE_ONCE)&&bFirst)) -{ -bFirst=false; WRITE(BEEPER, HIGH); -} } if (counterBeep == 20) { WRITE(BEEPER, LOW); @@ -7113,11 +7101,7 @@ bFirst=false; disable_e2(); delay(100); -//-// -//if(eSoundMode==e_SOUND_MODE_LOUD) -// Sound_MakeSound_tmp(); -Sound_MakeSound(e_SOUND_CLASS_Prompt,e_SOUND_TYPE_StandardPrompt); -/* + WRITE(BEEPER, HIGH); uint8_t counterBeep = 0; while (!lcd_clicked() && (counterBeep < 50)) { @@ -7126,13 +7110,6 @@ Sound_MakeSound(e_SOUND_CLASS_Prompt,e_SOUND_TYPE_StandardPrompt); counterBeep++; } WRITE(BEEPER, LOW); -*/ -uint8_t counterBeep = 0; -while (!lcd_clicked() && (counterBeep < 50)) { - delay_keep_alive(100); - counterBeep++; -} -//-// st_synchronize(); while (lcd_clicked()) delay_keep_alive(100); diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h deleted file mode 100644 index f6af7037e..000000000 --- a/Firmware/eeprom.h +++ /dev/null @@ -1,182 +0,0 @@ -#ifndef EEPROM_H -#define EEPROM_H - -// The total size of the EEPROM is -// 4096 for the Atmega2560 -#define EEPROM_TOP 4096 -#define EEPROM_SILENT 4095 -#define EEPROM_LANG 4094 -#define EEPROM_BABYSTEP_X 4092 -#define EEPROM_BABYSTEP_Y 4090 -#define EEPROM_BABYSTEP_Z 4088 -#define EEPROM_CALIBRATION_STATUS 4087 -#define EEPROM_BABYSTEP_Z0 4085 -#define EEPROM_FILAMENTUSED 4081 -// uint32_t -#define EEPROM_TOTALTIME 4077 - -#define EEPROM_BED_CALIBRATION_CENTER (EEPROM_TOTALTIME-2*4) -#define EEPROM_BED_CALIBRATION_VEC_X (EEPROM_BED_CALIBRATION_CENTER-2*4) -#define EEPROM_BED_CALIBRATION_VEC_Y (EEPROM_BED_CALIBRATION_VEC_X-2*4) - -// Offsets of the Z heiths of the calibration points from the first point. -// The offsets are saved as 16bit signed int, scaled to tenths of microns. -#define EEPROM_BED_CALIBRATION_Z_JITTER (EEPROM_BED_CALIBRATION_VEC_Y-2*8) -#define EEPROM_FARM_MODE (EEPROM_BED_CALIBRATION_Z_JITTER-1) -#define EEPROM_FARM_NUMBER (EEPROM_FARM_MODE-3) - -// Correction of the bed leveling, in micrometers. -// Maximum 50 micrometers allowed. -// Bed correction is valid if set to 1. If set to zero or 255, the successive 4 bytes are invalid. -#define EEPROM_BED_CORRECTION_VALID (EEPROM_FARM_NUMBER-1) -#define EEPROM_BED_CORRECTION_LEFT (EEPROM_BED_CORRECTION_VALID-1) -#define EEPROM_BED_CORRECTION_RIGHT (EEPROM_BED_CORRECTION_LEFT-1) -#define EEPROM_BED_CORRECTION_FRONT (EEPROM_BED_CORRECTION_RIGHT-1) -#define EEPROM_BED_CORRECTION_REAR (EEPROM_BED_CORRECTION_FRONT-1) -#define EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY (EEPROM_BED_CORRECTION_REAR-1) -#define EEPROM_PRINT_FLAG (EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY-1) -#define EEPROM_PROBE_TEMP_SHIFT (EEPROM_PRINT_FLAG - 2*5) //5 x int for storing pinda probe temp shift relative to 50 C; unit: motor steps -#define EEPROM_TEMP_CAL_ACTIVE (EEPROM_PROBE_TEMP_SHIFT - 1) -#define EEPROM_BOWDEN_LENGTH (EEPROM_TEMP_CAL_ACTIVE - 2*4) //4 x int for bowden lengths for multimaterial -#define EEPROM_CALIBRATION_STATUS_PINDA (EEPROM_BOWDEN_LENGTH - 1) //0 - not calibrated; 1 - calibrated -#define EEPROM_UVLO (EEPROM_CALIBRATION_STATUS_PINDA - 1) //1 - uvlo during print -#define EEPROM_UVLO_CURRENT_POSITION (EEPROM_UVLO-2*4) // 2 x float for current_position in X and Y axes -#define EEPROM_FILENAME (EEPROM_UVLO_CURRENT_POSITION - 8) //8chars to store filename without extension -#define EEPROM_FILE_POSITION (EEPROM_FILENAME - 4) //32 bit for uint32_t file position -#define EEPROM_UVLO_CURRENT_POSITION_Z (EEPROM_FILE_POSITION - 4) //float for current position in Z -#define EEPROM_UVLO_TARGET_HOTEND (EEPROM_UVLO_CURRENT_POSITION_Z - 1) -#define EEPROM_UVLO_TARGET_BED (EEPROM_UVLO_TARGET_HOTEND - 1) -#define EEPROM_UVLO_FEEDRATE (EEPROM_UVLO_TARGET_BED - 2) -#define EEPROM_UVLO_FAN_SPEED (EEPROM_UVLO_FEEDRATE - 1) -#define EEPROM_FAN_CHECK_ENABLED (EEPROM_UVLO_FAN_SPEED - 1) -#define EEPROM_UVLO_MESH_BED_LEVELING (EEPROM_FAN_CHECK_ENABLED - 9*2) - -#define EEPROM_UVLO_Z_MICROSTEPS (EEPROM_UVLO_MESH_BED_LEVELING - 2) -#define EEPROM_UVLO_E_ABS (EEPROM_UVLO_Z_MICROSTEPS - 1) -#define EEPROM_UVLO_CURRENT_POSITION_E (EEPROM_UVLO_E_ABS - 4) //float for current position in E - -// Crash detection mode EEPROM setting -#define EEPROM_CRASH_DET (EEPROM_UVLO_CURRENT_POSITION_E - 5) // float (orig EEPROM_UVLO_MESH_BED_LEVELING-12) -// Crash detection counter Y (last print) -#define EEPROM_CRASH_COUNT_Y (EEPROM_CRASH_DET - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-15) -// Filament sensor on/off EEPROM setting -#define EEPROM_FSENSOR (EEPROM_CRASH_COUNT_Y - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-14) -// Crash detection counter X (last print) -#define EEPROM_CRASH_COUNT_X (EEPROM_FSENSOR - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-15) -// Filament runout/error coutner (last print) -#define EEPROM_FERROR_COUNT (EEPROM_CRASH_COUNT_X - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-16) -// Power loss errors (last print) -#define EEPROM_POWER_COUNT (EEPROM_FERROR_COUNT - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-17) - -#define EEPROM_XYZ_CAL_SKEW (EEPROM_POWER_COUNT - 4) // float for skew backup -#define EEPROM_WIZARD_ACTIVE (EEPROM_XYZ_CAL_SKEW - 1) -#define EEPROM_BELTSTATUS_X (EEPROM_WIZARD_ACTIVE - 2) // uint16 -#define EEPROM_BELTSTATUS_Y (EEPROM_BELTSTATUS_X - 2) // uint16 - -#define EEPROM_DIR_DEPTH (EEPROM_BELTSTATUS_Y-1) -#define EEPROM_DIRS (EEPROM_DIR_DEPTH-80) //8 chars for each dir name, max 10 levels -#define EEPROM_SD_SORT (EEPROM_DIRS - 1) //0 -time, 1-alpha, 2-none -#define EEPROM_SECOND_SERIAL_ACTIVE (EEPROM_SD_SORT - 1) - -#define EEPROM_FSENS_AUTOLOAD_ENABLED (EEPROM_SECOND_SERIAL_ACTIVE - 1) - -// Crash detection counter X (total) -#define EEPROM_CRASH_COUNT_X_TOT (EEPROM_FSENS_AUTOLOAD_ENABLED - 2) // uint16 -// Crash detection counter Y (total) -#define EEPROM_CRASH_COUNT_Y_TOT (EEPROM_CRASH_COUNT_X_TOT - 2) // uint16 -// Filament runout/error coutner (total) -#define EEPROM_FERROR_COUNT_TOT (EEPROM_CRASH_COUNT_Y_TOT - 2) // uint16 -// Power loss errors (total) -#define EEPROM_POWER_COUNT_TOT (EEPROM_FERROR_COUNT_TOT - 2) // uint16 - -//////////////////////////////////////// -// TMC2130 Accurate sensorless homing - -// X-axis home origin (stepper phase in microsteps, 0..63 for 16ustep resolution) -#define EEPROM_TMC2130_HOME_X_ORIGIN (EEPROM_POWER_COUNT_TOT - 1) // uint8 -// X-axis home bsteps (number of microsteps backward) -#define EEPROM_TMC2130_HOME_X_BSTEPS (EEPROM_TMC2130_HOME_X_ORIGIN - 1) // uint8 -// X-axis home fsteps (number of microsteps forward) -#define EEPROM_TMC2130_HOME_X_FSTEPS (EEPROM_TMC2130_HOME_X_BSTEPS - 1) // uint8 -// Y-axis home origin (stepper phase in microsteps, 0..63 for 16ustep resolution) -#define EEPROM_TMC2130_HOME_Y_ORIGIN (EEPROM_TMC2130_HOME_X_FSTEPS - 1) // uint8 -// X-axis home bsteps (number of microsteps backward) -#define EEPROM_TMC2130_HOME_Y_BSTEPS (EEPROM_TMC2130_HOME_Y_ORIGIN - 1) // uint8 -// X-axis home fsteps (number of microsteps forward) -#define EEPROM_TMC2130_HOME_Y_FSTEPS (EEPROM_TMC2130_HOME_Y_BSTEPS - 1) // uint8 -// Accurate homing enabled -#define EEPROM_TMC2130_HOME_ENABLED (EEPROM_TMC2130_HOME_Y_FSTEPS - 1) // uint8 - - -//////////////////////////////////////// -// TMC2130 uStep linearity correction - -// Linearity correction factor (XYZE) -#define EEPROM_TMC2130_WAVE_X_FAC (EEPROM_TMC2130_HOME_ENABLED - 1) // uint8 -#define EEPROM_TMC2130_WAVE_Y_FAC (EEPROM_TMC2130_WAVE_X_FAC - 1) // uint8 -#define EEPROM_TMC2130_WAVE_Z_FAC (EEPROM_TMC2130_WAVE_Y_FAC - 1) // uint8 -#define EEPROM_TMC2130_WAVE_E_FAC (EEPROM_TMC2130_WAVE_Z_FAC - 1) // uint8 - - -//////////////////////////////////////// -// TMC2130 uStep resolution - -// microstep resolution (XYZE): usteps = (256 >> mres) -#define EEPROM_TMC2130_X_MRES (EEPROM_TMC2130_WAVE_E_FAC - 1) // uint8 -#define EEPROM_TMC2130_Y_MRES (EEPROM_TMC2130_X_MRES - 1) // uint8 -#define EEPROM_TMC2130_Z_MRES (EEPROM_TMC2130_Y_MRES - 1) // uint8 -#define EEPROM_TMC2130_E_MRES (EEPROM_TMC2130_Z_MRES - 1) // uint8 - -// HW -#define EEPROM_PRINTER_TYPE (EEPROM_TMC2130_E_MRES - 2) // uint16 -#define EEPROM_BOARD_TYPE (EEPROM_PRINTER_TYPE - 2) // uint16 - -// Extruder multiplier for power panic -#define EEPROM_EXTRUDER_MULTIPLIER_0 (EEPROM_BOARD_TYPE - 4) //float -#define EEPROM_EXTRUDER_MULTIPLIER_1 (EEPROM_EXTRUDER_MULTIPLIER_0 - 4) //float -#define EEPROM_EXTRUDER_MULTIPLIER_2 (EEPROM_EXTRUDER_MULTIPLIER_1 - 4) //float -#define EEPROM_EXTRUDEMULTIPLY (EEPROM_EXTRUDER_MULTIPLIER_2 - 2) // uint16 - -// Sound Mode -#define EEPROM_SOUND_MODE (EEPROM_EXTRUDEMULTIPLY-1) // uint8 - -// !!!!! -// !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!! -// !!!!! - -//TMC2130 configuration -#define EEPROM_TMC_AXIS_SIZE //axis configuration block size -#define EEPROM_TMC_X (EEPROM_TMC + 0 * EEPROM_TMC_AXIS_SIZE) //X axis configuration blok -#define EEPROM_TMC_Y (EEPROM_TMC + 1 * EEPROM_TMC_AXIS_SIZE) //Y axis -#define EEPROM_TMC_Z (EEPROM_TMC + 2 * EEPROM_TMC_AXIS_SIZE) //Z axis -#define EEPROM_TMC_E (EEPROM_TMC + 3 * EEPROM_TMC_AXIS_SIZE) //E axis -//TMC2130 - X axis -#define EEPROM_TMC_X_USTEPS_INTPOL (EEPROM_TMC_X + 0) // 1byte, bit 0..4 USTEPS, bit 7 INTPOL -#define EEPROM_TMC_X_PWM_AMPL (EEPROM_TMC_X + 1) // 1byte (0..255) -#define EEPROM_TMC_X_PWM_GRAD_FREQ (EEPROM_TMC_X + 2) // 1byte, bit 0..3 GRAD, bit 4..5 FREQ -#define EEPROM_TMC_X_TCOOLTHRS (EEPROM_TMC_X + 3) // 2bytes (0..) -#define EEPROM_TMC_X_SG_THRS (EEPROM_TMC_X + 5) // 1byte, (-64..+63) -#define EEPROM_TMC_X_CURRENT_H (EEPROM_TMC_X + 6) // 1byte, (0..63) -#define EEPROM_TMC_X_CURRENT_R (EEPROM_TMC_X + 7) // 1byte, (0..63) -#define EEPROM_TMC_X_HOME_SG_THRS (EEPROM_TMC_X + 8) // 1byte, (-64..+63) -#define EEPROM_TMC_X_HOME_CURRENT_R (EEPROM_TMC_X + 9) // 1byte, (-64..+63) -#define EEPROM_TMC_X_HOME_DTCOOLTHRS (EEPROM_TMC_X + 10) // 1byte (-128..+127) -#define EEPROM_TMC_X_DTCOOLTHRS_LOW (EEPROM_TMC_X + 11) // 1byte (-128..+127) -#define EEPROM_TMC_X_DTCOOLTHRS_HIGH (EEPROM_TMC_X + 12) // 1byte (-128..+127) -#define EEPROM_TMC_X_SG_THRS_LOW (EEPROM_TMC_X + 13) // 1byte, (-64..+63) -#define EEPROM_TMC_X_SG_THRS_HIGH (EEPROM_TMC_X + 14) // 1byte, (-64..+63) - -// Currently running firmware, each digit stored as uint16_t. -// The flavor differentiates a dev, alpha, beta, release candidate or a release version. -#define EEPROM_FIRMWARE_VERSION_END (FW_PRUSA3D_MAGIC_LEN+8) -#define EEPROM_FIRMWARE_VERSION_FLAVOR (FW_PRUSA3D_MAGIC_LEN+6) -#define EEPROM_FIRMWARE_VERSION_REVISION (FW_PRUSA3D_MAGIC_LEN+4) -#define EEPROM_FIRMWARE_VERSION_MINOR (FW_PRUSA3D_MAGIC_LEN+2) -#define EEPROM_FIRMWARE_VERSION_MAJOR FW_PRUSA3D_MAGIC_LEN -// Magic string, indicating that the current or the previous firmware running was the Prusa3D firmware. -#define EEPROM_FIRMWARE_PRUSA_MAGIC 0 - -#define EEPROM_OFFSET 20 //offset for storing settings using M500 -//#define EEPROM_OFFSET - -#endif // EEPROM_H diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index b68b943bc..f564be869 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -13,8 +13,6 @@ //#include #include "Marlin.h" #include "fastio.h" -//-// -#include "sound.h" // commands @@ -691,9 +689,6 @@ uint8_t lcd_clicked(void) void lcd_beeper_quick_feedback(void) { SET_OUTPUT(BEEPER); -//-// -Sound_MakeSound(e_SOUND_CLASS_Echo,e_SOUND_TYPE_ButtonEcho); -/* for(int8_t i = 0; i < 10; i++) { WRITE(BEEPER,HIGH); @@ -701,7 +696,6 @@ Sound_MakeSound(e_SOUND_CLASS_Echo,e_SOUND_TYPE_ButtonEcho); WRITE(BEEPER,LOW); delayMicroseconds(100); } -*/ } void lcd_quick_feedback(void) diff --git a/Firmware/sound.cpp b/Firmware/sound.cpp deleted file mode 100644 index 90e6ab93e..000000000 --- a/Firmware/sound.cpp +++ /dev/null @@ -1,105 +0,0 @@ -#include "sound.h" - -#include "Marlin.h" - -//#include -//#include -//#include "eeprom.h" - - -//eSOUND_MODE eSoundMode=e_SOUND_MODE_LOUD; -// nema vyznam, pokud se bude volat Sound_Init (tzn. poc. hodnota je v EEPROM) -// !?! eSOUND_MODE eSoundMode; v ultraldc.cpp :: cd_settings_menu() se takto jevi jako lokalni promenna -eSOUND_MODE eSoundMode; //=e_SOUND_MODE_DEFAULT; - - -static void Sound_SaveMode(void); -static void Sound_DoSound_Echo(void); -static void Sound_DoSound_Prompt(void); - - -void Sound_Init(void) -{ -eSoundMode=(eSOUND_MODE)eeprom_read_byte((uint8_t*)EEPROM_SOUND_MODE); -if(eSoundMode==e_SOUND_MODE_NULL) - Sound_Default(); // je potreba provest i ulozeni do EEPROM -} - -void Sound_Default(void) -{ -eSoundMode=e_SOUND_MODE_DEFAULT; -Sound_SaveMode(); -} - -void Sound_SaveMode(void) -{ -eeprom_update_byte((uint8_t*)EEPROM_SOUND_MODE,(uint8_t)eSoundMode); -} - -void Sound_CycleState(void) -{ -switch(eSoundMode) - { - case e_SOUND_MODE_LOUD: - eSoundMode=e_SOUND_MODE_ONCE; - break; - case e_SOUND_MODE_ONCE: - eSoundMode=e_SOUND_MODE_SILENT; - break; - case e_SOUND_MODE_SILENT: - eSoundMode=e_SOUND_MODE_MUTE; - break; - case e_SOUND_MODE_MUTE: - eSoundMode=e_SOUND_MODE_LOUD; - break; - default: - eSoundMode=e_SOUND_MODE_LOUD; - } -Sound_SaveMode(); -} - -void Sound_MakeSound(eSOUND_CLASS eSoundClass,eSOUND_TYPE eSoundType) -{ -switch(eSoundMode) - { - case e_SOUND_MODE_LOUD: - if(eSoundType==e_SOUND_TYPE_ButtonEcho) - Sound_DoSound_Echo(); - if(eSoundType==e_SOUND_TYPE_StandardPrompt) - Sound_DoSound_Prompt(); - break; - case e_SOUND_MODE_ONCE: - if(eSoundType==e_SOUND_TYPE_ButtonEcho) - Sound_DoSound_Echo(); - if(eSoundType==e_SOUND_TYPE_StandardPrompt) - Sound_DoSound_Prompt(); - break; - case e_SOUND_MODE_SILENT: - break; - case e_SOUND_MODE_MUTE: - break; - default: - ; - } -} - - -static void Sound_DoSound_Echo(void) -{ -uint8_t nI; - -for(nI=0;nI<10;nI++) - { - WRITE(BEEPER,HIGH); - delayMicroseconds(100); - WRITE(BEEPER,LOW); - delayMicroseconds(100); - } -} - -static void Sound_DoSound_Prompt(void) -{ -WRITE(BEEPER,HIGH); -delay_keep_alive(500); -WRITE(BEEPER,LOW); -} diff --git a/Firmware/sound.h b/Firmware/sound.h deleted file mode 100644 index 9415b7634..000000000 --- a/Firmware/sound.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef SOUND_H -#define SOUND_H - - -#define MSG_SOUND_MODE_LOUD "Sound [loud]" -#define MSG_SOUND_MODE_ONCE "Sound [once]" -#define MSG_SOUND_MODE_SILENT "Sound [silent]" -#define MSG_SOUND_MODE_MUTE "Sound [mute]" - - -#define e_SOUND_MODE_NULL 0xFF -typedef enum - {e_SOUND_MODE_LOUD,e_SOUND_MODE_ONCE,e_SOUND_MODE_SILENT,e_SOUND_MODE_MUTE} eSOUND_MODE; -#define e_SOUND_MODE_DEFAULT e_SOUND_MODE_LOUD - -typedef enum - {e_SOUND_TYPE_ButtonEcho,e_SOUND_TYPE_EncoderEcho,e_SOUND_TYPE_StandardPrompt,e_SOUND_TYPE_StandardConfirm,e_SOUND_TYPE_StandardWarning,e_SOUND_TYPE_StandardAlert} eSOUND_TYPE; -typedef enum - {e_SOUND_CLASS_Echo,e_SOUND_CLASS_Prompt,e_SOUND_CLASS_Confirm,e_SOUND_CLASS_Warning,e_SOUND_CLASS_Alert} eSOUND_CLASS; - - -extern eSOUND_MODE eSoundMode; - - -extern void Sound_Init(void); -extern void Sound_Default(void); -extern void Sound_Save(void); -extern void Sound_CycleState(void); -extern void Sound_MakeSound(eSOUND_CLASS eSoundClass,eSOUND_TYPE eSoundType); - -//static void Sound_DoSound_Echo(void); -//static void Sound_DoSound_Prompt(void); - -#endif // SOUND_H diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8543d5a2b..6ea1b5f15 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -31,9 +31,6 @@ #include "tmc2130.h" #endif //TMC2130 -//-// -#include "sound.h" - #ifdef SNMM_V2 #include "uart2.h" #endif //SNMM_V2 @@ -4115,11 +4112,6 @@ static void lcd_fsensor_state_set() } #endif //PAT9125 -//-// -static void lcd_sound_state_set(void) -{ -Sound_CycleState(); -} #if !SDSORT_USES_RAM void lcd_set_degree() { @@ -4676,7 +4668,7 @@ static void lcd_settings_menu() #endif //(LANG_MODE != 0) if (card.ToshibaFlashAir_isEnabled()) { - MENU_ITEM_FUNCTION_P(_i("SD card [flshAir]"), lcd_toshiba_flash_air_compatibility_toggle);////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 + MENU_ITEM_FUNCTION_P(_i("SD card [FlshAir]"), lcd_toshiba_flash_air_compatibility_toggle);////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 } else { MENU_ITEM_FUNCTION_P(_i("SD card [normal]"), lcd_toshiba_flash_air_compatibility_toggle);////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 } @@ -4686,33 +4678,13 @@ static void lcd_settings_menu() uint8_t sdSort; EEPROM_read(EEPROM_SD_SORT, (uint8_t*)&sdSort, sizeof(sdSort)); switch (sdSort) { - case SD_SORT_TIME: MENU_ITEM_FUNCTION_P(_i("Sort: [time]"), lcd_sort_type_set); break;////MSG_SORT_TIME c=17 r=1 - case SD_SORT_ALPHA: MENU_ITEM_FUNCTION_P(_i("Sort: [alphabet]"), lcd_sort_type_set); break;////MSG_SORT_ALPHA c=17 r=1 - default: MENU_ITEM_FUNCTION_P(_i("Sort: [none]"), lcd_sort_type_set);////MSG_SORT_NONE c=17 r=1 + case SD_SORT_TIME: MENU_ITEM_FUNCTION_P(_i("Sort: [Time]"), lcd_sort_type_set); break;////MSG_SORT_TIME c=17 r=1 + case SD_SORT_ALPHA: MENU_ITEM_FUNCTION_P(_i("Sort: [Alphabet]"), lcd_sort_type_set); break;////MSG_SORT_ALPHA c=17 r=1 + default: MENU_ITEM_FUNCTION_P(_i("Sort: [None]"), lcd_sort_type_set);////MSG_SORT_NONE c=17 r=1 } } #endif // SDCARD_SORT_ALPHA - -//-// -switch(eSoundMode) - { - case e_SOUND_MODE_LOUD: - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set); - break; - case e_SOUND_MODE_ONCE: - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_ONCE),lcd_sound_state_set); - break; - case e_SOUND_MODE_SILENT: - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_SILENT),lcd_sound_state_set); - break; - case e_SOUND_MODE_MUTE: - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_MUTE),lcd_sound_state_set); - break; - default: - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set); - } -//-// - + if (farm_mode) { MENU_ITEM_SUBMENU_P(PSTR("Farm number"), lcd_farm_no);