Skip to content

Commit

Permalink
Update version number and change log
Browse files Browse the repository at this point in the history
  • Loading branch information
andrivet committed Jul 23, 2023
1 parent ad3b250 commit db3f38d
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 5.7.0-dev+2023-06-22
current_version = 5.7.0-stable+2023-07-23
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?\+(?P<date>\d{4}\-\d{2}\-\d{2})
Expand All @@ -11,7 +11,7 @@ values =
dev
stable

[bumpversion:file:Marlin/src/advi3pp/versions.h]
[bumpversion:file:Marlin/Configuration.h]
serialize = {major}{minor}{patch}
search = advi3_pp_version = 0x{current_version}
replace = advi3_pp_version = 0x{new_version}
Expand Down
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,16 @@

## 5.7.0 (2023-06-22)

Align with Marlin 2.1.2.1
* **#332** - [SD card sorting is not working as expected bug](https://github.com/andrivet/ADVi3pp/issues/332)
* **#329** - [Add a way to cancel Load and Unload filament enhancement](https://github.com/andrivet/ADVi3pp/issues/329)
* **#327** - [For Mark II printers, select by default the Mark II offsets for the probe enhancement](https://github.com/andrivet/ADVi3pp/issues/327)
* **#326** - [Synchronise sources with Marlin 2.1.2 enhancement](https://github.com/andrivet/ADVi3pp/issues/326)
* **#322** - [Save the last temperature used to Load/Unload and restore it on boot enhancement](https://github.com/andrivet/ADVi3pp/issues/322)
* **#319** - [Use Touch Switch Mode (SW) for BLTouch enhancement](https://github.com/andrivet/ADVi3pp/issues/319)
* **#315** - [Beep in Preheat when the target temperature is achieved enhancement](https://github.com/andrivet/ADVi3pp/issues/315)
* **#314** - [Apply the setting under Settings / Beeper / Beep duration to M300 without P argument enhancement](https://github.com/andrivet/ADVi3pp/issues/314)
* **#262** - [Add BLTouch support for i3 plus Mark II enhancement](https://github.com/andrivet/ADVi3pp/issues/262)
* **#115** - [Allow Temp Change during filament change enhancement](https://github.com/andrivet/ADVi3pp/issues/115)

## 5.6.0 (2023-03-19)

Expand Down
Binary file modified LCD-Panel/Masters/ADVi3++5 LCD-Panel.sketch
Binary file not shown.
4 changes: 2 additions & 2 deletions Marlin/src/inc/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
* vendor name, download location, GitHub account, etc.
*/
#ifndef DETAILED_BUILD_VERSION
#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " (" ADVi3PP_NAME " 5.7.0-dev)"
#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " (" ADVi3PP_NAME " 5.7.0)"
#endif

/**
Expand All @@ -59,7 +59,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2023-06-22"
#define STRING_DISTRIBUTION_DATE "2023-07-23"
#endif

/**
Expand Down
5 changes: 3 additions & 2 deletions Scripts/create-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ echo "======================================"
echo
echo "BE SURE YOU HAVE CHANGED:"
echo "- CHANGELOG.md"
echo "- cd .. ; advbumpversion --allow-dirty --no-commit --no-tag release ; cd Scripts"
echo "- cd .. ; bump2version --allow-dirty --no-commit --no-tag release ; cd Scripts"
echo "- User Manual if necessary"
echo
pause 'Press any key to continue or Ctrl-C to abort...'
Expand Down Expand Up @@ -67,7 +67,7 @@ echo "***** Generate other microSD images..."
echo
echo "***** Compile Mainboard firmwares..."
echo
platformio -f -c clion run -d "${advi3pp}" -e advi3pp_51 -e advi3pp_51_bltouch -e advi3pp_52c -e advi3pp_52c_bltouch -e advi3pp_54
platformio -f -c clion run -d "${advi3pp}" -e advi3pp_51 -e advi3pp_51_bltouch -e advi3pp_52c -e advi3pp_52c_bltouch -e advi3pp_54 -e advi3pp_54_bltouch
ret=$?; if [[ $ret != 0 ]]; then exit $ret; fi

echo
Expand All @@ -78,6 +78,7 @@ cp "${advi3pp}/.pio/build/advi3pp_51_bltouch/firmware.hex" "${release}/ADVi3pp-M
cp "${advi3pp}/.pio/build/advi3pp_52c/firmware.hex" "${release}/ADVi3pp-Mainboard-52c-${version}.hex"
cp "${advi3pp}/.pio/build/advi3pp_52c_bltouch/firmware.hex" "${release}/ADVi3pp-Mainboard-52c-BLTouch-${version}.hex"
cp "${advi3pp}/.pio/build/advi3pp_54/firmware.hex" "${release}/ADVi3pp-Mainboard-54-${version}.hex"
cp "${advi3pp}/.pio/build/advi3pp_54_bltouch/firmware.hex" "${release}/ADVi3pp-Mainboard-54-BLTouch-${version}.hex"
ret=$?; if [[ $ret != 0 ]]; then exit $ret; fi

echo
Expand Down
2 changes: 1 addition & 1 deletion Scripts/version.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version="5.7.0-dev"
version="5.7.0"

0 comments on commit db3f38d

Please sign in to comment.