From 1c6a1ab6fdc98e9d62f9e1cdf2a87c371ce5fc97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20K=C3=A4berich?= <j.kaeberich@gmx.de>
Date: Sun, 5 Dec 2021 19:53:14 +0100
Subject: [PATCH] Version number increased, added changelog

---
 CHANGELOG.md                                  | 26 +++++++++++++++++++
 Software/PC_Application/LibreVNA-GUI.pro      |  2 +-
 Software/VNA_embedded/.cproject               |  2 +-
 .../.settings/language.settings.xml           |  4 +--
 Software/VNA_embedded/Makefile                |  2 +-
 5 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e1aa3f..8b5e845 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Changelog
 
+## v1.2.1
+
+Mostly bugfixes along with the occasional new feature.
+
+- Calibration:
+  - File format changed to json
+  - Multiple measurements can be taken/deleted at the same time
+  - Calibration kit allows separate male/female standards
+  - configurable Z0 for short/open
+- SCPI commands:
+  - load/save calibration files
+  - export to touchstone file format directly
+  - additional command for reading trace data
+  - fix typo in documentation
+- UI improvements:
+  - Additional Y-axis options: Reactance/Real/Imaginary
+  - Graphs look a bit nicer
+  - Configurable line width for graphs
+  - finally added an application logo
+- General bugfixes, among others:
+  - PLL divider calculation fixed for certain frequencies
+  - Improved USB buffer handling
+  - Better error handling when opening invalid files
+  - Various bugs when adding/deleting markers
+  - graph autoscaling with invisible traces
+
 ## v1.2.0
 
 - Additional SCPI commands
diff --git a/Software/PC_Application/LibreVNA-GUI.pro b/Software/PC_Application/LibreVNA-GUI.pro
index 2f02f04..04a72c0 100644
--- a/Software/PC_Application/LibreVNA-GUI.pro
+++ b/Software/PC_Application/LibreVNA-GUI.pro
@@ -304,5 +304,5 @@ RESOURCES += \
 CONFIG += c++17
 REVISION = $$system(git rev-parse HEAD)
 DEFINES += GITHASH=\\"\"$$REVISION\\"\"
-DEFINES += FW_MAJOR=1 FW_MINOR=2 FW_PATCH=0 FW_SUFFIX=""#\\"\"-alpha.2\\"\"
+DEFINES += FW_MAJOR=1 FW_MINOR=2 FW_PATCH=1 FW_SUFFIX=""#\\"\"-alpha.2\\"\"
 DEFINES -= _UNICODE UNICODE
diff --git a/Software/VNA_embedded/.cproject b/Software/VNA_embedded/.cproject
index c9b8014..41f3bde 100644
--- a/Software/VNA_embedded/.cproject
+++ b/Software/VNA_embedded/.cproject
@@ -189,7 +189,7 @@
                                     									
                                     <listOptionValue builtIn="false" value="FW_MAJOR=1"/>
                                     									
-                                    <listOptionValue builtIn="false" value="FW_PATCH=0"/>
+                                    <listOptionValue builtIn="false" value="FW_PATCH=1"/>
                                     									
                                     <listOptionValue builtIn="false" value="FW_MINOR=2"/>
                                     									
diff --git a/Software/VNA_embedded/.settings/language.settings.xml b/Software/VNA_embedded/.settings/language.settings.xml
index aadbc97..17b53d6 100644
--- a/Software/VNA_embedded/.settings/language.settings.xml
+++ b/Software/VNA_embedded/.settings/language.settings.xml
@@ -11,7 +11,7 @@
             			
             <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
             			
-            <provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="1307432939745961523" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+            <provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="1365419078466866483" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
                 				
                 <language-scope id="org.eclipse.cdt.core.gcc"/>
                 				
@@ -33,7 +33,7 @@
             			
             <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
             			
-            <provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="1307432939745961523" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+            <provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="1365419078466866483" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
                 				
                 <language-scope id="org.eclipse.cdt.core.gcc"/>
                 				
diff --git a/Software/VNA_embedded/Makefile b/Software/VNA_embedded/Makefile
index 8f06c5a..ec8f4f3 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=2 \
--DFW_PATCH=0 \
+-DFW_PATCH=1 \
 -DUSE_FULL_LL_DRIVER \
 -DHW_REVISION="'B'" \
 -D__weak="__attribute__((weak))" \