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

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

Browse Source
This commit is contained in:
Jan Käberich 2024-02-17 19:45:55 +01:00
commit 4aa1564de0
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/devicepacketlogview.cpp
View File

@ -33,8 +33,8 @@ DevicePacketLogView::DevicePacketLogView(QWidget *parent) :
// aborted selection // aborted selection
return; return;
} }
if(!filename.endsWith(".usblog")) { if(!filename.endsWith(".vnalog")) {
filename.append(".usblog"); filename.append(".vnalog");
} }
ofstream file; ofstream file;
file.open(filename.toStdString()); file.open(filename.toStdString());

4
Software/PC_Application/LibreVNA-GUI/modehandler.cpp
View File

@ -74,7 +74,9 @@ void ModeHandler::activate(Mode * mode)
void ModeHandler::deactivate(Mode* mode) void ModeHandler::deactivate(Mode* mode)
{ {
mode->deactivate(); if(mode) {
mode->deactivate();
}
activeMode = nullptr; activeMode = nullptr;
} }

6
Software/VNA_embedded/.settings/stm32cubeide.project.prefs
View File

@ -1,5 +1,5 @@
2F62501ED4689FB349E356AB974DBE57=EF826FD321FB312AEADE4DB74B81458C 2F62501ED4689FB349E356AB974DBE57=6F84FD31C089E822CF61FFCABCD0B7D1
66BE74F758C12D739921AEA421D593D3=2 66BE74F758C12D739921AEA421D593D3=2
8DF89ED150041C4CBC7CB9A9CAA90856=EF826FD321FB312AEADE4DB74B81458C 8DF89ED150041C4CBC7CB9A9CAA90856=6F84FD31C089E822CF61FFCABCD0B7D1
DC22A860405A8BF2F2C095E5B6529F12=A01929E06A3F8E0B7C263320E5AF494F DC22A860405A8BF2F2C095E5B6529F12=E145D2B520F6278E1CA273AAD12F90E0
eclipse.preferences.version=1 eclipse.preferences.version=1

1
Software/VNA_embedded/Application/VNA.cpp
View File

@ -379,6 +379,7 @@ void VNA::SweepHalted() {
LOG_DEBUG("Halted before point %d", pointCnt); LOG_DEBUG("Halted before point %d", pointCnt);
bool adcShiftRequired = false; bool adcShiftRequired = false;
uint64_t frequency = getPointFrequency(pointCnt); uint64_t frequency = getPointFrequency(pointCnt);
frequency = Cal::FrequencyCorrectionToDevice(frequency);
int16_t power = settings.cdbm_excitation_start int16_t power = settings.cdbm_excitation_start
+ (settings.cdbm_excitation_stop - settings.cdbm_excitation_start) + (settings.cdbm_excitation_stop - settings.cdbm_excitation_start)
* pointCnt / (settings.points - 1); * pointCnt / (settings.points - 1);