From 63ebbf8348dded948e93e582faf4f44eff975a8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20K=C3=A4berich?= <j.kaeberich@gmx.de>
Date: Sat, 1 Oct 2022 23:27:03 +0200
Subject: [PATCH] Version number increase + boot LED debug reverted

---
 .../LibreVNA-GUI/LibreVNA-GUI.pro             |  2 +-
 .../PC_Application/LibreVNA-GUI/appwindow.cpp |  2 +-
 Software/VNA_embedded/.cproject               |  4 +--
 .../.settings/org.eclipse.cdt.core.prefs      |  6 ++++
 Software/VNA_embedded/Application/App.cpp     |  1 -
 Software/VNA_embedded/Application/Led.cpp     |  4 +--
 Software/VNA_embedded/Inc/main.h              |  2 ++
 Software/VNA_embedded/Makefile                |  2 +-
 Software/VNA_embedded/Src/main.c              | 23 +++++++++-----
 Software/VNA_embedded/Src/stm32g4xx_hal_msp.c | 30 ++++++++++++++++++-
 Software/VNA_embedded/VNA_embedded.ioc        |  8 +++--
 11 files changed, 65 insertions(+), 19 deletions(-)
 create mode 100644 Software/VNA_embedded/.settings/org.eclipse.cdt.core.prefs

diff --git a/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro b/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro
index ebe4715..a990df7 100644
--- a/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro
+++ b/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro
@@ -346,5 +346,5 @@ RESOURCES += \
 CONFIG += c++17
 REVISION = $$system(git rev-parse HEAD)
 DEFINES += GITHASH=\\"\"$$REVISION\\"\"
-DEFINES += FW_MAJOR=1 FW_MINOR=4 FW_PATCH=0 FW_SUFFIX=""#\\"\"-alpha.2\\"\"
+DEFINES += FW_MAJOR=1 FW_MINOR=5 FW_PATCH=0 FW_SUFFIX=\\"\"-alpha.1\\"\"
 DEFINES -= _UNICODE UNICODE
diff --git a/Software/PC_Application/LibreVNA-GUI/appwindow.cpp b/Software/PC_Application/LibreVNA-GUI/appwindow.cpp
index 5d8f351..d001a98 100644
--- a/Software/PC_Application/LibreVNA-GUI/appwindow.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/appwindow.cpp
@@ -63,7 +63,7 @@ using namespace std;
 
 static const QString APP_VERSION = QString::number(FW_MAJOR) + "." +
                                    QString::number(FW_MINOR) + "." +
-                                   QString::number(FW_PATCH);
+                                   QString::number(FW_PATCH) + QString(FW_SUFFIX);
 static const QString APP_GIT_HASH = QString(GITHASH);
 
 static bool noGUIset = false;
diff --git a/Software/VNA_embedded/.cproject b/Software/VNA_embedded/.cproject
index 8278692..3774486 100644
--- a/Software/VNA_embedded/.cproject
+++ b/Software/VNA_embedded/.cproject
@@ -43,7 +43,7 @@
 									<listOptionValue builtIn="false" value="_RTOS"/>
 									<listOptionValue builtIn="false" value="_SNK"/>
 									<listOptionValue builtIn="false" value="FW_MAJOR=1"/>
-									<listOptionValue builtIn="false" value="FW_MINOR=4"/>
+									<listOptionValue builtIn="false" value="FW_MINOR=5"/>
 									<listOptionValue builtIn="false" value="FW_PATCH=0"/>
 									<listOptionValue builtIn="false" value="HW_REVISION='B'"/>
 									<listOptionValue builtIn="false" value="USE_FULL_LL_DRIVER"/>
@@ -90,7 +90,7 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols.536220696" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
 									<listOptionValue builtIn="false" value="FW_MAJOR=1"/>
-									<listOptionValue builtIn="false" value="FW_MINOR=4"/>
+									<listOptionValue builtIn="false" value="FW_MINOR=5"/>
 									<listOptionValue builtIn="false" value="FW_PATCH=0"/>
 									<listOptionValue builtIn="false" value="HW_REVISION='B'"/>
 									<listOptionValue builtIn="false" value="USE_FULL_LL_DRIVER"/>
