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

Merge 45f3f73962 into f3e0dfd481

This commit is contained in:
3d-gussner 2025-08-23 10:55:23 +01:00 committed by GitHub
parent f3e0dfd481 45f3f73962
commit 25a24817ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
32 changed files with 565 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
Firmware/Marlin_main.cpp
View File

@ -5839,6 +5839,14 @@ void process_commands()
extended_capabilities_report(); extended_capabilities_report();
#endif //EXTENDED_CAPABILITIES_REPORT #endif //EXTENDED_CAPABILITIES_REPORT
} }
#ifdef STEEL_SHEET_TYPES
if ((eeprom_read_byte((uint8_t*)EEPROM_CHECK_SHEET_TYPE) == (uint8_t)ClCheckMode::_Always) && printer_active()) {
uint8_t result = lcd_show_multiscreen_message_cont_cancel_and_wait_P(_T(MSG_CHECK_SHEET_TYPE), true, LCD_MIDDLE_BUTTON_CHOICE);
if (result == LCD_MIDDLE_BUTTON_CHOICE) {
print_stop(false, true);
}
}
#endif //STEEL_SHEET_TYPES
break; break;
/*! /*!
@ -7179,22 +7187,27 @@ void process_commands()
Get and Set Sheet parameters Get and Set Sheet parameters
#### Usage #### Usage
M850 [ S | Z | L | B | P | A ] M850 [ S | Z | L | T | A ]
#### Parameters #### Parameters
- `S` - Sheet id [0-7] - `S` - Sheet id [0-7]
- `Z` - Z offset - `Z` - Z offset
- `L` - Label [aA-zZ, 0-9 max 7 chars] - `L` - Label [aA-zZ, 0-9 max 7 chars]
- `B` - Bed temp - `T` - Type
- `P` - PINDA temp - `0` - Smooth
- `1` - Textured
- `2` - Satin
- `3` - PA Nylon
- `4` - PP
- `A` - Active [0|1] - `A` - Active [0|1]
*/ */
uint8_t iSel = 0; uint8_t iSel = 0;
int16_t zraw = 0; int16_t zraw = 0;
float z_val = 0; float z_val = 0;
char strLabel[8]; char strLabel[8];
uint8_t iBedC = 0; #ifdef STEEL_SHEET_TYPES
uint8_t iPindaC = 0; uint8_t iType = 0;
#endif //STEEL_SHEET_TYPES
bool bIsActive=false; bool bIsActive=false;
strLabel[7] = '\0'; // null terminate. strLabel[7] = '\0'; // null terminate.
size_t max_sheets = sizeof(EEPROM_Sheets_base->s)/sizeof(EEPROM_Sheets_base->s[0]); size_t max_sheets = sizeof(EEPROM_Sheets_base->s)/sizeof(EEPROM_Sheets_base->s[0]);
@ -7243,25 +7256,19 @@ void process_commands()
eeprom_read_block(strLabel, EEPROM_Sheets_base->s[iSel].name, sizeof(Sheet::name)); eeprom_read_block(strLabel, EEPROM_Sheets_base->s[iSel].name, sizeof(Sheet::name));
} }
if (code_seen('B')) #ifdef STEEL_SHEET_TYPES
if (code_seen('T'))
{ {
iBedC = code_value_uint8(); iType = code_value_uint8();
eeprom_update_byte_notify(&EEPROM_Sheets_base->s[iSel].bed_temp, iBedC); eeprom_update_byte_notify(&EEPROM_Sheets_base->s[iSel].type, iType);
} }
else else
{ {
iBedC = eeprom_read_byte(&EEPROM_Sheets_base->s[iSel].bed_temp); iType = eeprom_read_byte(&EEPROM_Sheets_base->s[iSel].type);
}
if (code_seen('P'))
{
iPindaC = code_value_uint8();
eeprom_update_byte_notify(&EEPROM_Sheets_base->s[iSel].pinda_temp, iPindaC);
}
else
{
iPindaC = eeprom_read_byte(&EEPROM_Sheets_base->s[iSel].pinda_temp);
} }
// Reset Sheet type if out of range
if (iType > 32) eeprom_update_byte_notify(&EEPROM_Sheets_base->s[iSel].type, 0);
#endif //STEEL_SHEET_TYPES
if (code_seen('A')) if (code_seen('A'))
{ {
@ -7289,10 +7296,10 @@ void process_commands()
SERIAL_PROTOCOL((int)zraw); SERIAL_PROTOCOL((int)zraw);
SERIAL_PROTOCOLPGM(" L"); SERIAL_PROTOCOLPGM(" L");
SERIAL_PROTOCOL(strLabel); SERIAL_PROTOCOL(strLabel);
SERIAL_PROTOCOLPGM(" B"); #ifdef STEEL_SHEET_TYPES
SERIAL_PROTOCOL((int)iBedC); SERIAL_PROTOCOLPGM(" T");
SERIAL_PROTOCOLPGM(" P"); SERIAL_PROTOCOL((int)iType);
SERIAL_PROTOCOL((int)iPindaC); #endif //STEEL_SHEET_TYPES
SERIAL_PROTOCOLPGM(" A"); SERIAL_PROTOCOLPGM(" A");
SERIAL_PROTOCOLLN((int)bIsActive); SERIAL_PROTOCOLLN((int)bIsActive);
break; break;
@ -7422,6 +7429,7 @@ void process_commands()
- M862.4 { P<fw_version> | Q } - M862.4 { P<fw_version> | Q }
- M862.5 { P<gcode_level> | Q } - M862.5 { P<gcode_level> | Q }
- M862.6 Not used but reserved by 32-bit - M862.6 Not used but reserved by 32-bit
- M862.7 { P<sheet type> | W<warn sheet type>| Q }
When run with P<> argument, the check is performed against the input value. When run with P<> argument, the check is performed against the input value.
When run with Q argument, the current value is shown. When run with Q argument, the current value is shown.
@ -7497,8 +7505,8 @@ void process_commands()
case ClPrintChecking::_Gcode: // ~ .5 case ClPrintChecking::_Gcode: // ~ .5
if(code_seen('P')) if(code_seen('P'))
{ {
uint16_t nGcodeLevel; uint8_t nGcodeLevel;
nGcodeLevel=(uint16_t)code_value_long(); nGcodeLevel=(uint8_t)code_value_uint8();
gcode_level_check(nGcodeLevel); gcode_level_check(nGcodeLevel);
} }
else if(code_seen('Q')) else if(code_seen('Q'))
@ -7506,6 +7514,23 @@ void process_commands()
break; break;
case ClPrintChecking::_Features: // ~ .6 used by 32-bit case ClPrintChecking::_Features: // ~ .6 used by 32-bit
break; break;
#ifdef STEEL_SHEET_TYPES
case ClPrintChecking::_SheetType: // ~ .7
if(code_seen('P'))
{
uint8_t nSheetType;
uint8_t wSheetType;
nSheetType=(uint8_t)code_value_uint8();
if(code_seen('W'))
{
wSheetType=(uint8_t)code_value_uint8();
}
sheet_type_check(nSheetType, wSheetType);
}
else if(code_seen('Q'))
SERIAL_PROTOCOLLN((int)eeprom_read_byte(&EEPROM_Sheets_base->s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))].type));
break;
#endif //STEEL_SHEET_TYPES
default: default:
break; break;
} }

55
Firmware/eeprom.cpp
View File

