From 855210155923da06bb3556919d64d339a94827b4 Mon Sep 17 00:00:00 2001 From: Kymkim Date: Tue, 19 Aug 2025 19:20:38 -0700 Subject: [PATCH] numpad ioc update for future compability with sync uart --- firmware/numpad/numpad.ioc | 153 ++++++++++++++++++------------------- 1 file changed, 76 insertions(+), 77 deletions(-) diff --git a/firmware/numpad/numpad.ioc b/firmware/numpad/numpad.ioc index d5afb32e..dd4f710e 100644 --- a/firmware/numpad/numpad.ioc +++ b/firmware/numpad/numpad.ioc @@ -11,10 +11,10 @@ Mcu.IP0=I2C1 Mcu.IP1=NVIC Mcu.IP2=RCC Mcu.IP3=SYS -Mcu.IP4=UART4 -Mcu.IP5=UART5 -Mcu.IP6=USART1 -Mcu.IP7=USART2 +Mcu.IP4=USART1 +Mcu.IP5=USART2 +Mcu.IP6=USART3 +Mcu.IP7=USART6 Mcu.IP8=USB_DEVICE Mcu.IP9=USB_OTG_FS Mcu.IPNb=10 @@ -22,36 +22,36 @@ Mcu.Name=STM32F446R(C-E)Tx Mcu.Package=LQFP64 Mcu.Pin0=PH0-OSC_IN Mcu.Pin1=PH1-OSC_OUT -Mcu.Pin10=PB2 -Mcu.Pin11=PB10 -Mcu.Pin12=PC7 -Mcu.Pin13=PC8 -Mcu.Pin14=PC9 -Mcu.Pin15=PA8 +Mcu.Pin10=PB0 +Mcu.Pin11=PB1 +Mcu.Pin12=PB2 +Mcu.Pin13=PB10 +Mcu.Pin14=PC6 +Mcu.Pin15=PC7 Mcu.Pin16=PA9 Mcu.Pin17=PA10 Mcu.Pin18=PA11 Mcu.Pin19=PA12 -Mcu.Pin2=PA0-WKUP +Mcu.Pin2=PC0 Mcu.Pin20=PA13 Mcu.Pin21=PA14 -Mcu.Pin22=PC12 -Mcu.Pin23=PD2 +Mcu.Pin22=PC10 +Mcu.Pin23=PC11 Mcu.Pin24=PB4 Mcu.Pin25=PB5 Mcu.Pin26=PB6 Mcu.Pin27=PB7 Mcu.Pin28=PB8 Mcu.Pin29=PB9 -Mcu.Pin3=PA1 +Mcu.Pin3=PC1 Mcu.Pin30=VP_SYS_VS_Systick Mcu.Pin31=VP_USB_DEVICE_VS_USB_DEVICE_HID_FS -Mcu.Pin4=PA2 -Mcu.Pin5=PA3 -Mcu.Pin6=PC4 -Mcu.Pin7=PC5 -Mcu.Pin8=PB0 -Mcu.Pin9=PB1 +Mcu.Pin4=PC2 +Mcu.Pin5=PC3 +Mcu.Pin6=PA2 +Mcu.Pin7=PA3 +Mcu.Pin8=PC4 +Mcu.Pin9=PC5 Mcu.PinsNb=32 Mcu.ThirdPartyNb=0 Mcu.UserConstants= @@ -70,15 +70,9 @@ NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:false\:true\:false -NVIC.UART4_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true -NVIC.UART5_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true NVIC.USART1_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true NVIC.USART2_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false -PA0-WKUP.Mode=Asynchronous -PA0-WKUP.Signal=UART4_TX -PA1.Mode=Asynchronous -PA1.Signal=UART4_RX PA10.Mode=Asynchronous PA10.Signal=USART1_RX PA11.Mode=Device_Only @@ -93,10 +87,6 @@ PA2.Mode=Asynchronous PA2.Signal=USART2_TX PA3.Mode=Asynchronous PA3.Signal=USART2_RX -PA8.GPIOParameters=GPIO_Label -PA8.GPIO_Label=COL4 -PA8.Locked=true -PA8.Signal=GPIO_Output PA9.Mode=Asynchronous PA9.Signal=USART1_TX PB0.GPIOParameters=GPIO_PuPd,GPIO_Label @@ -110,7 +100,7 @@ PB1.GPIO_PuPd=GPIO_PULLDOWN PB1.Locked=true PB1.Signal=GPIO_Input PB10.GPIOParameters=GPIO_PuPd,GPIO_Label -PB10.GPIO_Label=ROW1SR +PB10.GPIO_Label=ROW1 PB10.GPIO_PuPd=GPIO_PULLDOWN PB10.Locked=true PB10.Signal=GPIO_Input @@ -139,8 +129,26 @@ PB8.Mode=I2C PB8.Signal=I2C1_SCL PB9.Mode=I2C PB9.Signal=I2C1_SDA -PC12.Mode=Asynchronous -PC12.Signal=UART5_TX +PC0.GPIOParameters=GPIO_Label +PC0.GPIO_Label=COL1 +PC0.Locked=true +PC0.Signal=GPIO_Output +PC1.GPIOParameters=GPIO_Label +PC1.GPIO_Label=COL2 +PC1.Locked=true +PC1.Signal=GPIO_Output +PC10.Mode=Asynchronous +PC10.Signal=USART3_TX +PC11.Mode=Asynchronous +PC11.Signal=USART3_RX +PC2.GPIOParameters=GPIO_Label +PC2.GPIO_Label=COL3 +PC2.Locked=true +PC2.Signal=GPIO_Output +PC3.GPIOParameters=GPIO_Label +PC3.GPIO_Label=COL4 +PC3.Locked=true +PC3.Signal=GPIO_Output PC4.GPIOParameters=GPIO_PuPd,GPIO_Label PC4.GPIO_Label=ROW6 PC4.GPIO_PuPd=GPIO_PULLDOWN @@ -151,20 +159,10 @@ PC5.GPIO_Label=ROW5 PC5.GPIO_PuPd=GPIO_PULLDOWN PC5.Locked=true PC5.Signal=GPIO_Input -PC7.GPIOParameters=GPIO_Label -PC7.GPIO_Label=COL1 -PC7.Locked=true -PC7.Signal=GPIO_Output -PC8.GPIOParameters=GPIO_Label -PC8.GPIO_Label=COL2 -PC8.Locked=true -PC8.Signal=GPIO_Output -PC9.GPIOParameters=GPIO_Label -PC9.GPIO_Label=COL3 -PC9.Locked=true -PC9.Signal=GPIO_Output -PD2.Mode=Asynchronous -PD2.Signal=UART5_RX +PC6.Mode=Asynchronous +PC6.Signal=USART6_TX +PC7.Mode=Asynchronous +PC7.Signal=USART6_RX PH0-OSC_IN.Mode=HSE-External-Oscillator PH0-OSC_IN.Signal=RCC_OSC_IN PH1-OSC_OUT.Mode=HSE-External-Oscillator @@ -195,50 +193,51 @@ ProjectManager.ProjectName=numpad ProjectManager.ProjectStructure= ProjectManager.RegisterCallBack= ProjectManager.StackSize=0x400 -ProjectManager.TargetToolchain=EWARM V8.50 +ProjectManager.TargetToolchain=CMake ProjectManager.ToolChainLocation= ProjectManager.UAScriptAfterPath= ProjectManager.UAScriptBeforePath= ProjectManager.UnderRoot=false -ProjectManager.functionlistsort= +ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_I2C1_Init-I2C1-false-HAL-true,4-MX_USART1_UART_Init-USART1-false-HAL-true,5-MX_USART2_UART_Init-USART2-false-HAL-true,6-MX_USB_DEVICE_Init-USB_DEVICE-false-HAL-false,7-MX_USART3_UART_Init-USART3-false-HAL-true,8-MX_USART6_UART_Init-USART6-false-HAL-true RCC.CECFreq_Value=32786.88524590164 RCC.CortexFreq_Value=16000000 RCC.FamilyName=M -RCC.I2S1Freq_Value=150000000 -RCC.I2S2Freq_Value=150000000 -RCC.IPParameters=CECFreq_Value,CortexFreq_Value,FamilyName,I2S1Freq_Value,I2S2Freq_Value,PLLCLKFreq_Value,PLLI2SPCLKFreq_Value,PLLI2SQCLKFreq_Value,PLLI2SRCLKFreq_Value,PLLI2SoutputFreq_Value,PLLM,PLLN,PLLQ,PLLQCLKFreq_Value,PLLRCLKFreq_Value,PLLSAIPCLKFreq_Value,PLLSAIQCLKFreq_Value,PLLSAIoutputFreq_Value,SAIAFreq_Value,SAIBFreq_Value,SDIOFreq_Value,SPDIFRXFreq_Value,USBFreq_Value,VCOI2SInputFreq_Value,VCOI2SOutputFreq_Value,VCOInputFreq_Value,VCOOutputFreq_Value,VCOSAIInputFreq_Value,VCOSAIOutputFreq_Value -RCC.PLLCLKFreq_Value=120000000 -RCC.PLLI2SPCLKFreq_Value=150000000 -RCC.PLLI2SQCLKFreq_Value=150000000 -RCC.PLLI2SRCLKFreq_Value=150000000 -RCC.PLLI2SoutputFreq_Value=150000000 -RCC.PLLM=15 -RCC.PLLN=144 -RCC.PLLQ=5 +RCC.HSE_VALUE=8000000 +RCC.I2S1Freq_Value=48000000 +RCC.I2S2Freq_Value=48000000 +RCC.IPParameters=CECFreq_Value,CortexFreq_Value,FamilyName,HSE_VALUE,I2S1Freq_Value,I2S2Freq_Value,PLLCLKFreq_Value,PLLI2SPCLKFreq_Value,PLLI2SQCLKFreq_Value,PLLI2SRCLKFreq_Value,PLLI2SoutputFreq_Value,PLLM,PLLN,PLLQ,PLLQCLKFreq_Value,PLLRCLKFreq_Value,PLLSAIPCLKFreq_Value,PLLSAIQCLKFreq_Value,PLLSAIoutputFreq_Value,SAIAFreq_Value,SAIBFreq_Value,SDIOFreq_Value,SPDIFRXFreq_Value,USBFreq_Value,VCOI2SInputFreq_Value,VCOI2SOutputFreq_Value,VCOInputFreq_Value,VCOOutputFreq_Value,VCOSAIInputFreq_Value,VCOSAIOutputFreq_Value +RCC.PLLCLKFreq_Value=72000000 +RCC.PLLI2SPCLKFreq_Value=48000000 +RCC.PLLI2SQCLKFreq_Value=48000000 +RCC.PLLI2SRCLKFreq_Value=48000000 +RCC.PLLI2SoutputFreq_Value=48000000 +RCC.PLLM=4 +RCC.PLLN=72 +RCC.PLLQ=3 RCC.PLLQCLKFreq_Value=48000000 -RCC.PLLRCLKFreq_Value=120000000 -RCC.PLLSAIPCLKFreq_Value=150000000 -RCC.PLLSAIQCLKFreq_Value=150000000 -RCC.PLLSAIoutputFreq_Value=150000000 -RCC.SAIAFreq_Value=150000000 -RCC.SAIBFreq_Value=150000000 +RCC.PLLRCLKFreq_Value=72000000 +RCC.PLLSAIPCLKFreq_Value=48000000 +RCC.PLLSAIQCLKFreq_Value=48000000 +RCC.PLLSAIoutputFreq_Value=48000000 +RCC.SAIAFreq_Value=48000000 +RCC.SAIBFreq_Value=48000000 RCC.SDIOFreq_Value=48000000 -RCC.SPDIFRXFreq_Value=120000000 +RCC.SPDIFRXFreq_Value=72000000 RCC.USBFreq_Value=48000000 -RCC.VCOI2SInputFreq_Value=1562500 -RCC.VCOI2SOutputFreq_Value=300000000 -RCC.VCOInputFreq_Value=1666666.6666666667 -RCC.VCOOutputFreq_Value=240000000 -RCC.VCOSAIInputFreq_Value=1562500 -RCC.VCOSAIOutputFreq_Value=300000000 -UART4.IPParameters=VirtualMode -UART4.VirtualMode=Asynchronous -UART5.IPParameters=VirtualMode -UART5.VirtualMode=Asynchronous +RCC.VCOI2SInputFreq_Value=500000 +RCC.VCOI2SOutputFreq_Value=96000000 +RCC.VCOInputFreq_Value=2000000 +RCC.VCOOutputFreq_Value=144000000 +RCC.VCOSAIInputFreq_Value=500000 +RCC.VCOSAIOutputFreq_Value=96000000 USART1.IPParameters=VirtualMode USART1.VirtualMode=VM_ASYNC USART2.IPParameters=VirtualMode USART2.VirtualMode=VM_ASYNC +USART3.IPParameters=VirtualMode +USART3.VirtualMode=VM_ASYNC +USART6.IPParameters=VirtualMode +USART6.VirtualMode=VM_ASYNC USB_DEVICE.CLASS_NAME_FS=HID USB_DEVICE.IPParameters=VirtualMode-HID_FS,VirtualModeFS,CLASS_NAME_FS USB_DEVICE.VirtualMode-HID_FS=Hid