Additional Malyan modifications which allow M200 using STM32F070CB to…

… work.
MarlinFirmware · Aug 29, 2020 · 6786121 · 6786121
1 parent d3c92e8
commit 6786121
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
@@ -70,6 +70,7 @@ jobs:
         - mks_robin_stm32
         - ARMED
         - FYSETC_S6
+        - STM32F070CB_malyan
         - STM32F070RB_malyan
         - malyan_M300
         - mks_robin_lite
@@ -94,7 +95,6 @@ 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
@@ -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  // STM32F070CB  Libmaple-based STM32F0 controller
+#define BOARD_MALYAN_M200_V2          4002  // STM32F070CB  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/buildroot/tests/STM32F070CB_malyan-tests b/buildroot/tests/STM32F070CB_malyan-tests
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+#
+# Build tests for STM32F070CB Malyan M200 v2
+#
+
+# exit on first failure
+set -e
+
+restore_configs
+opt_set MOTHERBOARD BOARD_MALYAN_M200_V2
+opt_set SERIAL_PORT -1
+exec_test $1 $2 "Malyan M200 v2 Default Config"
+
+# cleanup
+restore_configs
diff --git a/platformio.ini b/platformio.ini
@@ -1004,20 +1004,19 @@ lib_ignore    = ${common_stm32f1.lib_ignore}
 platform    = ${common_stm32.platform}
 extends     = common_stm32
 board       = malyanM200v2
-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
+build_flags = ${common_stm32.build_flags} -DHAL_PCD_MODULE_ENABLED
+  -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing
   -DCUSTOM_STARTUP_FILE
 
 #
 # Malyan M200 v2 (STM32F070CB)
 #
 [env:STM32F070CB_malyan]
-platform    = ststm32
+platform    = ${common_stm32.platform}
+extends     = common_stm32
 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} +<src/HAL/STM32F1>
-lib_ignore  = LiquidCrystal, LiquidTWI2, Adafruit NeoPixel, TMCStepper, U8glib-HAL, SPI
+build_flags = ${common_stm32.build_flags}
+  -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB -DHAL_UART_MODULE_ENABLED -DCUSTOM_STARTUP_FILE
 
 #
 # Malyan M300 (STM32F070CB)