@ -4,6 +4,9 @@
#include "eeprom.h" #include "eeprom.h"
#include "Marlin.h" #include "Marlin.h"
#ifdef STEEL_SHEET_TYPES
#include "messages.h"
#endif //STEEL_SHEET_TYPES
#include <avr/eeprom.h> #include <avr/eeprom.h>
#include <stdint.h> #include <stdint.h>
@ -46,6 +49,12 @@ void eeprom_init()
} }
check_babystep(); check_babystep();
#ifdef STEEL_SHEET_TYPES
if (eeprom_read_byte((uint8_t*)EEPROM_CHECK_SHEET_TYPE) == EEPROM_EMPTY_VALUE) {
eeprom_default_sheet_type();
}
#endif //STEEL_SHEET_TPYES
// initialize custom mendel name in eeprom // initialize custom mendel name in eeprom
if (eeprom_read_byte((uint8_t*)EEPROM_CUSTOM_MENDEL_NAME) == EEPROM_EMPTY_VALUE) { if (eeprom_read_byte((uint8_t*)EEPROM_CUSTOM_MENDEL_NAME) == EEPROM_EMPTY_VALUE) {
//SERIAL_ECHOLN("Init Custom Mendel Name"); //SERIAL_ECHOLN("Init Custom Mendel Name");
@ -83,8 +92,8 @@ void eeprom_adjust_bed_reset() {
//! | 3 | Textur2 | //! | 3 | Textur2 |
//! | 4 | Satin | //! | 4 | Satin |
//! | 5 | NylonPA | //! | 5 | NylonPA |
//! | 6 | Custom1 | //! | 6 | PolyPro |
//! | 7 | Custom2 | //! | 7 | Custom |
//! //!
//! @param[in] index //! @param[in] index
//! @param[out] sheetName //! @param[out] sheetName
@ -94,25 +103,53 @@ void eeprom_default_sheet_name(uint8_t index, SheetName &sheetName)
if (index < 2) if (index < 2)
{ {
#ifdef STEEL_SHEET_TYPES
strcpy_P(sheetName.c, MSG_SHEET_TYPE_SMOOTH);
#else
strcpy_P(sheetName.c, PSTR("Smooth")); strcpy_P(sheetName.c, PSTR("Smooth"));
#endif //STEEL_SHEET_TYPES
} }
else if (index < 4) else if (index < 4)
{ {
#ifdef STEEL_SHEET_TYPES
strcpy_P(sheetName.c, MSG_SHEET_TYPE_TEXTURED);
#else
strcpy_P(sheetName.c, PSTR("Textur")); strcpy_P(sheetName.c, PSTR("Textur"));
#endif //STEEL_SHEET_TYPES
} }
else if (index < 5) else if (index < 5)
{ {
#ifdef STEEL_SHEET_TYPES
strcpy_P(sheetName.c, MSG_SHEET_TYPE_SATIN);
#else
strcpy_P(sheetName.c, PSTR("Satin ")); strcpy_P(sheetName.c, PSTR("Satin "));
#endif //STEEL_SHEET_TYPES
} }
else if (index < 6) else if (index < 6)
{ {
#ifdef STEEL_SHEET_TYPES
strcpy_P(sheetName.c, MSG_SHEET_TYPE_NYLON_PA);
#else
strcpy_P(sheetName.c, PSTR("NylonPA")); strcpy_P(sheetName.c, PSTR("NylonPA"));
#endif //STEEL_SHEET_TYPES
} }
#ifdef STEEL_SHEET_TYPES
else if (index < 7)
{
strcpy_P(sheetName.c, MSG_SHEET_TYPE_PP);
}
else
{
strcpy_P(sheetName.c, MSG_SHEET_TYPE_CUSTOM);
}
if (index <4)
#else
else else
{ {
strcpy_P(sheetName.c, PSTR("Custom")); strcpy_P(sheetName.c, PSTR("Custom"));
} }
if (index <4 || index >5) if (index <4 || index >5)
#endif //STEEL_SHEET_TYPES
{ {
sheetName.c[6] = '0' + ((index % 2)+1); sheetName.c[6] = '0' + ((index % 2)+1);
sheetName.c[7] = '\0'; sheetName.c[7] = '\0';
@ -137,6 +174,20 @@ int8_t eeprom_next_initialized_sheet(int8_t sheet)
return -1; return -1;
} }
#ifdef STEEL_SHEET_TYPES
void eeprom_default_sheet_type()
{
eeprom_update_byte_notify(&EEPROM_Sheets_base->s[0].type, 1); //Smooth
eeprom_update_byte_notify(&EEPROM_Sheets_base->s[1].type, 1); //Smooth
eeprom_update_byte_notify(&EEPROM_Sheets_base->s[2].type, 2); //Textur
eeprom_update_byte_notify(&EEPROM_Sheets_base->s[3].type, 2); //Textur
eeprom_update_byte_notify(&EEPROM_Sheets_base->s[4].type, 4); //Satin
eeprom_update_byte_notify(&EEPROM_Sheets_base->s[5].type, 8); //NylonPA
eeprom_update_byte_notify(&EEPROM_Sheets_base->s[6].type, 16); //PolyPro
eeprom_update_byte_notify((uint8_t*)EEPROM_CHECK_SHEET_TYPE,1);
}
#endif //STEEL_SHEET_TYPES
#ifdef DEBUG_EEPROM_CHANGES #ifdef DEBUG_EEPROM_CHANGES
static void eeprom_byte_notify(uint8_t *dst, uint8_t previous_value, uint8_t value, bool write) { static void eeprom_byte_notify(uint8_t *dst, uint8_t previous_value, uint8_t value, bool write) {
printf_P(PSTR("EEPROMChng b %s %u %d -> %d\n"), write ? "write":"", dst , previous_value, value); printf_P(PSTR("EEPROMChng b %s %u %d -> %d\n"), write ? "write":"", dst , previous_value, value);

54
Firmware/eeprom.h
View File

@ -31,8 +31,8 @@ typedef struct
{ {
unsigned char name[MAX_SHEET_NAME_LENGTH]; //!< Can be null terminated, doesn't need to be null terminated unsigned char name[MAX_SHEET_NAME_LENGTH]; //!< Can be null terminated, doesn't need to be null terminated
int16_t z_offset; //!< Z_BABYSTEP_MIN .. Z_BABYSTEP_MAX = Z_BABYSTEP_MIN*2/1000 [mm] .. Z_BABYSTEP_MAX*2/1000 [mm] int16_t z_offset; //!< Z_BABYSTEP_MIN .. Z_BABYSTEP_MAX = Z_BABYSTEP_MIN*2/1000 [mm] .. Z_BABYSTEP_MAX*2/1000 [mm]
uint8_t bed_temp; //!< 0 .. 254 [°C] NOTE: currently only written-to and never used uint8_t type; //!< 0 .. 7
uint8_t pinda_temp; //!< 0 .. 254 [°C] NOTE: currently only written-to and never used uint8_t reserved; //! currently only reserved
} Sheet; } Sheet;
typedef struct typedef struct
@ -279,36 +279,36 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP
| 0x0D49 3401 | uint16 | EEPROM_SHEETS_BASE | ??? | ffh 255 | ??? | LCD menu | D3 Ax0d49 C89 | 0x0D49 3401 | uint16 | EEPROM_SHEETS_BASE | ??? | ffh 255 | ??? | LCD menu | D3 Ax0d49 C89
| 0x0D49 3401 | char | _1st Sheet block_ |536d6f6f746831| ffffffffffffff | 1st sheet - Name: _Smooth1_ | ^ | D3 Ax0d49 C7 | 0x0D49 3401 | char | _1st Sheet block_ |536d6f6f746831| ffffffffffffff | 1st sheet - Name: _Smooth1_ | ^ | D3 Ax0d49 C7
| 0x0D50 3408 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 1st sheet - Z offset | ^ | D3 Ax0d50 C2 | 0x0D50 3408 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 1st sheet - Z offset | ^ | D3 Ax0d50 C2
| 0x0D52 3410 | uint8 | ^ | 00h 0 | ffh 255 | 1st sheet - bed temp | ^ | D3 Ax0d52 C1 | 0x0D52 3410 | uint8 | ^ | 00h 0 | ffh 255 | 1st sheet - Type | ^ | D3 Ax0d52 C1
| 0x0D53 3411 | uint8 | ^ | 00h 0 | ffh 255 | 1st sheet - PINDA temp | ^ | D3 Ax0d53 C1 | 0x0D53 3411 | uint8 | ^ | 00h 0 | ffh 255 | 1st sheet - Reserved | ^ | D3 Ax0d53 C1
| 0x0D54 3412 | char | _2nd Sheet block_ |536d6f6f746832| ffffffffffffff | 2nd sheet - Name: _Smooth2_ | ^ | D3 Ax0d54 C7 | 0x0D54 3412 | char | _2nd Sheet block_ |536d6f6f746832| ffffffffffffff | 2nd sheet - Name: _Smooth2_ | ^ | D3 Ax0d54 C7
| 0x0D5B 3419 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 2nd sheet - Z offset | ^ | D3 Ax0d5b C2 | 0x0D5B 3419 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 2nd sheet - Z offset | ^ | D3 Ax0d5b C2
| 0x0D5D 3421 | uint8 | ^ | 00h 0 | ffh 255 | 2nd sheet - bed temp | ^ | D3 Ax0d5d C1 | 0x0D5D 3421 | uint8 | ^ | 00h 0 | ffh 255 | 2nd sheet - Type | ^ | D3 Ax0d5d C1
| 0x0D5E 3422 | uint8 | ^ | 00h 0 | ffh 255 | 2nd sheet - PINDA temp | ^ | D3 Ax0d5e C1 | 0x0D5E 3422 | uint8 | ^ | 00h 0 | ffh 255 | 2nd sheet - Reserved | ^ | D3 Ax0d5e C1
| 0x0D5F 3423 | char | _3rd Sheet block_ |54657874757231| ffffffffffffff | 3rd sheet - Name: _Textur1_ | ^ | D3 Ax0d5f C7 | 0x0D5F 3423 | char | _3rd Sheet block_ |54657874757231| ffffffffffffff | 3rd sheet - Name: _Textur1_ | ^ | D3 Ax0d5f C7
| 0x0D66 3430 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 3rd sheet - Z offset | ^ | D3 Ax0d66 C2 | 0x0D66 3430 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 3rd sheet - Z offset | ^ | D3 Ax0d66 C2
| 0x0D68 3432 | uint8 | ^ | 00h 0 | ffh 255 | 3rd sheet - bed temp | ^ | D3 Ax0d68 C1 | 0x0D68 3432 | uint8 | ^ | 00h 0 | ffh 255 | 3rd sheet - Type | ^ | D3 Ax0d68 C1
| 0x0D69 3433 | uint8 | ^ | 00h 0 | ffh 255 | 3rd sheet - PINDA temp | ^ | D3 Ax0d69 C1 | 0x0D69 3433 | uint8 | ^ | 00h 0 | ffh 255 | 3rd sheet - Reserved | ^ | D3 Ax0d69 C1
| 0x0D6A 3434 | char | _4th Sheet block_ |54657874757232| ffffffffffffff | 4th sheet - Name: _Textur2_ | ^ | D3 Ax0d6a C7 | 0x0D6A 3434 | char | _4th Sheet block_ |54657874757232| ffffffffffffff | 4th sheet - Name: _Textur2_ | ^ | D3 Ax0d6a C7
| 0x0D71 3441 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 4th sheet - Z offset | ^ | D3 Ax0d71 C2 | 0x0D71 3441 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 4th sheet - Z offset | ^ | D3 Ax0d71 C2
| 0x0D73 3443 | uint8 | ^ | 00h 0 | ffh 255 | 4th sheet - bed temp | ^ | D3 Ax0d73 C1 | 0x0D73 3443 | uint8 | ^ | 00h 0 | ffh 255 | 4th sheet - Type | ^ | D3 Ax0d73 C1
| 0x0D74 3444 | uint8 | ^ | 00h 0 | ffh 255 | 4th sheet - PINDA temp | ^ | D3 Ax0d74 C1 | 0x0D74 3444 | uint8 | ^ | 00h 0 | ffh 255 | 4th sheet - Reserved | ^ | D3 Ax0d74 C1
| 0x0D75 3445 | char | _5th Sheet block_ |536174696e2020| ffffffffffffff | 5th sheet - Name: _Satin _ | ^ | D3 Ax0d75 C7 | 0x0D75 3445 | char | _5th Sheet block_ |536174696e2020| ffffffffffffff | 5th sheet - Name: _Satin_ | ^ | D3 Ax0d75 C7
| 0x0D7C 3452 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 5th sheet - Z offset | ^ | D3 Ax0d7c C2 | 0x0D7C 3452 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 5th sheet - Z offset | ^ | D3 Ax0d7c C2
| 0x0D7E 3454 | uint8 | ^ | 00h 0 | ffh 255 | 5th sheet - bed temp | ^ | D3 Ax0d7e C1 | 0x0D7E 3454 | uint8 | ^ | 00h 0 | ffh 255 | 5th sheet - Type | ^ | D3 Ax0d7e C1
| 0x0D7F 3455 | uint8 | ^ | 00h 0 | ffh 255 | 5th sheet - PINDA temp | ^ | D3 Ax0d7f C1 | 0x0D7F 3455 | uint8 | ^ | 00h 0 | ffh 255 | 5th sheet - Reserved | ^ | D3 Ax0d7f C1
| 0x0D80 3456 | char | _6th Sheet block_ |4e796c6f6e5041| ffffffffffffff | 6th sheet - Name: _NylonPA_ | ^ | D3 Ax0d80 C7 | 0x0D80 3456 | char | _6th Sheet block_ |4e796c6f6e5041| ffffffffffffff | 6th sheet - Name: _NylonPA_ | ^ | D3 Ax0d80 C7
| 0x0D87 3463 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 6th sheet - Z offset | ^ | D3 Ax0d87 C2 | 0x0D87 3463 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 6th sheet - Z offset | ^ | D3 Ax0d87 C2
| 0x0D89 3465 | uint8 | ^ | 00h 0 | ffh 255 | 6th sheet - bed temp | ^ | D3 Ax0d89 C1 | 0x0D89 3465 | uint8 | ^ | 00h 0 | ffh 255 | 6th sheet - Type | ^ | D3 Ax0d89 C1
| 0x0D8A 3466 | uint8 | ^ | 00h 0 | ffh 255 | 6th sheet - PINDA temp | ^ | D3 Ax0d8a C1 | 0x0D8A 3466 | uint8 | ^ | 00h 0 | ffh 255 | 6th sheet - Reserved | ^ | D3 Ax0d8a C1
| 0x0D8B 3467 | char | _7th Sheet block_ |437573746f6d31| ffffffffffffff | 7th sheet - Name: _Custom1_ | ^ | D3 Ax0d8b C7 | 0x0D8B 3467 | char | _7th Sheet block_ |437573746f6d31| ffffffffffffff | 7th sheet - Name: _PP_ | ^ | D3 Ax0d8b C7
| 0x0D92 3474 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 7th sheet - Z offset | ^ | D3 Ax0d92 C2 | 0x0D92 3474 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 7th sheet - Z offset | ^ | D3 Ax0d92 C2
| 0x0D94 3476 | uint8 | ^ | 00h 0 | ffh 255 | 7th sheet - bed temp | ^ | D3 Ax0d94 C1 | 0x0D94 3476 | uint8 | ^ | 00h 0 | ffh 255 | 7th sheet - Type | ^ | D3 Ax0d94 C1
| 0x0D95 3477 | uint8 | ^ | 00h 0 | ffh 255 | 7th sheet - PINDA temp | ^ | D3 Ax0d95 C1 | 0x0D95 3477 | uint8 | ^ | 00h 0 | ffh 255 | 7th sheet - Reserved | ^ | D3 Ax0d95 C1
| 0x0D96 3478 | char | _8th Sheet block_ |437573746f6d32| ffffffffffffff | 8th sheet - Name: _Custom2_ | ^ | D3 Ax0d96 C7 | 0x0D96 3478 | char | _8th Sheet block_ |437573746f6d32| ffffffffffffff | 8th sheet - Name: _Custom_ | ^ | D3 Ax0d96 C7
| 0x0D9D 3485 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 8th sheet - Z offset | ^ | D3 Ax0d9d C2 | 0x0D9D 3485 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 8th sheet - Z offset | ^ | D3 Ax0d9d C2
| 0x0D9F 3487 | uint8 | ^ | 00h 0 | ffh 255 | 8th sheet - bed temp | ^ | D3 Ax0d9f C1 | 0x0D9F 3487 | uint8 | ^ | 00h 0 | ffh 255 | 8th sheet - Type | ^ | D3 Ax0d9f C1
| 0x0DA0 3488 | uint8 | ^ | 00h 0 | ffh 255 | 8th sheet - PINDA temp | ^ | D3 Ax0da0 C1 | 0x0DA0 3488 | uint8 | ^ | 00h 0 | ffh 255 | 8th sheet - Reserved | ^ | D3 Ax0da0 C1
| 0x0DA1 3489 | uint8 | active_sheet | 00h 0 | ffh 255 | Active sheet index | ^ | D3 Ax0da1 C1 | 0x0DA1 3489 | uint8 | active_sheet | 00h 0 | ffh 255 | Active sheet index | ^ | D3 Ax0da1 C1
| 0x0D48 3400 | uint8 | EEPROM_FSENSOR_PCB | ffh 255 | ffh 255 | Filament Sensor type IR unknown | LCD Support | D3 Ax0d48 C1 | 0x0D48 3400 | uint8 | EEPROM_FSENSOR_PCB | ffh 255 | ffh 255 | Filament Sensor type IR unknown | LCD Support | D3 Ax0d48 C1
| ^ | ^ | ^ | 00h 0 | ^ | Filament Sensor type IR 0.3 or older | ^ | ^ | ^ | ^ | ^ | 00h 0 | ^ | Filament Sensor type IR 0.3 or older | ^ | ^
@ -414,9 +414,13 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP
| ^ | ^ | ^ | ??? | ^ | Z-axis | ^ | D3 Ax0d29 C4 | ^ | ^ | ^ | ??? | ^ | Z-axis | ^ | D3 Ax0d29 C4
| ^ | ^ | ^ | ??? | ^ | Y-axis | ^ | D3 Ax0d25 C4 | ^ | ^ | ^ | ??? | ^ | Y-axis | ^ | D3 Ax0d25 C4
| ^ | ^ | ^ | ??? | ^ | X-axis | ^ | D3 Ax0c21 C4 | ^ | ^ | ^ | ??? | ^ | X-axis | ^ | D3 Ax0c21 C4
| 0x0C11 3089 | uint8 | EEPROM_CHECK_FILAMENT | 01h 1 | ffh 255 | Check mode for filament is: __warn__ | LCD menu | D3 Ax0c11 C1 | 0x0C20 3104 | uint8 | EEPROM_CHECK_FILAMENT | 01h 1 | ffh 255 | Check mode for filament is: __warn__ | LCD menu | D3 Ax0c20 C1
| ^ | ^ | ^ | 02h 2 | ^ | Check mode for filament is: __strict__ | ^ | ^ | ^ | ^ | ^ | 02h 2 | ^ | Check mode for filament is: __strict__ | ^ | ^
| ^ | ^ | ^ | 00h 0 | ^ | Check mode for filament is: __none__ | ^ | ^ | ^ | ^ | ^ | 00h 0 | ^ | Check mode for filament is: __none__ | ^ | ^
| 0x0C1f 3103 | uint8 | EEPROM_CHECK_SHEET_TYPE | 01h 1 | ffh 255 | Check mode for sheet type is: __warn__ | LCD menu | D3 Ax0c1f C1
| ^ | ^ | ^ | 00h 0 | ^ | Check mode for sheet type is: __none__ | ^ | ^
| ^ | ^ | ^ | 02h 2 | ^ | Check mode for sheet type is: __strict__ | ^ | ^
| ^ | ^ | ^ | 03h 3 | ^ | Check mode for sheet type is: __always__ | ^ | ^
|Address begin|Bit/Type | Name | Valid values | Default/FactoryReset | Description |Gcode/Function| Debug code |Address begin|Bit/Type | Name | Valid values | Default/FactoryReset | Description |Gcode/Function| Debug code
@ -668,8 +672,9 @@ static Sheets * const EEPROM_Sheets_base = (Sheets*)(EEPROM_SHEETS_BASE);
#define EEPROM_UVLO_MIN_SEGMENT_TIME_US (EEPROM_UVLO_MIN_TRAVEL_FEEDRATE-4) //uint32_t #define EEPROM_UVLO_MIN_SEGMENT_TIME_US (EEPROM_UVLO_MIN_TRAVEL_FEEDRATE-4) //uint32_t
#define EEPROM_UVLO_MAX_JERK (EEPROM_UVLO_MIN_SEGMENT_TIME_US-4*4) // 4 x float #define EEPROM_UVLO_MAX_JERK (EEPROM_UVLO_MIN_SEGMENT_TIME_US-4*4) // 4 x float
#define EEPROM_CHECK_FILAMENT (EEPROM_UVLO_MAX_JERK-1) // uint8_t #define EEPROM_CHECK_FILAMENT (EEPROM_UVLO_MAX_JERK-1) // uint8_t
#define EEPROM_CHECK_SHEET_TYPE (EEPROM_CHECK_FILAMENT-1) // uint8_t
//This is supposed to point to last item to allow EEPROM overrun check. Please update when adding new items. //This is supposed to point to last item to allow EEPROM overrun check. Please update when adding new items.
#define EEPROM_LAST_ITEM EEPROM_CHECK_FILAMENT #define EEPROM_LAST_ITEM EEPROM_CHECK_SHEET_TYPE
// !!!!! // !!!!!
// !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!! // !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!!
// !!!!! // !!!!!
@ -708,6 +713,9 @@ struct SheetName
char c[sizeof(Sheet::name) + 1]; char c[sizeof(Sheet::name) + 1];
}; };
void eeprom_default_sheet_name(uint8_t index, SheetName &sheetName); void eeprom_default_sheet_name(uint8_t index, SheetName &sheetName);
#ifdef STEEL_SHEET_TYPES
void eeprom_default_sheet_type();
#endif //STEEL_SHEET_TYPES
int8_t eeprom_next_initialized_sheet(int8_t sheet); int8_t eeprom_next_initialized_sheet(int8_t sheet);
void eeprom_switch_to_next_sheet(); void eeprom_switch_to_next_sheet();
bool eeprom_is_sheet_initialized(uint8_t sheet_num); bool eeprom_is_sheet_initialized(uint8_t sheet_num);

12
Firmware/messages.cpp
View File

@ -159,6 +159,9 @@ const char MSG_MISSING_FILAMENT[] PROGMEM_I1 = ISTR("There is no filament loaded
const char MSG_NOZZLE_DIFFERS_CONTINUE[] PROGMEM_I1 = ISTR("Nozzle diameter differs from the G-code."); ////MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 const char MSG_NOZZLE_DIFFERS_CONTINUE[] PROGMEM_I1 = ISTR("Nozzle diameter differs from the G-code."); ////MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3
const char MSG_NOZZLE_DIFFERS_CANCELLED[] PROGMEM_I1 = ISTR("Nozzle diameter differs from the G-code. Please check the value in settings."); ////MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 const char MSG_NOZZLE_DIFFERS_CANCELLED[] PROGMEM_I1 = ISTR("Nozzle diameter differs from the G-code. Please check the value in settings."); ////MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8
const char MSG_NOZZLE_DIAMETER[] PROGMEM_I1 = ISTR("Nozzle d."); ////MSG_NOZZLE_DIAMETER c=10 const char MSG_NOZZLE_DIAMETER[] PROGMEM_I1 = ISTR("Nozzle d."); ////MSG_NOZZLE_DIAMETER c=10
#ifdef STEEL_SHEET_TYPES
const char MSG_CHECK_SHEET_TYPE[] PROGMEM_I1 = ISTR("Check selected steel sheet."); ////MSG_CHECK_SHEET_TYPE c=20 r=3
#endif //STEEL_SHEET_TYPES
const char MSG_MMU_MODE[] PROGMEM_I1 = ISTR("MMU Mode"); ////MSG_MMU_MODE c=8 const char MSG_MMU_MODE[] PROGMEM_I1 = ISTR("MMU Mode"); ////MSG_MMU_MODE c=8
const char MSG_SD_CARD[] PROGMEM_I1 = ISTR("SD card"); ////MSG_SD_CARD c=8 const char MSG_SD_CARD[] PROGMEM_I1 = ISTR("SD card"); ////MSG_SD_CARD c=8
const char MSG_SORT[] PROGMEM_I1 = ISTR("Sort"); ////MSG_SORT c=7 const char MSG_SORT[] PROGMEM_I1 = ISTR("Sort"); ////MSG_SORT c=7
@ -425,6 +428,15 @@ const char MSG_POWERPANIC_DETECTED[] PROGMEM_N1 = "POWER PANIC DETECTED"; ////c=
const char MSG_LCD_STATUS_CHANGED[] PROGMEM_N1 = "LCD status changed"; const char MSG_LCD_STATUS_CHANGED[] PROGMEM_N1 = "LCD status changed";
const char MSG_UNKNOWN_CODE[] PROGMEM_N1 = "Unknown %c code: %s\n"; const char MSG_UNKNOWN_CODE[] PROGMEM_N1 = "Unknown %c code: %s\n";
const char MSG_FILAMENT_RUNOUT_DETECTED[] PROGMEM_N1 = "Filament runout detected!"; ////c=20 r=2 const char MSG_FILAMENT_RUNOUT_DETECTED[] PROGMEM_N1 = "Filament runout detected!"; ////c=20 r=2
#ifdef STEEL_SHEET_TYPES
const char MSG_SHEET_TYPE[] PROGMEM_N1 = "Type"; ////c=8
const char MSG_SHEET_TYPE_SMOOTH[] PROGMEM_N1 = "Smooth"; ////c=6
const char MSG_SHEET_TYPE_TEXTURED[] PROGMEM_N1 = "Textur"; ////c=6
const char MSG_SHEET_TYPE_SATIN[] PROGMEM_N1 = "Satin "; ////c=7
const char MSG_SHEET_TYPE_NYLON_PA[] PROGMEM_N1 = "NylonPA"; ////c=7
const char MSG_SHEET_TYPE_PP[] PROGMEM_N1 = "PolyPro"; ////c=7
const char MSG_SHEET_TYPE_CUSTOM[] PROGMEM_N1 = "Custom "; ////c=7
#endif //STEEL_SHEET_TYPES
// Common G-gcodes // Common G-gcodes
const char G1_E_F2700[] PROGMEM_N1 = "G1 E%-.3f F2700"; const char G1_E_F2700[] PROGMEM_N1 = "G1 E%-.3f F2700";

12
Firmware/messages.h
View File

@ -161,6 +161,9 @@ extern const char MSG_MISSING_FILAMENT[];
extern const char MSG_NOZZLE_DIFFERS_CONTINUE[]; extern const char MSG_NOZZLE_DIFFERS_CONTINUE[];
extern const char MSG_NOZZLE_DIFFERS_CANCELLED[]; extern const char MSG_NOZZLE_DIFFERS_CANCELLED[];
extern const char MSG_NOZZLE_DIAMETER[]; extern const char MSG_NOZZLE_DIAMETER[];
#ifdef STEEL_SHEET_TYPES
extern const char MSG_CHECK_SHEET_TYPE[];
#endif //STEEL_SHEET_TYPES
extern const char MSG_MMU_MODE[]; extern const char MSG_MMU_MODE[];
extern const char MSG_SD_CARD[]; extern const char MSG_SD_CARD[];
extern const char MSG_SORT[]; extern const char MSG_SORT[];
@ -427,6 +430,15 @@ extern const char MSG_POWERPANIC_DETECTED[];
extern const char MSG_LCD_STATUS_CHANGED[]; extern const char MSG_LCD_STATUS_CHANGED[];
extern const char MSG_UNKNOWN_CODE[]; extern const char MSG_UNKNOWN_CODE[];
extern const char MSG_FILAMENT_RUNOUT_DETECTED[]; extern const char MSG_FILAMENT_RUNOUT_DETECTED[];
#ifdef STEEL_SHEET_TYPES
extern const char MSG_SHEET_TYPE[];
extern const char MSG_SHEET_TYPE_SMOOTH[];
extern const char MSG_SHEET_TYPE_TEXTURED[];
extern const char MSG_SHEET_TYPE_SATIN[];
extern const char MSG_SHEET_TYPE_NYLON_PA[];
extern const char MSG_SHEET_TYPE_PP[];
extern const char MSG_SHEET_TYPE_CUSTOM[];
#endif //STEEL_SHEET_TYPES
// Common G-gcodes // Common G-gcodes
extern const char G1_E_F2700[]; extern const char G1_E_F2700[];

102
Firmware/ultralcd.cpp
View File

@ -365,9 +365,9 @@ void lcdui_print_percent_done(void)
const int8_t nextSheet = eeprom_next_initialized_sheet(sheetNR); const int8_t nextSheet = eeprom_next_initialized_sheet(sheetNR);
if ((nextSheet >= 0) && (sheetNR != nextSheet)) if ((nextSheet >= 0) && (sheetNR != nextSheet))
{ {
char sheet[8]; char sheet[sizeof(Sheet::name)+1UL];
eeprom_read_block(sheet, EEPROM_Sheets_base->s[sheetNR].name, 7); eeprom_read_block(sheet, EEPROM_Sheets_base->s[sheetNR].name, sizeof(Sheet::name));
sheet[7] = '\0'; sheet[sizeof(Sheet::name)] = '\0';
lcd_printf_P(PSTR("%-7s"),sheet); lcd_printf_P(PSTR("%-7s"),sheet);
return; //do not also print the percentage return; //do not also print the percentage
} }
@ -2669,12 +2669,6 @@ static void lcd_babystep_z()
// Only update the EEPROM when leaving the menu. // Only update the EEPROM when leaving the menu.
uint8_t active_sheet=eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)); uint8_t active_sheet=eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet));
eeprom_update_word_notify(reinterpret_cast<uint16_t *>(&(EEPROM_Sheets_base->s[active_sheet].z_offset)),_md->babystepMemZ); eeprom_update_word_notify(reinterpret_cast<uint16_t *>(&(EEPROM_Sheets_base->s[active_sheet].z_offset)),_md->babystepMemZ);
// NOTE: bed_temp and pinda_temp are not currently read/used anywhere.
eeprom_update_byte_notify(&(EEPROM_Sheets_base->s[active_sheet].bed_temp),target_temperature_bed);
#ifdef PINDA_THERMISTOR
eeprom_update_byte_notify(&(EEPROM_Sheets_base->s[active_sheet].pinda_temp),current_temperature_pinda);
#endif //PINDA_THERMISTOR
calibration_status_set(CALIBRATION_STATUS_LIVE_ADJUST); calibration_status_set(CALIBRATION_STATUS_LIVE_ADJUST);
} }
menu_back_if_clicked(); menu_back_if_clicked();
@ -4291,6 +4285,63 @@ do\
}\ }\
while (0) while (0)
#ifdef STEEL_SHEET_TYPES
static void lcd_sheet_type_cycle(void) {
uint8_t nSheetType;
switch(oCheckSheetType){
case ClCheckSheetType::_Smooth:
oCheckSheetType=ClCheckSheetType::_Textured;
nSheetType=2;
break;
case ClCheckSheetType::_Textured:
oCheckSheetType=ClCheckSheetType::_Satin;
nSheetType=4;
break;
case ClCheckSheetType::_Satin:
oCheckSheetType=ClCheckSheetType::_NylonPA;
nSheetType=8;
break;
case ClCheckSheetType::_NylonPA:
oCheckSheetType=ClCheckSheetType::_PP;
nSheetType=16;
break;
case ClCheckSheetType::_PP:
oCheckSheetType=ClCheckSheetType::_Custom;
nSheetType=32;
break;
case ClCheckSheetType::_Custom:
oCheckSheetType=ClCheckSheetType::_Smooth;
nSheetType=1;
break;
case ClCheckSheetType::_Undef:
oCheckSheetType=ClCheckSheetType::_Smooth;
nSheetType=1;
break;
default:
oCheckSheetType=ClCheckSheetType::_Smooth;
nSheetType=1;
}
eeprom_update_byte_notify(&EEPROM_Sheets_base->s[selected_sheet].type, nSheetType);
}
#define SETTINGS_SHEET_TYPE \
do\
{\
switch (oCheckSheetType)\
{\
case ClCheckSheetType::_Smooth: MENU_ITEM_TOGGLE_P(MSG_SHEET_TYPE, MSG_SHEET_TYPE_SMOOTH, lcd_sheet_type_cycle); break;\
case ClCheckSheetType::_Textured: MENU_ITEM_TOGGLE_P(MSG_SHEET_TYPE, MSG_SHEET_TYPE_TEXTURED, lcd_sheet_type_cycle); break;\
case ClCheckSheetType::_Satin: MENU_ITEM_TOGGLE_P(MSG_SHEET_TYPE, MSG_SHEET_TYPE_SATIN, lcd_sheet_type_cycle); break;\
case ClCheckSheetType::_NylonPA: MENU_ITEM_TOGGLE_P(MSG_SHEET_TYPE, MSG_SHEET_TYPE_NYLON_PA, lcd_sheet_type_cycle); break;\
case ClCheckSheetType::_PP: MENU_ITEM_TOGGLE_P(MSG_SHEET_TYPE, MSG_SHEET_TYPE_PP, lcd_sheet_type_cycle); break;\
case ClCheckSheetType::_Custom: MENU_ITEM_TOGGLE_P(MSG_SHEET_TYPE, MSG_SHEET_TYPE_CUSTOM, lcd_sheet_type_cycle); break;\
case ClCheckSheetType::_Undef: MENU_ITEM_TOGGLE_P(MSG_SHEET_TYPE, _O(MSG_UNKNOWN), lcd_sheet_type_cycle); break;\
}\
}\
while (0)
#endif//STEEL_SHEET_TYPES
static void lcd_check_update_RAM(ClCheckMode * oCheckSetting) { static void lcd_check_update_RAM(ClCheckMode * oCheckSetting) {
switch(*oCheckSetting) { switch(*oCheckSetting) {
case ClCheckMode::_None: case ClCheckMode::_None:
@ -4300,6 +4351,11 @@ static void lcd_check_update_RAM(ClCheckMode * oCheckSetting) {
*oCheckSetting = ClCheckMode::_Strict; *oCheckSetting = ClCheckMode::_Strict;
break; break;
case ClCheckMode::_Strict: case ClCheckMode::_Strict:
#ifdef STEEL_SHEET_TYPES
*oCheckSetting = ClCheckMode::_Always;
break;
case ClCheckMode::_Always:
#endif //STEEL_SHEET_TYPES
*oCheckSetting = ClCheckMode::_None; *oCheckSetting = ClCheckMode::_None;
break; break;
default: default:
@ -4327,6 +4383,13 @@ static void lcd_check_filament_set() {
eeprom_update_byte_notify((uint8_t*)EEPROM_CHECK_FILAMENT,(uint8_t)oCheckFilament); eeprom_update_byte_notify((uint8_t*)EEPROM_CHECK_FILAMENT,(uint8_t)oCheckFilament);
} }
#ifdef STEEL_SHEET_TYPES
static void lcd_check_sheet_type_set() {
lcd_check_update_RAM(&oCheckSheets);
eeprom_update_byte_notify((uint8_t*)EEPROM_CHECK_SHEET_TYPE,(uint8_t)oCheckSheets);
}
#endif //STEEL_SHEET_TYPES
static void settings_check_toggle(ClCheckMode * oCheckSetting, const char* msg, void (*func)(void)) { static void settings_check_toggle(ClCheckMode * oCheckSetting, const char* msg, void (*func)(void)) {
switch(*oCheckSetting) { switch(*oCheckSetting) {
case ClCheckMode::_None: case ClCheckMode::_None:
@ -4338,6 +4401,11 @@ static void settings_check_toggle(ClCheckMode * oCheckSetting, const char* msg,
case ClCheckMode::_Strict: case ClCheckMode::_Strict:
MENU_ITEM_TOGGLE_P(msg, _T(MSG_STRICT), func); MENU_ITEM_TOGGLE_P(msg, _T(MSG_STRICT), func);
break; break;
#ifdef STEEL_SHEET_TYPES
case ClCheckMode::_Always:
MENU_ITEM_TOGGLE_P(msg, _T(MSG_ALWAYS), func);
break;
#endif //STEEL_SHEET_TYPES
default: default:
MENU_ITEM_TOGGLE_P(msg, _T(MSG_NONE), func); MENU_ITEM_TOGGLE_P(msg, _T(MSG_NONE), func);
} }
@ -4351,6 +4419,9 @@ static void lcd_checking_menu(void)
settings_check_toggle(&oCheckModel, _T(MSG_MODEL), lcd_check_model_set); settings_check_toggle(&oCheckModel, _T(MSG_MODEL), lcd_check_model_set);
settings_check_toggle(&oCheckVersion, MSG_FIRMWARE, lcd_check_version_set); settings_check_toggle(&oCheckVersion, MSG_FIRMWARE, lcd_check_version_set);
settings_check_toggle(&oCheckFilament, MSG_FILAMENT, lcd_check_filament_set); settings_check_toggle(&oCheckFilament, MSG_FILAMENT, lcd_check_filament_set);
#ifdef STEEL_SHEET_TYPES
settings_check_toggle(&oCheckSheets, _T(MSG_SHEET), lcd_check_sheet_type_set);
#endif //STEEL_SHEET_TYPES
MENU_END(); MENU_END();
} }
@ -4358,6 +4429,9 @@ template <uint8_t number>
static void select_sheet_menu() static void select_sheet_menu()
{ {
selected_sheet = number; selected_sheet = number;
#ifdef STEEL_SHEET_TYPES
oCheckSheetType = (ClCheckSheetType)eeprom_read_byte((uint8_t *)&EEPROM_Sheets_base->s[selected_sheet].type);
#endif //STEEL_SHEET_TYPES
lcd_sheet_menu(); lcd_sheet_menu();
} }
@ -5038,7 +5112,9 @@ static void change_sheet()
//! @brief Send a notification to the host. Param 'message' must reside in program memory! //! @brief Send a notification to the host. Param 'message' must reside in program memory!
void sendHostNotification_P(const char* message) void sendHostNotification_P(const char* message)
{ {
printf_P(MSG_HOST_ACTION_NOTIFICATION, message); if (M79_timer_get_status()) {
printf_P(MSG_HOST_ACTION_NOTIFICATION, message);
}
} }
static void lcd_rename_sheet_menu() static void lcd_rename_sheet_menu()
@ -5092,6 +5168,9 @@ static void lcd_reset_sheet()
{ {
SheetName sheetName; SheetName sheetName;
eeprom_default_sheet_name(selected_sheet, sheetName); eeprom_default_sheet_name(selected_sheet, sheetName);
#ifdef STEEL_SHEET_TYPES
eeprom_default_sheet_type();
#endif // STEEL_SHEET_TYPES
eeprom_update_word_notify(reinterpret_cast<uint16_t *>(&(EEPROM_Sheets_base->s[selected_sheet].z_offset)),EEPROM_EMPTY_VALUE16); eeprom_update_word_notify(reinterpret_cast<uint16_t *>(&(EEPROM_Sheets_base->s[selected_sheet].z_offset)),EEPROM_EMPTY_VALUE16);
eeprom_update_block_notify(sheetName.c,EEPROM_Sheets_base->s[selected_sheet].name,sizeof(Sheet::name)); eeprom_update_block_notify(sheetName.c,EEPROM_Sheets_base->s[selected_sheet].name,sizeof(Sheet::name));
if (selected_sheet == eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))) if (selected_sheet == eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))
@ -5125,6 +5204,9 @@ static void lcd_sheet_menu()
MENU_ITEM_SUBMENU_P(_T(MSG_V2_CALIBRATION), activate_calibrate_sheet); MENU_ITEM_SUBMENU_P(_T(MSG_V2_CALIBRATION), activate_calibrate_sheet);
} }
MENU_ITEM_SUBMENU_P(_T(MSG_RENAME), lcd_rename_sheet_menu); MENU_ITEM_SUBMENU_P(_T(MSG_RENAME), lcd_rename_sheet_menu);
#ifdef STEEL_SHEET_TYPES
SETTINGS_SHEET_TYPE;
#endif //STEEL_SHEET_TYPES
MENU_ITEM_FUNCTION_P(_T(MSG_RESET), lcd_reset_sheet); MENU_ITEM_FUNCTION_P(_T(MSG_RESET), lcd_reset_sheet);
MENU_END(); MENU_END();

81
Firmware/util.cpp
View File

@ -211,6 +211,7 @@ bool show_upgrade_dialog_if_version_newer(const char *version_string)
return false; return false;
if (upgrade) { if (upgrade) {
sendHostNotification_P(_O(MSG_NEW_FIRMWARE_AVAILABLE));
lcd_display_message_fullscreen_P(_T(MSG_NEW_FIRMWARE_AVAILABLE)); lcd_display_message_fullscreen_P(_T(MSG_NEW_FIRMWARE_AVAILABLE));
lcd_puts_at_P(0, 2, PSTR("")); lcd_puts_at_P(0, 2, PSTR(""));
for (const char *c = version_string; ! is_whitespace_or_nl_or_eol(*c); ++ c) for (const char *c = version_string; ! is_whitespace_or_nl_or_eol(*c); ++ c)
@ -247,6 +248,10 @@ ClCheckMode oCheckModel;
ClCheckMode oCheckVersion; ClCheckMode oCheckVersion;
ClCheckMode oCheckGcode; ClCheckMode oCheckGcode;
ClCheckMode oCheckFilament; ClCheckMode oCheckFilament;
#ifdef STEEL_SHEET_TYPES
ClCheckSheetType oCheckSheetType;
ClCheckMode oCheckSheets;
#endif //STEEL_SHEET_TYPES
void fCheckModeInit() { void fCheckModeInit() {
oCheckMode = (ClCheckMode)eeprom_init_default_byte((uint8_t *)EEPROM_CHECK_MODE, (uint8_t)ClCheckMode::_Warn); oCheckMode = (ClCheckMode)eeprom_init_default_byte((uint8_t *)EEPROM_CHECK_MODE, (uint8_t)ClCheckMode::_Warn);
@ -263,16 +268,26 @@ void fCheckModeInit() {
oCheckVersion = (ClCheckMode)eeprom_init_default_byte((uint8_t *)EEPROM_CHECK_VERSION, (uint8_t)ClCheckMode::_Warn); oCheckVersion = (ClCheckMode)eeprom_init_default_byte((uint8_t *)EEPROM_CHECK_VERSION, (uint8_t)ClCheckMode::_Warn);
oCheckGcode = (ClCheckMode)eeprom_init_default_byte((uint8_t *)EEPROM_CHECK_GCODE, (uint8_t)ClCheckMode::_Warn); oCheckGcode = (ClCheckMode)eeprom_init_default_byte((uint8_t *)EEPROM_CHECK_GCODE, (uint8_t)ClCheckMode::_Warn);
oCheckFilament = (ClCheckMode)eeprom_init_default_byte((uint8_t *)EEPROM_CHECK_FILAMENT, (uint8_t)ClCheckMode::_Warn); oCheckFilament = (ClCheckMode)eeprom_init_default_byte((uint8_t *)EEPROM_CHECK_FILAMENT, (uint8_t)ClCheckMode::_Warn);
#ifdef STEEL_SHEET_TYPES
oCheckSheets = (ClCheckMode)eeprom_init_default_byte((uint8_t *)EEPROM_CHECK_SHEET_TYPE, (uint8_t)ClCheckMode::_Warn);
oCheckSheetType = (ClCheckSheetType)eeprom_init_default_byte((uint8_t *)&EEPROM_Sheets_base->s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))].type, (uint8_t)ClCheckSheetType::_Smooth);
#endif //STEEL_SHEET_TYPES
} }
static void render_M862_warnings(const char* warning, const char* strict, uint8_t check) static void render_M862_warnings(const char* warning, const char* strict, uint8_t check)
{ {
#ifdef STEEL_SHEET_TYPES
if (check == 1 || check == 3) { // Warning, stop print if user selects 'No'
#else
if (check == 1) { // Warning, stop print if user selects 'No' if (check == 1) { // Warning, stop print if user selects 'No'
if (lcd_show_multiscreen_message_cont_cancel_and_wait_P(warning, true, LCD_LEFT_BUTTON_CHOICE) == LCD_MIDDLE_BUTTON_CHOICE) { #endif //STEEL_SHEET_TYPES
sendHostNotification_P(_O(warning));
if (lcd_show_multiscreen_message_cont_cancel_and_wait_P(_T(warning), true, LCD_LEFT_BUTTON_CHOICE) == LCD_MIDDLE_BUTTON_CHOICE) {
lcd_print_stop(); lcd_print_stop();
} }
} else if (check == 2) { // Strict, always stop print } else if (check == 2) { // Strict, always stop print
lcd_show_fullscreen_message_and_wait_P(strict); sendHostNotification_P(_O(strict));
lcd_show_fullscreen_message_and_wait_P(_T(strict));
lcd_print_stop(); lcd_print_stop();
} }
} }
@ -293,8 +308,8 @@ void nozzle_diameter_check(uint16_t nDiameter) {
// SERIAL_ECHOLN((float)(nDiameter/1000.0)); // SERIAL_ECHOLN((float)(nDiameter/1000.0));
render_M862_warnings( render_M862_warnings(
_T(MSG_NOZZLE_DIFFERS_CONTINUE) MSG_NOZZLE_DIFFERS_CONTINUE
,_T(MSG_NOZZLE_DIFFERS_CANCELLED) ,MSG_NOZZLE_DIFFERS_CANCELLED
,(uint8_t)oCheckMode ,(uint8_t)oCheckMode
); );
@ -316,8 +331,8 @@ void printer_model_check(uint16_t nPrinterModel, uint16_t actualPrinterModel) {
// SERIAL_ECHOPGM("expected: "); // SERIAL_ECHOPGM("expected: ");
// SERIAL_ECHOLN(nPrinterModel); // SERIAL_ECHOLN(nPrinterModel);
render_M862_warnings( render_M862_warnings(
_T(MSG_GCODE_DIFF_PRINTER_CONTINUE) MSG_GCODE_DIFF_PRINTER_CONTINUE
,_T(MSG_GCODE_DIFF_PRINTER_CANCELLED) ,MSG_GCODE_DIFF_PRINTER_CANCELLED
,(uint8_t)oCheckModel ,(uint8_t)oCheckModel
); );
} }
@ -366,8 +381,8 @@ void fw_version_check(const char *pVersion) {
*/ */
render_M862_warnings( render_M862_warnings(
_T(MSG_GCODE_NEWER_FIRMWARE_CONTINUE) MSG_GCODE_NEWER_FIRMWARE_CONTINUE
,_T(MSG_GCODE_NEWER_FIRMWARE_CANCELLED) ,MSG_GCODE_NEWER_FIRMWARE_CANCELLED
,(uint8_t)oCheckVersion ,(uint8_t)oCheckVersion
); );
} }
@ -385,8 +400,8 @@ bool filament_presence_check() {
} }
render_M862_warnings( render_M862_warnings(
_T(MSG_MISSING_FILAMENT) MSG_MISSING_FILAMENT
,_T(MSG_MISSING_FILAMENT) //Identical messages ,MSG_MISSING_FILAMENT //Identical messages
,(uint8_t)oCheckFilament ,(uint8_t)oCheckFilament
); );
@ -400,10 +415,10 @@ done:
return true; return true;
} }
void gcode_level_check(uint16_t nGcodeLevel) { void gcode_level_check(uint8_t nGcodeLevel) {
if (oCheckGcode == ClCheckMode::_None) if (oCheckGcode == ClCheckMode::_None)
return; return;
if (nGcodeLevel <= (uint16_t)GCODE_LEVEL) if (nGcodeLevel <= (uint8_t)GCODE_LEVEL)
return; return;
// SERIAL_ECHO_START; // SERIAL_ECHO_START;
@ -414,12 +429,46 @@ void gcode_level_check(uint16_t nGcodeLevel) {
// SERIAL_ECHOLN(nGcodeLevel); // SERIAL_ECHOLN(nGcodeLevel);
render_M862_warnings( render_M862_warnings(
_T(MSG_GCODE_DIFF_CONTINUE) MSG_GCODE_DIFF_CONTINUE
,_T(MSG_GCODE_DIFF_CANCELLED) ,MSG_GCODE_DIFF_CANCELLED
,(uint8_t)oCheckGcode ,(uint8_t)oCheckGcode
); );
} }
#ifdef STEEL_SHEET_TYPES
void sheet_type_check(uint8_t nSheetType, uint8_t wSheetType) {
uint8_t actualSheetType;
if (oCheckSheets == ClCheckMode::_None)
return;
actualSheetType = eeprom_read_byte(&EEPROM_Sheets_base->s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))].type);
bool n_SheetType = (nSheetType & actualSheetType) ? 1 : 0; //Expected sheet found
bool w_SheetType = (wSheetType & actualSheetType) ? 1 : 0; //Warn sheet found
/*
SERIAL_PROTOCOLPGM("Active sheet number: ");
SERIAL_PROTOCOL((int)eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)));
SERIAL_PROTOCOLPGM(" actual sheet type: ");
SERIAL_PROTOCOL((int)eeprom_read_byte(&EEPROM_Sheets_base->s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))].type));
SERIAL_PROTOCOLPGM(" expected sheet type: ");
SERIAL_PROTOCOL((int)nSheetType);
SERIAL_PROTOCOLPGM(" warn sheet type: ");
SERIAL_PROTOCOL((int)wSheetType);
SERIAL_PROTOCOLPGM(" n_sheet found: ");
SERIAL_PROTOCOL((int)n_SheetType);
SERIAL_PROTOCOLPGM(" w_sheet not found: ");
SERIAL_PROTOCOL((int)w_SheetType);
SERIAL_PROTOCOLPGM(" oCheckSheets: ");
SERIAL_PROTOCOLLN((int)oCheckSheets);
*/
if (n_SheetType && !w_SheetType && oCheckSheets != ClCheckMode::_Always)
return;
render_M862_warnings(
MSG_CHECK_SHEET_TYPE
,MSG_CHECK_SHEET_TYPE //Identical messages
,(uint8_t)oCheckSheets
);
}
#endif //STEEL_SHEET_TYPES
void printer_smodel_check(const char *pStrPos, const char *actualPrinterSModel) { void printer_smodel_check(const char *pStrPos, const char *actualPrinterSModel) {
unquoted_string smodel = unquoted_string(pStrPos); unquoted_string smodel = unquoted_string(pStrPos);
@ -433,8 +482,8 @@ void printer_smodel_check(const char *pStrPos, const char *actualPrinterSModel)
} }
render_M862_warnings( render_M862_warnings(
_T(MSG_GCODE_DIFF_PRINTER_CONTINUE) MSG_GCODE_DIFF_PRINTER_CONTINUE
,_T(MSG_GCODE_DIFF_PRINTER_CANCELLED) ,MSG_GCODE_DIFF_PRINTER_CANCELLED
,(uint8_t)oCheckModel ,(uint8_t)oCheckModel
); );
} }

