From 2bac0bbbe1efe1fd284394b775468d42e810b9bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=A4berich?= Date: Sat, 10 Apr 2021 13:00:35 +0200 Subject: [PATCH] Version bumped to 1.0.0 --- Software/PC_Application/LibreVNA-GUI.pro | 2 +- Software/PC_Application/appwindow.cpp | 2 +- Software/VNA_embedded/Makefile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Software/PC_Application/LibreVNA-GUI.pro b/Software/PC_Application/LibreVNA-GUI.pro index a21e8f8..4c4c85f 100644 --- a/Software/PC_Application/LibreVNA-GUI.pro +++ b/Software/PC_Application/LibreVNA-GUI.pro @@ -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 diff --git a/Software/PC_Application/appwindow.cpp b/Software/PC_Application/appwindow.cpp index da103d8..08cb391 100644 --- a/Software/PC_Application/appwindow.cpp +++ b/Software/PC_Application/appwindow.cpp @@ -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+")"); }); diff --git a/Software/VNA_embedded/Makefile b/Software/VNA_embedded/Makefile index 5d5badc..df3451d 100644 --- a/Software/VNA_embedded/Makefile +++ b/Software/VNA_embedded/Makefile @@ -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'" \