From 248086f80b208cfc4a0aeb5039be6c19f691dc4f Mon Sep 17 00:00:00 2001
From: Anton Mukhin <mcfly@mcflyer.ru>
Date: Fri, 7 Jul 2023 02:17:24 +0300
Subject: [PATCH] Firmware: Fans; PID; Removed testing stuff; many small amends

---
 firmware/PCB-Heater/.cproject                 |   6 +-
 .../.settings/language.settings.xml           |   4 +-
 firmware/PCB-Heater/Core/Inc/main.h           |   1 +
 firmware/PCB-Heater/Core/Inc/stm32g0xx_it.h   |   1 +
 firmware/PCB-Heater/Core/Inc/tim.h            |   3 +
 firmware/PCB-Heater/Core/Src/app_freertos.c   | 171 +++++++++++-------
 firmware/PCB-Heater/Core/Src/gpio.c           |   8 +-
 firmware/PCB-Heater/Core/Src/main.c           |  26 ++-
 .../Core/Src/stm32g0xx_hal_timebase_tim.c     |   1 +
 firmware/PCB-Heater/Core/Src/stm32g0xx_it.c   |  15 ++
 firmware/PCB-Heater/Core/Src/tim.c            | 123 ++++++++++++-
 firmware/PCB-Heater/PCB-Heater.ioc            |  54 ++++--
 kicad/pcb-heater/BOM.xlsx                     | Bin 0 -> 13391 bytes
 kicad/pcb-heater/pcb-heater.kicad_pro         |  14 +-
 kicad/pcb-heater/pcb-heater.kicad_sch         |   2 +-
 15 files changed, 327 insertions(+), 102 deletions(-)
 create mode 100644 kicad/pcb-heater/BOM.xlsx