27
Firmware/util.h
View File

@ -35,7 +35,7 @@ enum class ClPrintChecking:uint_least8_t
_Version=4, _Version=4,
_Gcode=5, _Gcode=5,
_Features=6, _Features=6,
_PrinterState=7 _SheetType=7
}; };
enum class ClNozzleDiameter:uint_least8_t enum class ClNozzleDiameter:uint_least8_t
@ -47,11 +47,27 @@ enum class ClNozzleDiameter:uint_least8_t
_Diameter_Undef=EEPROM_EMPTY_VALUE _Diameter_Undef=EEPROM_EMPTY_VALUE
}; };
#ifdef STEEL_SHEET_TYPES
enum class ClCheckSheetType:uint_least8_t
{
_Smooth =0b00000001,
_Textured =0b00000010,
_Satin =0b00000100,
_NylonPA =0b00001000,
_PP =0b00010000,
_Custom =0b00100000,
_Undef =0b00000000,
};
#endif //STEEL_SHEET_TYPES
enum class ClCheckMode:uint_least8_t enum class ClCheckMode:uint_least8_t
{ {
_None, _None,
_Warn, _Warn,
_Strict, _Strict,
#ifdef STEEL_SHEET_TYPES
_Always,
#endif //STEEL_SHEET_TYPES
_Undef=EEPROM_EMPTY_VALUE _Undef=EEPROM_EMPTY_VALUE
}; };
@ -109,13 +125,20 @@ extern ClCheckMode oCheckModel;
extern ClCheckMode oCheckVersion; extern ClCheckMode oCheckVersion;
extern ClCheckMode oCheckGcode; extern ClCheckMode oCheckGcode;
extern ClCheckMode oCheckFilament; extern ClCheckMode oCheckFilament;
#ifdef STEEL_SHEET_TYPES
extern ClCheckMode oCheckSheets;
extern ClCheckSheetType oCheckSheetType;
#endif //STEEL_SHEET_TYPES
void fCheckModeInit(); void fCheckModeInit();
void nozzle_diameter_check(uint16_t nDiameter); void nozzle_diameter_check(uint16_t nDiameter);
void printer_model_check(uint16_t nPrinterModel, uint16_t actualPrinterModel); void printer_model_check(uint16_t nPrinterModel, uint16_t actualPrinterModel);
void printer_smodel_check(const char *pStrPos, const char *actualPrinterSModel); void printer_smodel_check(const char *pStrPos, const char *actualPrinterSModel);
void fw_version_check(const char *pVersion); void fw_version_check(const char *pVersion);
void gcode_level_check(uint16_t nGcodeLevel); void gcode_level_check(uint8_t nGcodeLevel);
#ifdef STEEL_SHEET_TYPES
void sheet_type_check(uint8_t nSheetType, uint8_t wSheetType);
#endif //STEEL_SHEET_TYPES
/// Check if the filament is present before starting a print job. /// Check if the filament is present before starting a print job.
/// Depending on the check level set in the menus the printer will: /// Depending on the check level set in the menus the printer will:

