Version bumped to 1.0.0

This commit is contained in:
Jan Käberich 2021-04-10 13:00:35 +02:00
parent dfe5704480
commit 2bac0bbbe1
3 changed files with 4 additions and 4 deletions

View File

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

View File

@ -160,7 +160,7 @@ AppWindow::AppWindow(QWidget *parent)
connect(ui->actionAbout, &QAction::triggered, [=](){
auto commit = QString(GITHASH);
commit.truncate(7);
QMessageBox::about(this, "About", "More information: github.com/jankae/VNA2\n"
QMessageBox::about(this, "About", "More information: github.com/jankae/LibreVNA\n"
"\nVersion: " + QString::number(FW_MAJOR) + "." + QString::number(FW_MINOR)
+ "." + QString::number(FW_PATCH) + FW_SUFFIX + " ("+ commit+")");
});

View File

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