SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix Fysetc S6 FLASH_PAGE_SIZE and test build (#16560)

Browse source
This commit is contained in:
Jason Smith 2020-01-14 13:36:47 -08:00 committed by Scott Lahteine
parent bfe4ceedd1
commit fc773c2784
6 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/test-builds.yml vendored
View file

@ -54,6 +54,7 @@ jobs:
- BIGTREE_SKR_PRO - BIGTREE_SKR_PRO
- mks_robin - mks_robin
- ARMED - ARMED
- FYSETC_S6
# Put lengthy tests last # Put lengthy tests last

2
buildroot/share/PlatformIO/scripts/fysetc_STM32S6.py
View file

@ -1,5 +1,5 @@
from os.path import join from os.path import join
Import("env", "projenv") Import("env")
import os,shutil import os,shutil
from SCons.Script import DefaultEnvironment from SCons.Script import DefaultEnvironment

2
buildroot/share/PlatformIO/variants/FYSETC_S6/variant.h
View file

@ -149,7 +149,7 @@ extern "C" {
/* HAL configuration */ /* HAL configuration */
#define HSE_VALUE 12000000U #define HSE_VALUE 12000000U
#define FLASH_PAGE_SIZE uint32(4 * 1024) #define FLASH_PAGE_SIZE (4U * 1024U)
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"

1
buildroot/share/git/mftest
View file

@ -34,6 +34,7 @@ case $TESTENV in
f1) TESTENV='STM32F103RE' ;; f1) TESTENV='STM32F103RE' ;;
f4) TESTENV='STM32F4' ;; f4) TESTENV='STM32F4' ;;
f7) TESTENV='STM32F7' ;; f7) TESTENV='STM32F7' ;;
s6) TESTENV='FYSETC_S6' ;;
teensy) TESTENV='teensy31' ;; teensy) TESTENV='teensy31' ;;
t31) TESTENV='teensy31' ;; t31) TESTENV='teensy31' ;;
t32) TESTENV='teensy31' ;; t32) TESTENV='teensy31' ;;

15
buildroot/share/tests/FYSETC_S6-tests Normal file
View file

@ -0,0 +1,15 @@
#!/usr/bin/env bash
#
# Build tests for FYSETC_S6
#
# exit on first failure
set -e
# Build examples
restore_configs
use_example_configs FYSETC/S6
exec_test $1 $2 "FYSETC S6 Example"
# cleanup
restore_configs

2
platformio.ini
View file

@ -627,7 +627,7 @@ build_flags = ${common.build_flags}
-DVECT_TAB_OFFSET=0x10000 -DVECT_TAB_OFFSET=0x10000
-DUSBCON -DUSBD_USE_CDC -DHAL_PCD_MODULE_ENABLED -DUSBD_VID=0x0483 '-DUSB_PRODUCT="FYSETC_S6"' -DUSBCON -DUSBD_USE_CDC -DHAL_PCD_MODULE_ENABLED -DUSBD_VID=0x0483 '-DUSB_PRODUCT="FYSETC_S6"'
build_unflags = -std=gnu++11 build_unflags = -std=gnu++11
extra_scripts = buildroot/share/PlatformIO/scripts/fysetc_STM32S6.py extra_scripts = pre:buildroot/share/PlatformIO/scripts/fysetc_STM32S6.py
src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32> src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32>
lib_ignore = Arduino-L6470 lib_ignore = Arduino-L6470
debug_tool = stlink debug_tool = stlink