From 0d8b3ceee1367195550c935663c8387acbcfebf5 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 26 Jun 2023 10:10:00 +0200 Subject: [PATCH] Change MMU2 to MMU3 --- Firmware/Marlin_main.cpp | 4 +++- Firmware/eeprom.h | 2 ++ Firmware/printers.h | 4 ++++ Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h | 4 ++-- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 4 ++-- Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h | 4 ++-- Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 4 ++-- 7 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index b009d2b3c..8cce3da4d 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7921,9 +7921,11 @@ Sigma_Exit: - MK2.5SMMU2S (20252) - MK3 (300) - MK3MMU2 (20300) + - MK3MMU3 (30300) - MK3S (302) - MK3SMMU2S (20302) - + - MK3SMMU3 (30302) + */ case 862: // M862: print checking { diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index e54984d53..93a8b23da 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -201,8 +201,10 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | ^ | ^ | ^ | 1c 4fh 20252 | ^ | PRINTER_MK2.5S with MMU2S | ??? | ^ | ^ | ^ | ^ | 2c 01h 300 | ^ | PRINTER_MK3 | ??? | ^ | ^ | ^ | ^ | 4c 4fh 20300 | ^ | PRINTER_MK3 with MMU2 | ??? | ^ +| ^ | ^ | ^ | 5c 76h 30300 | ^ | PRINTER_MK3 with MMU3 | ??? | ^ | ^ | ^ | ^ | 2e 01h 302 | ^ | PRINTER_MK3S | ??? | ^ | ^ | ^ | ^ | 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 | ^ | ^ | ^ | c8 00h 200 | ^ | BOARD_RAMBO_MINI_1_0 | ??? | ^ | ^ | ^ | ^ | cb 00h 203 | ^ | BOARD_RAMBO_MINI_1_3 | ??? | ^ diff --git a/Firmware/printers.h b/Firmware/printers.h index e26431302..2a9616e4a 100644 --- a/Firmware/printers.h +++ b/Firmware/printers.h @@ -31,10 +31,14 @@ #define PRINTER_MK3_NAME "MK3" #define PRINTER_MK3_MMU2 20300 #define PRINTER_MK3_MMU2_NAME "MK3MMU2" +#define PRINTER_MK3_MMU3 30300 +#define PRINTER_MK3_MMU3_NAME "MK3MMU3" // *** MK3S #define PRINTER_MK3S 302 #define PRINTER_MK3S_NAME "MK3S" #define PRINTER_MK3S_MMU2 20302 #define PRINTER_MK3S_MMU2_NAME "MK3SMMU2S" +#define PRINTER_MK3S_MMU3 30302 +#define PRINTER_MK3S_MMU3_NAME "MK3SMMU3" #endif //PRINTERS_H diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h index afed016eb..01f3f54f4 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h @@ -12,8 +12,8 @@ #define PRINTER_TYPE PRINTER_MK3 #define PRINTER_NAME PRINTER_MK3_NAME #define PRINTER_NAME_ALTERNATE PRINTER_MK3S_NAME //the other similar printer to this. -#define PRINTER_MMU_TYPE PRINTER_MK3_MMU2 -#define PRINTER_MMU_NAME PRINTER_MK3_MMU2_NAME +#define PRINTER_MMU_TYPE PRINTER_MK3_MMU3 +#define PRINTER_MMU_NAME PRINTER_MK3_MMU3_NAME #define FILAMENT_SIZE "1_75mm_MK3" #define NOZZLE_TYPE "E3DREVO" diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 21adab2d1..751ae579e 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -12,8 +12,8 @@ #define PRINTER_TYPE PRINTER_MK3 #define PRINTER_NAME PRINTER_MK3_NAME #define PRINTER_NAME_ALTERNATE PRINTER_MK3S_NAME //the other similar printer to this. -#define PRINTER_MMU_TYPE PRINTER_MK3_MMU2 -#define PRINTER_MMU_NAME PRINTER_MK3_MMU2_NAME +#define PRINTER_MMU_TYPE PRINTER_MK3_MMU3 +#define PRINTER_MMU_NAME PRINTER_MK3_MMU3_NAME #define FILAMENT_SIZE "1_75mm_MK3" #define NOZZLE_TYPE "E3Dv6full" diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h index 4638cb3fc..2a44ee101 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h @@ -11,8 +11,8 @@ #define PRINTER_TYPE PRINTER_MK3S #define PRINTER_NAME PRINTER_MK3S_NAME #define PRINTER_NAME_ALTERNATE PRINTER_MK3_NAME //the other similar printer to this. -#define PRINTER_MMU_TYPE PRINTER_MK3S_MMU2 -#define PRINTER_MMU_NAME PRINTER_MK3S_MMU2_NAME +#define PRINTER_MMU_TYPE PRINTER_MK3S_MMU3 +#define PRINTER_MMU_NAME PRINTER_MK3S_MMU3_NAME #define FILAMENT_SIZE "1_75mm_MK3S" #define NOZZLE_TYPE "E3DREVO" diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index ee7550acd..bc861ed06 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -11,8 +11,8 @@ #define PRINTER_TYPE PRINTER_MK3S #define PRINTER_NAME PRINTER_MK3S_NAME #define PRINTER_NAME_ALTERNATE PRINTER_MK3_NAME //the other similar printer to this. -#define PRINTER_MMU_TYPE PRINTER_MK3S_MMU2 -#define PRINTER_MMU_NAME PRINTER_MK3S_MMU2_NAME +#define PRINTER_MMU_TYPE PRINTER_MK3S_MMU3 +#define PRINTER_MMU_NAME PRINTER_MK3S_MMU3_NAME #define FILAMENT_SIZE "1_75mm_MK3S" #define NOZZLE_TYPE "E3Dv6full"