14
Firmware/variants/MK25-RAMBo10a.h
View File

@ -25,6 +25,20 @@
#define HEATBED_V2 #define HEATBED_V2
#define STEEL_SHEET #define STEEL_SHEET
//#define NEW_FIRST_LAYER_CAL //from front to back //#define NEW_FIRST_LAYER_CAL //from front to back
/* Sheet types
bit based
- 0 = Smooth
- 1 = Textured
- 2 = Satin
- 3 = NylonPA
- 4 = PolyPro
- 5 = Custom
- 6 = free
- 7 = free
*/
#define STEEL_SHEET_TYPES 6
#define TACH0PULLUP #define TACH0PULLUP
// Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier) // Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier)

14
Firmware/variants/MK25-RAMBo13a.h
View File

@ -25,6 +25,20 @@
#define HEATBED_V2 #define HEATBED_V2
#define STEEL_SHEET #define STEEL_SHEET
//#define NEW_FIRST_LAYER_CAL //from front to back //#define NEW_FIRST_LAYER_CAL //from front to back
/* Sheet types
bit based
- 0 = Smooth
- 1 = Textured
- 2 = Satin
- 3 = NylonPA
- 4 = PolyPro
- 5 = Custom
- 6 = free
- 7 = free
*/
#define STEEL_SHEET_TYPES 6
#define TACH0PULLUP #define TACH0PULLUP
// Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier) // Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier)

