From 07f9ac2234bbc367d7203f094233867f360671f5 Mon Sep 17 00:00:00 2001 From: jinlicong <493886250@qq.com> Date: Fri, 26 Apr 2024 17:25:32 +0800 Subject: [PATCH] 继续完善，开始增加阀控相关 --- Soft/system_run_fun.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Soft/system_run_fun.c b/Soft/system_run_fun.c index eb3d0b4..631cb1b 100644 --- a/Soft/system_run_fun.c +++ b/Soft/system_run_fun.c @@ -5,8 +5,8 @@ #include "mbcrc.h" #include "gpio.h" #include "extern_rtc.h" - - +#include "key.h" +#include "lcd_io_api.h" @@ -20,7 +20,7 @@ // InputtIO(UNCAP_DETECTION_PORT,UNCAP_DETECTION_PIN,IN_NORMAL); // -// Lcd_IO_Init(); +// Lcd_GPIO_Init(); // Measure_IO_Init(); // KEY_IO_Init(); // Valve_IO_Init(); @@ -34,6 +34,9 @@ RTC_GPIO_Init(); + Key_GPIO_Init(); + + Lcd_GPIO_Init(); } @@ -56,7 +59,7 @@ //��λ���������ֱ�Ҫ���蹦�ܳ�ʼ������Ҫ�õ��ſ��������蹦������ѭ������֮ǰ���ü��� // allPeripheralDriver(); - //SPI��ʼ�� + SPI3_Init(); //EEP-SPI��ʼ�� } @@ -67,6 +70,11 @@ CMU_OPCCR1_EXTICKE_Setable(ENABLE); //EXTI����ʱ��ʹ�� GPIO_EXTI_Init( EXT_RTC_INT_PORT, EXT_RTC_INT_PIN, EXTI_FALLING, ENABLE); + GPIO_EXTI_Init( KEY1_PORT, KEY1_PIN, EXTI_FALLING, ENABLE); + GPIO_EXTI_Init( KEY2_PORT, KEY2_PIN, EXTI_FALLING, ENABLE); + GPIO_EXTI_Init( KEY3_PORT, KEY3_PIN, EXTI_FALLING, ENABLE); + GPIO_EXTI_Init( KEY4_PORT, KEY4_PIN, EXTI_FALLING, ENABLE); + /*NVIC�ж�����*/ NVIC_DisableIRQ(GPIO_IRQn); @@ -137,7 +145,8 @@ 1,save_realtime_data_g.record_time_BCD.hour,save_realtime_data_g.record_time_BCD.min,save_realtime_data_g.record_time_BCD.sec); } - + //�������г�ʼ�� + ValveRunParaInit(); } -- Gitblit v1.9.3