caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix test compile on windows

Browse Source
This commit is contained in:
Jan Käberich 2022-10-11 14:37:24 +02:00
parent 03eac96557
commit 4ae7b31a48
4 changed files with 11 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Software/PC_Application/LibreVNA-GUI/TraceSetup
View File

265
Software/PC_Application/LibreVNA-GUI/test.setup
View File

@ -1,265 +0,0 @@
{
"Generator": null,
"SpectrumAnalyzer": {
"markers": null,
"tiles": {
"plot": "XY-plot",
"plotsettings": {
"XAxis": {
"div": 200000.0,
"log": false,
"max": 405226753.0,
"min": 402073243.0,
"mode": "Use Span",
"type": "Frequency"
},
"YPrimary": {
"autorange": false,
"div": 10.0,
"log": false,
"max": 0.0,
"min": -120.0,
"traces": [
502445883,
2060438610
],
"type": "Magnitude"
},
"YSecondary": {
"autorange": true,
"div": 1.0,
"log": false,
"max": 0.0,
"min": 0.0,
"traces": null,
"type": "Unknown"
}
},
"split": false
},
"traces": [
{
"color": "#ffff00",
"livetype": 0,
"math": null,
"math_enabled": false,
"name": "Port1",
"parameter": 4,
"paused": false,
"reflection": false,
"type": "Live",
"visible": true
},
{
"color": "#0000ff",
"livetype": 0,
"math": null,
"math_enabled": false,
"name": "Port2",
"parameter": 5,
"paused": false,
"reflection": false,
"type": "Live",
"visible": true
}
]
},
"VNA": {
"de-embedding": [
{
"operation": "Matching Network",
"settings": [
[
{
"component": "SeriesC",
"params": {
"value": 1.2e-11
}
}
],
[
{
"component": "SeriesR",
"params": {
"value": 44.0
}
},
{
"component": "ParallelL",
"params": {
"value": 5.3000000000000005e-08
}
}
]
]
}
],
"markers": null,
"tiles": {
"orientation": "vertical",
"sizes": [
381,
381
],
"split": true,
"tile1": {
"orientation": "horizontal",
"sizes": [
791,
790
],
"split": true,
"tile1": {
"plot": "smithchart",
"plotsettings": {
"limit_to_span": true,
"traces": [
2459058830
]
},
"split": false
},
"tile2": {
"plot": "XY-plot",
"plotsettings": {
"XAxis": {
"div": 500000000.0,
"log": false,
"max": 6000000000.0,
"min": 0.0,
"mode": "Use Span",
"type": "Frequency"
},
"YPrimary": {
"autorange": false,
"div": 10.0,
"log": false,
"max": 20.0,
"min": -120.0,
"traces": [
2100767570
],
"type": "Magnitude"
},
"YSecondary": {
"autorange": false,
"div": 30.0,
"log": false,
"max": 180.0,
"min": -180.0,
"traces": [
2100767570
],
"type": "Phase"
}
},
"split": false
}
},
"tile2": {
"orientation": "horizontal",
"sizes": [
791,
790
],
"split": true,
"tile1": {
"plot": "XY-plot",
"plotsettings": {
"XAxis": {
"div": 500000000.0,
"log": false,
"max": 6000000000.0,
"min": 0.0,
"mode": "Use Span",
"type": "Frequency"
},
"YPrimary": {
"autorange": false,
"div": 10.0,
"log": false,
"max": 20.0,
"min": -120.0,
"traces": [
572044863
],
"type": "Magnitude"
},
"YSecondary": {
"autorange": false,
"div": 30.0,
"log": false,
"max": 180.0,
"min": -180.0,
"traces": [
572044863
],
"type": "Phase"
}
},
"split": false
},
"tile2": {
"plot": "smithchart",
"plotsettings": {
"limit_to_span": true,
"traces": [
783313651
]
},
"split": false
}
}
},
"traces": [
{
"color": "#ffff00",
"livetype": 0,
"math": null,
"math_enabled": false,
"name": "S11",
"parameter": 0,
"paused": false,
"reflection": true,
"type": "Live",
"visible": true
},
{
"color": "#0000ff",
"livetype": 0,
"math": null,
"math_enabled": false,
"name": "S12",
"parameter": 1,
"paused": false,
"reflection": false,
"type": "Live",
"visible": true
},
{
"color": "#00ff00",
"livetype": 0,
"math": null,
"math_enabled": false,
"name": "S21",
"parameter": 2,
"paused": false,
"reflection": false,
"type": "Live",
"visible": true
},
{
"color": "#ff0000",
"livetype": 0,
"math": null,
"math_enabled": false,
"name": "S22",
"parameter": 3,
"paused": false,
"reflection": true,
"type": "Live",
"visible": true
}
]
}
}

5
Software/PC_Application/LibreVNA-Test/LibreVNA-Test.pro
View File

@ -375,10 +375,6 @@ FORMS += \
../LibreVNA-GUI/main.ui \
../LibreVNA-GUI/preferencesdialog.ui
DISTFILES += \
../LibreVNA-GUI/TraceSetup \
../LibreVNA-GUI/test.setup
CONFIG += c++17
LIBS += -lusb-1.0
@ -387,3 +383,4 @@ unix:LIBS += -L/usr/lib/
REVISION = $$system(git rev-parse HEAD)
DEFINES += GITHASH=\\"\"$$REVISION\\"\"
DEFINES += FW_MAJOR=1 FW_MINOR=4 FW_PATCH=0 FW_SUFFIX=""#\\"\"-alpha.2\\"\"
DEFINES -= _UNICODE UNICODE

10
Software/PC_Application/LibreVNA-Test/target_wrapper.bat Normal file
View File

@ -0,0 +1,10 @@
@echo off
SetLocal EnableDelayedExpansion
(set PATH=C:\Qt\5.15.1\mingw81_64\bin;!PATH!)
if defined QT_PLUGIN_PATH (
set QT_PLUGIN_PATH=C:\Qt\5.15.1\mingw81_64\plugins;!QT_PLUGIN_PATH!
) else (
set QT_PLUGIN_PATH=C:\Qt\5.15.1\mingw81_64\plugins
)
%*
EndLocal