Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 2459a68

Browse files
authoredDec 11, 2019
Merge pull request #1 from fpistm/pr-828-MALYANM300
PR 828 malyanm300
2 parents 0884673 + fac4966 commit 2459a68

File tree

13 files changed

+22
-1014
lines changed

13 files changed

+22
-1014
lines changed
 

‎boards.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,7 +1301,8 @@ LoRa.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
13011301
3dprinter.menu.pnum.MALYANM200_F103CB.build.variant=MALYANM200_F103CB
13021302
3dprinter.menu.pnum.MALYANM200_F103CB.build.cmsis_lib_gcc=arm_cortexM3l_math
13031303
3dprinter.menu.pnum.MALYANM200_F103CB.build.startup_file=-DCUSTOM_STARTUP_FILE
1304-
3dprinter.menu.pnum.MALYANM200_F103CB.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET=0x2000
1304+
3dprinter.menu.pnum.MALYANM200_F103CB.build.flash_offset=0x2000
1305+
3dprinter.menu.pnum.MALYANM200_F103CB.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET={build.flash_offset}
13051306

13061307
# MALYANM200_F070CB board
13071308
3dprinter.menu.pnum.MALYANM200_F070CB=Malyan M200 V2
@@ -1311,10 +1312,11 @@ LoRa.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
13111312
3dprinter.menu.pnum.MALYANM200_F070CB.build.board=MALYANM200_F070CB
13121313
3dprinter.menu.pnum.MALYANM200_F070CB.build.series=STM32F0xx
13131314
3dprinter.menu.pnum.MALYANM200_F070CB.build.product_line=STM32F070xB
1314-
3dprinter.menu.pnum.MALYANM200_F070CB.build.variant=MALYANM200_F070CB
1315+
3dprinter.menu.pnum.MALYANM200_F070CB.build.variant=MALYANMx00_F070CB
13151316
3dprinter.menu.pnum.MALYANM200_F070CB.build.cmsis_lib_gcc=arm_cortexM0l_math
13161317
3dprinter.menu.pnum.MALYANM200_F070CB.build.startup_file=-DCUSTOM_STARTUP_FILE
1317-
3dprinter.menu.pnum.MALYANM200_F070CB.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET=0x2000
1318+
3dprinter.menu.pnum.MALYANM200_F070CB.build.flash_offset=0x2000
1319+
3dprinter.menu.pnum.MALYANM200_F070CB.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET={build.flash_offset}
13181320

13191321
# MALYANM300_F070CB board
13201322
3dprinter.menu.pnum.MALYANM300_F070CB=Malyan M300
@@ -1324,7 +1326,7 @@ LoRa.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
13241326
3dprinter.menu.pnum.MALYANM300_F070CB.build.board=MALYANM300_F070CB
13251327
3dprinter.menu.pnum.MALYANM300_F070CB.build.series=STM32F0xx
13261328
3dprinter.menu.pnum.MALYANM300_F070CB.build.product_line=STM32F070xB
1327-
3dprinter.menu.pnum.MALYANM300_F070CB.build.variant=MALYANM300_F070CB
1329+
3dprinter.menu.pnum.MALYANM300_F070CB.build.variant=MALYANMx00_F070CB
13281330
3dprinter.menu.pnum.MALYANM300_F070CB.build.cmsis_lib_gcc=arm_cortexM0l_math
13291331
3dprinter.menu.pnum.MALYANM300_F070CB.build.startup_file=-DCUSTOM_STARTUP_FILE
13301332
3dprinter.menu.pnum.MALYANM300_F070CB.build.flash_offset=0x2000

‎variants/MALYANM300_F070CB/PeripheralPins.c

Lines changed: 0 additions & 228 deletions
This file was deleted.

‎variants/MALYANM300_F070CB/PinNamesVar.h

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎variants/MALYANM300_F070CB/ldscript.ld

Lines changed: 0 additions & 132 deletions
This file was deleted.

‎variants/MALYANM300_F070CB/startup_M300_f070xb.S

Lines changed: 0 additions & 302 deletions
This file was deleted.

‎variants/MALYANM300_F070CB/variant.cpp

Lines changed: 0 additions & 172 deletions
This file was deleted.

‎variants/MALYANM300_F070CB/variant.h

Lines changed: 0 additions & 142 deletions
This file was deleted.

‎variants/MALYANM200_F070CB/variant.h renamed to ‎variants/MALYANMx00_F070CB/variant.h

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ extern "C" {
5858
#define PB13 15
5959
#define PB12 16
6060
// Right side
61-
#define PC13 17 // LED
61+
#define PC13 17
6262
#define PC14 18
6363
#define PC15 19
6464
#define PA0 20 // A0
@@ -85,14 +85,27 @@ extern "C" {
8585
#define NUM_ANALOG_FIRST 20
8686

8787
// On-board LED pin number
88-
#define LED_BUILTIN PC13
89-
#define LED_GREEN LED_BUILTIN
88+
#ifdef ARDUINO_MALYANM200_F070CB
89+
#define LED_GREEN PC13
90+
#else // MALYANM300_F070CB
91+
#define LED_RED PB15
92+
#define LED_GREEN PB8
93+
#define LED_BLUE PB9
94+
#endif
95+
#define LED_BUILTIN LED_GREEN
9096

9197
// SPI Definitions
98+
#ifdef ARDUINO_MALYANM200_F070CB
9299
#define PIN_SPI_SS PA4
93100
#define PIN_SPI_MOSI PA7
94101
#define PIN_SPI_MISO PA6
95102
#define PIN_SPI_SCK PA5
103+
#else // MALYANM300_F070CB
104+
#define PIN_SPI_SS PB6
105+
#define PIN_SPI_MOSI PB5
106+
#define PIN_SPI_MISO PB4
107+
#define PIN_SPI_SCK PB3
108+
#endif
96109

97110
// I2C Definitions
98111
#define PIN_WIRE_SDA PB7

0 commit comments

Comments
 (0)
Please sign in to comment.