diff --git a/firmware/PCB-Heater/.cproject b/firmware/PCB-Heater/.cproject
index 0717793..190ab33 100644
--- a/firmware/PCB-Heater/.cproject
+++ b/firmware/PCB-Heater/.cproject
@@ -21,7 +21,8 @@
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.554259374" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.262677090" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1482216284" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1344937624" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.5 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32G070RBTx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Middlewares/Third_Party/FreeRTOS/Source/include | ../Drivers/CMSIS/Include | ../Core/Inc | ../Drivers/STM32G0xx_HAL_Driver/Inc | ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2 | ../Drivers/CMSIS/Device/ST/STM32G0xx/Include | ../Drivers/STM32G0xx_HAL_Driver/Inc/Legacy | ../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM0 ||  ||  || USE_HAL_DRIVER | STM32G070xx | CMSIS_device_header=&lt;stm32g0xx.h&gt; ||  || Drivers | Core/Startup | Middlewares | Core ||  ||  || ${workspace_loc:/${ProjName}/STM32G070RBTX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1344937624" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.6 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32G070RBTx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Middlewares/Third_Party/FreeRTOS/Source/include | ../Drivers/CMSIS/Include | ../Core/Inc | ../Drivers/STM32G0xx_HAL_Driver/Inc | ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2 | ../Drivers/CMSIS/Device/ST/STM32G0xx/Include | ../Drivers/STM32G0xx_HAL_Driver/Inc/Legacy | ../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM0 ||  ||  || USE_HAL_DRIVER | STM32G070xx | CMSIS_device_header=&lt;stm32g0xx.h&gt; ||  || Drivers | Core/Startup | Middlewares | Core ||  ||  || ${workspace_loc:/${ProjName}/STM32G070RBTX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None ||  ||  || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.debug.option.cpuclock.1224262438" superClass="com.st.stm32cube.ide.mcu.debug.option.cpuclock" useByScannerDiscovery="false" value="64" valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1893601218" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/PCB-Heater}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1892196526" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1860582162" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
@@ -103,7 +104,8 @@
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1293906698" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.213198084" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.667446265" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1233208762" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.5 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32G070RBTx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Middlewares/Third_Party/FreeRTOS/Source/include | ../Drivers/CMSIS/Include | ../Core/Inc | ../Drivers/STM32G0xx_HAL_Driver/Inc | ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2 | ../Drivers/CMSIS/Device/ST/STM32G0xx/Include | ../Drivers/STM32G0xx_HAL_Driver/Inc/Legacy | ../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM0 ||  ||  || USE_HAL_DRIVER | STM32G070xx | CMSIS_device_header=&lt;stm32g0xx.h&gt; ||  || Drivers | Core/Startup | Middlewares | Core ||  ||  || ${workspace_loc:/${ProjName}/STM32G070RBTX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1233208762" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.6 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32G070RBTx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Middlewares/Third_Party/FreeRTOS/Source/include | ../Drivers/CMSIS/Include | ../Core/Inc | ../Drivers/STM32G0xx_HAL_Driver/Inc | ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2 | ../Drivers/CMSIS/Device/ST/STM32G0xx/Include | ../Drivers/STM32G0xx_HAL_Driver/Inc/Legacy | ../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM0 ||  ||  || USE_HAL_DRIVER | STM32G070xx | CMSIS_device_header=&lt;stm32g0xx.h&gt; ||  || Drivers | Core/Startup | Middlewares | Core ||  ||  || ${workspace_loc:/${ProjName}/STM32G070RBTX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None ||  ||  || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.debug.option.cpuclock.1336430547" superClass="com.st.stm32cube.ide.mcu.debug.option.cpuclock" useByScannerDiscovery="false" value="64" valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1618910208" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/PCB-Heater}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1264878438" managedBuildOn="true" name="Gnu Make Builder.Release" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.909624158" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
diff --git a/firmware/PCB-Heater/.settings/language.settings.xml b/firmware/PCB-Heater/.settings/language.settings.xml
index b87f44b..8bb4761 100644
--- a/firmware/PCB-Heater/.settings/language.settings.xml
+++ b/firmware/PCB-Heater/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider-reference id="org.eclipse.cdt.ui.UserLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="596919080754294639" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-412172835581539755" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC 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"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -17,7 +17,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="596919080754294639" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-412172835581539755" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC 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"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/firmware/PCB-Heater/Core/Inc/main.h b/firmware/PCB-Heater/Core/Inc/main.h
index dc5eb00..5ec0c17 100644
--- a/firmware/PCB-Heater/Core/Inc/main.h
+++ b/firmware/PCB-Heater/Core/Inc/main.h
@@ -105,6 +105,7 @@ void Error_Handler(void);
 #define TIM1_GC_GPIO_Port GPIOA
 #define BUZZER_Pin GPIO_PIN_9
 #define BUZZER_GPIO_Port GPIOB
+
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/firmware/PCB-Heater/Core/Inc/stm32g0xx_it.h b/firmware/PCB-Heater/Core/Inc/stm32g0xx_it.h
index 91e5f9e..a946a67 100644
--- a/firmware/PCB-Heater/Core/Inc/stm32g0xx_it.h
+++ b/firmware/PCB-Heater/Core/Inc/stm32g0xx_it.h
@@ -49,6 +49,7 @@
 void NMI_Handler(void);
 void HardFault_Handler(void);
 void TIM6_IRQHandler(void);
+void TIM16_IRQHandler(void);
 void TIM17_IRQHandler(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/firmware/PCB-Heater/Core/Inc/tim.h b/firmware/PCB-Heater/Core/Inc/tim.h
index 7b5b85e..de5bdc2 100644
--- a/firmware/PCB-Heater/Core/Inc/tim.h
+++ b/firmware/PCB-Heater/Core/Inc/tim.h
@@ -38,6 +38,8 @@ extern TIM_HandleTypeDef htim14;
 
 extern TIM_HandleTypeDef htim15;
 
+extern TIM_HandleTypeDef htim16;
+
 extern TIM_HandleTypeDef htim17;
 
 /* USER CODE BEGIN Private defines */
@@ -47,6 +49,7 @@ extern TIM_HandleTypeDef htim17;
 void MX_TIM1_Init(void);
 void MX_TIM14_Init(void);
 void MX_TIM15_Init(void);
+void MX_TIM16_Init(void);
 void MX_TIM17_Init(void);
 
 void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim);
diff --git a/firmware/PCB-Heater/Core/Src/app_freertos.c b/firmware/PCB-Heater/Core/Src/app_freertos.c
index 11e3a9c..ae8c9ee 100644
--- a/firmware/PCB-Heater/Core/Src/app_freertos.c
+++ b/firmware/PCB-Heater/Core/Src/app_freertos.c
@@ -160,10 +160,11 @@ static uint8_t	Stage = 0;									//current stage of a profile
 static float		spp;												//Seconds per pixel (horizontal)
 static float		dpp;												//Degrees per pixel (vertical)
 uint16_t				Timer = 0;									//Time counter
+static uint8_t  fanActive = 0;							//Fans are active flag
 settings_t 			settings = {								//settings structure
 									20,							//	uint8_t temp_offset
 									0,							//	uint8_t color_scheme
-									0,							//	uint8_t btn_clicks
+									1,							//	uint8_t btn_clicks
 									100,						//	uint8_t brightness
 									0,							//	uint8_t language
 									1								//	uint8_t boot_screen
@@ -188,7 +189,7 @@ PIDController pid = {
 		.Kd  = 5.0f,
 		.T   = 0.5f,			//2 times per second
 		.tau = 0.2f,			//Low-pass filter (0 - no filter)
-		.limMin = 0.0f,
+		.limMin = -100.0f,
 		.limMax = 969.0f
 };
 
@@ -237,15 +238,19 @@ const osMutexAttr_t mutScreen_attributes = {
 
 /* Private function prototypes -----------------------------------------------*/
 /* USER CODE BEGIN FunctionPrototypes */
-void btnPressed(uint8_t id);				//buttons actions
-void updateTInfo(void);
+void btnPressed(uint8_t id);									//buttons actions
+void updateTInfo(uint16_t lvl);
 void drawBootScreen(void);
 void drawMainScreen(void);
 void drawRunningScreen(void);
 void drawSettingsScreen(void);
 void drawPlan(uint8_t use_mutex, uint8_t numbers, uint8_t wide);
-void playSound(uint8_t sound);			//Play one of the beeps
+void playSound(uint8_t sound, uint8_t note);	//Play one of the beeps
+void playTestSound();													//Play a test sound
+void setSoundPitch(uint8_t note);							//Set sound pitch (note) 0-6 - A2-A8
 void drawButton(uint8_t id, uint8_t func);		//Draw a button by ID
+void setFansSpeed(uint8_t speed);							//Set fans speed
+void stopHeater(void);												//Stop the heater and reset the PID
 
 /* USER CODE END FunctionPrototypes */
 
@@ -376,7 +381,7 @@ void svc_display(void *argument)
 						) {
 
 					lastPressed = id;
-					playSound(S_CLICK);
+					playSound(S_CLICK, 2);
 
 					osMutexAcquire(mutScreenHandle, osWaitForever);
 					if (id < 4) {
@@ -441,9 +446,6 @@ void svc_sensor(void *argument)
   /* Infinite loop */
   float temp, res, res_old;
   uint8_t i;
-  uint16_t pulse;
-	int in, fr;
-	static char str[12] = {0};
 
   PID_Init(&pid);
 
@@ -457,17 +459,9 @@ void svc_sensor(void *argument)
 	}
 	if (temp >= 0.0f) {
 		res = res / 3;
-		//PID
-		if (Preset == 2) {
-			PID_Update(&pid, 35.0f, res);
-			pulse = (uint16_t)(pid.limMax - pid.out)+20;
-			TIM1->ARR = pulse+10;
-			TIM1->CCR2 = pulse;
-		}
 	} else {
 		res = temp;
-		PID_Init(&pid);
-		TIM1->CCR2 = 1020;
+		stopHeater();
 	}
 	Temperature = res;
 	if (res != res_old) {
@@ -475,18 +469,6 @@ void svc_sensor(void *argument)
 		osMessageQueuePut(tempUpdateHandle, &res, 0, 50);
 	}
 
-	//Draw PID value
-	if (Screen == SCR_RUNNING) {
-		in = (int)(pid.out);
-		fr = (int)((pid.out-in)*100);
-		snprintf(str, 7, "%3d.%02d", in, fr);
-		osMutexAcquire(mutScreenHandle, osWaitForever);
-		ST7793_SetFontSize(1);
-		ST7793_FillRect(Darkergray, 11, 180, 27, 192);
-		ST7793_DrawString(Black, Darkergray, str, 11, 180);
-		osMutexRelease(mutScreenHandle);
-	}
-
 	osDelay(500);
   }
   /* USER CODE END svc_sensor */
@@ -533,9 +515,10 @@ void clockTick(void *argument)
 	uint16_t x, y;
 	static uint16_t stime, stemp; 	//starting time and temperature for a stage
 	static float dps;								//degrees per second
+  static uint16_t pulse;          //to calculate pulse for TIM1
 
 	if (Temperature < 0.0f) {
-		osTimerStop(secTimerHandle);
+		stopHeater();
 		return;
 	}
 
@@ -553,7 +536,7 @@ void clockTick(void *argument)
 		ST7793_SetFontSize(2);
 		ST7793_DrawStringC(Yellow, Darkergray, "Done!", 210, 5);
 		osMutexRelease(mutScreenHandle);
-		osTimerStop(secTimerHandle);
+		stopHeater();
 		return;
 	}
 
@@ -585,43 +568,50 @@ void clockTick(void *argument)
 	ST7793_DrawString(Black, Darkergray, str, 10, 140);
 
 	osMutexRelease(mutScreenHandle);
+
+	//PID
+	PID_Update(&pid, aimTemperature, Temperature);
+	if (pid.out >= 0.0f) {
+		pulse = (uint16_t)(pid.limMax - pid.out)+20;
+	}
+	else {
+		pulse = 1020;
+		setFansSpeed((uint8_t)(pid.out * -1));
+	}
+	TIM1->ARR = pulse+10;
+	TIM1->CCR2 = pulse;
+
+	//Draw PID value
+	if (Screen == SCR_RUNNING) {
+		snprintf(str, 7, "%3d.%02d", (int)pid.out, (int)((pid.out-(int)pid.out)*100));
+		osMutexAcquire(mutScreenHandle, osWaitForever);
+		ST7793_SetFontSize(1);
+		ST7793_FillRect(Darkergray, 11, 180, 27, 192);
+		ST7793_DrawString(Black, Darkergray, str, 11, 180);
+		osMutexRelease(mutScreenHandle);
+	}
+
   /* USER CODE END clockTick */
 }
 
 /* Private application code --------------------------------------------------*/
 /* USER CODE BEGIN Application */
 char str[10] = {0};
-uint16_t lvl = 989;
+//uint16_t lvl = 989;
 void btnPressed(uint8_t id) {
 
 	switch (id) {
 	case BTN_PRE1:								// PRE1
-		PID_Init(&pid);
-		TIM1->CCR2 = 1020;
-		ST7793_Brightness(99);
+
 		break;
 	case BTN_PRE2:								// PRE2
-		lvl -= 50;
-		if (lvl < 60) lvl = 989;
-		TIM1->ARR = lvl+10;
-		TIM1->CCR2 = lvl;
-		//htim1.Instance->EGR |= 1;
 
-		updateTInfo();
-		ST7793_Brightness(75);
 		break;
 	case BTN_PRE3:								// PRE3
-		PID_Init(&pid);
 
-		ST7793_Brightness(50);
 		break;
 	case BTN_PRE4:								// PRE4
-		lvl += 50;
-		if (lvl > 930) lvl = 60;
-		TIM1->ARR = lvl+10;
-		TIM1->CCR2 = lvl;
-		updateTInfo();
-		ST7793_Brightness(25);
+
 		break;
 	case BTN_START:								// START
 		Timer = 0;
@@ -630,13 +620,10 @@ void btnPressed(uint8_t id) {
 		osTimerStart(secTimerHandle, 1000);
 		break;
 	case BTN_COG:								// COG (Settings)
-//		drawBootScreen();
-//		osDelay(10000);
-//		drawMainScreen();
 		drawSettingsScreen();
 		break;
 	case BTN_STOP:
-		osTimerStop(secTimerHandle);
+		stopHeater();
 		drawMainScreen();
 		break;
 	case BTN_OK:
@@ -645,7 +632,7 @@ void btnPressed(uint8_t id) {
 	}
 }
 
-void updateTInfo(void) {
+void updateTInfo(uint16_t lvl) {
 	osMutexAcquire(mutScreenHandle, osWaitForever);
 	ST7793_SetFontSize(1);
 	snprintf(str, 8, "T:%d", lvl);
@@ -818,7 +805,7 @@ void drawPlan(uint8_t use_mutex, uint8_t numbers, uint8_t wide) {
 }
 
 //Play one of the beeps
-void playSound(uint8_t sound) {
+void playSound(uint8_t sound, uint8_t note) {
 	uint16_t time;
 	uint8_t enabled = 1;
 
@@ -831,15 +818,52 @@ void playSound(uint8_t sound) {
 			break;
 		case S_CLICK:
 			if (!settings.btn_clicks) enabled = 0;
-			else time = 10;
+			else time = 5;
 			break;
 	}
 	if (enabled) {
-		TIM17->ARR = time;
-		HAL_GPIO_WritePin(BUZZER_GPIO_Port, BUZZER_Pin, GPIO_PIN_SET);
-		HAL_TIM_Base_Start_IT(&htim17);
+		setSoundPitch(note);
+		TIM16->ARR = time;
+		//HAL_GPIO_WritePin(BUZZER_GPIO_Port, BUZZER_Pin, GPIO_PIN_SET);
+		HAL_TIM_PWM_Start(&htim17, TIM_CHANNEL_1);
+		HAL_TIM_Base_Start_IT(&htim16);
 	}
+}
 
+//Play a test sound
+void playTestSound() {
+	static uint8_t i;
+
+	for (i=0; i<6; i++) {
+		setSoundPitch(i);
+		HAL_TIM_PWM_Start(&htim17, TIM_CHANNEL_1);
+		osDelay(500);
+	}
+	HAL_TIM_PWM_Stop(&htim17, TIM_CHANNEL_1);
+
+}
+
+//Set sound pitch
+void setSoundPitch(uint8_t note) {
+	static const uint16_t notes[] = {
+			58182, //A2
+			29091, //A3
+			14545, //A4
+			7273,  //A5
+			3636,  //A6
+			1818,  //A7
+			909    //A8
+	};
+
+	if (note > 6) note = 0;
+	htim17.Init.Period = notes[note];
+	HAL_TIM_Base_Init(&htim17);
+	TIM_OC_InitTypeDef conf = {0};
+	conf.OCMode = TIM_OCMODE_PWM1;
+	conf.Pulse = notes[note] >> 1;
+	conf.OCPolarity = TIM_OCPOLARITY_HIGH;
+	conf.OCFastMode = TIM_OCFAST_DISABLE;
+	HAL_TIM_PWM_ConfigChannel(&htim17, &conf, TIM_CHANNEL_1);
 }
 
 //Draw a button by ID
@@ -857,5 +881,30 @@ void drawButton(uint8_t id, uint8_t func) {
 		func
 	);
 }
+
+//Set fans speed
+void setFansSpeed(uint8_t speed) {
+	if (speed == 0) {
+		if (fanActive) {
+			HAL_TIM_PWM_Stop(&htim14, TIM_CHANNEL_1);
+			fanActive = 0;
+		}
+	} else {
+		if (speed > 100) speed = 100;
+		TIM14->CCR1 = speed;
+		if (!fanActive) {
+			fanActive = 1;
+			HAL_TIM_PWM_Start(&htim14, TIM_CHANNEL_1);
+		}
+	}
+}
+
+//Stop the heater and reset the PID
+void stopHeater(void) {
+	if (osTimerIsRunning(secTimerHandle))	osTimerStop(secTimerHandle);
+	aimTemperature = 0.0f;
+	PID_Init(&pid);
+	TIM1->CCR2 = 1020;
+}
 /* USER CODE END Application */
 
diff --git a/firmware/PCB-Heater/Core/Src/gpio.c b/firmware/PCB-Heater/Core/Src/gpio.c
index ada0691..8a15937 100644
--- a/firmware/PCB-Heater/Core/Src/gpio.c
+++ b/firmware/PCB-Heater/Core/Src/gpio.c
@@ -58,7 +58,7 @@ void MX_GPIO_Init(void)
                           |LCD_D4_Pin|LCD_D5_Pin|LCD_D6_Pin|LCD_D7_Pin, GPIO_PIN_RESET);
 
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOB, LCD_RS_Pin|LCD_WR_Pin|BUZZER_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(GPIOB, LCD_RS_Pin|LCD_WR_Pin, GPIO_PIN_RESET);
 
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(MAX_CS_GPIO_Port, MAX_CS_Pin, GPIO_PIN_SET);
@@ -99,12 +99,12 @@ void MX_GPIO_Init(void)
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-  /*Configure GPIO pins : PBPin PBPin */
-  GPIO_InitStruct.Pin = MAX_CS_Pin|BUZZER_Pin;
+  /*Configure GPIO pin : PtPin */
+  GPIO_InitStruct.Pin = MAX_CS_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+  HAL_GPIO_Init(MAX_CS_GPIO_Port, &GPIO_InitStruct);
 
 }
 
diff --git a/firmware/PCB-Heater/Core/Src/main.c b/firmware/PCB-Heater/Core/Src/main.c
index 037b6ae..35475c6 100644
--- a/firmware/PCB-Heater/Core/Src/main.c
+++ b/firmware/PCB-Heater/Core/Src/main.c
@@ -98,8 +98,16 @@ int main(void)
   MX_TIM15_Init();
   MX_TIM14_Init();
   MX_USART1_UART_Init();
+  MX_TIM16_Init();
   /* USER CODE BEGIN 2 */
-  __HAL_TIM_CLEAR_FLAG(&htim17, TIM_SR_UIF);	//clear the update flag so it wont trigger right away;
+
+  // TIM1  - Zero crossing and Triac duty
+  // TIM14 - Cooling fans PWM
+  // TIM15 - LCD backlight PWM
+  // TIM16 - Count beep duration
+  // TIM17 - PWM for passive buzzer
+
+  __HAL_TIM_CLEAR_FLAG(&htim16, TIM_SR_UIF);	//clear the update flag so it wont trigger right away;
   if (ST7793_Init() != 0) {
 	  HAL_GPIO_WritePin(LED_Status_GPIO_Port, LED_Status_Pin, GPIO_PIN_SET);
 	  while (1) {;}
@@ -109,6 +117,14 @@ int main(void)
   HAL_TIM_OnePulse_Start(&htim1, 2);
   //TIM1->CR1 |= TIM_CR1_CEN;
   HAL_TIM_PWM_Start(&htim15, TIM_CHANNEL_1);
+
+  HAL_TIM_Base_Start(&htim14);
+  //HAL_TIM_Base_Start(&htim17);
+
+  // Boot beep
+  HAL_TIM_PWM_Start(&htim17, TIM_CHANNEL_1);
+  HAL_Delay(70);
+  HAL_TIM_PWM_Stop(&htim17, TIM_CHANNEL_1);
   /* USER CODE END 2 */
 
   /* Init scheduler */
@@ -117,7 +133,6 @@ int main(void)
 
   /* Start scheduler */
   osKernelStart();
-
   /* We should never get here as control is now taken by the scheduler */
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
@@ -198,9 +213,10 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
   }
   /* USER CODE BEGIN Callback 1 */
 
-  if (htim->Instance == TIM17) {
-  	HAL_TIM_Base_Stop_IT(&htim17);
-  	HAL_GPIO_WritePin(BUZZER_GPIO_Port, BUZZER_Pin, GPIO_PIN_RESET);
+  if (htim->Instance == TIM16) {
+  	HAL_TIM_Base_Stop_IT(&htim16);
+  	HAL_TIM_PWM_Stop(&htim17, TIM_CHANNEL_1);
+  	//HAL_GPIO_WritePin(BUZZER_GPIO_Port, BUZZER_Pin, GPIO_PIN_RESET);
   }
 
   /* USER CODE END Callback 1 */
diff --git a/firmware/PCB-Heater/Core/Src/stm32g0xx_hal_timebase_tim.c b/firmware/PCB-Heater/Core/Src/stm32g0xx_hal_timebase_tim.c
index 57273fc..957a059 100644
--- a/firmware/PCB-Heater/Core/Src/stm32g0xx_hal_timebase_tim.c
+++ b/firmware/PCB-Heater/Core/Src/stm32g0xx_hal_timebase_tim.c
@@ -72,6 +72,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
   htim6.Instance = TIM6;
 
   /* Initialize TIMx peripheral as follow:
+
   + Period = [(TIM6CLK/1000) - 1]. to have a (1/1000) s time base.
   + Prescaler = (uwTimclock/1000000 - 1) to have a 1MHz counter clock.
   + ClockDivision = 0
diff --git a/firmware/PCB-Heater/Core/Src/stm32g0xx_it.c b/firmware/PCB-Heater/Core/Src/stm32g0xx_it.c
index ca4c7f0..1fa8cd2 100644
--- a/firmware/PCB-Heater/Core/Src/stm32g0xx_it.c
+++ b/firmware/PCB-Heater/Core/Src/stm32g0xx_it.c
@@ -55,6 +55,7 @@
 /* USER CODE END 0 */
 
 /* External variables --------------------------------------------------------*/
+extern TIM_HandleTypeDef htim16;
 extern TIM_HandleTypeDef htim17;
 extern TIM_HandleTypeDef htim6;
 
@@ -116,6 +117,20 @@ void TIM6_IRQHandler(void)
   /* USER CODE END TIM6_IRQn 1 */
 }
 
+/**
+  * @brief This function handles TIM16 global interrupt.
+  */
+void TIM16_IRQHandler(void)
+{
+  /* USER CODE BEGIN TIM16_IRQn 0 */
+
+  /* USER CODE END TIM16_IRQn 0 */
+  HAL_TIM_IRQHandler(&htim16);
+  /* USER CODE BEGIN TIM16_IRQn 1 */
+
+  /* USER CODE END TIM16_IRQn 1 */
+}
+
 /**
   * @brief This function handles TIM17 global interrupt.
   */
diff --git a/firmware/PCB-Heater/Core/Src/tim.c b/firmware/PCB-Heater/Core/Src/tim.c
index bf6b20c..65f240b 100644
--- a/firmware/PCB-Heater/Core/Src/tim.c
+++ b/firmware/PCB-Heater/Core/Src/tim.c
@@ -27,6 +27,7 @@
 TIM_HandleTypeDef htim1;
 TIM_HandleTypeDef htim14;
 TIM_HandleTypeDef htim15;
+TIM_HandleTypeDef htim16;
 TIM_HandleTypeDef htim17;
 
 /* TIM1 init function */
@@ -147,9 +148,9 @@ void MX_TIM14_Init(void)
 
   /* USER CODE END TIM14_Init 1 */
   htim14.Instance = TIM14;
-  htim14.Init.Prescaler = 0;
+  htim14.Init.Prescaler = 10-1;
   htim14.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim14.Init.Period = 65535;
+  htim14.Init.Period = 100-1;
   htim14.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
   htim14.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
   if (HAL_TIM_Base_Init(&htim14) != HAL_OK)
@@ -161,7 +162,7 @@ void MX_TIM14_Init(void)
     Error_Handler();
   }
   sConfigOC.OCMode = TIM_OCMODE_PWM1;
-  sConfigOC.Pulse = 0;
+  sConfigOC.Pulse = 100;
   sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
   sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
   if (HAL_TIM_PWM_ConfigChannel(&htim14, &sConfigOC, TIM_CHANNEL_1) != HAL_OK)
@@ -191,7 +192,7 @@ void MX_TIM15_Init(void)
 
   /* USER CODE END TIM15_Init 1 */
   htim15.Instance = TIM15;
-  htim15.Init.Prescaler = 320-1;
+  htim15.Init.Prescaler = 640-1;
   htim15.Init.CounterMode = TIM_COUNTERMODE_UP;
   htim15.Init.Period = 100-1;
   htim15.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
@@ -244,6 +245,37 @@ void MX_TIM15_Init(void)
   /* USER CODE END TIM15_Init 2 */
   HAL_TIM_MspPostInit(&htim15);
 
+}
+/* TIM16 init function */
+void MX_TIM16_Init(void)
+{
+
+  /* USER CODE BEGIN TIM16_Init 0 */
+
+  /* USER CODE END TIM16_Init 0 */
+
+  /* USER CODE BEGIN TIM16_Init 1 */
+
+  /* USER CODE END TIM16_Init 1 */
+  htim16.Instance = TIM16;
+  htim16.Init.Prescaler = 64000-1;
+  htim16.Init.CounterMode = TIM_COUNTERMODE_UP;
+  htim16.Init.Period = 999;
+  htim16.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
+  htim16.Init.RepetitionCounter = 0;
+  htim16.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
+  if (HAL_TIM_Base_Init(&htim16) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_TIM_OnePulse_Init(&htim16, TIM_OPMODE_SINGLE) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN TIM16_Init 2 */
+
+  /* USER CODE END TIM16_Init 2 */
+
 }
 /* TIM17 init function */
 void MX_TIM17_Init(void)
@@ -253,13 +285,16 @@ void MX_TIM17_Init(void)
 
   /* USER CODE END TIM17_Init 0 */
 
+  TIM_OC_InitTypeDef sConfigOC = {0};
+  TIM_BreakDeadTimeConfigTypeDef sBreakDeadTimeConfig = {0};
+
   /* USER CODE BEGIN TIM17_Init 1 */
 
   /* USER CODE END TIM17_Init 1 */
   htim17.Instance = TIM17;
-  htim17.Init.Prescaler = 64000-1;
+  htim17.Init.Prescaler = 10-1;
   htim17.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim17.Init.Period = 999;
+  htim17.Init.Period = 14545-1;
   htim17.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
   htim17.Init.RepetitionCounter = 0;
   htim17.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
@@ -267,13 +302,37 @@ void MX_TIM17_Init(void)
   {
     Error_Handler();
   }
-  if (HAL_TIM_OnePulse_Init(&htim17, TIM_OPMODE_SINGLE) != HAL_OK)
+  if (HAL_TIM_PWM_Init(&htim17) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  sConfigOC.OCMode = TIM_OCMODE_PWM1;
+  sConfigOC.Pulse = 7272;
+  sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
+  sConfigOC.OCNPolarity = TIM_OCNPOLARITY_HIGH;
+  sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
+  sConfigOC.OCIdleState = TIM_OCIDLESTATE_RESET;
+  sConfigOC.OCNIdleState = TIM_OCNIDLESTATE_RESET;
+  if (HAL_TIM_PWM_ConfigChannel(&htim17, &sConfigOC, TIM_CHANNEL_1) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  sBreakDeadTimeConfig.OffStateRunMode = TIM_OSSR_DISABLE;
+  sBreakDeadTimeConfig.OffStateIDLEMode = TIM_OSSI_DISABLE;
+  sBreakDeadTimeConfig.LockLevel = TIM_LOCKLEVEL_OFF;
+  sBreakDeadTimeConfig.DeadTime = 0;
+  sBreakDeadTimeConfig.BreakState = TIM_BREAK_DISABLE;
+  sBreakDeadTimeConfig.BreakPolarity = TIM_BREAKPOLARITY_HIGH;
+  sBreakDeadTimeConfig.BreakFilter = 0;
+  sBreakDeadTimeConfig.AutomaticOutput = TIM_AUTOMATICOUTPUT_DISABLE;
+  if (HAL_TIMEx_ConfigBreakDeadTime(&htim17, &sBreakDeadTimeConfig) != HAL_OK)
   {
     Error_Handler();
   }
   /* USER CODE BEGIN TIM17_Init 2 */
 
   /* USER CODE END TIM17_Init 2 */
+  HAL_TIM_MspPostInit(&htim17);
 
 }
 
@@ -326,6 +385,21 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle)
 
   /* USER CODE END TIM15_MspInit 1 */
   }
+  else if(tim_baseHandle->Instance==TIM16)
+  {
+  /* USER CODE BEGIN TIM16_MspInit 0 */
+
+  /* USER CODE END TIM16_MspInit 0 */
+    /* TIM16 clock enable */
+    __HAL_RCC_TIM16_CLK_ENABLE();
+
+    /* TIM16 interrupt Init */
+    HAL_NVIC_SetPriority(TIM16_IRQn, 3, 0);
+    HAL_NVIC_EnableIRQ(TIM16_IRQn);
+  /* USER CODE BEGIN TIM16_MspInit 1 */
+
+  /* USER CODE END TIM16_MspInit 1 */
+  }
   else if(tim_baseHandle->Instance==TIM17)
   {
   /* USER CODE BEGIN TIM17_MspInit 0 */
@@ -408,6 +482,27 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* timHandle)
 
   /* USER CODE END TIM15_MspPostInit 1 */
   }
