From 162309e54a861e4840e1d7505852a115b312c196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=A4berich?= Date: Sat, 31 May 2025 14:59:14 +0200 Subject: [PATCH 1/3] 1us delay after CS high on SPI flash --- Software/VNA_embedded/Application/Drivers/Flash.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Software/VNA_embedded/Application/Drivers/Flash.hpp b/Software/VNA_embedded/Application/Drivers/Flash.hpp index d904290..691908d 100644 --- a/Software/VNA_embedded/Application/Drivers/Flash.hpp +++ b/Software/VNA_embedded/Application/Drivers/Flash.hpp @@ -9,6 +9,7 @@ #define DRIVERS_FLASH_HPP_ #include "stm.hpp" +#include "delay.hpp" class Flash { public: @@ -37,6 +38,7 @@ private: void CS(bool high) { if(high) { CS_gpio->BSRR = CS_pin; + Delay::us(1); } else { CS_gpio->BSRR = CS_pin << 16; } From b5da8015b55ce5721d102fc9a1732de38cd8ea9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=A4berich?= Date: Sat, 31 May 2025 15:14:19 +0200 Subject: [PATCH 2/3] HIL: more rigorous test of firmware update process --- Software/Integrationtests/tests/TestUpdate.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Software/Integrationtests/tests/TestUpdate.py b/Software/Integrationtests/tests/TestUpdate.py index c53c8e3..8e13f40 100644 --- a/Software/Integrationtests/tests/TestUpdate.py +++ b/Software/Integrationtests/tests/TestUpdate.py @@ -4,8 +4,11 @@ import subprocess class TestUpdate(TestBase): def test_Update(self): + # first update: actually update to the firmware version we want to test self.vna.cmd("DEV:UPDATE ../../combined.vnafw", timeout=60) - + # second update: check that we still have a working firmware update with this version + self.vna.cmd("DEV:UPDATE ../../combined.vnafw", timeout=60) + reported = self.vna.query("DEV:INF:FWREVISION?") major = subprocess.check_output("grep -oP '(?<=FW_MAJOR=)[0-9]+' ../VNA_embedded/Makefile", shell=True).strip() minor = subprocess.check_output("grep -oP '(?<=FW_MINOR=)[0-9]+' ../VNA_embedded/Makefile", shell=True).strip() From a2b3146f1c34e2f87bfb9b3302e02f944583175f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=A4berich?= Date: Sat, 31 May 2025 16:05:21 +0200 Subject: [PATCH 3/3] Changelog + version bump --- CHANGELOG.md | 15 +++++++++++++++ .../PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro | 2 +- .../LibreVNA-Test/LibreVNA-Test.pro | 2 +- Software/VNA_embedded/.cproject | 4 ++-- Software/VNA_embedded/Makefile | 2 +- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 594c791..bf6f1cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,21 @@ # Changelog +## v1.6.4 + +Critical bugfix for the embedded firmware: + +- Fix SPI flash timing, see #315 + +Minor improvement for the GUI: + +- Option to add titles to graphs +- Show trace names even when only enabled on secondary Y axis +- Add x axis variable to the available variables for formulas in "from math" traces + + + ## v1.6.3 + Bugfixes and quality of life improvements - Windows and macOS: add icon to GUI application diff --git a/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro b/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro index c070682..d067010 100644 --- a/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro +++ b/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro @@ -416,5 +416,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=3 FW_SUFFIX="" +DEFINES += FW_MAJOR=1 FW_MINOR=6 FW_PATCH=4 FW_SUFFIX="" DEFINES -= _UNICODE UNICODE diff --git a/Software/PC_Application/LibreVNA-Test/LibreVNA-Test.pro b/Software/PC_Application/LibreVNA-Test/LibreVNA-Test.pro index 9c25927..bf0872e 100644 --- a/Software/PC_Application/LibreVNA-Test/LibreVNA-Test.pro +++ b/Software/PC_Application/LibreVNA-Test/LibreVNA-Test.pro @@ -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=2 FW_SUFFIX=""#\\"\"-alpha.2\\"\" +DEFINES += FW_MAJOR=1 FW_MINOR=6 FW_PATCH=4 FW_SUFFIX=""#\\"\"-alpha.2\\"\" DEFINES -= _UNICODE UNICODE win32:DEFINES += QMICROZ_LIBRARY diff --git a/Software/VNA_embedded/.cproject b/Software/VNA_embedded/.cproject index b1393ba..67f1bd9 100644 --- a/Software/VNA_embedded/.cproject +++ b/Software/VNA_embedded/.cproject @@ -44,7 +44,7 @@ - + @@ -91,7 +91,7 @@ - + diff --git a/Software/VNA_embedded/Makefile b/Software/VNA_embedded/Makefile index 2ef881b..ae3b667 100644 --- a/Software/VNA_embedded/Makefile +++ b/Software/VNA_embedded/Makefile @@ -101,7 +101,7 @@ MCU = $(CPU) -mthumb $(FLOAT-ABI) $(FPU) C_DEFS = \ -DFW_MAJOR=1 \ -DFW_MINOR=6 \ --DFW_PATCH=3 \ +-DFW_PATCH=4 \ -DDEBUG \ -DUSE_FULL_LL_DRIVER \ -DHW_REVISION="'B'" \