14
Firmware/variants/MK25S-RAMBo10a.h
View File

@ -25,6 +25,20 @@
#define HEATBED_V2 #define HEATBED_V2
#define STEEL_SHEET #define STEEL_SHEET
//#define NEW_FIRST_LAYER_CAL //from front to back //#define NEW_FIRST_LAYER_CAL //from front to back
/* Sheet types
bit based
- 0 = Smooth
- 1 = Textured
- 2 = Satin
- 3 = NylonPA
- 4 = PolyPro
- 5 = Custom
- 6 = free
- 7 = free
*/
#define STEEL_SHEET_TYPES 6
#define TACH0PULLUP #define TACH0PULLUP
// Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier) // Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier)

14
Firmware/variants/MK25S-RAMBo13a.h
View File

@ -25,6 +25,20 @@
#define HEATBED_V2 #define HEATBED_V2
#define STEEL_SHEET #define STEEL_SHEET
//#define NEW_FIRST_LAYER_CAL //from front to back //#define NEW_FIRST_LAYER_CAL //from front to back
/* Sheet types
bit based
- 0 = Smooth
- 1 = Textured
- 2 = Satin
- 3 = NylonPA
- 4 = PolyPro
- 5 = Custom
- 6 = free
- 7 = free
*/
#define STEEL_SHEET_TYPES 6
#define TACH0PULLUP #define TACH0PULLUP
// Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier) // Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier)

