jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2025-12-06 07:12:10 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jankae/LibreVNA

Browse source
This commit is contained in:
Jan Käberich 2025-06-23 15:25:14 +02:00
parent d6020a6a26 a2b3146f1c
commit d615089afe
7 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
CHANGELOG.md
View file

@ -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

3
Software/Integrationtests/tests/TestUpdate.py
View file

@ -4,6 +4,9 @@ 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?")

2
Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro
View file

@ -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

2
Software/PC_Application/LibreVNA-Test/LibreVNA-Test.pro
View file

@ -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

4
Software/VNA_embedded/.cproject
View file

@ -44,7 +44,7 @@
<listOptionValue builtIn="false" value="_SNK"/>
<listOptionValue builtIn="false" value="FW_MAJOR=1"/>
<listOptionValue builtIn="false" value="FW_MINOR=6"/>
<listOptionValue builtIn="false" value="FW_PATCH=3"/>
<listOptionValue builtIn="false" value="FW_PATCH=4"/>
<listOptionValue builtIn="false" value="HW_REVISION='B'"/>
<listOptionValue builtIn="false" value="USE_FULL_LL_DRIVER"/>
<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
@ -91,7 +91,7 @@
<listOptionValue builtIn="false" value="DEBUG"/>
<listOptionValue builtIn="false" value="FW_MAJOR=1"/>
<listOptionValue builtIn="false" value="FW_MINOR=6"/>
<listOptionValue builtIn="false" value="FW_PATCH=3"/>
<listOptionValue builtIn="false" value="FW_PATCH=4"/>
<listOptionValue builtIn="false" value="HW_REVISION='B'"/>
<listOptionValue builtIn="false" value="USE_FULL_LL_DRIVER"/>
<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>

2
Software/VNA_embedded/Application/Drivers/Flash.hpp
View file

@ -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;
}

2
Software/VNA_embedded/Makefile
View file

@ -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'" \