MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename and repair MELZI_1284 (PR#2301)

Browse Source 
to MELZI_MAKR3D.

Fix for #2288
As the normal MELZI also can have a 1284.
This commit is contained in:
AnHardt 2015-06-16 23:00:43 +02:00 committed by Richard Wackerbarth
parent 1e9cf905c7
commit c461975140
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/boards.h
View File

@ -23,7 +23,7 @@
#define BOARD_MELZI 63 // Melzi #define BOARD_MELZI 63 // Melzi
#define BOARD_STB_11 64 // STB V1.1 #define BOARD_STB_11 64 // STB V1.1
#define BOARD_AZTEEG_X1 65 // Azteeg X1 #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 67 // Azteeg X3
#define BOARD_AZTEEG_X3_PRO 68 // Azteeg X3 Pro #define BOARD_AZTEEG_X3_PRO 68 // Azteeg X3 Pro
#define BOARD_ULTIMAKER 7 // Ultimaker #define BOARD_ULTIMAKER 7 // Ultimaker

2
Marlin/configurator/config/boards.h
View File

@ -23,7 +23,7 @@
#define BOARD_MELZI 63 // Melzi #define BOARD_MELZI 63 // Melzi
#define BOARD_STB_11 64 // STB V1.1 #define BOARD_STB_11 64 // STB V1.1
#define BOARD_AZTEEG_X1 65 // Azteeg X1 #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 67 // Azteeg X3
#define BOARD_AZTEEG_X3_PRO 68 // Azteeg X3 Pro #define BOARD_AZTEEG_X3_PRO 68 // Azteeg X3 Pro
#define BOARD_ULTIMAKER 7 // Ultimaker #define BOARD_ULTIMAKER 7 // Ultimaker

4
Marlin/pins.h
View File

@ -52,8 +52,8 @@
#include "pins_STB_11.h" #include "pins_STB_11.h"
#elif MB(AZTEEG_X1) #elif MB(AZTEEG_X1)
#include "pins_AZTEEG_X1.h" #include "pins_AZTEEG_X1.h"
#elif MB(MELZI_1284) #elif MB(MELZI_MAKR3D)
#include "pins_MELZI_1284.h" #include "pins_MELZI_MAKR3D.h"
#elif MB(AZTEEG_X3) #elif MB(AZTEEG_X3)
#include "pins_AZTEEG_X3.h" #include "pins_AZTEEG_X3.h"
#elif MB(AZTEEG_X3_PRO) #elif MB(AZTEEG_X3_PRO)

4
Marlin/pins_MELZI_1284.h → Marlin/pins_MELZI_MAKR3D.h
View File

@ -2,10 +2,8 @@
* Melzi with ATmega1284 (MaKr3d version) pin assignments * Melzi with ATmega1284 (MaKr3d version) pin assignments
*/ */
#define MELZI
#undef MOTHERBOARD #undef MOTHERBOARD
#define MOTHERBOARD BOARD_SANGUINOLOLU_11 #define MOTHERBOARD MELZI
#define SANGUINOLOLU_V_1_2 #define SANGUINOLOLU_V_1_2
#if defined(__AVR_ATmega1284P__) #if defined(__AVR_ATmega1284P__)

2
Marlin/pins_SANGUINOLOLU_12.h
View File

@ -5,7 +5,7 @@
* *
* AZTEEG_X1 * AZTEEG_X1
* MELZI * MELZI
* MELZI_1284 * MELZI_MAKR3D
* SANGUINOLOLU_12 * SANGUINOLOLU_12
* STB_11 * STB_11
*/ */