14
Firmware/variants/MK3-E3DREVO.h
View File

@ -24,6 +24,20 @@
#define MOTHERBOARD BOARD_EINSY_1_0a #define MOTHERBOARD BOARD_EINSY_1_0a
#define STEEL_SHEET #define STEEL_SHEET
//#define NEW_FIRST_LAYER_CAL //from front to back //#define NEW_FIRST_LAYER_CAL //from front to back
/* Sheet types
bit based
- 0 = Smooth
- 1 = Textured
- 2 = Satin
- 3 = NylonPA
- 4 = PolyPro
- 5 = Custom
- 6 = free
- 7 = free
*/
#define STEEL_SHEET_TYPES 6
#define HAS_SECOND_SERIAL_PORT #define HAS_SECOND_SERIAL_PORT

14
Firmware/variants/MK3-E3DREVO_HF_60W.h
View File

@ -24,6 +24,20 @@
#define MOTHERBOARD BOARD_EINSY_1_0a #define MOTHERBOARD BOARD_EINSY_1_0a
#define STEEL_SHEET #define STEEL_SHEET
//#define NEW_FIRST_LAYER_CAL //from front to back //#define NEW_FIRST_LAYER_CAL //from front to back
/* Sheet types
bit based
- 0 = Smooth
- 1 = Textured
- 2 = Satin
- 3 = NylonPA
- 4 = PolyPro
- 5 = Custom
- 6 = free
- 7 = free
*/
#define STEEL_SHEET_TYPES 6
#define HAS_SECOND_SERIAL_PORT #define HAS_SECOND_SERIAL_PORT

