zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Allow use of Fysetc SoftwareSerialM (#14893)

Browse source
This commit is contained in:
Tanguy Pruvot 2019-08-10 08:45:36 +02:00 committed by Scott Lahteine
parent d2d71caa3b
commit 5d2519ed50
3 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/HAL/HAL_STM32F1/SoftwareSerial.cpp
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * 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) * Empty class for Software Serial implementation (Custom RX/TX pins)

24
buildroot/share/PlatformIO/scripts/fysetc_STM32F1.py
View file

@ -1,8 +1,7 @@
from os.path import join from os.path import join
from os.path import expandvars
Import("env", "projenv") Import("env", "projenv")
platform = env.PioPlatform()
# Relocate firmware from 0x08000000 to 0x08002000 # Relocate firmware from 0x08000000 to 0x08002000
#env['CPPDEFINES'].remove(("VECT_TAB_ADDR", 134217728)) #env['CPPDEFINES'].remove(("VECT_TAB_ADDR", 134217728))
#env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08010000")) #env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08010000"))
@ -10,13 +9,10 @@ platform = env.PioPlatform()
# Custom HEX from ELF # Custom HEX from ELF
env.AddPostAction( env.AddPostAction(
"$BUILD_DIR/${PROGNAME}.elf", join("$BUILD_DIR","${PROGNAME}.elf"),
env.VerboseAction(" ".join([ env.VerboseAction(" ".join([
"$OBJCOPY", "$OBJCOPY", "-O ihex", "$TARGET", # TARGET=.pio/build/fysetc_STM32F1/firmware.elf
"-O", "'" + join("$BUILD_DIR","${PROGNAME}.hex") + "'", # Note: $BUILD_DIR is a full path
"ihex",
'"$BUILD_DIR/${PROGNAME}.elf"',
'"$BUILD_DIR/${PROGNAME}.hex"'
]), "Building $TARGET")) ]), "Building $TARGET"))
# please keep $SOURCE variable, it will be replaced with a path to firmware # please keep $SOURCE variable, it will be replaced with a path to firmware
@ -28,11 +24,15 @@ env.AddPostAction(
#) #)
# In-line command with arguments # In-line command with arguments
env.Replace( UPLOAD_TOOL="stm32flash"
UPLOADER=platform.get_package_dir("tool-stm32duino") + '/stm32flash/stm32flash', platform = env.PioPlatform()
UPLOADCMD='"${UPLOADER}" -v -i rts,-dtr,dtr,-rts -R -b 115200 -g 0x8000000 -w "${BUILD_DIR}/${PROGNAME}.hex" ${UPLOAD_PORT}' if platform.get_package_dir("tool-stm32duino") != None:
) UPLOAD_TOOL=expandvars("'" + join(platform.get_package_dir("tool-stm32duino"),"stm32flash","stm32flash") + "'")
env.Replace(
UPLOADER=UPLOAD_TOOL,
UPLOADCMD=expandvars(UPLOAD_TOOL + " -v -i rts,-dtr,dtr $UPLOAD_PORT -R -w '" + join("$BUILD_DIR","${PROGNAME}.hex") + "'")
)
# Python callback # Python callback
#def on_upload(source, target, env): #def on_upload(source, target, env):

3
platformio.ini
View file

@ -280,11 +280,10 @@ monitor_speed = 250000
platform = ststm32 platform = ststm32
framework = arduino framework = arduino
board = genericSTM32F103RC board = genericSTM32F103RC
#board_build.core = maple
extra_scripts = buildroot/share/PlatformIO/scripts/fysetc_STM32F1.py extra_scripts = buildroot/share/PlatformIO/scripts/fysetc_STM32F1.py
build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
${common.build_flags} -std=gnu++14 ${common.build_flags} -std=gnu++14
-DDEBUG_LEVEL=0 -DDEBUG_LEVEL=0 -DHAVE_SW_SERIAL
build_unflags = -std=gnu++11 build_unflags = -std=gnu++11
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip