Bump to head with stepper delay and M851XY
This commit is contained in:
+13
-13
@@ -1,8 +1,7 @@
|
||||
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"))
|
||||
@@ -10,14 +9,11 @@ platform = env.PioPlatform()
|
||||
|
||||
# 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
|
||||
|
||||
@@ -28,11 +24,15 @@ env.AddPostAction(
|
||||
#)
|
||||
|
||||
# In-line command with arguments
|
||||
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}'
|
||||
)
|
||||
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=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):
|
||||
@@ -0,0 +1,12 @@
|
||||
#
|
||||
# common-cxxflags.py
|
||||
# Convenience script to apply customizations to CPP flags
|
||||
#
|
||||
Import("env")
|
||||
env.Append(CXXFLAGS=[
|
||||
"-Wno-register"
|
||||
#"-Wno-incompatible-pointer-types",
|
||||
#"-Wno-unused-const-variable",
|
||||
#"-Wno-maybe-uninitialized",
|
||||
#"-Wno-sign-compare"
|
||||
])
|
||||
@@ -39,5 +39,5 @@ def addboot(source,target,env):
|
||||
os.rename(target[0].path, firmware_without_bootloader_dir)
|
||||
#os.rename(target[0].dir.path+'/firmware_with_bootloader.bin', target[0].dir.path+'/firmware.bin')
|
||||
|
||||
env.AddPostAction('"$BUILD_DIR/${PROGNAME}.bin"', addboot);
|
||||
env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", addboot);
|
||||
|
||||
|
||||
+4
-3
@@ -5,9 +5,9 @@ for define in env['CPPDEFINES']:
|
||||
if define[0] == "VECT_TAB_ADDR":
|
||||
env['CPPDEFINES'].remove(define)
|
||||
env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08010000"))
|
||||
env.Replace(LDSCRIPT_PATH="buildroot/share/PlatformIO/ldscripts/alfawise_Ux0.ld")
|
||||
env.Replace(LDSCRIPT_PATH="buildroot/share/PlatformIO/ldscripts/longer_STM32.ld")
|
||||
|
||||
# Encrypt ${PROGNAME}.bin and save it as 'project.bin'
|
||||
# Rename ${PROGNAME}.bin and save it as 'project.bin' (No encryption on the Longer3D)
|
||||
def encrypt(source, target, env):
|
||||
import os
|
||||
|
||||
@@ -23,4 +23,5 @@ def encrypt(source, target, env):
|
||||
finally:
|
||||
firmware.close()
|
||||
marlin_alfa.close()
|
||||
env.AddPostAction('"$BUILD_DIR/${PROGNAME}.bin"', encrypt);
|
||||
|
||||
env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", encrypt);
|
||||
@@ -27,4 +27,4 @@ def encrypt(source, target, env):
|
||||
finally:
|
||||
firmware.close()
|
||||
robin.close()
|
||||
env.AddPostAction('"$BUILD_DIR/${PROGNAME}.bin"', encrypt);
|
||||
env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", encrypt);
|
||||
|
||||
@@ -27,4 +27,4 @@ def encrypt(source, target, env):
|
||||
finally:
|
||||
firmware.close()
|
||||
robin.close()
|
||||
env.AddPostAction('"$BUILD_DIR/${PROGNAME}.bin"', encrypt);
|
||||
env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", encrypt);
|
||||
|
||||
@@ -27,4 +27,4 @@ def encrypt(source, target, env):
|
||||
finally:
|
||||
firmware.close()
|
||||
robin.close()
|
||||
env.AddPostAction('"$BUILD_DIR/${PROGNAME}.bin"', encrypt);
|
||||
env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", encrypt);
|
||||
|
||||
@@ -27,4 +27,4 @@ def encrypt(source, target, env):
|
||||
finally:
|
||||
firmware.close()
|
||||
robin.close()
|
||||
env.AddPostAction('"$BUILD_DIR/${PROGNAME}.bin"', encrypt);
|
||||
env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", encrypt);
|
||||
|
||||
Reference in New Issue
Block a user