From b39a40b0191e0a8b155db74e885ff66e17b91896 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 06 Jun 2024 19:25:15 +0800
Subject: [PATCH] 继续完善
---
HARDWARE/TIM/tim.c | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/HARDWARE/TIM/tim.c b/HARDWARE/TIM/tim.c
index 881d3a0..b398c76 100644
--- a/HARDWARE/TIM/tim.c
+++ b/HARDWARE/TIM/tim.c
@@ -1,31 +1,29 @@
#include "tim.h"
#include "rs485_read_data.h"
-
#include "gpio.h"
+#include "pulse_and_alarm_line.h"
uint8_t first_power_tim_cnt_g = 5;
void BTx_IRQHandler(void)
{
-// if( BTx_ISR_CMPHIF_Chk(BT1)==SET) //�춨����
-// {
-// BTx_ISR_CMPLIF_Clr(BT1);
-// BTx_ISR_CMPHIF_Clr(BT1);
-// sys_time_g.sys_cal_run_period = SET;//����ʱ��
-// }else if(BTx_ISR_CMPHIF_Chk(BT2)==SET)
-// {
-// BTx_ISR_CMPLIF_Clr(BT2);
-// BTx_ISR_CMPHIF_Clr(BT2);
-// ++first_power_tim_cnt_g;
-// if(first_power_tim_cnt_g % 5 == 0)
-// {
-// pwr_vol_g.lith_flag = LMS_PERIOD;//�״��ϵ磬��ѹ��μ���
-// if(++first_power_get_cnt_g >= FIRST_POWER_TIM_MAX)
-// BTx_CR1_CHEN_Setable(BT2,DISABLE);
-// }
-//
-// }
+ if( BTx_ISR_CMPHIF_Chk(BT1)==SET) //�춨����
+ {
+ BTx_ISR_CMPLIF_Clr(BT1);
+ BTx_ISR_CMPHIF_Clr(BT1);
+
+ BTx_CR1_CHEN_Setable(BT1,DISABLE);
+ pulse_exti_flag = RESET;
+
+ pulse_count +=1;
+
+ }else if(BTx_ISR_CMPHIF_Chk(BT2)==SET)
+ {
+ BTx_ISR_CMPLIF_Clr(BT2);
+ BTx_ISR_CMPHIF_Clr(BT2);
+
+ }
}
void BSTIM_IRQHandler(void)
@@ -161,7 +159,7 @@
BSTIM_ARR_Write(Arr - 1);
NVIC_DisableIRQ(BSTIM_IRQn );
- NVIC_SetPriority(BSTIM_IRQn ,2); //�ж����ȼ�����
+ NVIC_SetPriority(BSTIM_IRQn ,5); //�ж����ȼ�����
NVIC_EnableIRQ(BSTIM_IRQn );
/*���������ʱ����ֱ�ӽ���һ���жϵ�����*/
@@ -196,7 +194,7 @@
LPTIM_IER_OVIE_Setable(ENABLE); /* �����������ж� */
NVIC_DisableIRQ(LPTIM_IRQn);
- NVIC_SetPriority(LPTIM_IRQn,2);//�ж����ȼ�����
+ NVIC_SetPriority(LPTIM_IRQn,6);//�ж����ȼ�����
NVIC_EnableIRQ(LPTIM_IRQn);
LPTIM_CR_EN_Setable(ENABLE); /* ʹ�ܼ�����: */
--
Gitblit v1.9.3