소스 검색

Rename and repair MELZI_1284 (PR#2301)

to MELZI_MAKR3D.

Fix for #2288
As the normal MELZI also can have a 1284.
AnHardt 10 년 전
부모
커밋
c461975140
5개의 변경된 파일6개의 추가작업 그리고 8개의 파일을 삭제
  1. 1
    1
      Marlin/boards.h
  2. 1
    1
      Marlin/configurator/config/boards.h
  3. 2
    2
      Marlin/pins.h
  4. 1
    3
      Marlin/pins_MELZI_MAKR3D.h
  5. 1
    1
      Marlin/pins_SANGUINOLOLU_12.h

+ 1
- 1
Marlin/boards.h 파일 보기

23
 #define BOARD_MELZI             63   // Melzi
23
 #define BOARD_MELZI             63   // Melzi
24
 #define BOARD_STB_11            64   // STB V1.1
24
 #define BOARD_STB_11            64   // STB V1.1
25
 #define BOARD_AZTEEG_X1         65   // Azteeg X1
25
 #define BOARD_AZTEEG_X1         65   // Azteeg X1
26
-#define BOARD_MELZI_1284        66   // Melzi with ATmega1284 (MaKr3d version)
26
+#define BOARD_MELZI_MAKR3D      66   // Melzi with ATmega1284 (MaKr3d version)
27
 #define BOARD_AZTEEG_X3         67   // Azteeg X3
27
 #define BOARD_AZTEEG_X3         67   // Azteeg X3
28
 #define BOARD_AZTEEG_X3_PRO     68   // Azteeg X3 Pro
28
 #define BOARD_AZTEEG_X3_PRO     68   // Azteeg X3 Pro
29
 #define BOARD_ULTIMAKER         7    // Ultimaker
29
 #define BOARD_ULTIMAKER         7    // Ultimaker

+ 1
- 1
Marlin/configurator/config/boards.h 파일 보기

23
 #define BOARD_MELZI             63   // Melzi
23
 #define BOARD_MELZI             63   // Melzi
24
 #define BOARD_STB_11            64   // STB V1.1
24
 #define BOARD_STB_11            64   // STB V1.1
25
 #define BOARD_AZTEEG_X1         65   // Azteeg X1
25
 #define BOARD_AZTEEG_X1         65   // Azteeg X1
26
-#define BOARD_MELZI_1284        66   // Melzi with ATmega1284 (MaKr3d version)
26
+#define BOARD_MELZI_MAKR3D      66   // Melzi with ATmega1284 (MaKr3d version)
27
 #define BOARD_AZTEEG_X3         67   // Azteeg X3
27
 #define BOARD_AZTEEG_X3         67   // Azteeg X3
28
 #define BOARD_AZTEEG_X3_PRO     68   // Azteeg X3 Pro
28
 #define BOARD_AZTEEG_X3_PRO     68   // Azteeg X3 Pro
29
 #define BOARD_ULTIMAKER         7    // Ultimaker
29
 #define BOARD_ULTIMAKER         7    // Ultimaker

+ 2
- 2
Marlin/pins.h 파일 보기

52
   #include "pins_STB_11.h"
52
   #include "pins_STB_11.h"
53
 #elif MB(AZTEEG_X1)
53
 #elif MB(AZTEEG_X1)
54
   #include "pins_AZTEEG_X1.h"
54
   #include "pins_AZTEEG_X1.h"
55
-#elif MB(MELZI_1284)
56
-  #include "pins_MELZI_1284.h"
55
+#elif MB(MELZI_MAKR3D)
56
+  #include "pins_MELZI_MAKR3D.h"
57
 #elif MB(AZTEEG_X3)
57
 #elif MB(AZTEEG_X3)
58
   #include "pins_AZTEEG_X3.h"
58
   #include "pins_AZTEEG_X3.h"
59
 #elif MB(AZTEEG_X3_PRO)
59
 #elif MB(AZTEEG_X3_PRO)

Marlin/pins_MELZI_1284.h → Marlin/pins_MELZI_MAKR3D.h 파일 보기

2
  * Melzi with ATmega1284 (MaKr3d version) pin assignments
2
  * Melzi with ATmega1284 (MaKr3d version) pin assignments
3
  */
3
  */
4
 
4
 
5
-#define MELZI
6
-
7
 #undef MOTHERBOARD
5
 #undef MOTHERBOARD
8
-#define MOTHERBOARD BOARD_SANGUINOLOLU_11
6
+#define MOTHERBOARD MELZI
9
 #define SANGUINOLOLU_V_1_2
7
 #define SANGUINOLOLU_V_1_2
10
 
8
 
11
 #if defined(__AVR_ATmega1284P__)
9
 #if defined(__AVR_ATmega1284P__)

+ 1
- 1
Marlin/pins_SANGUINOLOLU_12.h 파일 보기

5
  *
5
  *
6
  *  AZTEEG_X1
6
  *  AZTEEG_X1
7
  *  MELZI
7
  *  MELZI
8
- *  MELZI_1284
8
+ *  MELZI_MAKR3D
9
  *  SANGUINOLOLU_12
9
  *  SANGUINOLOLU_12
10
  *  STB_11
10
  *  STB_11
11
  */
11
  */

Loading…
취소
저장