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

Merge remote-tracking branch 'upstream/MK3' into MK3_PF-build_106

Browse Source
This commit is contained in:
3d-gussner 2019-07-24 13:54:27 +02:00
commit 004eb3d299
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Firmware/ultralcd.cpp
View File

@ -6494,10 +6494,19 @@ static void change_sheet()
static void change_sheet_from_menu(){ static void change_sheet_from_menu(){
uint8_t next_sheet = selected_sheet+1; uint8_t next_sheet = selected_sheet+1;
if(next_sheet > 2) next_sheet = 0; while(true){
if(is_sheet_initialized(next_sheet)){ if(next_sheet > 2) next_sheet = 0;
eeprom_update_byte(&(EEPROM_Sheets_base->active_sheet), next_sheet); if(is_sheet_initialized(next_sheet)){
selected_sheet = next_sheet; eeprom_update_byte(&(EEPROM_Sheets_base->active_sheet), next_sheet);
selected_sheet = next_sheet;
break;
}
else if (next_sheet == selected_sheet){
break;
}
else{
next_sheet++;
}
} }
menu_back(); menu_back();
} }

6
Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h
View File

@ -193,9 +193,9 @@
//#define FSENSOR_QUALITY //#define FSENSOR_QUALITY
//#define LINEARITY_CORRECTION #define LINEARITY_CORRECTION
//#define TMC2130_LINEARITY_CORRECTION #define TMC2130_LINEARITY_CORRECTION
//#define TMC2130_LINEARITY_CORRECTION_XYZ #define TMC2130_LINEARITY_CORRECTION_XYZ
#define TMC2130_VARIABLE_RESOLUTION #define TMC2130_VARIABLE_RESOLUTION