From c461975140c926a8d7815655c1f0ad195b98d839 Mon Sep 17 00:00:00 2001
From: AnHardt <github@kitelab.de>
Date: Tue, 16 Jun 2015 23:00:43 +0200
Subject: [PATCH] Rename and repair MELZI_1284 (PR#2301)
to MELZI_MAKR3D.
Fix for #2288
As the normal MELZI also can have a 1284.
---
Marlin/boards.h | 2 +-
Marlin/configurator/config/boards.h | 2 +-
Marlin/pins.h | 4 ++--
Marlin/{pins_MELZI_1284.h => pins_MELZI_MAKR3D.h} | 4 +---
Marlin/pins_SANGUINOLOLU_12.h | 2 +-
5 files changed, 6 insertions(+), 8 deletions(-)
rename Marlin/{pins_MELZI_1284.h => pins_MELZI_MAKR3D.h} (79%)
diff --git a/Marlin/boards.h b/Marlin/boards.h
index 1748ac4c8a..d913220c7c 100644
--- a/Marlin/boards.h
+++ b/Marlin/boards.h
@@ -23,7 +23,7 @@
#define BOARD_MELZI 63 // Melzi
#define BOARD_STB_11 64 // STB V1.1
#define BOARD_AZTEEG_X1 65 // Azteeg X1
-#define BOARD_MELZI_1284 66 // Melzi with ATmega1284 (MaKr3d version)
+#define BOARD_MELZI_MAKR3D 66 // Melzi with ATmega1284 (MaKr3d version)
#define BOARD_AZTEEG_X3 67 // Azteeg X3
#define BOARD_AZTEEG_X3_PRO 68 // Azteeg X3 Pro
#define BOARD_ULTIMAKER 7 // Ultimaker
diff --git a/Marlin/configurator/config/boards.h b/Marlin/configurator/config/boards.h
index 4e0241f874..5e782125db 100644
--- a/Marlin/configurator/config/boards.h
+++ b/Marlin/configurator/config/boards.h
@@ -23,7 +23,7 @@
#define BOARD_MELZI 63 // Melzi
#define BOARD_STB_11 64 // STB V1.1
#define BOARD_AZTEEG_X1 65 // Azteeg X1
-#define BOARD_MELZI_1284 66 // Melzi with ATmega1284 (MaKr3d version)
+#define BOARD_MELZI_MAKR3D 66 // Melzi with ATmega1284 (MaKr3d version)
#define BOARD_AZTEEG_X3 67 // Azteeg X3
#define BOARD_AZTEEG_X3_PRO 68 // Azteeg X3 Pro
#define BOARD_ULTIMAKER 7 // Ultimaker
diff --git a/Marlin/pins.h b/Marlin/pins.h
index 4893cf5ee0..0b7d34a623 100644
--- a/Marlin/pins.h
+++ b/Marlin/pins.h
@@ -52,8 +52,8 @@
#include "pins_STB_11.h"
#elif MB(AZTEEG_X1)
#include "pins_AZTEEG_X1.h"
-#elif MB(MELZI_1284)
- #include "pins_MELZI_1284.h"
+#elif MB(MELZI_MAKR3D)
+ #include "pins_MELZI_MAKR3D.h"
#elif MB(AZTEEG_X3)
#include "pins_AZTEEG_X3.h"
#elif MB(AZTEEG_X3_PRO)
diff --git a/Marlin/pins_MELZI_1284.h b/Marlin/pins_MELZI_MAKR3D.h
similarity index 79%
rename from Marlin/pins_MELZI_1284.h
rename to Marlin/pins_MELZI_MAKR3D.h
index 2c18666725..dad313fdfa 100644
--- a/Marlin/pins_MELZI_1284.h
+++ b/Marlin/pins_MELZI_MAKR3D.h
@@ -2,10 +2,8 @@
* Melzi with ATmega1284 (MaKr3d version) pin assignments
*/
-#define MELZI
-
#undef MOTHERBOARD
-#define MOTHERBOARD BOARD_SANGUINOLOLU_11
+#define MOTHERBOARD MELZI
#define SANGUINOLOLU_V_1_2
#if defined(__AVR_ATmega1284P__)
diff --git a/Marlin/pins_SANGUINOLOLU_12.h b/Marlin/pins_SANGUINOLOLU_12.h
index d92cff7329..5498bc99cb 100644
--- a/Marlin/pins_SANGUINOLOLU_12.h
+++ b/Marlin/pins_SANGUINOLOLU_12.h
@@ -5,7 +5,7 @@
*
* AZTEEG_X1
* MELZI
- * MELZI_1284
+ * MELZI_MAKR3D
* SANGUINOLOLU_12
* STB_11
*/
--
GitLab