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

Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/devicepacketlogview.cpp

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

Software/PC_Application/LibreVNA-GUI/modehandler.cpp

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

Software/VNA_embedded/.settings/stm32cubeide.project.prefs

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

Software/VNA_embedded/Application/VNA.cpp

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