Skip to content

Commit 6539c88

Browse files
Bob-the-Kuhnthinkyhead
authored and
LCh-77
committed
🐛 Fix Lerdge build / encrypt (MarlinFirmware#24391)
Co-authored-by: Scott Lahteine <[email protected]>
1 parent 542b011 commit 6539c88

File tree

5 files changed

+70
-70
lines changed

5 files changed

+70
-70
lines changed

‎buildroot/share/PlatformIO/scripts/lerdge.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ def encrypt_file(input, output_file, file_length):
2626
input_file[i] = encryptByte(input_file[i])
2727
output_file.write(input_file)
2828

29-
# Encrypt ${PROGNAME}.bin and save it with the name given in build.encrypt
29+
# Encrypt ${PROGNAME}.bin and save it with the name given in build.crypt_lerdge
3030
def encrypt(source, target, env):
3131
fwpath = target[0].path
32-
enname = board.get("build.encrypt")
32+
enname = board.get("build.crypt_lerdge")
3333
print("Encrypting %s to %s" % (fwpath, enname))
3434
fwfile = open(fwpath, "rb")
3535
enfile = open(target[0].dir.path + "/" + enname, "wb")
@@ -41,9 +41,9 @@ def encrypt(source, target, env):
4141
enfile.close()
4242
os.remove(fwpath)
4343

44-
if 'encrypt' in board.get("build").keys():
45-
if board.get("build.encrypt") != "":
44+
if 'crypt_lerdge' in board.get("build").keys():
45+
if board.get("build.crypt_lerdge") != "":
4646
marlin.add_post_action(encrypt)
4747
else:
48-
print("LERDGE builds require output file via board_build.encrypt = 'filename' parameter")
48+
print("LERDGE builds require output file via board_build.crypt_lerdge = 'filename' parameter")
4949
exit(1)

‎buildroot/share/PlatformIO/scripts/marlin.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ def custom_ld_script(ldname):
4141
elif flag == "-T":
4242
env["LINKFLAGS"][i + 1] = apath
4343

44-
# Encrypt ${PROGNAME}.bin and save it with a new name
45-
# Called by specific encrypt() functions, mostly for MKS boards
44+
# Encrypt ${PROGNAME}.bin and save it with a new name. This applies (mostly) to MKS boards
45+
# This PostAction is set up by offset_and_rename.py for envs with 'build.encrypt_mks'.
4646
def encrypt_mks(source, target, env, new_name):
4747
import sys
4848

‎buildroot/share/PlatformIO/scripts/offset_and_rename.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@
3939
env["LINKFLAGS"][i] = "-Wl,--defsym=LD_MAX_DATA_SIZE=" + str(maximum_ram_size - 40)
4040

4141
#
42-
# For build.encrypt rename and encode the firmware file.
42+
# For build.encrypt_mks rename and encode the firmware file.
4343
#
44-
if 'encrypt' in board_keys:
44+
if 'encrypt_mks' in board_keys:
4545

46-
# Encrypt ${PROGNAME}.bin and save it with the name given in build.encrypt
46+
# Encrypt ${PROGNAME}.bin and save it with the name given in build.encrypt_mks
4747
def encrypt(source, target, env):
48-
marlin.encrypt_mks(source, target, env, board.get("build.encrypt"))
48+
marlin.encrypt_mks(source, target, env, board.get("build.encrypt_mks"))
4949

50-
if board.get("build.encrypt") != "":
50+
if board.get("build.encrypt_mks") != "":
5151
marlin.add_post_action(encrypt)
5252

5353
#

‎ini/stm32f1.ini

+18-18
Original file line numberDiff line numberDiff line change
@@ -89,22 +89,22 @@ board_upload.offset_address = 0x08005000
8989
# Uses HAL STM32 to support Marlin UI for TFT screen with optional touch panel
9090
#
9191
[env:mks_robin]
92-
extends = stm32_variant
93-
board = genericSTM32F103ZE
94-
board_build.variant = MARLIN_F103Zx
95-
board_build.encrypt = Robin.bin
96-
board_build.offset = 0x7000
97-
build_flags = ${stm32_variant.build_flags}
98-
-DENABLE_HWSERIAL3 -DTIMER_SERIAL=TIM5
99-
build_unflags = ${stm32_variant.build_unflags}
100-
-DUSBCON -DUSBD_USE_CDC
92+
extends = stm32_variant
93+
board = genericSTM32F103ZE
94+
board_build.variant = MARLIN_F103Zx
95+
board_build.encrypt_mks = Robin.bin
96+
board_build.offset = 0x7000
97+
build_flags = ${stm32_variant.build_flags}
98+
-DENABLE_HWSERIAL3 -DTIMER_SERIAL=TIM5
99+
build_unflags = ${stm32_variant.build_unflags}
100+
-DUSBCON -DUSBD_USE_CDC
101101

102102
#
103103
# MKS Robin E3/E3D (STM32F103RCT6) with TMC2209
104104
#
105105
[env:mks_robin_e3]
106106
extends = common_STM32F103RC_variant
107-
board_build.encrypt = Robin_e3.bin
107+
board_build.encrypt_mks = Robin_e3.bin
108108
board_build.offset = 0x5000
109109
board_upload.offset_address = 0x08005000
110110
build_flags = ${common_STM32F103RC_variant.build_flags}
@@ -206,7 +206,7 @@ build_unflags = ${stm32_variant.build_unflags} -DUSBD_USE_CDC
206206
extends = stm32_variant
207207
board = genericSTM32F103VE
208208
board_build.variant = MARLIN_F103Vx
209-
board_build.encrypt = Robin_mini.bin
209+
board_build.encrypt_mks = Robin_mini.bin
210210
board_build.offset = 0x7000
211211
board_upload.offset_address = 0x08007000
212212
build_flags = ${stm32_variant.build_flags}
@@ -222,7 +222,7 @@ build_unflags = ${stm32_variant.build_unflags}
222222
extends = stm32_variant
223223
board = genericSTM32F103VE
224224
board_build.variant = MARLIN_F103Vx
225-
board_build.encrypt = Robin_nano35.bin
225+
board_build.encrypt_mks = Robin_nano35.bin
226226
board_build.offset = 0x7000
227227
board_upload.offset_address = 0x08007000
228228
build_flags = ${stm32_variant.build_flags}
@@ -275,7 +275,7 @@ build_flags = ${stm32_variant.build_flags} -DSS_TIMER=4
275275
extends = stm32_variant
276276
board = genericSTM32F103VE
277277
board_build.variant = MARLIN_F103Vx
278-
board_build.encrypt = Robin_mini.bin
278+
board_build.encrypt_mks = Robin_mini.bin
279279
board_build.offset = 0x7000
280280
board_upload.offset_address = 0x08007000
281281
build_flags = ${stm32_variant.build_flags}
@@ -288,7 +288,7 @@ build_flags = ${stm32_variant.build_flags}
288288
extends = stm32_variant
289289
board = genericSTM32F103RC
290290
board_build.variant = MARLIN_F103Rx
291-
board_build.encrypt = mksLite.bin
291+
board_build.encrypt_mks = mksLite.bin
292292
board_build.offset = 0x5000
293293
board_upload.offset_address = 0x08005000
294294

@@ -297,14 +297,14 @@ board_upload.offset_address = 0x08005000
297297
#
298298
[env:mks_robin_lite3]
299299
extends = env:mks_robin_lite
300-
board_build.encrypt = mksLite3.bin
300+
board_build.encrypt_mks = mksLite3.bin
301301

302302
#
303303
# MKS Robin Pro (STM32F103ZET6)
304304
#
305305
[env:mks_robin_pro]
306-
extends = env:mks_robin
307-
board_build.encrypt = Robin_pro.bin
306+
extends = env:mks_robin
307+
board_build.encrypt_mks = Robin_pro.bin
308308

309309
#
310310
# MKS Robin E3p (STM32F103VET6)
@@ -314,7 +314,7 @@ board_build.encrypt = Robin_pro.bin
314314
extends = stm32_variant
315315
board = genericSTM32F103VE
316316
board_build.variant = MARLIN_F103Vx
317-
board_build.encrypt = Robin_e3p.bin
317+
board_build.encrypt_mks = Robin_e3p.bin
318318
board_build.offset = 0x7000
319319
board_upload.offset_address = 0x08007000
320320
build_flags = ${stm32_variant.build_flags}

‎ini/stm32f4.ini

+40-40
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ extra_scripts = ${stm32_variant.extra_scripts}
113113
extends = stm32_variant
114114
board = marlin_STM32F407VGT6_CCM
115115
board_build.variant = MARLIN_F4x7Vx
116-
board_build.encrypt = firmware.srec
116+
board_build.encrypt_mks = firmware.srec
117117
board_build.offset = 0x10000
118118
board_upload.offset_address = 0x08010000
119119
build_flags = ${stm32_variant.build_flags}
@@ -302,24 +302,24 @@ build_flags = ${stm_flash_drive.build_flags}
302302
# Lerdge base
303303
#
304304
[lerdge_common]
305-
extends = stm32_variant
306-
board = marlin_STM32F407ZGT6
307-
board_build.variant = MARLIN_LERDGE
308-
board_build.offset = 0x10000
309-
build_flags = ${stm32_variant.build_flags}
310-
-DSTM32F4 -DSTM32F4xx -DTARGET_STM32F4
311-
-DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32 -DLERDGE_TFT35
312-
build_unflags = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483
313-
extra_scripts = ${common_stm32.extra_scripts}
314-
pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
315-
buildroot/share/PlatformIO/scripts/lerdge.py
305+
extends = stm32_variant
306+
board = marlin_STM32F407ZGT6
307+
board_build.variant = MARLIN_LERDGE
308+
board_build.crypt_lerdge = firmware.bin
309+
board_build.offset = 0x10000
310+
build_flags = ${stm32_variant.build_flags}
311+
-DSTM32F4 -DSTM32F4xx -DTARGET_STM32F4
312+
-DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32 -DLERDGE_TFT35
313+
build_unflags = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483
314+
extra_scripts = ${stm32_variant.extra_scripts}
315+
buildroot/share/PlatformIO/scripts/lerdge.py
316316

317317
#
318318
# Lerdge X (STM32F407VE)
319319
#
320320
[env:LERDGEX]
321-
extends = lerdge_common
322-
board_build.encrypt = Lerdge_X_firmware_force.bin
321+
extends = lerdge_common
322+
board_build.crypt_lerdge = Lerdge_X_firmware_force.bin
323323

324324
#
325325
# Lerdge X with USB Flash Drive Support
@@ -333,8 +333,8 @@ build_flags = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
333333
# Lerdge S (STM32F407ZG)
334334
#
335335
[env:LERDGES]
336-
extends = lerdge_common
337-
board_build.encrypt = Lerdge_firmware_force.bin
336+
extends = lerdge_common
337+
board_build.crypt_lerdge = Lerdge_firmware_force.bin
338338

339339
#
340340
# Lerdge S with USB Flash Drive Support
@@ -348,9 +348,9 @@ build_flags = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
348348
# Lerdge K (STM32F407ZG)
349349
#
350350
[env:LERDGEK]
351-
extends = lerdge_common
352-
board_build.encrypt = Lerdge_K_firmware_force.bin
353-
build_flags = ${lerdge_common.build_flags} -DLERDGEK
351+
extends = lerdge_common
352+
board_build.crypt_lerdge = Lerdge_K_firmware_force.bin
353+
build_flags = ${lerdge_common.build_flags} -DLERDGEK
354354

355355
#
356356
# Lerdge K with USB Flash Drive Support
@@ -364,17 +364,17 @@ build_flags = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
364364
# RUMBA32
365365
#
366366
[env:rumba32]
367-
extends = stm32_variant
368-
board = rumba32_f446ve
369-
board_build.variant = MARLIN_F446VE
370-
board_build.offset = 0x0000
371-
build_flags = ${stm32_variant.build_flags}
372-
-Os -DHAL_PCD_MODULE_ENABLED
373-
-DDISABLE_GENERIC_SERIALUSB
374-
-DHAL_UART_MODULE_ENABLED
375-
-DTIMER_SERIAL=TIM9
376-
monitor_speed = 500000
377-
upload_protocol = dfu
367+
extends = stm32_variant
368+
board = rumba32_f446ve
369+
board_build.variant = MARLIN_F446VE
370+
board_build.offset = 0x0000
371+
build_flags = ${stm32_variant.build_flags}
372+
-Os -DHAL_PCD_MODULE_ENABLED
373+
-DDISABLE_GENERIC_SERIALUSB
374+
-DHAL_UART_MODULE_ENABLED
375+
-DTIMER_SERIAL=TIM9
376+
monitor_speed = 500000
377+
upload_protocol = dfu
378378

379379
#
380380
# MKS Robin Pro V2
@@ -547,17 +547,17 @@ build_unflags = -DUSBD_USE_CDC
547547
# TH3D EZBoard v2.0 (STM32F405RGT6 ARM Cortex-M4)
548548
#
549549
[env:TH3D_EZBoard_V2]
550-
extends = stm32_variant
551-
board = genericSTM32F405RG
552-
board_build.variant = MARLIN_TH3D_EZBOARD_V2
553-
board_build.encrypt = firmware.bin
554-
board_build.offset = 0xC000
550+
extends = stm32_variant
551+
board = genericSTM32F405RG
552+
board_build.variant = MARLIN_TH3D_EZBOARD_V2
553+
board_build.encrypt_mks = firmware.bin
554+
board_build.offset = 0xC000
555555
board_upload.offset_address = 0x0800C000
556-
build_flags = ${stm32_variant.build_flags} -DHSE_VALUE=12000000U -O0
557-
debug_tool = stlink
558-
upload_protocol = stlink
559-
extra_scripts = ${stm32_variant.extra_scripts}
560-
buildroot/share/PlatformIO/scripts/openblt.py
556+
build_flags = ${stm32_variant.build_flags} -DHSE_VALUE=12000000U -O0
557+
debug_tool = stlink
558+
upload_protocol = stlink
559+
extra_scripts = ${stm32_variant.extra_scripts}
560+
buildroot/share/PlatformIO/scripts/openblt.py
561561

562562
#
563563
# BOARD_MKS_ROBIN_NANO_V1_3_F4

0 commit comments

Comments
 (0)