14
Firmware/variants/MK3.h
View File

@ -24,6 +24,20 @@
#define MOTHERBOARD BOARD_EINSY_1_0a #define MOTHERBOARD BOARD_EINSY_1_0a
#define STEEL_SHEET #define STEEL_SHEET
//#define NEW_FIRST_LAYER_CAL //from front to back //#define NEW_FIRST_LAYER_CAL //from front to back
/* Sheet types
bit based
- 0 = Smooth
- 1 = Textured
- 2 = Satin
- 3 = NylonPA
- 4 = PolyPro
- 5 = Custom
- 6 = free
- 7 = free
*/
#define STEEL_SHEET_TYPES 6
#define HAS_SECOND_SERIAL_PORT #define HAS_SECOND_SERIAL_PORT

14
Firmware/variants/MK3S-E3DREVO.h
View File

@ -23,6 +23,20 @@
#define MOTHERBOARD BOARD_EINSY_1_0a #define MOTHERBOARD BOARD_EINSY_1_0a
#define STEEL_SHEET #define STEEL_SHEET
//#define NEW_FIRST_LAYER_CAL //from front to back //#define NEW_FIRST_LAYER_CAL //from front to back
/* Sheet types
bit based
- 0 = Smooth
- 1 = Textured
- 2 = Satin
- 3 = NylonPA
- 4 = PolyPro
- 5 = Custom
- 6 = free
- 7 = free
*/
#define STEEL_SHEET_TYPES 6
#define HAS_SECOND_SERIAL_PORT #define HAS_SECOND_SERIAL_PORT
// PSU // PSU

14
Firmware/variants/MK3S-E3DREVO_HF_60W.h
View File

@ -23,6 +23,20 @@
#define MOTHERBOARD BOARD_EINSY_1_0a #define MOTHERBOARD BOARD_EINSY_1_0a
#define STEEL_SHEET #define STEEL_SHEET
//#define NEW_FIRST_LAYER_CAL //from front to back //#define NEW_FIRST_LAYER_CAL //from front to back
/* Sheet types
bit based
- 0 = Smooth
- 1 = Textured
- 2 = Satin
- 3 = NylonPA
- 4 = PolyPro
- 5 = Custom
- 6 = free
- 7 = free
*/
#define STEEL_SHEET_TYPES 6
#define HAS_SECOND_SERIAL_PORT #define HAS_SECOND_SERIAL_PORT
// PSU // PSU

14
Firmware/variants/MK3S.h
View File

