Skip to content

New variant - Malyan M300 3D Printer #828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 13, 2019
Merged

New variant - Malyan M300 3D Printer #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0884673
New variant - Malyan M300 3D Printer
mojocorp Dec 11, 2019
fac4966
Merge MALYAN M200 and M300 F070CB
fpistm Dec 11, 2019
2459a68
Merge pull request #1 from fpistm/pr-828-MALYANM300
mojocorp Dec 11, 2019
0f444d0
[Malyan M200/300] Add pin description
mojocorp Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1301,7 +1301,8 @@ LoRa.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
3dprinter.menu.pnum.MALYANM200_F103CB.build.variant=MALYANM200_F103CB
3dprinter.menu.pnum.MALYANM200_F103CB.build.cmsis_lib_gcc=arm_cortexM3l_math
3dprinter.menu.pnum.MALYANM200_F103CB.build.startup_file=-DCUSTOM_STARTUP_FILE
3dprinter.menu.pnum.MALYANM200_F103CB.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET=0x2000
3dprinter.menu.pnum.MALYANM200_F103CB.build.flash_offset=0x2000
3dprinter.menu.pnum.MALYANM200_F103CB.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET={build.flash_offset}

# MALYANM200_F070CB board
3dprinter.menu.pnum.MALYANM200_F070CB=Malyan M200 V2
Expand All @@ -1311,10 +1312,25 @@ LoRa.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
3dprinter.menu.pnum.MALYANM200_F070CB.build.board=MALYANM200_F070CB
3dprinter.menu.pnum.MALYANM200_F070CB.build.series=STM32F0xx
3dprinter.menu.pnum.MALYANM200_F070CB.build.product_line=STM32F070xB
3dprinter.menu.pnum.MALYANM200_F070CB.build.variant=MALYANM200_F070CB
3dprinter.menu.pnum.MALYANM200_F070CB.build.variant=MALYANMx00_F070CB
3dprinter.menu.pnum.MALYANM200_F070CB.build.cmsis_lib_gcc=arm_cortexM0l_math
3dprinter.menu.pnum.MALYANM200_F070CB.build.startup_file=-DCUSTOM_STARTUP_FILE
3dprinter.menu.pnum.MALYANM200_F070CB.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET=0x2000
3dprinter.menu.pnum.MALYANM200_F070CB.build.flash_offset=0x2000
3dprinter.menu.pnum.MALYANM200_F070CB.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET={build.flash_offset}

# MALYANM300_F070CB board
3dprinter.menu.pnum.MALYANM300_F070CB=Malyan M300
3dprinter.menu.pnum.MALYANM300_F070CB.upload.maximum_size=122880
3dprinter.menu.pnum.MALYANM300_F070CB.upload.maximum_data_size=15168
3dprinter.menu.pnum.MALYANM300_F070CB.build.mcu=cortex-m0
3dprinter.menu.pnum.MALYANM300_F070CB.build.board=MALYANM300_F070CB
3dprinter.menu.pnum.MALYANM300_F070CB.build.series=STM32F0xx
3dprinter.menu.pnum.MALYANM300_F070CB.build.product_line=STM32F070xB
3dprinter.menu.pnum.MALYANM300_F070CB.build.variant=MALYANMx00_F070CB
3dprinter.menu.pnum.MALYANM300_F070CB.build.cmsis_lib_gcc=arm_cortexM0l_math
3dprinter.menu.pnum.MALYANM300_F070CB.build.startup_file=-DCUSTOM_STARTUP_FILE
3dprinter.menu.pnum.MALYANM300_F070CB.build.flash_offset=0x2000
3dprinter.menu.pnum.MALYANM300_F070CB.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET={build.flash_offset}

# VAkE v1.0
3dprinter.menu.pnum.VAKE_F446VE=VAkE v1.0
Expand Down
0 variants/MALYANM200_F070CB/PeripheralPins.c → variants/MALYANMx00_F070CB/PeripheralPins.c
View file
Open in desktop
File renamed without changes.
0 variants/MALYANM200_F070CB/PinNamesVar.h → variants/MALYANMx00_F070CB/PinNamesVar.h
View file
Open in desktop
File renamed without changes.
0 variants/MALYANM200_F070CB/ldscript.ld → variants/MALYANMx00_F070CB/ldscript.ld
View file
Open in desktop
File renamed without changes.
0 ...s/MALYANM200_F070CB/startup_M200_f070xb.S → ...s/MALYANMx00_F070CB/startup_Mx00_f070xb.S
View file
Open in desktop
File renamed without changes.
0 variants/MALYANM200_F070CB/variant.cpp → variants/MALYANMx00_F070CB/variant.cpp
View file
Open in desktop
File renamed without changes.
46 changes: 42 additions & 4 deletions variants/MALYANM200_F070CB/variant.h → variants/MALYANMx00_F070CB/variant.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,32 @@ extern "C" {
#endif // __cplusplus

/*----------------------------------------------------------------------------
* Pins
* Pin M200 M300
* X_MIN_PIN PB4 -
* X_MAX_PIN - PC13
* Y_MIN_PIN PA15 -
* Y_MAX_PIN - PC14
* Z_MAX_PIN - PC15
* Z_MIN_PIN PB5 PB7
* X_STEP_PIN PB14 PB14
* X_DIR_PIN PB15 PB13
* X_ENABLE_PIN PA8 PB10
* Y_STEP_PIN PB12 PB12
* Y_DIR_PIN PB13 PB11
* Y_ENABLE_PIN PA8 PB10
* Z_STEP_PIN PB10 PB2
* Z_DIR_PIN PB2 PB1
* Z_ENABLE_PIN PA8 PB10
* E0_STEP_PIN PB0 PA7
* E0_DIR_PIN PC13 PA6
* E0_ENABLE_PIN PB1 PB0
* HEATER_0_PIN PB6 PA1
* HEATER_BED_PIN PB7 PA5
* TEMP_0_PIN PA0 PA0
* TEMP_BED_PIN PA1 PA4
* FAN1_PIN PB8 PA8
* FAN2_PIN PB3 -
*
*----------------------------------------------------------------------------*/

// USB connector on the top, MCU side
Expand All @@ -58,7 +83,7 @@ extern "C" {
#define PB13 15
#define PB12 16
// Right side
#define PC13 17 // LED
#define PC13 17
#define PC14 18
#define PC15 19
#define PA0 20 // A0
Expand All @@ -85,14 +110,27 @@ extern "C" {
#define NUM_ANALOG_FIRST 20

// On-board LED pin number
#define LED_BUILTIN PC13
#define LED_GREEN LED_BUILTIN
#ifdef ARDUINO_MALYANM200_F070CB
#define LED_GREEN PC13
#else // MALYANM300_F070CB
#define LED_RED PB15
#define LED_GREEN PB8
#define LED_BLUE PB9
#endif
#define LED_BUILTIN LED_GREEN

// SPI Definitions
#ifdef ARDUINO_MALYANM200_F070CB
#define PIN_SPI_SS PA4
#define PIN_SPI_MOSI PA7
#define PIN_SPI_MISO PA6
#define PIN_SPI_SCK PA5
#else // MALYANM300_F070CB
#define PIN_SPI_SS PB6
#define PIN_SPI_MOSI PB5
#define PIN_SPI_MISO PB4
#define PIN_SPI_SCK PB3
#endif

// I2C Definitions
#define PIN_WIRE_SDA PB7
Expand Down