From 0316091d89215481188c74b8070e3372d2b84a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=A4berich?= Date: Sat, 22 May 2021 11:58:50 +0200 Subject: [PATCH] increased version number to 1.1.0 --- Software/PC_Application/LibreVNA-GUI.pro | 2 +- Software/VNA_embedded/.cproject | 1213 +++++++++++++++------- Software/VNA_embedded/Makefile | 2 +- 3 files changed, 811 insertions(+), 406 deletions(-) diff --git a/Software/PC_Application/LibreVNA-GUI.pro b/Software/PC_Application/LibreVNA-GUI.pro index 90df6a5..cc13701 100644 --- a/Software/PC_Application/LibreVNA-GUI.pro +++ b/Software/PC_Application/LibreVNA-GUI.pro @@ -294,5 +294,5 @@ RESOURCES += \ CONFIG += c++17 REVISION = $$system(git rev-parse HEAD) DEFINES += GITHASH=\\"\"$$REVISION\\"\" -DEFINES += FW_MAJOR=1 FW_MINOR=0 FW_PATCH=0 FW_SUFFIX=""#\\"\"-alpha.2\\"\" +DEFINES += FW_MAJOR=1 FW_MINOR=1 FW_PATCH=0 FW_SUFFIX=""#\\"\"-alpha.2\\"\" DEFINES -= _UNICODE UNICODE diff --git a/Software/VNA_embedded/.cproject b/Software/VNA_embedded/.cproject index cbdb8c0..d8d92c6 100644 --- a/Software/VNA_embedded/.cproject +++ b/Software/VNA_embedded/.cproject @@ -1,407 +1,812 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/VNA_embedded/Makefile b/Software/VNA_embedded/Makefile index df3451d..b41629d 100644 --- a/Software/VNA_embedded/Makefile +++ b/Software/VNA_embedded/Makefile @@ -100,7 +100,7 @@ MCU = $(CPU) -mthumb $(FLOAT-ABI) $(FPU) # C defines C_DEFS = \ -DFW_MAJOR=1 \ --DFW_MINOR=0 \ +-DFW_MINOR=1 \ -DFW_PATCH=0 \ -DUSE_FULL_LL_DRIVER \ -DHW_REVISION="'B'" \