Skip to content
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.

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

Fix FYSETC S6 FLASH_PAGE_SIZE #16560

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/test-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
- BIGTREE_SKR_PRO
- mks_robin
- ARMED
- FYSETC_S6

# Put lengthy tests last

Expand Down
2 changes: 1 addition & 1 deletion buildroot/share/PlatformIO/scripts/fysetc_STM32S6.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from os.path import join
Import("env", "projenv")
Import("env")

import os,shutil
from SCons.Script import DefaultEnvironment
Expand Down
2 changes: 1 addition & 1 deletion buildroot/share/PlatformIO/variants/FYSETC_S6/variant.h
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ extern "C" {
/* HAL configuration */
#define HSE_VALUE 12000000U

#define FLASH_PAGE_SIZE uint32(4 * 1024)
#define FLASH_PAGE_SIZE (4U * 1024U)

#ifdef __cplusplus
} // extern "C"
Expand Down
1 change: 1 addition & 0 deletions buildroot/share/git/mftest
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ case $TESTENV in
f1) TESTENV='STM32F103RE' ;;
f4) TESTENV='STM32F4' ;;
f7) TESTENV='STM32F7' ;;
s6) TESTENV='FYSETC_S6' ;;
teensy) TESTENV='teensy31' ;;
t31) TESTENV='teensy31' ;;
t32) TESTENV='teensy31' ;;
Expand Down
15 changes: 15 additions & 0 deletions buildroot/share/tests/FYSETC_S6-tests
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ build_flags = ${common.build_flags}
-DVECT_TAB_OFFSET=0x10000
-DUSBCON -DUSBD_USE_CDC -DHAL_PCD_MODULE_ENABLED -DUSBD_VID=0x0483 '-DUSB_PRODUCT="FYSETC_S6"'
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>
lib_ignore = Arduino-L6470
debug_tool = stlink
Expand Down