@@ -2730,23 +2730,23 @@ GenF1.menu.upload_method.hidMethod=HID Bootloader 2.2
27302730GenF1.menu.upload_method.hidMethod.upload.protocol=hid22
27312731GenF1.menu.upload_method.hidMethod.upload.tool=hid_upload
27322732GenF1.menu.upload_method.hidMethod.build.flash_offset=0x800
2733- GenF1.menu.upload_method.hidMethod.build.bootloader_flags=-DBL_HID -DVECT_TAB_OFFSET={build.flash_offset}
2733+ GenF1.menu.upload_method.hidMethod.build.bootloader_flags=-DBL_HID
27342734
27352735GenF1.menu.upload_method.dfu2Method=Maple DFU Bootloader 2.0
27362736GenF1.menu.upload_method.dfu2Method.upload.protocol=maple
27372737GenF1.menu.upload_method.dfu2Method.upload.tool=maple_upload
27382738GenF1.menu.upload_method.dfu2Method.upload.usbID=1EAF:0003
27392739GenF1.menu.upload_method.dfu2Method.upload.altID=2
27402740GenF1.menu.upload_method.dfu2Method.build.flash_offset=0x2000
2741- GenF1.menu.upload_method.dfu2Method.build.bootloader_flags=-DBL_LEGACY_LEAF -DVECT_TAB_OFFSET={build.flash_offset}
2741+ GenF1.menu.upload_method.dfu2Method.build.bootloader_flags=-DBL_LEGACY_LEAF
27422742
27432743GenF1.menu.upload_method.dfuoMethod=Maple DFU Bootloader original
27442744GenF1.menu.upload_method.dfuoMethod.upload.protocol=maple
27452745GenF1.menu.upload_method.dfuoMethod.upload.tool=maple_upload
27462746GenF1.menu.upload_method.dfuoMethod.upload.usbID=1EAF:0003
27472747GenF1.menu.upload_method.dfuoMethod.upload.altID=1
27482748GenF1.menu.upload_method.dfuoMethod.build.flash_offset=0x5000
2749- GenF1.menu.upload_method.dfuoMethod.build.bootloader_flags=-DBL_LEGACY_LEAF -DVECT_TAB_OFFSET={build.flash_offset}
2749+ GenF1.menu.upload_method.dfuoMethod.build.bootloader_flags=-DBL_LEGACY_LEAF
27502750
27512751################################################################################
27522752# Generic F2
@@ -4397,7 +4397,7 @@ GenF4.menu.upload_method.hidMethod=HID Bootloader 2.2
43974397GenF4.menu.upload_method.hidMethod.upload.protocol=hid22
43984398GenF4.menu.upload_method.hidMethod.upload.tool=hid_upload
43994399GenF4.menu.upload_method.hidMethod.build.flash_offset=0x4000
4400- GenF4.menu.upload_method.hidMethod.build.bootloader_flags=-DBL_HID -DVECT_TAB_OFFSET={build.flash_offset}
4400+ GenF4.menu.upload_method.hidMethod.build.bootloader_flags=-DBL_HID
44014401
44024402################################################################################
44034403# Generic F7
@@ -10010,7 +10010,7 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
10010100103dprinter.menu.pnum.PRNTR_V2.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
10011100113dprinter.menu.pnum.PRNTR_V2.build.cmsis_lib_gcc=arm_cortexM4lf_math
10012100123dprinter.menu.pnum.PRNTR_V2.build.flash_offset=0x8000
10013- 3dprinter.menu.pnum.PRNTR_V2.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET={build.flash_offset}
10013+ 3dprinter.menu.pnum.PRNTR_V2.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
1001410014
1001510015# EEXTR_F030_V1 board
10016100163dprinter.menu.pnum.EEXTR_F030_V1=EExtruder F030 V1
@@ -10037,7 +10037,7 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
10037100373dprinter.menu.pnum.MALYANM200_F103CB.build.cmsis_lib_gcc=arm_cortexM3l_math
10038100383dprinter.menu.pnum.MALYANM200_F103CB.build.startup_file=-DCUSTOM_STARTUP_FILE
10039100393dprinter.menu.pnum.MALYANM200_F103CB.build.flash_offset=0x2000
10040- 3dprinter.menu.pnum.MALYANM200_F103CB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET={build.flash_offset}
10040+ 3dprinter.menu.pnum.MALYANM200_F103CB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
1004110041
1004210042# MALYANM200_F070CB board
10043100433dprinter.menu.pnum.MALYANM200_F070CB=Malyan M200 V2
@@ -10053,7 +10053,7 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
10053100533dprinter.menu.pnum.MALYANM200_F070CB.build.startup_file=-DCUSTOM_STARTUP_FILE
10054100543dprinter.menu.pnum.MALYANM200_F070CB.build.ldscript=MALYANMx00_F070CB.ld
10055100553dprinter.menu.pnum.MALYANM200_F070CB.build.flash_offset=0x2000
10056- 3dprinter.menu.pnum.MALYANM200_F070CB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET={build.flash_offset}
10056+ 3dprinter.menu.pnum.MALYANM200_F070CB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
1005710057
1005810058# MALYANM300_F070CB board
10059100593dprinter.menu.pnum.MALYANM300_F070CB=Malyan M300
@@ -10069,7 +10069,7 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
10069100693dprinter.menu.pnum.MALYANM300_F070CB.build.startup_file=-DCUSTOM_STARTUP_FILE
10070100703dprinter.menu.pnum.MALYANM200_F070CB.build.ldscript=MALYANMx00_F070CB.ld
10071100713dprinter.menu.pnum.MALYANM300_F070CB.build.flash_offset=0x2000
10072- 3dprinter.menu.pnum.MALYANM300_F070CB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET={build.flash_offset}
10072+ 3dprinter.menu.pnum.MALYANM300_F070CB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
1007310073
1007410074# VAkE v1.0
10075100753dprinter.menu.pnum.VAKE_V1=VAkE v1.0
@@ -10099,7 +10099,7 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
10099100993dprinter.menu.pnum.FYSETC_S6.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
10100101003dprinter.menu.pnum.FYSETC_S6.build.cmsis_lib_gcc=arm_cortexM4lf_math
10101101013dprinter.menu.pnum.FYSETC_S6.build.flash_offset=0x10000
10102- 3dprinter.menu.pnum.FYSETC_S6.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DVECT_TAB_OFFSET={build.flash_offset}
10102+ 3dprinter.menu.pnum.FYSETC_S6.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
1010310103
1010410104# Upload menu
10105101053dprinter.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
@@ -10393,23 +10393,23 @@ GenFlight.menu.upload_method.hidMethod=HID Bootloader 2.2
1039310393GenFlight.menu.upload_method.hidMethod.upload.protocol=hid22
1039410394GenFlight.menu.upload_method.hidMethod.upload.tool=hid_upload
1039510395GenFlight.menu.upload_method.hidMethod.build.flash_offset=0x800
10396- GenFlight.menu.upload_method.hidMethod.build.bootloader_flags=-DBL_HID -DVECT_TAB_OFFSET={build.flash_offset}
10396+ GenFlight.menu.upload_method.hidMethod.build.bootloader_flags=-DBL_HID
1039710397
1039810398GenFlight.menu.upload_method.dfu2Method=Maple DFU Bootloader 2.0
1039910399GenFlight.menu.upload_method.dfu2Method.upload.protocol=maple
1040010400GenFlight.menu.upload_method.dfu2Method.upload.tool=maple_upload
1040110401GenFlight.menu.upload_method.dfu2Method.upload.usbID=1EAF:0003
1040210402GenFlight.menu.upload_method.dfu2Method.upload.altID=2
1040310403GenFlight.menu.upload_method.dfu2Method.build.flash_offset=0x2000
10404- GenFlight.menu.upload_method.dfu2Method.build.bootloader_flags=-DBL_LEGACY_LEAF -DVECT_TAB_OFFSET={build.flash_offset}
10404+ GenFlight.menu.upload_method.dfu2Method.build.bootloader_flags=-DBL_LEGACY_LEAF
1040510405
1040610406GenFlight.menu.upload_method.dfuoMethod=Maple DFU Bootloader original
1040710407GenFlight.menu.upload_method.dfuoMethod.upload.protocol=maple
1040810408GenFlight.menu.upload_method.dfuoMethod.upload.tool=maple_upload
1040910409GenFlight.menu.upload_method.dfuoMethod.upload.usbID=1EAF:0003
1041010410GenFlight.menu.upload_method.dfuoMethod.upload.altID=1
1041110411GenFlight.menu.upload_method.dfuoMethod.build.flash_offset=0x5000
10412- GenFlight.menu.upload_method.dfuoMethod.build.bootloader_flags=-DBL_LEGACY_LEAF -DVECT_TAB_OFFSET={build.flash_offset}
10412+ GenFlight.menu.upload_method.dfuoMethod.build.bootloader_flags=-DBL_LEGACY_LEAF
1041310413
1041410414################################################################################
1041510415# LoRa boards
0 commit comments