diff --git a/Software/VNA_embedded/.settings/org.eclipse.cdt.core.prefs b/Software/VNA_embedded/.settings/org.eclipse.cdt.core.prefs
new file mode 100644
index 0000000..c8ec5df
--- /dev/null
+++ b/Software/VNA_embedded/.settings/org.eclipse.cdt.core.prefs
@@ -0,0 +1,6 @@
+doxygen/doxygen_new_line_after_brief=true
+doxygen/doxygen_use_brief_tag=false
+doxygen/doxygen_use_javadoc_tags=true
+doxygen/doxygen_use_pre_tag=false
+doxygen/doxygen_use_structural_commands=false
+eclipse.preferences.version=1
diff --git a/Software/VNA_embedded/Application/App.cpp b/Software/VNA_embedded/Application/App.cpp
index 7e72a20..adfd421 100644
--- a/Software/VNA_embedded/Application/App.cpp
+++ b/Software/VNA_embedded/Application/App.cpp
@@ -119,7 +119,6 @@ inline void App_Init() {
 inline void App_Process() {
 	while(1) {
 		uint32_t notification;
-		LED::Toggle();
 		if(xTaskNotifyWait(0x00, UINT32_MAX, &notification, 100) == pdPASS) {
 			// something happened
 			if(notification & FLAG_USB_PACKET) {
diff --git a/Software/VNA_embedded/Application/Led.cpp b/Software/VNA_embedded/Application/Led.cpp
index 82695d6..ad41856 100644
--- a/Software/VNA_embedded/Application/Led.cpp
+++ b/Software/VNA_embedded/Application/Led.cpp
@@ -87,8 +87,8 @@ void LED::Init() {
 #if HW_REVISION == 'B'
 	led_ncnt = 0;
 	mode = Mode::Off;
-//	HAL_TIM_Base_Start(&htim2);
-//	HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_1);
+	HAL_TIM_Base_Start(&htim2);
+	HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_1);
 
 	LedStatusHandle = xTaskCreateStatic(LedStatus, "LedStatusTask", LED_STATUS_TASK_STACK_SIZE_WORDS,
 										NULL, 6, LedStatusStack, &LedStatusCB);
diff --git a/Software/VNA_embedded/Inc/main.h b/Software/VNA_embedded/Inc/main.h
index 046add0..082fbbe 100644
--- a/Software/VNA_embedded/Inc/main.h
+++ b/Software/VNA_embedded/Inc/main.h
@@ -61,6 +61,8 @@ extern "C" {
 
 /* USER CODE END EM */
 
+void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim);
+
 /* Exported functions prototypes ---------------------------------------------*/
 void Error_Handler(void);
 
diff --git a/Software/VNA_embedded/Makefile b/Software/VNA_embedded/Makefile
index 2290cd8..0fb6706 100644
--- a/Software/VNA_embedded/Makefile
+++ b/Software/VNA_embedded/Makefile
@@ -100,7 +100,7 @@ MCU = $(CPU) -mthumb $(FLOAT-ABI) $(FPU)
 # C defines
 C_DEFS =  \
 -DFW_MAJOR=1 \
--DFW_MINOR=4 \
+-DFW_MINOR=5 \
 -DFW_PATCH=0 \
 -DDEBUG \
 -DUSE_FULL_LL_DRIVER \
diff --git a/Software/VNA_embedded/Src/main.c b/Software/VNA_embedded/Src/main.c
index 6221d9e..1ab5992 100644
--- a/Software/VNA_embedded/Src/main.c
+++ b/Software/VNA_embedded/Src/main.c
@@ -466,6 +466,7 @@ static void MX_TIM2_Init(void)
 
   TIM_ClockConfigTypeDef sClockSourceConfig = {0};
   TIM_MasterConfigTypeDef sMasterConfig = {0};
+  TIM_OC_InitTypeDef sConfigOC = {0};
 
   /* USER CODE BEGIN TIM2_Init 1 */
 
@@ -485,15 +486,28 @@ static void MX_TIM2_Init(void)
   {
     Error_Handler();
   }
+  if (HAL_TIM_PWM_Init(&htim2) != HAL_OK)
+  {
+    Error_Handler();
+  }
   sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
   sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
   if (HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig) != HAL_OK)
   {
     Error_Handler();
   }
+  sConfigOC.OCMode = TIM_OCMODE_PWM2;
+  sConfigOC.Pulse = 0;
+  sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
+  sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
+  if (HAL_TIM_PWM_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_1) != HAL_OK)
+  {
+    Error_Handler();
+  }
   /* USER CODE BEGIN TIM2_Init 2 */
 
   /* USER CODE END TIM2_Init 2 */
+  HAL_TIM_MspPostInit(&htim2);
 
 }
 
@@ -701,7 +715,7 @@ static void MX_GPIO_Init(void)
   __HAL_RCC_GPIOB_CLK_ENABLE();
 
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOA, FPGA_AUX1_Pin|FPGA_AUX3_Pin|FPGA_AUX2_Pin|GPIO_PIN_15, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(GPIOA, FPGA_AUX1_Pin|FPGA_AUX3_Pin|FPGA_AUX2_Pin, GPIO_PIN_RESET);
 
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(FPGA_CS_GPIO_Port, FPGA_CS_Pin, GPIO_PIN_SET);
@@ -745,13 +759,6 @@ static void MX_GPIO_Init(void)
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-  /*Configure GPIO pin : PA15 */
-  GPIO_InitStruct.Pin = GPIO_PIN_15;
-  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
   /*Configure GPIO pin : FPGA_TRIGGER_OUT_Pin */
   GPIO_InitStruct.Pin = FPGA_TRIGGER_OUT_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
diff --git a/Software/VNA_embedded/Src/stm32g4xx_hal_msp.c b/Software/VNA_embedded/Src/stm32g4xx_hal_msp.c
index 06d3d18..ae1f1e5 100644
--- a/Software/VNA_embedded/Src/stm32g4xx_hal_msp.c
+++ b/Software/VNA_embedded/Src/stm32g4xx_hal_msp.c
@@ -60,7 +60,9 @@ extern DMA_HandleTypeDef hdma_spi1_tx;
 /* USER CODE BEGIN 0 */
 
 /* USER CODE END 0 */
-/**
+
+void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim);
+                    /**
   * Initializes the Global MSP.
   */
 void HAL_MspInit(void)
@@ -402,6 +404,32 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* htim_base)
 
 }
 