+  else if(timHandle->Instance==TIM17)
+  {
+  /* USER CODE BEGIN TIM17_MspPostInit 0 */
+
+  /* USER CODE END TIM17_MspPostInit 0 */
+
+    __HAL_RCC_GPIOB_CLK_ENABLE();
+    /**TIM17 GPIO Configuration
+    PB9     ------> TIM17_CH1
+    */
+    GPIO_InitStruct.Pin = BUZZER_Pin;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+    GPIO_InitStruct.Alternate = GPIO_AF2_TIM17;
+    HAL_GPIO_Init(BUZZER_GPIO_Port, &GPIO_InitStruct);
+
+  /* USER CODE BEGIN TIM17_MspPostInit 1 */
+
+  /* USER CODE END TIM17_MspPostInit 1 */
+  }
 
 }
 
@@ -454,6 +549,20 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* tim_baseHandle)
 
   /* USER CODE END TIM15_MspDeInit 1 */
   }
+  else if(tim_baseHandle->Instance==TIM16)
+  {
+  /* USER CODE BEGIN TIM16_MspDeInit 0 */
+
+  /* USER CODE END TIM16_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_TIM16_CLK_DISABLE();
+
+    /* TIM16 interrupt Deinit */
+    HAL_NVIC_DisableIRQ(TIM16_IRQn);
+  /* USER CODE BEGIN TIM16_MspDeInit 1 */
+
+  /* USER CODE END TIM16_MspDeInit 1 */
+  }
   else if(tim_baseHandle->Instance==TIM17)
   {
   /* USER CODE BEGIN TIM17_MspDeInit 0 */
diff --git a/firmware/PCB-Heater/PCB-Heater.ioc b/firmware/PCB-Heater/PCB-Heater.ioc
index 4da7247..8429e85 100644
--- a/firmware/PCB-Heater/PCB-Heater.ioc
+++ b/firmware/PCB-Heater/PCB-Heater.ioc
@@ -28,7 +28,8 @@ Mcu.CPN=STM32G070RBT6
 Mcu.Family=STM32G0
 Mcu.IP0=ADC1
 Mcu.IP1=FREERTOS
-Mcu.IP10=USART1
+Mcu.IP10=TIM17
+Mcu.IP11=USART1
 Mcu.IP2=NVIC
 Mcu.IP3=RCC
 Mcu.IP4=SPI2
@@ -36,8 +37,8 @@ Mcu.IP5=SYS
 Mcu.IP6=TIM1
 Mcu.IP7=TIM14
 Mcu.IP8=TIM15
-Mcu.IP9=TIM17
-Mcu.IPNb=11
+Mcu.IP9=TIM16
+Mcu.IPNb=12
 Mcu.Name=STM32G070RBTx
 Mcu.Package=LQFP64
 Mcu.Pin0=PC12
@@ -73,20 +74,21 @@ Mcu.Pin35=VP_TIM1_VS_ClockSourceINT
 Mcu.Pin36=VP_TIM1_VS_OPM
 Mcu.Pin37=VP_TIM14_VS_ClockSourceINT
 Mcu.Pin38=VP_TIM15_VS_ClockSourceINT
-Mcu.Pin39=VP_TIM17_VS_ClockSourceINT
+Mcu.Pin39=VP_TIM16_VS_ClockSourceINT
 Mcu.Pin4=PC1
-Mcu.Pin40=VP_TIM17_VS_OPM
+Mcu.Pin40=VP_TIM16_VS_OPM
+Mcu.Pin41=VP_TIM17_VS_ClockSourceINT
 Mcu.Pin5=PC2
 Mcu.Pin6=PC3
 Mcu.Pin7=PA0
 Mcu.Pin8=PA1
 Mcu.Pin9=PA2
-Mcu.PinsNb=41
+Mcu.PinsNb=42
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32G070RBTx
-MxCube.Version=6.6.1
-MxDb.Version=DB.6.0.60
+MxCube.Version=6.8.0
+MxDb.Version=DB.6.0.80
 NVIC.ForceEnableDMAVector=true
 NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false
 NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false
@@ -96,6 +98,7 @@ NVIC.SavedPendsvIrqHandlerGenerated=true
 NVIC.SavedSvcallIrqHandlerGenerated=true
 NVIC.SavedSystickIrqHandlerGenerated=true
 NVIC.SysTick_IRQn=true\:3\:0\:false\:false\:false\:true\:false\:true\:false
+NVIC.TIM16_IRQn=true\:3\:0\:false\:false\:true\:true\:true\:true\:true
 NVIC.TIM17_IRQn=true\:3\:0\:false\:false\:true\:true\:true\:true\:true
 NVIC.TIM6_IRQn=true\:3\:0\:false\:false\:true\:false\:false\:true\:true
 NVIC.TimeBase=TIM6_IRQn
@@ -189,11 +192,10 @@ PB6.Signal=USART1_TX
 PB7.Locked=true
 PB7.Mode=Asynchronous
 PB7.Signal=USART1_RX
-PB9.GPIOParameters=GPIO_Speed,GPIO_Label
+PB9.GPIOParameters=GPIO_Label
 PB9.GPIO_Label=BUZZER
-PB9.GPIO_Speed=GPIO_SPEED_FREQ_HIGH
 PB9.Locked=true
-PB9.Signal=GPIO_Output
+PB9.Signal=S_TIM17_CH1
 PC1.GPIOParameters=GPIO_Label
 PC1.GPIO_Label=LCD_LED
 PC1.Signal=S_TIM15_CH1
@@ -252,12 +254,13 @@ ProjectManager.PreviousToolchain=STM32CubeIDE
 ProjectManager.ProjectBuild=false
 ProjectManager.ProjectFileName=PCB-Heater.ioc
 ProjectManager.ProjectName=PCB-Heater
+ProjectManager.ProjectStructure=
 ProjectManager.RegisterCallBack=
 ProjectManager.StackSize=0x400
 ProjectManager.TargetToolchain=STM32CubeIDE
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=true
-ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_TIM1_Init-TIM1-false-HAL-true,4-MX_ADC1_Init-ADC1-false-HAL-true,5-MX_SPI2_Init-SPI2-false-HAL-true,6-MX_TIM17_Init-TIM17-false-HAL-true,7-MX_TIM15_Init-TIM15-false-HAL-true,8-MX_TIM14_Init-TIM14-false-HAL-true,9-MX_USART1_UART_Init-USART1-false-HAL-true
+ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_TIM1_Init-TIM1-false-HAL-true,4-MX_ADC1_Init-ADC1-false-HAL-true,5-MX_SPI2_Init-SPI2-false-HAL-true,6-MX_TIM17_Init-TIM17-false-HAL-true,7-MX_TIM15_Init-TIM15-false-HAL-true,8-MX_TIM14_Init-TIM14-false-HAL-true,9-MX_USART1_UART_Init-USART1-false-HAL-true,10-MX_TIM16_Init-TIM16-false-HAL-true
 RCC.ADCFreq_Value=64000000
 RCC.AHBFreq_Value=64000000
 RCC.APBFreq_Value=64000000
@@ -289,6 +292,8 @@ SH.S_TIM14_CH1.0=TIM14_CH1,PWM Generation1 CH1
 SH.S_TIM14_CH1.ConfNb=1
 SH.S_TIM15_CH1.0=TIM15_CH1,PWM Generation1 CH1
 SH.S_TIM15_CH1.ConfNb=1
+SH.S_TIM17_CH1.0=TIM17_CH1,PWM Generation1 CH1
+SH.S_TIM17_CH1.ConfNb=1
 SH.S_TIM1_CH1.0=TIM1_CH1,Input_Capture1_from_TI1
 SH.S_TIM1_CH1.1=TIM1_CH1,TriggerSource_TI1FP1
 SH.S_TIM1_CH1.ConfNb=2
@@ -315,15 +320,23 @@ TIM1.Period=999
 TIM1.Prescaler=640-1
 TIM1.Pulse-PWM\ Generation2\ CH2=1020
 TIM14.Channel=TIM_CHANNEL_1
-TIM14.IPParameters=Channel
+TIM14.IPParameters=Channel,Prescaler,Period,Pulse
+TIM14.Period=100-1
+TIM14.Prescaler=10-1
+TIM14.Pulse=100
 TIM15.Channel-PWM\ Generation1\ CH1=TIM_CHANNEL_1
 TIM15.IPParameters=Channel-PWM Generation1 CH1,Prescaler,Period
 TIM15.Period=100-1
-TIM15.Prescaler=320-1
+TIM15.Prescaler=640-1
+TIM16.IPParameters=Prescaler,Period
+TIM16.Period=999
+TIM16.Prescaler=64000-1
 TIM17.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_DISABLE
-TIM17.IPParameters=Prescaler,Period,AutoReloadPreload
-TIM17.Period=999
-TIM17.Prescaler=64000-1
+TIM17.Channel=TIM_CHANNEL_1
+TIM17.IPParameters=Prescaler,Period,AutoReloadPreload,Channel,Pulse
+TIM17.Period=14545-1
+TIM17.Prescaler=10-1
+TIM17.Pulse=7272
 USART1.IPParameters=VirtualMode-Asynchronous
 USART1.VirtualMode-Asynchronous=VM_ASYNC
 VP_FREERTOS_VS_CMSIS_V2.Mode=CMSIS_V2
@@ -336,10 +349,12 @@ VP_TIM14_VS_ClockSourceINT.Mode=Enable_Timer
 VP_TIM14_VS_ClockSourceINT.Signal=TIM14_VS_ClockSourceINT
 VP_TIM15_VS_ClockSourceINT.Mode=Internal
 VP_TIM15_VS_ClockSourceINT.Signal=TIM15_VS_ClockSourceINT
+VP_TIM16_VS_ClockSourceINT.Mode=Enable_Timer
+VP_TIM16_VS_ClockSourceINT.Signal=TIM16_VS_ClockSourceINT
+VP_TIM16_VS_OPM.Mode=OPM_bit
+VP_TIM16_VS_OPM.Signal=TIM16_VS_OPM
 VP_TIM17_VS_ClockSourceINT.Mode=Enable_Timer
 VP_TIM17_VS_ClockSourceINT.Signal=TIM17_VS_ClockSourceINT
-VP_TIM17_VS_OPM.Mode=OPM_bit
-VP_TIM17_VS_OPM.Signal=TIM17_VS_OPM
 VP_TIM1_VS_ClockSourceINT.Mode=Internal
 VP_TIM1_VS_ClockSourceINT.Signal=TIM1_VS_ClockSourceINT
 VP_TIM1_VS_ControllerModeCombinedResetTrigger.Mode=Combined_Reset_Trigger_Mode
@@ -347,4 +362,5 @@ VP_TIM1_VS_ControllerModeCombinedResetTrigger.Signal=TIM1_VS_ControllerModeCombi
 VP_TIM1_VS_OPM.Mode=OPM_bit
 VP_TIM1_VS_OPM.Signal=TIM1_VS_OPM
 board=custom
+rtos.0.ip=FREERTOS
 isbadioc=false
diff --git a/kicad/pcb-heater/BOM.xlsx b/kicad/pcb-heater/BOM.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..706e31c21865664dbde843b1e3a15d9d53c38d88
GIT binary patch
literal 13391
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
T=^y|A5BgDn)EJHVkE{O!U4nu~

literal 0
HcmV?d00001

diff --git a/kicad/pcb-heater/pcb-heater.kicad_pro b/kicad/pcb-heater/pcb-heater.kicad_pro
index b47c415..6b91e08 100644
--- a/kicad/pcb-heater/pcb-heater.kicad_pro
+++ b/kicad/pcb-heater/pcb-heater.kicad_pro
@@ -391,18 +391,23 @@
     "rule_severities": {
       "bus_definition_conflict": "error",
       "bus_entry_needed": "error",
-      "bus_label_syntax": "error",
       "bus_to_bus_conflict": "error",
       "bus_to_net_conflict": "error",
+      "conflicting_netclasses": "error",
       "different_unit_footprint": "error",
       "different_unit_net": "error",
       "duplicate_reference": "error",
       "duplicate_sheet_names": "error",
+      "endpoint_off_grid": "warning",
       "extra_units": "error",
       "global_label_dangling": "warning",
       "hier_label_mismatch": "error",
       "label_dangling": "error",
       "lib_symbol_issues": "warning",
+      "missing_bidi_pin": "warning",
+      "missing_input_pin": "warning",
+      "missing_power_pin": "error",
+      "missing_unit": "warning",
       "multiple_net_names": "warning",
       "net_not_bus_member": "warning",
       "no_connect_connected": "warning",
@@ -412,6 +417,7 @@
       "pin_to_pin": "warning",
       "power_pin_not_driven": "error",
       "similar_labels": "warning",
+      "simulation_model_issue": "error",
       "unannotated": "error",
       "unit_value_mismatch": "error",
       "unresolved_variable": "error",
@@ -467,6 +473,8 @@
   "schematic": {
     "annotate_start_num": 0,
     "drawing": {
+      "dashed_lines_dash_length_ratio": 12.0,
+      "dashed_lines_gap_length_ratio": 3.0,
       "default_line_thickness": 6.0,
       "default_text_size": 50.0,
       "field_names": [],
@@ -498,7 +506,11 @@
     "page_layout_descr_file": "",
     "plot_directory": "",
     "spice_adjust_passive_values": false,
+    "spice_current_sheet_as_root": false,
     "spice_external_command": "spice \"%I\"",
+    "spice_model_current_sheet_as_root": true,
+    "spice_save_all_currents": false,
+    "spice_save_all_voltages": false,
     "subpart_first_id": 65,
     "subpart_id_separator": 0
   },
diff --git a/kicad/pcb-heater/pcb-heater.kicad_sch b/kicad/pcb-heater/pcb-heater.kicad_sch
index 410a54d..f7e014a 100644
--- a/kicad/pcb-heater/pcb-heater.kicad_sch
+++ b/kicad/pcb-heater/pcb-heater.kicad_sch
@@ -6901,7 +6901,7 @@
     (property "Reference" "F1" (at 143.51 32.385 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "0.5A" (at 144.145 35.56 90)
+    (property "Value" "5A" (at 144.145 35.56 90)
       (effects (font (size 1.27 1.27)))
     )
     (property "Footprint" "my_additions:Fuse_1808_0451_Holder_HandSolder" (at 149.86 32.385 0)