From 00ab015de7b728082196c203626dd215dc8427d3 Mon Sep 17 00:00:00 2001 From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Sat, 10 Jun 2023 17:20:50 -0700 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=94=A8=20Firmware=20rename=20followup?= =?UTF-8?q?=20(#25966)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Followup to #25957 --- ini/stm32f1-maple.ini | 6 +++--- ini/stm32f1.ini | 2 +- ini/stm32f4.ini | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini index 88a6f8b49225..6f9ac32e0e6e 100644 --- a/ini/stm32f1-maple.ini +++ b/ini/stm32f1-maple.ini @@ -118,7 +118,7 @@ extends = env:STM32F103RE_maple build_flags = ${env:STM32F103RE_maple.build_flags} -DTEMP_TIMER_CHAN=4 board_build.address = 0x08007000 board_build.ldscript = creality.ld -board_build.rename = firmware-{date}-{time} +board_build.rename = firmware-{date}-{time}.bin debug_tool = jlink upload_protocol = jlink @@ -130,7 +130,7 @@ extends = env:STM32F103RC_maple build_flags = ${env:STM32F103RC_maple.build_flags} -DTEMP_TIMER_CHAN=4 board_build.address = 0x08007000 board_build.ldscript = creality.ld -board_build.rename = firmware-{date}-{time} +board_build.rename = firmware-{date}-{time}.bin debug_tool = jlink upload_protocol = jlink @@ -398,7 +398,7 @@ extends = env:STM32F103RE_maple build_flags = ${STM32F1_maple.build_flags} -DTEMP_TIMER_CHAN=4 board_build.address = 0x08007000 board_build.ldscript = sovol.ld -board_build.rename = firmware-{date}-{time} +board_build.rename = firmware-{date}-{time}.bin extra_scripts = ${STM32F1_maple.extra_scripts} buildroot/share/PlatformIO/scripts/custom_board.py debug_tool = jlink diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini index feb64a098f66..08686a1fb475 100644 --- a/ini/stm32f1.ini +++ b/ini/stm32f1.ini @@ -121,7 +121,7 @@ debug_tool = stlink extends = stm32_variant board_build.variant = MARLIN_F103Rx board_build.offset = 0x7000 -board_build.rename = firmware-{date}-{time} +board_build.rename = firmware-{date}-{time}.bin board_upload.offset_address = 0x08007000 build_flags = ${stm32_variant.build_flags} -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini index 67c2c6033cb0..7efb31107b86 100644 --- a/ini/stm32f4.ini +++ b/ini/stm32f4.ini @@ -684,7 +684,7 @@ board = genericSTM32F401RC board_build.variant = MARLIN_CREALITY_STM32F401RC board_build.offset = 0x10000 board_upload.offset_address = 0x08010000 -board_build.rename = firmware-{date}-{time} +board_build.rename = firmware-{date}-{time}.bin build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RC -DSTM32F4 -DSS_TIMER=4 -DTIMER_SERVO=TIM5 -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8 @@ -709,7 +709,7 @@ extends = stm32_variant board = marlin_CREALITY_STM32F401RE board_build.offset = 0x10000 board_upload.offset_address = 0x08010000 -board_build.rename = firmware-{date}-{time} +board_build.rename = firmware-{date}-{time}.bin build_flags = ${stm32_variant.build_flags} -DSTM32F401xE -DSTM32F4 -DSTM32F4_UPDATE_FOLDER build_unflags = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC monitor_speed = 115200 From 85067e14b5cd9a1d4d8ac8f38a763e9745d4fe61 Mon Sep 17 00:00:00 2001 From: thinkyhead Date: Sun, 11 Jun 2023 00:29:06 +0000 Subject: [PATCH 2/2] [cron] Bump distribution date (2023-06-11) --- Marlin/Version.h | 2 +- Marlin/src/inc/Version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Version.h b/Marlin/Version.h index 3631000cbead..28c9903fdfb8 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2023-06-10" +//#define STRING_DISTRIBUTION_DATE "2023-06-11" /** * Defines a generic printer name to be output to the LCD after booting Marlin. diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index 6fce9695750c..86700d9c8b9e 100644 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -42,7 +42,7 @@ * version was tagged. */ #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2023-06-10" + #define STRING_DISTRIBUTION_DATE "2023-06-11" #endif /**