+void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim)
+{
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  if(htim->Instance==TIM2)
+  {
+  /* USER CODE BEGIN TIM2_MspPostInit 0 */
+
+  /* USER CODE END TIM2_MspPostInit 0 */
+
+    __HAL_RCC_GPIOA_CLK_ENABLE();
+    /**TIM2 GPIO Configuration
+    PA15     ------> TIM2_CH1
+    */
+    GPIO_InitStruct.Pin = GPIO_PIN_15;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+    GPIO_InitStruct.Alternate = GPIO_AF1_TIM2;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+  /* USER CODE BEGIN TIM2_MspPostInit 1 */
+
+  /* USER CODE END TIM2_MspPostInit 1 */
+  }
+
+}
 /**
 * @brief TIM_Base MSP De-Initialization
 * This function freeze the hardware resources used in this example
diff --git a/Software/VNA_embedded/VNA_embedded.ioc b/Software/VNA_embedded/VNA_embedded.ioc
index 50d1583..be31ef2 100644
--- a/Software/VNA_embedded/VNA_embedded.ioc
+++ b/Software/VNA_embedded/VNA_embedded.ioc
@@ -204,7 +204,7 @@ PA14.Locked=true
 PA14.Mode=Serial_Wire
 PA14.Signal=SYS_JTCK-SWCLK
 PA15.Locked=true
-PA15.Signal=GPIO_Output
+PA15.Signal=S_TIM2_CH1
 PA2.GPIOParameters=GPIO_Speed,GPIO_Label
 PA2.GPIO_Label=FPGA_AUX3
 PA2.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH
@@ -386,6 +386,8 @@ RCC.VCOInputFreq_Value=4000000
 RCC.VCOOutputFreq_Value=320000000
 SH.GPXTI1.0=GPIO_EXTI1
 SH.GPXTI1.ConfNb=1
+SH.S_TIM2_CH1.0=TIM2_CH1,PWM Generation1 CH1
+SH.S_TIM2_CH1.ConfNb=1
 SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_4
 SPI1.CalculateBaudRate=40.0 MBits/s
 SPI1.DataSize=SPI_DATASIZE_8BIT
@@ -402,7 +404,9 @@ SPI2.Mode=SPI_MODE_MASTER
 SPI2.VirtualType=VM_MASTER
 TIM1.IPParameters=Prescaler
 TIM1.Prescaler=159
-TIM2.IPParameters=Prescaler,PeriodNoDither
+TIM2.Channel-PWM\ Generation1\ CH1=TIM_CHANNEL_1
+TIM2.IPParameters=Prescaler,PeriodNoDither,Channel-PWM Generation1 CH1,OCMode_PWM-PWM Generation1 CH1
+TIM2.OCMode_PWM-PWM\ Generation1\ CH1=TIM_OCMODE_PWM2
 TIM2.PeriodNoDither=99
 TIM2.Prescaler=143
 USART3.IPParameters=WordLength,VirtualMode-Asynchronous