@ -23,6 +23,20 @@
#define MOTHERBOARD BOARD_EINSY_1_0a #define MOTHERBOARD BOARD_EINSY_1_0a
#define STEEL_SHEET #define STEEL_SHEET
//#define NEW_FIRST_LAYER_CAL //from front to back //#define NEW_FIRST_LAYER_CAL //from front to back
/* Sheet types
bit based
- 0 = Smooth
- 1 = Textured
- 2 = Satin
- 3 = NylonPA
- 4 = PolyPro
- 5 = Custom
- 6 = free
- 7 = free
*/
#define STEEL_SHEET_TYPES 6
#define HAS_SECOND_SERIAL_PORT #define HAS_SECOND_SERIAL_PORT
// PSU // PSU

6
lang/po/Firmware.pot
View File

@ -272,6 +272,12 @@ msgstr ""
msgid "Changed correctly" msgid "Changed correctly"
msgstr "" msgstr ""
#. MSG_CHECK_SHEET_TYPE c=20 r=3
#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163
#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455
msgid "Check selected steel sheet."
msgstr ""
#. MSG_CHECKING_X c=20 #. MSG_CHECKING_X c=20
#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:5930 #: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:5930
#: ../../Firmware/ultralcd.cpp:6955 #: ../../Firmware/ultralcd.cpp:6955

6
lang/po/Firmware_cs.po
View File

@ -2582,6 +2582,12 @@ msgstr "Není vložen filament."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Doporučujeme kalibraci osy Z. Spustit nyní?" msgstr "Doporučujeme kalibraci osy Z. Spustit nyní?"
#. MSG_CHECK_SHEET_TYPE c=20 r=3
#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163
#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455
msgid "Check selected steel sheet."
msgstr "Zkontrolujte tiskový plát."
#~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho." #~ msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho."

6
lang/po/Firmware_de.po
View File

@ -2609,6 +2609,12 @@ msgstr "Kein Filament geladen."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Z-Kalibrierung empfohlen. Jetzt ausführen?" msgstr "Z-Kalibrierung empfohlen. Jetzt ausführen?"
#. MSG_CHECK_SHEET_TYPE c=20 r=3
#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163
#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455
msgid "Check selected steel sheet."
msgstr "Überprüfe ausgewähltes Stahlblech."
#~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Entferne das alte Fil. und drücke den Knopf, um das neue zu laden." #~ msgstr "Entferne das alte Fil. und drücke den Knopf, um das neue zu laden."

6
lang/po/Firmware_es.po
View File

@ -2608,6 +2608,12 @@ msgstr "No hay ningún filamento cargado."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Se recomienda calibrar Z. ¿Ejecutarlo ahora?" msgstr "Se recomienda calibrar Z. ¿Ejecutarlo ahora?"
#. MSG_CHECK_SHEET_TYPE c=20 r=3
#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163
#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455
msgid "Check selected steel sheet."
msgstr "Verifique la lámina de acero seleccionada."
#~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "" #~ msgstr ""
#~ "Retira el fil. viejo y presiona el dial para comenzar a cargar el nuevo." #~ "Retira el fil. viejo y presiona el dial para comenzar a cargar el nuevo."

6
lang/po/Firmware_fr.po
View File

@ -2616,6 +2616,12 @@ msgstr "Il n'y a pas de filament chargé."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Calibrage Z recommandé. Exécuter maintenant?" msgstr "Calibrage Z recommandé. Exécuter maintenant?"
#. MSG_CHECK_SHEET_TYPE c=20 r=3
#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163
#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455
msgid "Check selected steel sheet."
msgstr "Vérifiez la plaque en acier sélectionnée."
#~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "" #~ msgstr ""
#~ "Retirez l'ancien fil. puis appuyez sur le bouton pour charger le nouveau." #~ "Retirez l'ancien fil. puis appuyez sur le bouton pour charger le nouveau."

6
lang/po/Firmware_hr.po
View File

@ -2598,6 +2598,12 @@ msgstr "Nema umetnute niti."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Preporuča se Z kalibracija. Pokrenuti ga sada?" msgstr "Preporuča se Z kalibracija. Pokrenuti ga sada?"
#. MSG_CHECK_SHEET_TYPE c=20 r=3
#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163
#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455
msgid "Check selected steel sheet."
msgstr "Provjerite odabrani čelični ploca."
#~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Uklonite stari fil. i pritisnite gumb za pocetak stavljanja novog." #~ msgstr "Uklonite stari fil. i pritisnite gumb za pocetak stavljanja novog."

6
lang/po/Firmware_hu.po
View File

@ -2606,6 +2606,12 @@ msgstr "Nincs befűzve filament."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Z kalibráció javasolt. Futtassam most?" msgstr "Z kalibráció javasolt. Futtassam most?"
#. MSG_CHECK_SHEET_TYPE c=20 r=3
#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163
#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455
msgid "Check selected steel sheet."
msgstr "Nezd meg a kiválasztott az acellapot."
#~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Vedd ki a regi fil., majd nyomd meg a gombot az uj fil. betoltesehez." #~ msgstr "Vedd ki a regi fil., majd nyomd meg a gombot az uj fil. betoltesehez."

6
lang/po/Firmware_it.po
View File

@ -2604,6 +2604,12 @@ msgstr "Nessun filamento caricato."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Si consiglia la calibrazione Z. Eseguirla ora?" msgstr "Si consiglia la calibrazione Z. Eseguirla ora?"
#. MSG_CHECK_SHEET_TYPE c=20 r=3
#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163
#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455
msgid "Check selected steel sheet."
msgstr "Controllare la piastra d'acciaio selezionata."
#~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Rimuovi il fil. precedente e premi la manopola per caricare il nuovo." #~ msgstr "Rimuovi il fil. precedente e premi la manopola per caricare il nuovo."

6
lang/po/Firmware_nl.po
View File

@ -2607,6 +2607,12 @@ msgstr "Geen filament geladen."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Z-kalibratie aanbevolen. Nu uitvoeren?" msgstr "Z-kalibratie aanbevolen. Nu uitvoeren?"
#. MSG_CHECK_SHEET_TYPE c=20 r=3
#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163
#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455
msgid "Check selected steel sheet."
msgstr "Controleer de geselecteerde staalplaat."
#~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "" #~ msgstr ""
#~ "Verwijder de oude filament en druk op de knop om nieuwe filament te laden." #~ "Verwijder de oude filament en druk op de knop om nieuwe filament te laden."

6
lang/po/Firmware_no.po
View File

@ -2581,6 +2581,12 @@ msgstr "Det er ingen filament lastet."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Z-kalibrering anbefales. Kjøre det nå?" msgstr "Z-kalibrering anbefales. Kjøre det nå?"
#. MSG_CHECK_SHEET_TYPE c=20 r=3
#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163
#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455
msgid "Check selected steel sheet."
msgstr "Sjekk valgt stålplaten."
#~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Ta bort det gamle filamentet og trykk valghjulet for å laste et nytt." #~ msgstr "Ta bort det gamle filamentet og trykk valghjulet for å laste et nytt."

6
lang/po/Firmware_pl.po
View File

@ -2595,6 +2595,12 @@ msgstr "Nie ma załadowanego filamentu."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Zalecana kalibracja Z. Uruchomić teraz?" msgstr "Zalecana kalibracja Z. Uruchomić teraz?"
#. MSG_CHECK_SHEET_TYPE c=20 r=3
#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163
#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455
msgid "Check selected steel sheet."
msgstr "Sprawdź wybraną płyta stalowa."
#~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Wyciągnij poprzedni filament i naciśnij pokrętło aby załadować nowy." #~ msgstr "Wyciągnij poprzedni filament i naciśnij pokrętło aby załadować nowy."

6
lang/po/Firmware_ro.po
View File

@ -2605,6 +2605,12 @@ msgstr "Filamentul nu este detectat."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Calibrarea Z este recomandată. Calibrează acum?" msgstr "Calibrarea Z este recomandată. Calibrează acum?"
#. MSG_CHECK_SHEET_TYPE c=20 r=3
#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163
#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455
msgid "Check selected steel sheet."
msgstr "Verificați suprafața de print selectată"
#~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Scoateți fil. vechi și apăsați butonul pentru a încărca unul nou." #~ msgstr "Scoateți fil. vechi și apăsați butonul pentru a încărca unul nou."

6
lang/po/Firmware_sk.po
View File

@ -2585,6 +2585,12 @@ msgstr "Nie je zavedený žiaden filament."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Odporúča sa kalibrácia Z. Spustiť ju teraz?" msgstr "Odporúča sa kalibrácia Z. Spustiť ju teraz?"
#. MSG_CHECK_SHEET_TYPE c=20 r=3
#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163
#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455
msgid "Check selected steel sheet."
msgstr "Skontrolujte vybranú platňu."
#~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Vyberte starý filament a stlačte tlačidlo pre zavedenie nového." #~ msgstr "Vyberte starý filament a stlačte tlačidlo pre zavedenie nového."

6
lang/po/Firmware_sv.po
View File

@ -2593,6 +2593,12 @@ msgstr "Det finns ingen filament laddad."
msgid "Z calibration recommended. Run it now?" msgid "Z calibration recommended. Run it now?"
msgstr "Z-kalibrering rekommenderas. Kör den nu?" msgstr "Z-kalibrering rekommenderas. Kör den nu?"
#. MSG_CHECK_SHEET_TYPE c=20 r=3
#: ../../Firmware/Marlin_main.cpp:5844 ../../Firmware/messages.cpp:163
#: ../../Firmware/util.cpp:454 ../../Firmware/util.cpp:455
msgid "Check selected steel sheet."
msgstr "Kontrollera vald metallskivan."
#~ msgid "Remove old filament and press the knob to start loading new filament." #~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Ta bort det gamla fil. och tryck på knappen för att börja ladda nytt." #~ msgstr "Ta bort det gamla fil. och tryck på knappen för att börja ladda nytt."