From d3c92e860525e5c5141d710917b08ec47f943b50 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 4 May 2020 17:52:50 -0500 Subject: [PATCH] Assume CB not RB (cherry picked from commit 43bf41dc5b7dccdc9fa290ec2e0e1144e8e39c30) --- .github/workflows/test-builds.yml | 1 + Marlin/src/core/boards.h | 2 +- Marlin/src/pins/pins.h | 2 +- platformio.ini | 11 +++++++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml index fdb81fbdc9d2..e9e344e66de4 100644 --- a/.github/workflows/test-builds.yml +++ b/.github/workflows/test-builds.yml @@ -94,6 +94,7 @@ jobs: #- at90usb1286_cdc #- at90usb1286_dfu #- STM32F103CB_malyan + #- STM32F070CB_malyan #- mks_robin_mini steps: diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h index c880b3d3256a..fb30dc66f3ad 100644 --- a/Marlin/src/core/boards.h +++ b/Marlin/src/core/boards.h @@ -281,7 +281,7 @@ #define BOARD_STM32F103RE 4000 // STM32F103RE Libmaple-based STM32F1 controller #define BOARD_MALYAN_M200 4001 // STM32C8T6 Libmaple-based STM32F1 controller -#define BOARD_MALYAN_M200_V2 4002 // STM32F070RB Libmaple-based STM32F0 controller +#define BOARD_MALYAN_M200_V2 4002 // STM32F070CB Libmaple-based STM32F0 controller #define BOARD_STM3R_MINI 4003 // STM32F103RE Libmaple-based STM32F1 controller #define BOARD_GTM32_PRO_VB 4004 // STM32F103VET6 controller #define BOARD_MORPHEUS 4005 // STM32F103C8 / STM32F103CB Libmaple-based STM32F1 controller diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 22f6ea663ce0..d4cdbc8b56f9 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -478,7 +478,7 @@ // STM32 ARM Cortex-M0 // #elif MB(MALYAN_M200_V2) - #include "stm32f0/pins_MALYAN_M200_V2.h" // STM32F0 env:STM32F070RB_malyan + #include "stm32f0/pins_MALYAN_M200_V2.h" // STM32F0 env:STM32F070RB_malyan env:STM32F070CB_malyan #elif MB(MALYAN_M300) #include "stm32f0/pins_MALYAN_M300.h" // STM32F070 env:malyan_M300 diff --git a/platformio.ini b/platformio.ini index a29aa43954dc..6f881dbd17f2 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1008,6 +1008,17 @@ build_flags = ${common_stm32.build_flags} -DSTM32F0xx -DHAL_PCD_MODULE_ENABLED -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing -std=gnu11 -std=gnu++11 -DCUSTOM_STARTUP_FILE +# +# Malyan M200 v2 (STM32F070CB) +# +[env:STM32F070CB_malyan] +platform = ststm32 +board = malyanm200_f070cb +build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py -D __STM32F1__=1 -std=c++1y -DSERIAL_USB -ffunction-sections -fdata-sections -Wl,--gc-sections + -DDEBUG_LEVEL=0 -D__MARLIN_FIRMWARE__ +src_filter = ${common.default_src_filter} + +lib_ignore = LiquidCrystal, LiquidTWI2, Adafruit NeoPixel, TMCStepper, U8glib-HAL, SPI + # # Malyan M300 (STM32F070CB) #