diff --git a/firmware/PCB-Heater/.settings/language.settings.xml b/firmware/PCB-Heater/.settings/language.settings.xml index bfe28e9..b87f44b 100644 --- a/firmware/PCB-Heater/.settings/language.settings.xml +++ b/firmware/PCB-Heater/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -17,7 +17,7 @@ - + diff --git a/firmware/PCB-Heater/.settings/stm32cubeide.project.prefs b/firmware/PCB-Heater/.settings/stm32cubeide.project.prefs index 4e2d197..2aee863 100644 --- a/firmware/PCB-Heater/.settings/stm32cubeide.project.prefs +++ b/firmware/PCB-Heater/.settings/stm32cubeide.project.prefs @@ -1,3 +1,3 @@ -8DF89ED150041C4CBC7CB9A9CAA90856=D5C17FA6F4938023A9EBA64C627C34C9 -DC22A860405A8BF2F2C095E5B6529F12=D5C17FA6F4938023A9EBA64C627C34C9 +8DF89ED150041C4CBC7CB9A9CAA90856=DEB078C68ED7C3404713540BA3B0EF9A +DC22A860405A8BF2F2C095E5B6529F12=DEB078C68ED7C3404713540BA3B0EF9A eclipse.preferences.version=1 diff --git a/firmware/PCB-Heater/Core/Inc/main.h b/firmware/PCB-Heater/Core/Inc/main.h index 5e9fe88..ed2c7a0 100644 --- a/firmware/PCB-Heater/Core/Inc/main.h +++ b/firmware/PCB-Heater/Core/Inc/main.h @@ -59,12 +59,12 @@ void Error_Handler(void); /* Private defines -----------------------------------------------------------*/ #define FAN_PWM_Pin GPIO_PIN_12 #define FAN_PWM_GPIO_Port GPIOC +#define btnSTOP_Pin GPIO_PIN_13 +#define btnSTOP_GPIO_Port GPIOC #define LCD_LED_Pin GPIO_PIN_1 #define LCD_LED_GPIO_Port GPIOC #define LED_Status_Pin GPIO_PIN_2 #define LED_Status_GPIO_Port GPIOC -#define btnSTOP_Pin GPIO_PIN_3 -#define btnSTOP_GPIO_Port GPIOC #define LCD_D0_Pin GPIO_PIN_0 #define LCD_D0_GPIO_Port GPIOA #define LCD_D1_Pin GPIO_PIN_1 diff --git a/firmware/PCB-Heater/Core/Src/gpio.c b/firmware/PCB-Heater/Core/Src/gpio.c index a25f3d7..9179d96 100644 --- a/firmware/PCB-Heater/Core/Src/gpio.c +++ b/firmware/PCB-Heater/Core/Src/gpio.c @@ -67,6 +67,12 @@ void MX_GPIO_Init(void) /*Configure GPIO pin Output Level */ HAL_GPIO_WritePin(LCD_CS_GPIO_Port, LCD_CS_Pin, GPIO_PIN_RESET); + /*Configure GPIO pin : PtPin */ + GPIO_InitStruct.Pin = btnSTOP_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_INPUT; + GPIO_InitStruct.Pull = GPIO_PULLUP; + HAL_GPIO_Init(btnSTOP_GPIO_Port, &GPIO_InitStruct); + /*Configure GPIO pin : PtPin */ GPIO_InitStruct.Pin = LED_Status_Pin; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; @@ -74,12 +80,6 @@ void MX_GPIO_Init(void) GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH; HAL_GPIO_Init(LED_Status_GPIO_Port, &GPIO_InitStruct); - /*Configure GPIO pin : PtPin */ - GPIO_InitStruct.Pin = btnSTOP_Pin; - GPIO_InitStruct.Mode = GPIO_MODE_INPUT; - GPIO_InitStruct.Pull = GPIO_PULLUP; - HAL_GPIO_Init(btnSTOP_GPIO_Port, &GPIO_InitStruct); - /*Configure GPIO pins : PAPin PAPin PAPin PAPin PAPin PAPin PAPin PAPin */ GPIO_InitStruct.Pin = LCD_D0_Pin|LCD_D1_Pin|LCD_D2_Pin|LCD_D3_Pin diff --git a/firmware/PCB-Heater/PCB-Heater.ioc b/firmware/PCB-Heater/PCB-Heater.ioc index 89bcd02..a1bbae6 100644 --- a/firmware/PCB-Heater/PCB-Heater.ioc +++ b/firmware/PCB-Heater/PCB-Heater.ioc @@ -41,7 +41,7 @@ Mcu.IPNb=11 Mcu.Name=STM32G070RBTx Mcu.Package=LQFP64 Mcu.Pin0=PC12 -Mcu.Pin1=PF0-OSC_IN (PF0) +Mcu.Pin1=PC13 Mcu.Pin10=PA4 Mcu.Pin11=PA5 Mcu.Pin12=PA6 @@ -52,7 +52,7 @@ Mcu.Pin16=PB0 Mcu.Pin17=PB1 Mcu.Pin18=PB2 Mcu.Pin19=PB10 -Mcu.Pin2=PF1-OSC_OUT (PF1) +Mcu.Pin2=PF0-OSC_IN (PF0) Mcu.Pin20=PB13 Mcu.Pin21=PB14 Mcu.Pin22=PB15 @@ -63,7 +63,7 @@ Mcu.Pin26=PA14-BOOT0 Mcu.Pin27=PD4 Mcu.Pin28=PB6 Mcu.Pin29=PB7 -Mcu.Pin3=PC1 +Mcu.Pin3=PF1-OSC_OUT (PF1) Mcu.Pin30=PB9 Mcu.Pin31=VP_FREERTOS_VS_CMSIS_V2 Mcu.Pin32=VP_SYS_VS_tim6 @@ -74,9 +74,9 @@ 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.Pin4=PC2 +Mcu.Pin4=PC1 Mcu.Pin40=VP_TIM17_VS_OPM -Mcu.Pin5=PC3 +Mcu.Pin5=PC2 Mcu.Pin6=PA0 Mcu.Pin7=PA1 Mcu.Pin8=PA2 @@ -200,16 +200,16 @@ PC1.Signal=S_TIM15_CH1 PC12.GPIOParameters=GPIO_Label PC12.GPIO_Label=FAN_PWM PC12.Signal=S_TIM14_CH1 +PC13.GPIOParameters=GPIO_PuPd,GPIO_Label +PC13.GPIO_Label=btnSTOP +PC13.GPIO_PuPd=GPIO_PULLUP +PC13.Locked=true +PC13.Signal=GPIO_Input PC2.GPIOParameters=GPIO_Speed,GPIO_Label PC2.GPIO_Label=LED_Status PC2.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PC2.Locked=true PC2.Signal=GPIO_Output -PC3.GPIOParameters=GPIO_PuPd,GPIO_Label -PC3.GPIO_Label=btnSTOP -PC3.GPIO_PuPd=GPIO_PULLUP -PC3.Locked=true -PC3.Signal=GPIO_Input PC4.GPIOParameters=GPIO_Speed,GPIO_Label PC4.GPIO_Label=LCD_RD PC4.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH diff --git a/kicad/pcb-heater/pcb-heater.kicad_sch b/kicad/pcb-heater/pcb-heater.kicad_sch index a69fd61..0d17925 100644 --- a/kicad/pcb-heater/pcb-heater.kicad_sch +++ b/kicad/pcb-heater/pcb-heater.kicad_sch @@ -2948,9 +2948,6 @@ (junction (at 173.99 29.21) (diameter 0) (color 0 0 0 0) (uuid 98a1eea8-44a8-4a47-a427-e6cc41ebeafa) ) - (junction (at 172.085 29.21) (diameter 0) (color 0 0 0 0) - (uuid 9aeb0cf7-682f-4953-a0c3-3444543cb436) - ) (junction (at 99.06 175.895) (diameter 0) (color 0 0 0 0) (uuid a7262465-6d9e-473a-bae3-ccbd4c7c4efa) ) @@ -2966,9 +2963,6 @@ (junction (at 179.07 27.94) (diameter 0) (color 0 0 0 0) (uuid c773af5b-01b9-41bd-9805-08e47da79272) ) - (junction (at 170.18 31.75) (diameter 0) (color 0 0 0 0) - (uuid cf99398f-5141-41cb-a9b8-f96be19e0226) - ) (junction (at 60.325 28.575) (diameter 0) (color 0 0 0 0) (uuid d3db1909-0dcc-44b7-b5eb-6b4eeb1acfa4) ) @@ -2981,12 +2975,18 @@ (junction (at 67.31 169.545) (diameter 0) (color 0 0 0 0) (uuid e9b73433-5613-4340-80df-b7e982d63d63) ) + (junction (at 170.18 29.21) (diameter 0) (color 0 0 0 0) + (uuid ed1345f8-1504-476c-bd93-b4c4b495a553) + ) + (junction (at 172.085 31.75) (diameter 0) (color 0 0 0 0) + (uuid f692e449-0c47-47be-9ec5-c7f7c41077a4) + ) (junction (at 219.71 76.2) (diameter 0) (color 0 0 0 0) (uuid f896ae27-bcdf-4350-ad6f-7b06190d5c77) ) (no_connect (at 71.755 114.935) (uuid 02a0e8ca-1285-40f1-830a-fd6772d26e9e)) - (no_connect (at 71.755 130.175) (uuid 120c25cd-b48f-4118-8a11-8d340ac5b9ec)) + (no_connect (at 71.755 104.775) (uuid 120c25cd-b48f-4118-8a11-8d340ac5b9ec)) (no_connect (at 71.755 125.095) (uuid 13c8acdf-a53f-4840-8513-f27fcda50062)) (no_connect (at 71.755 84.455) (uuid 231fb950-1955-44dc-88c0-205679e6be90)) (no_connect (at 132.715 128.27) (uuid 29ccae83-b57f-48a8-abd1-e3ee2ed14c2b)) @@ -3023,7 +3023,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 0021461e-29f3-423e-9587-5901802d71b2) ) - (wire (pts (xy 167.64 29.21) (xy 172.085 29.21)) + (wire (pts (xy 167.64 29.21) (xy 170.18 29.21)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 007ce7f0-c2c3-4aaa-82bb-fdf3c8562e05) ) @@ -3031,10 +3031,6 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 00ab1310-3a4b-4ee9-8d79-777dcf16f212) ) - (wire (pts (xy 70.485 104.775) (xy 71.755 104.775)) - (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid 012e6a48-1ff4-4d3f-ba21-915f00c9e26d) - ) (wire (pts (xy 71.755 86.995) (xy 70.485 86.995)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 0144d383-eac1-4f04-b205-b70cb20a560d) @@ -3111,10 +3107,6 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 15ac11b4-6f83-4265-8708-9a1c8046cc27) ) - (wire (pts (xy 172.085 63.5) (xy 172.085 29.21)) - (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid 169bf69e-01f6-48a1-a981-713ab5457cd2) - ) (wire (pts (xy 219.71 66.04) (xy 219.71 76.2)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 17346005-ee7a-448a-98ca-695574ed6db0) @@ -3123,6 +3115,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 17908aa3-3d4d-4772-9eac-9638d5436758) ) + (wire (pts (xy 172.085 31.75) (xy 175.895 31.75)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 1a055c2b-8eb2-4e43-b2e2-865a7dba1b47) + ) (wire (pts (xy 267.97 27.94) (xy 265.43 27.94)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 1a386317-bdf0-4bfe-ada3-a80fd004c070) @@ -3247,10 +3243,6 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 3bdc0e83-6cc4-46b1-b021-984a1e7cffe1) ) - (wire (pts (xy 172.085 29.21) (xy 173.99 29.21)) - (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid 3c1523fb-19b3-415e-8bee-782669dbda4d) - ) (wire (pts (xy 81.28 22.225) (xy 77.47 22.225)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 3cd7d5c3-9d51-4310-bc8d-6d3dd49a26cb) @@ -3403,7 +3395,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 6427b149-8335-42f9-beab-08f2b86f5d01) ) - (wire (pts (xy 170.18 31.75) (xy 175.895 31.75)) + (wire (pts (xy 167.64 31.75) (xy 172.085 31.75)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 651f9eb4-002d-4a2c-aa75-227371ea604a) ) @@ -3499,6 +3491,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 7a83ac6a-0e04-4867-b6b9-8c951c04c790) ) + (wire (pts (xy 170.18 29.21) (xy 173.99 29.21)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 7b9fccac-2787-4a54-9d97-ab97d9d155fc) + ) (wire (pts (xy 246.38 27.94) (xy 248.285 27.94)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 7d129dde-9d30-47aa-8c96-5f5e72207dca) @@ -3627,6 +3623,14 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 9f340e3a-770b-4395-b870-4c77f4b56570) ) + (wire (pts (xy 172.085 31.75) (xy 172.085 63.5)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 9f5729be-38ef-4b7b-ab33-c87c8571af48) + ) + (wire (pts (xy 70.485 130.175) (xy 71.755 130.175)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid a14cda0f-4041-4a46-8926-53187d1bb7cc) + ) (wire (pts (xy 207.01 130.175) (xy 209.55 130.175)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid a17ad839-b14e-414c-8cbf-dee43df3c8af) @@ -3995,10 +3999,6 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid f64fd4f2-52b1-420e-ba82-fd9e15aa1d81) ) - (wire (pts (xy 167.64 31.75) (xy 170.18 31.75)) - (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid f67554a5-238b-4745-99b7-7c4f4262c21a) - ) (wire (pts (xy 219.71 34.29) (xy 219.71 33.655)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid f79a038d-7c3a-4958-9467-b20efed84ddd) @@ -4019,6 +4019,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid fb22873a-1627-40e3-845d-332ed9e424a7) ) + (wire (pts (xy 170.18 29.21) (xy 170.18 63.5)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid fbca9098-e7a2-4b91-adef-d9382e95e11c) + ) (wire (pts (xy 58.42 45.72) (xy 58.42 46.355)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid fc1564ab-da78-4b03-a077-576737dc9e62) @@ -4031,10 +4035,6 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid ff1c6809-2acd-472a-b80c-fb68db75b2f2) ) - (wire (pts (xy 170.18 63.5) (xy 170.18 31.75)) - (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid fff3fac7-3cca-4e9c-83d2-b8ebd978deef) - ) (text "DB3" (at 27.305 62.23 180) (effects (font (size 1.27 1.27)) (justify right bottom)) @@ -4171,10 +4171,10 @@ (effects (font (size 1.27 1.27)) hide) ) ) - (global_label "STOP" (shape input) (at 70.485 104.775 180) (fields_autoplaced) + (global_label "STOP" (shape input) (at 70.485 130.175 180) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right)) (uuid 2e26359f-ddbb-49c9-b6a2-7ffd43a7947f) - (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 8.255 6.35 0) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 8.255 31.75 0) (effects (font (size 1.27 1.27)) hide) ) )