diff --git a/stm32F030F4_code/Core/Src/main.c b/stm32F030F4_code/Core/Src/main.c index 3997b17..e2ce98a 100644 --- a/stm32F030F4_code/Core/Src/main.c +++ b/stm32F030F4_code/Core/Src/main.c @@ -326,7 +326,7 @@ static void MX_GPIO_Init(void) /*Configure GPIO pins : tack_A_Pin tack_B_Pin */ GPIO_InitStruct.Pin = tack_A_Pin|tack_B_Pin; GPIO_InitStruct.Mode = GPIO_MODE_INPUT; - GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Pull = GPIO_PULLUP; HAL_GPIO_Init(GPIOF, &GPIO_InitStruct); /*Configure GPIO pin : charge_det_Pin */ diff --git a/stm32F030F4_code/mydrivers/my.c b/stm32F030F4_code/mydrivers/my.c index 756722f..51cca1b 100644 --- a/stm32F030F4_code/mydrivers/my.c +++ b/stm32F030F4_code/mydrivers/my.c @@ -177,7 +177,7 @@ void mymain() while(1) { - push_key=SW_C; + push_key=KEY1; if(push_key!=last_key) { @@ -214,6 +214,8 @@ void mymain() if(morse_y>=Y_WIDTH_) { morse_y=0; + + OLED_Init_Display_Buffer(0); } } diff --git a/stm32F030F4_code/stm32F030F4_code.ioc b/stm32F030F4_code/stm32F030F4_code.ioc index 9a0564c..7a537d8 100644 --- a/stm32F030F4_code/stm32F030F4_code.ioc +++ b/stm32F030F4_code/stm32F030F4_code.ioc @@ -67,12 +67,14 @@ PB1.GPIO_Label=SW_C PB1.GPIO_PuPd=GPIO_PULLUP PB1.Locked=true PB1.Signal=GPIO_Input -PF0-OSC_IN.GPIOParameters=GPIO_Label +PF0-OSC_IN.GPIOParameters=GPIO_PuPd,GPIO_Label PF0-OSC_IN.GPIO_Label=tack_A +PF0-OSC_IN.GPIO_PuPd=GPIO_PULLUP PF0-OSC_IN.Locked=true PF0-OSC_IN.Signal=GPIO_Input -PF1-OSC_OUT.GPIOParameters=GPIO_Label +PF1-OSC_OUT.GPIOParameters=GPIO_PuPd,GPIO_Label PF1-OSC_OUT.GPIO_Label=tack_B +PF1-OSC_OUT.GPIO_PuPd=GPIO_PULLUP PF1-OSC_OUT.Locked=true PF1-OSC_OUT.Signal=GPIO_Input PinOutPanel.RotationAngle=0 @@ -130,4 +132,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TIM14_VS_ClockSourceINT.Mode=Enable_Timer VP_TIM14_VS_ClockSourceINT.Signal=TIM14_VS_ClockSourceINT board=custom -isbadioc=false