Version bump + changelog

This commit is contained in:
Jan Käberich 2025-02-21 16:00:36 +01:00
parent d722f62947
commit 351b040237
5 changed files with 29 additions and 5 deletions

View file

@ -413,5 +413,5 @@ QMAKE_CXXFLAGS += -Wno-deprecated -Wno-deprecated-declarations -Wno-deprecated-c
CONFIG += c++17
REVISION = $$system(git rev-parse HEAD)
DEFINES += GITHASH=\\"\"$$REVISION\\"\"
DEFINES += FW_MAJOR=1 FW_MINOR=6 FW_PATCH=1 FW_SUFFIX=""
DEFINES += FW_MAJOR=1 FW_MINOR=6 FW_PATCH=2 FW_SUFFIX=""
DEFINES -= _UNICODE UNICODE

View file

@ -443,6 +443,6 @@ unix:LIBS += -L/usr/lib/
REVISION = $$system(git rev-parse HEAD)
DEFINES += GITHASH=\\"\"$$REVISION\\"\"
DEFINES += FW_MAJOR=1 FW_MINOR=6 FW_PATCH=1 FW_SUFFIX=""#\\"\"-alpha.2\\"\"
DEFINES += FW_MAJOR=1 FW_MINOR=6 FW_PATCH=2 FW_SUFFIX=""#\\"\"-alpha.2\\"\"
DEFINES -= _UNICODE UNICODE
win32:DEFINES += QMICROZ_LIBRARY

View file

@ -44,7 +44,7 @@
<listOptionValue builtIn="false" value="_SNK"/>
<listOptionValue builtIn="false" value="FW_MAJOR=1"/>
<listOptionValue builtIn="false" value="FW_MINOR=6"/>
<listOptionValue builtIn="false" value="FW_PATCH=1"/>
<listOptionValue builtIn="false" value="FW_PATCH=2"/>
<listOptionValue builtIn="false" value="HW_REVISION='B'"/>
<listOptionValue builtIn="false" value="USE_FULL_LL_DRIVER"/>
<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
@ -91,7 +91,7 @@
<listOptionValue builtIn="false" value="DEBUG"/>
<listOptionValue builtIn="false" value="FW_MAJOR=1"/>
<listOptionValue builtIn="false" value="FW_MINOR=6"/>
<listOptionValue builtIn="false" value="FW_PATCH=1"/>
<listOptionValue builtIn="false" value="FW_PATCH=2"/>
<listOptionValue builtIn="false" value="HW_REVISION='B'"/>
<listOptionValue builtIn="false" value="USE_FULL_LL_DRIVER"/>
<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>

View file

@ -101,7 +101,7 @@ MCU = $(CPU) -mthumb $(FLOAT-ABI) $(FPU)
C_DEFS = \
-DFW_MAJOR=1 \
-DFW_MINOR=6 \
-DFW_PATCH=1 \
-DFW_PATCH=2 \
-DDEBUG \
-DUSE_FULL_LL_DRIVER \
-DHW_REVISION="'B'" \