Merge branch 'bugfix-2.0.x' into CrealityDwin2.0_Bleeding

2021-07-07 17:50:24 -04:00
parent 541e074f97 38c79a4585
commit dc19c60a0e
199 changed files with 4997 additions and 3027 deletions
@@ -1,6 +1,9 @@
 #
 # buildroot/share/PlatformIO/scripts/custom_board.py
 #
+# - For build.address replace VECT_TAB_ADDR to relocate the firmware
+# - For build.ldscript use one of the linker scripts in buildroot/share/PlatformIO/ldscripts
+#
 import marlin
 board = marlin.env.BoardConfig()

@@ -30,15 +30,3 @@ if env.MarlinFeatureIsEnabled("POSTMORTEM_DEBUGGING"):
        print("Done patching exception handler")

    print("Libmaple modified and ready for post mortem debugging")
-
-mf = env["MARLIN_FEATURES"]
-rxBuf = mf["RX_BUFFER_SIZE"] if "RX_BUFFER_SIZE" in mf else "0"
-txBuf = mf["TX_BUFFER_SIZE"] if "TX_BUFFER_SIZE" in mf else "0"
-if int(rxBuf) < 64:
-	rxBuf = "64"
-if int(txBuf) < 64:
-	txBuf = "64"
-
-build_flags = env.get('BUILD_FLAGS')
-build_flags.append("-DUSART_RX_BUF_SIZE=" + rxBuf + " -DUSART_TX_BUF_SIZE=" + txBuf)
-env.Replace(BUILD_FLAGS=build_flags)
@@ -67,11 +67,3 @@ def encrypt_mks(source, target, env, new_name):

 def add_post_action(action):
 	env.AddPostAction(join("$BUILD_DIR", "${PROGNAME}.bin"), action);
-
-# Apply customizations for a MKS Robin
-def prepare_robin(address, ldname, fwname):
-	def encrypt(source, target, env):
-		encrypt_mks(source, target, env, fwname)
-	relocate_firmware(address)
-	custom_ld_script(ldname)
-	add_post_action(encrypt);
@@ -1,5 +1,5 @@
 #
 # buildroot/share/PlatformIO/scripts/mks_robin.py
 #
-import marlin
-marlin.prepare_robin("0x08007000", "mks_robin.ld", "Robin.bin")
+import robin
+robin.prepare("0x08007000", "mks_robin.ld", "Robin.bin")
@@ -1,5 +1,5 @@
 #
 # buildroot/share/PlatformIO/scripts/mks_robin_e3.py
 #
-import marlin
-marlin.prepare_robin("0x08005000", "mks_robin_e3.ld", "Robin_e3.bin")
+import robin
+robin.prepare("0x08005000", "mks_robin_e3.ld", "Robin_e3.bin")
@@ -1,5 +1,5 @@
 #
 # buildroot/share/PlatformIO/scripts/mks_robin_e3p.py
 #
-import marlin
-marlin.prepare_robin("0x08007000", "mks_robin_e3p.ld", "Robin_e3p.bin")
+import robin
+robin.prepare("0x08007000", "mks_robin_e3p.ld", "Robin_e3p.bin")
@@ -1,5 +1,5 @@
 #
 # buildroot/share/PlatformIO/scripts/mks_robin_lite.py
 #
-import marlin
-marlin.prepare_robin("0x08005000", "mks_robin_lite.ld", "mksLite.bin")
+import robin
+robin.prepare("0x08005000", "mks_robin_lite.ld", "mksLite.bin")
@@ -1,5 +1,5 @@
 #
 # buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
 #
-import marlin
-marlin.prepare_robin("0x08005000", "mks_robin_lite.ld", "mksLite3.bin")
+import robin
+robin.prepare("0x08005000", "mks_robin_lite.ld", "mksLite3.bin")
@@ -1,5 +1,5 @@
 #
 # buildroot/share/PlatformIO/scripts/mks_robin_mini.py
 #
-import marlin
-marlin.prepare_robin("0x08007000", "mks_robin_mini.ld", "Robin_mini.bin")
+import robin
+robin.prepare("0x08007000", "mks_robin_mini.ld", "Robin_mini.bin")
@@ -1,5 +1,5 @@
 #
 # buildroot/share/PlatformIO/scripts/mks_robin_nano.py
 #
-import marlin
-marlin.prepare_robin("0x08007000", "mks_robin_nano.ld", "Robin_nano.bin")
+import robin
+robin.prepare("0x08007000", "mks_robin_nano.ld", "Robin_nano.bin")
@@ -1,5 +1,5 @@
 #
 # buildroot/share/PlatformIO/scripts/mks_robin_nano35.py
 #
-import marlin
-marlin.prepare_robin("0x08007000", "mks_robin_nano.ld", "Robin_nano35.bin")
+import robin
+robin.prepare("0x08007000", "mks_robin_nano.ld", "Robin_nano35.bin")
@@ -1,5 +1,5 @@
 #
 # buildroot/share/PlatformIO/scripts/mks_robin_pro.py
 #
-import marlin
-marlin.prepare_robin("0x08007000", "mks_robin_pro.ld", "Robin_pro.bin")
+import robin
+robin.prepare("0x08007000", "mks_robin_pro.ld", "Robin_pro.bin")
@@ -0,0 +1,12 @@
+#
+# buildroot/share/PlatformIO/scripts/robin.py
+#
+import marlin
+
+# Apply customizations for a MKS Robin
+def prepare(address, ldname, fwname):
+	def encrypt(source, target, env):
+		marlin.encrypt_mks(source, target, env, fwname)
+	marlin.relocate_firmware(address)
+	marlin.custom_ld_script(ldname)
+	marlin.add_post_action(encrypt);
@@ -1,6 +1,13 @@
 #
 # stm32_bootloader.py
 #
+# - If 'build.offset' is provided, either by JSON or by the environment...
+# 	- Set linker flag LD_FLASH_OFFSET and relocate the VTAB based on 'build.offset'.
+# 	- Set linker flag LD_MAX_DATA_SIZE based on 'build.maximum_ram_size'.
+# 	- Define STM32_FLASH_SIZE from 'upload.maximum_size' for use by Flash-based EEPROM emulation.
+#
+# - For 'board_build.rename' add a post-action to rename the firmware file.
+#
 import os,sys,marlin
 Import("env")

@@ -13,11 +13,16 @@ Import("env")
 #
 # The script will set the value as the default one (64 bytes)
 # or the user-configured one, whichever is higher.
+#
+# Marlin has 128 and 32 as default values for RX_BUFFER_SIZE and
+# TX_BUFFER_SIZE respectively. We use the highest value.
 mf = env["MARLIN_FEATURES"]
-rxBuf = str(max(64, int(mf["RX_BUFFER_SIZE"]) if "RX_BUFFER_SIZE" in mf else 0))
+rxBuf = str(max(128, int(mf["RX_BUFFER_SIZE"]) if "RX_BUFFER_SIZE" in mf else 0))
 txBuf = str(max(64, int(mf["TX_BUFFER_SIZE"]) if "TX_BUFFER_SIZE" in mf else 0))

 build_flags = env.get('BUILD_FLAGS')
 build_flags.append("-DSERIAL_RX_BUFFER_SIZE=" + rxBuf)
 build_flags.append("-DSERIAL_TX_BUFFER_SIZE=" + txBuf)
+build_flags.append("-DUSART_RX_BUF_SIZE=" + rxBuf)
+build_flags.append("-DUSART_TX_BUF_SIZE=" + txBuf)
 env.Replace(BUILD_FLAGS=build_flags)