Skip to content

Commit 880fdf5

Browse files
committed
New variant - Malyan M300 3D Printer (stm32duino#828)
1 parent 2cc7dc7 commit 880fdf5

File tree

7 files changed

+61
-7
lines changed

7 files changed

+61
-7
lines changed

Diff for: boards.txt

+19-3
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,8 @@ LoRa.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
12891289
3dprinter.menu.pnum.MALYANM200_F103CB.build.variant=MALYANM200_F103CB
12901290
3dprinter.menu.pnum.MALYANM200_F103CB.build.cmsis_lib_gcc=arm_cortexM3l_math
12911291
3dprinter.menu.pnum.MALYANM200_F103CB.build.startup_file=-DCUSTOM_STARTUP_FILE
1292-
3dprinter.menu.pnum.MALYANM200_F103CB.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET=0x2000
1292+
3dprinter.menu.pnum.MALYANM200_F103CB.build.flash_offset=0x2000
1293+
3dprinter.menu.pnum.MALYANM200_F103CB.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET={build.flash_offset}
12931294

12941295
# MALYANM200_F070CB board
12951296
3dprinter.menu.pnum.MALYANM200_F070CB=Malyan M200 V2
@@ -1299,10 +1300,25 @@ LoRa.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
12991300
3dprinter.menu.pnum.MALYANM200_F070CB.build.board=MALYANM200_F070CB
13001301
3dprinter.menu.pnum.MALYANM200_F070CB.build.series=STM32F0xx
13011302
3dprinter.menu.pnum.MALYANM200_F070CB.build.product_line=STM32F070xB
1302-
3dprinter.menu.pnum.MALYANM200_F070CB.build.variant=MALYANM200_F070CB
1303+
3dprinter.menu.pnum.MALYANM200_F070CB.build.variant=MALYANMx00_F070CB
13031304
3dprinter.menu.pnum.MALYANM200_F070CB.build.cmsis_lib_gcc=arm_cortexM0l_math
13041305
3dprinter.menu.pnum.MALYANM200_F070CB.build.startup_file=-DCUSTOM_STARTUP_FILE
1305-
3dprinter.menu.pnum.MALYANM200_F070CB.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET=0x2000
1306+
3dprinter.menu.pnum.MALYANM200_F070CB.build.flash_offset=0x2000
1307+
3dprinter.menu.pnum.MALYANM200_F070CB.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET={build.flash_offset}
1308+
1309+
# MALYANM300_F070CB board
1310+
3dprinter.menu.pnum.MALYANM300_F070CB=Malyan M300
1311+
3dprinter.menu.pnum.MALYANM300_F070CB.upload.maximum_size=122880
1312+
3dprinter.menu.pnum.MALYANM300_F070CB.upload.maximum_data_size=15168
1313+
3dprinter.menu.pnum.MALYANM300_F070CB.build.mcu=cortex-m0
1314+
3dprinter.menu.pnum.MALYANM300_F070CB.build.board=MALYANM300_F070CB
1315+
3dprinter.menu.pnum.MALYANM300_F070CB.build.series=STM32F0xx
1316+
3dprinter.menu.pnum.MALYANM300_F070CB.build.product_line=STM32F070xB
1317+
3dprinter.menu.pnum.MALYANM300_F070CB.build.variant=MALYANMx00_F070CB
1318+
3dprinter.menu.pnum.MALYANM300_F070CB.build.cmsis_lib_gcc=arm_cortexM0l_math
1319+
3dprinter.menu.pnum.MALYANM300_F070CB.build.startup_file=-DCUSTOM_STARTUP_FILE
1320+
3dprinter.menu.pnum.MALYANM300_F070CB.build.flash_offset=0x2000
1321+
3dprinter.menu.pnum.MALYANM300_F070CB.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET={build.flash_offset}
13061322

13071323
# VAkE v1.0
13081324
3dprinter.menu.pnum.VAKE_F446VE=VAkE v1.0
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: variants/MALYANM200_F070CB/variant.h renamed to variants/MALYANMx00_F070CB/variant.h

+42-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,32 @@ extern "C" {
3535
#endif // __cplusplus
3636

3737
/*----------------------------------------------------------------------------
38-
* Pins
38+
* Pin M200 M300
39+
* X_MIN_PIN PB4 -
40+
* X_MAX_PIN - PC13
41+
* Y_MIN_PIN PA15 -
42+
* Y_MAX_PIN - PC14
43+
* Z_MAX_PIN - PC15
44+
* Z_MIN_PIN PB5 PB7
45+
* X_STEP_PIN PB14 PB14
46+
* X_DIR_PIN PB15 PB13
47+
* X_ENABLE_PIN PA8 PB10
48+
* Y_STEP_PIN PB12 PB12
49+
* Y_DIR_PIN PB13 PB11
50+
* Y_ENABLE_PIN PA8 PB10
51+
* Z_STEP_PIN PB10 PB2
52+
* Z_DIR_PIN PB2 PB1
53+
* Z_ENABLE_PIN PA8 PB10
54+
* E0_STEP_PIN PB0 PA7
55+
* E0_DIR_PIN PC13 PA6
56+
* E0_ENABLE_PIN PB1 PB0
57+
* HEATER_0_PIN PB6 PA1
58+
* HEATER_BED_PIN PB7 PA5
59+
* TEMP_0_PIN PA0 PA0
60+
* TEMP_BED_PIN PA1 PA4
61+
* FAN1_PIN PB8 PA8
62+
* FAN2_PIN PB3 -
63+
*
3964
*----------------------------------------------------------------------------*/
4065

4166
// USB connector on the top, MCU side
@@ -58,7 +83,7 @@ extern "C" {
5883
#define PB13 15
5984
#define PB12 16
6085
// Right side
61-
#define PC13 17 // LED
86+
#define PC13 17
6287
#define PC14 18
6388
#define PC15 19
6489
#define PA0 20 // A0
@@ -85,14 +110,27 @@ extern "C" {
85110
#define NUM_ANALOG_FIRST 20
86111

87112
// On-board LED pin number
88-
#define LED_BUILTIN PC13
89-
#define LED_GREEN LED_BUILTIN
113+
#ifdef ARDUINO_MALYANM200_F070CB
114+
#define LED_GREEN PC13
115+
#else // MALYANM300_F070CB
116+
#define LED_RED PB15
117+
#define LED_GREEN PB8
118+
#define LED_BLUE PB9
119+
#endif
120+
#define LED_BUILTIN LED_GREEN
90121

91122
// SPI Definitions
123+
#ifdef ARDUINO_MALYANM200_F070CB
92124
#define PIN_SPI_SS PA4
93125
#define PIN_SPI_MOSI PA7
94126
#define PIN_SPI_MISO PA6
95127
#define PIN_SPI_SCK PA5
128+
#else // MALYANM300_F070CB
129+
#define PIN_SPI_SS PB6
130+
#define PIN_SPI_MOSI PB5
131+
#define PIN_SPI_MISO PB4
132+
#define PIN_SPI_SCK PB3
133+
#endif
96134

97135
// I2C Definitions
98136
#define PIN_WIRE_SDA PB7

0 commit comments

Comments
 (0)