From d532bd5e0ed482e4760af0bac690d4e84148169d Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期四, 28 十一月 2024 11:10:19 +0800
Subject: [PATCH] 加入缓冲可以1对一较准确判断但是比较慢
---
keil/include/main/main.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 5559cc6..563373b 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -62,7 +62,7 @@
#include "HIDO_Timer.h"
#include "TCPClient.h"
-//#define DEBUG_MODE
+#define DEBUG_MODE
extern int simple_main(void);
extern int temp_main(void);
#define TEST_UART_POLL_MODE 0
@@ -208,6 +208,7 @@
uint8_t gps_enable_flag,motor_open_air_flag,moter_open_uwb_flag,flag_fenli_alarm = 0,fenli_alarm_count,delaysleep_count,enbale_blink_flag;
int need_open_gps_count;
uint32_t keystarttime,keystarttime2;
+extern uint32_t get_in_num,get_out_num;
void MotorPoll(void)
{
if(UWB_work_state==UN_BIND) {
@@ -321,6 +322,9 @@
second_count = 0;
MinuteTask();
}
+ TagListUpdate_person_num_car();
+ in_table_log();
+
// if(!power_low_flag)
// Gps_change();
// else{
@@ -370,7 +374,7 @@
green_charge_state=0;
charge_red_on();
}
- UWBPoll();
+
charge_state_change();//充电状态判断
if(secondtask_count++%2==0)
{
@@ -589,7 +593,7 @@
power_init();
//AIR780E_Reset(); //4G模块重启，耗时1.5秒,这个是无法同步的关键
sleep_timer_open(true, SLEEP_TIMER_MODE_RELOAD, sleep_timer_callback);
- //sleep_timer_start(__MS_TO_32K_CNT(g_com_map[COM_INTERVAL]));//测试
+ sleep_timer_start(__MS_TO_32K_CNT(g_com_map[COM_INTERVAL]));//测试
sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试
// board_5V_input_init(voltage_input_handler);
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
@@ -598,7 +602,7 @@
board_4GUsart_detection_init(_4gUsart_handler);
while (1)
{ test4=gpio_pin_get_val(SCL_PIN);
-
+ UWBPoll();
// if(!power_low_flag)//确认是否休眠下才开启功能
// {
// if(flag_TCP_reconnectting||IfTCPConnected())
--
Gitblit v1.9.3