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.

Sign up for GitHub

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

Allow use of Fysetc SoftwareSerialM #14893

Merged
merged 3 commits into from
Aug 10, 2019
Merged

Allow use of Fysetc SoftwareSerialM #14893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2cc6e94
Allow the use of fysetc SoftwareSerialM lib
tpruvot Aug 9, 2019
b510d86
Revert "Fix FYSETC stm32flash usage (#14703)"
tpruvot Aug 9, 2019
07e842a
py: handle spaces in full path + platform.get_package_dir undef case
tpruvot Aug 10, 2019
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
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#ifdef __STM32F1__
#if defined(__STM32F1__) && !defined(HAVE_SW_SERIAL)

/**
* Empty class for Software Serial implementation (Custom RX/TX pins)
Expand Down
24 changes: 12 additions & 12 deletions buildroot/share/PlatformIO/scripts/fysetc_STM32F1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
from os.path import join
from os.path import expandvars
Import("env", "projenv")

platform = env.PioPlatform()

# Relocate firmware from 0x08000000 to 0x08002000
#env['CPPDEFINES'].remove(("VECT_TAB_ADDR", 134217728))
#env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08010000"))
#env.Replace(LDSCRIPT_PATH="buildroot/share/PlatformIO/ldscripts/fysetc_aio_ii.ld")

# Custom HEX from ELF
env.AddPostAction(
"$BUILD_DIR/${PROGNAME}.elf",
join("$BUILD_DIR","${PROGNAME}.elf"),
env.VerboseAction(" ".join([
"$OBJCOPY",
"-O",
"ihex",
'"$BUILD_DIR/${PROGNAME}.elf"',
'"$BUILD_DIR/${PROGNAME}.hex"'
]), "Building $TARGET"))
"$OBJCOPY", "-O ihex", "$TARGET", # TARGET=.pio/build/fysetc_STM32F1/firmware.elf
"'" + join("$BUILD_DIR","${PROGNAME}.hex") + "'", # Note: $BUILD_DIR is a full path
]), "Building $TARGET"))

# please keep $SOURCE variable, it will be replaced with a path to firmware

Expand All @@ -28,12 +24,16 @@
#)

# In-line command with arguments
UPLOAD_TOOL="stm32flash"
platform = env.PioPlatform()
if platform.get_package_dir("tool-stm32duino") != None:
UPLOAD_TOOL=expandvars("'" + join(platform.get_package_dir("tool-stm32duino"),"stm32flash","stm32flash") + "'")

env.Replace(
UPLOADER=platform.get_package_dir("tool-stm32duino") + '/stm32flash/stm32flash',
UPLOADCMD='"${UPLOADER}" -v -i rts,-dtr,dtr,-rts -R -b 115200 -g 0x8000000 -w "${BUILD_DIR}/${PROGNAME}.hex" ${UPLOAD_PORT}'
UPLOADER=UPLOAD_TOOL,
UPLOADCMD=expandvars(UPLOAD_TOOL + " -v -i rts,-dtr,dtr $UPLOAD_PORT -R -w '" + join("$BUILD_DIR","${PROGNAME}.hex") + "'")
)


# Python callback
#def on_upload(source, target, env):
# print source, target
Expand Down
3 changes: 1 addition & 2 deletions platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,11 +280,10 @@ monitor_speed = 250000
platform = ststm32
framework = arduino
board = genericSTM32F103RC
#board_build.core = maple
extra_scripts = buildroot/share/PlatformIO/scripts/fysetc_STM32F1.py
build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
${common.build_flags} -std=gnu++14
-DDEBUG_LEVEL=0
-DDEBUG_LEVEL=0 -DHAVE_SW_SERIAL
build_unflags = -std=gnu++11
lib_deps = ${common.lib_deps}
SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
Expand Down