Adjust version number

This commit is contained in:
Jan Käberich 2021-08-22 16:52:28 +02:00
parent df76725f9d
commit dc885e947e
3 changed files with 5 additions and 5 deletions

View File

@ -303,5 +303,5 @@ RESOURCES += \
CONFIG += c++17 CONFIG += c++17
REVISION = $$system(git rev-parse HEAD) REVISION = $$system(git rev-parse HEAD)
DEFINES += GITHASH=\\"\"$$REVISION\\"\" DEFINES += GITHASH=\\"\"$$REVISION\\"\"
DEFINES += FW_MAJOR=1 FW_MINOR=1 FW_PATCH=2 FW_SUFFIX=""#\\"\"-alpha.2\\"\" DEFINES += FW_MAJOR=1 FW_MINOR=2 FW_PATCH=0 FW_SUFFIX=""#\\"\"-alpha.2\\"\"
DEFINES -= _UNICODE UNICODE DEFINES -= _UNICODE UNICODE

View File

@ -189,9 +189,9 @@
<listOptionValue builtIn="false" value="FW_MAJOR=1"/> <listOptionValue builtIn="false" value="FW_MAJOR=1"/>
<listOptionValue builtIn="false" value="FW_PATCH=1"/> <listOptionValue builtIn="false" value="FW_PATCH=0"/>
<listOptionValue builtIn="false" value="FW_MINOR=1"/> <listOptionValue builtIn="false" value="FW_MINOR=2"/>
<listOptionValue builtIn="false" value="USE_FULL_LL_DRIVER"/> <listOptionValue builtIn="false" value="USE_FULL_LL_DRIVER"/>

View File

@ -100,8 +100,8 @@ MCU = $(CPU) -mthumb $(FLOAT-ABI) $(FPU)
# C defines # C defines
C_DEFS = \ C_DEFS = \
-DFW_MAJOR=1 \ -DFW_MAJOR=1 \
-DFW_MINOR=1 \ -DFW_MINOR=2 \
-DFW_PATCH=1 \ -DFW_PATCH=0 \
-DUSE_FULL_LL_DRIVER \ -DUSE_FULL_LL_DRIVER \
-DHW_REVISION="'B'" \ -DHW_REVISION="'B'" \
-D__weak="__attribute__((weak))" \ -D__weak="__attribute__((weak))" \