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

Merge pull request #4249 from 3d-gussner/MK3_3130_MK3SMMU3 

Update check MMU version and change to MMU3
This commit is contained in:
3d-gussner 2023-06-28 09:13:47 +02:00 committed by GitHub
parent bfdef2c1da 0d8b3ceee1
commit 5dc6ccb4e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/Marlin_main.cpp
View File

@ -7921,9 +7921,11 @@ Sigma_Exit:
- MK2.5SMMU2S (20252) - MK2.5SMMU2S (20252)
- MK3 (300) - MK3 (300)
- MK3MMU2 (20300) - MK3MMU2 (20300)
- MK3MMU3 (30300)
- MK3S (302) - MK3S (302)
- MK3SMMU2S (20302) - MK3SMMU2S (20302)
- MK3SMMU3 (30302)
*/ */
case 862: // M862: print checking case 862: // M862: print checking
{ {

2
Firmware/eeprom.h
View File

@ -201,8 +201,10 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP
| ^ | ^ | ^ | 1c 4fh 20252 | ^ | PRINTER_MK2.5S with MMU2S | ??? | ^ | ^ | ^ | ^ | 1c 4fh 20252 | ^ | PRINTER_MK2.5S with MMU2S | ??? | ^
| ^ | ^ | ^ | 2c 01h 300 | ^ | PRINTER_MK3 | ??? | ^ | ^ | ^ | ^ | 2c 01h 300 | ^ | PRINTER_MK3 | ??? | ^
| ^ | ^ | ^ | 4c 4fh 20300 | ^ | PRINTER_MK3 with MMU2 | ??? | ^ | ^ | ^ | ^ | 4c 4fh 20300 | ^ | PRINTER_MK3 with MMU2 | ??? | ^
| ^ | ^ | ^ | 5c 76h 30300 | ^ | PRINTER_MK3 with MMU3 | ??? | ^
| ^ | ^ | ^ | 2e 01h 302 | ^ | PRINTER_MK3S | ??? | ^ | ^ | ^ | ^ | 2e 01h 302 | ^ | PRINTER_MK3S | ??? | ^
| ^ | ^ | ^ | 4e 4fh 20302 | ^ | PRINTER_MK3S with MMU2S | ??? | ^ | ^ | ^ | ^ | 4e 4fh 20302 | ^ | PRINTER_MK3S with MMU2S | ??? | ^
| ^ | ^ | ^ | 5e 76h 30302 | ^ | PRINTER_MK3S with MMU3 | ??? | ^
| 0x0EEC 3820 | uint16 | EEPROM_BOARD_TYPE | ??? | ff ffh 65535 | Board Type | ??? | D3 Ax0eec C2 | 0x0EEC 3820 | uint16 | EEPROM_BOARD_TYPE | ??? | ff ffh 65535 | Board Type | ??? | D3 Ax0eec C2
| ^ | ^ | ^ | c8 00h 200 | ^ | BOARD_RAMBO_MINI_1_0 | ??? | ^ | ^ | ^ | ^ | c8 00h 200 | ^ | BOARD_RAMBO_MINI_1_0 | ??? | ^
| ^ | ^ | ^ | cb 00h 203 | ^ | BOARD_RAMBO_MINI_1_3 | ??? | ^ | ^ | ^ | ^ | cb 00h 203 | ^ | BOARD_RAMBO_MINI_1_3 | ??? | ^

4
Firmware/printers.h
View File

@ -31,10 +31,14 @@
#define PRINTER_MK3_NAME "MK3" #define PRINTER_MK3_NAME "MK3"
#define PRINTER_MK3_MMU2 20300 #define PRINTER_MK3_MMU2 20300
#define PRINTER_MK3_MMU2_NAME "MK3MMU2" #define PRINTER_MK3_MMU2_NAME "MK3MMU2"
#define PRINTER_MK3_MMU3 30300
#define PRINTER_MK3_MMU3_NAME "MK3MMU3"
// *** MK3S // *** MK3S
#define PRINTER_MK3S 302 #define PRINTER_MK3S 302
#define PRINTER_MK3S_NAME "MK3S" #define PRINTER_MK3S_NAME "MK3S"
#define PRINTER_MK3S_MMU2 20302 #define PRINTER_MK3S_MMU2 20302
#define PRINTER_MK3S_MMU2_NAME "MK3SMMU2S" #define PRINTER_MK3S_MMU2_NAME "MK3SMMU2S"
#define PRINTER_MK3S_MMU3 30302
#define PRINTER_MK3S_MMU3_NAME "MK3SMMU3"
#endif //PRINTERS_H #endif //PRINTERS_H

10
Firmware/util.cpp
View File

@ -408,14 +408,14 @@ return pStrBegin;
void printer_smodel_check(const char *pStrPos, const char *actualPrinterSModel) { void printer_smodel_check(const char *pStrPos, const char *actualPrinterSModel) {
char* pResult; char* pResult;
size_t nLength,nPrinterNameLength; size_t nLength;
nPrinterNameLength = strlen_P(actualPrinterSModel);
pResult=code_string(pStrPos,&nLength); pResult=code_string(pStrPos,&nLength);
if(pResult != NULL && nLength == nPrinterNameLength) { if(pResult != NULL) {
// Only compare them if the lengths match // Only compare first 6 chars on MK3|MK3S
if (strncmp_P(pResult, actualPrinterSModel, nLength) == 0) return; if (strncmp_P(pResult, PSTR("MK3"), 3) == 0) nLength = 6;
if (strncmp_P(pResult, actualPrinterSModel, nLength) == 0) return;
} }
render_M862_warnings( render_M862_warnings(

4
Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h
View File

@ -12,8 +12,8 @@
#define PRINTER_TYPE PRINTER_MK3 #define PRINTER_TYPE PRINTER_MK3
#define PRINTER_NAME PRINTER_MK3_NAME #define PRINTER_NAME PRINTER_MK3_NAME
#define PRINTER_NAME_ALTERNATE PRINTER_MK3S_NAME //the other similar printer to this. #define PRINTER_NAME_ALTERNATE PRINTER_MK3S_NAME //the other similar printer to this.
#define PRINTER_MMU_TYPE PRINTER_MK3_MMU2 #define PRINTER_MMU_TYPE PRINTER_MK3_MMU3
#define PRINTER_MMU_NAME PRINTER_MK3_MMU2_NAME #define PRINTER_MMU_NAME PRINTER_MK3_MMU3_NAME
#define FILAMENT_SIZE "1_75mm_MK3" #define FILAMENT_SIZE "1_75mm_MK3"
#define NOZZLE_TYPE "E3DREVO" #define NOZZLE_TYPE "E3DREVO"

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

@ -12,8 +12,8 @@
#define PRINTER_TYPE PRINTER_MK3 #define PRINTER_TYPE PRINTER_MK3
#define PRINTER_NAME PRINTER_MK3_NAME #define PRINTER_NAME PRINTER_MK3_NAME
#define PRINTER_NAME_ALTERNATE PRINTER_MK3S_NAME //the other similar printer to this. #define PRINTER_NAME_ALTERNATE PRINTER_MK3S_NAME //the other similar printer to this.
#define PRINTER_MMU_TYPE PRINTER_MK3_MMU2 #define PRINTER_MMU_TYPE PRINTER_MK3_MMU3
#define PRINTER_MMU_NAME PRINTER_MK3_MMU2_NAME #define PRINTER_MMU_NAME PRINTER_MK3_MMU3_NAME
#define FILAMENT_SIZE "1_75mm_MK3" #define FILAMENT_SIZE "1_75mm_MK3"
#define NOZZLE_TYPE "E3Dv6full" #define NOZZLE_TYPE "E3Dv6full"

4
Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h
View File

@ -11,8 +11,8 @@
#define PRINTER_TYPE PRINTER_MK3S #define PRINTER_TYPE PRINTER_MK3S
#define PRINTER_NAME PRINTER_MK3S_NAME #define PRINTER_NAME PRINTER_MK3S_NAME
#define PRINTER_NAME_ALTERNATE PRINTER_MK3_NAME //the other similar printer to this. #define PRINTER_NAME_ALTERNATE PRINTER_MK3_NAME //the other similar printer to this.
#define PRINTER_MMU_TYPE PRINTER_MK3S_MMU2 #define PRINTER_MMU_TYPE PRINTER_MK3S_MMU3
#define PRINTER_MMU_NAME PRINTER_MK3S_MMU2_NAME #define PRINTER_MMU_NAME PRINTER_MK3S_MMU3_NAME
#define FILAMENT_SIZE "1_75mm_MK3S" #define FILAMENT_SIZE "1_75mm_MK3S"
#define NOZZLE_TYPE "E3DREVO" #define NOZZLE_TYPE "E3DREVO"

4
Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h
View File

@ -11,8 +11,8 @@
#define PRINTER_TYPE PRINTER_MK3S #define PRINTER_TYPE PRINTER_MK3S
#define PRINTER_NAME PRINTER_MK3S_NAME #define PRINTER_NAME PRINTER_MK3S_NAME
#define PRINTER_NAME_ALTERNATE PRINTER_MK3_NAME //the other similar printer to this. #define PRINTER_NAME_ALTERNATE PRINTER_MK3_NAME //the other similar printer to this.
#define PRINTER_MMU_TYPE PRINTER_MK3S_MMU2 #define PRINTER_MMU_TYPE PRINTER_MK3S_MMU3
#define PRINTER_MMU_NAME PRINTER_MK3S_MMU2_NAME #define PRINTER_MMU_NAME PRINTER_MK3S_MMU3_NAME
#define FILAMENT_SIZE "1_75mm_MK3S" #define FILAMENT_SIZE "1_75mm_MK3S"
#define NOZZLE_TYPE "E3Dv6full" #define NOZZLE_TYPE "E3Dv6full"