From 30bd11dac942b17928cc730da67768baf3f4c049 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期二, 07 一月 2025 09:50:39 +0800
Subject: [PATCH] 修改打印语句
---
keil/include/main/main.c | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 5559cc6..982bb0a 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)
{
@@ -380,7 +384,7 @@
}
if(enbale_blink_flag)
{
- delay_us(5000);
+ //delay_us(5000);
green_charge_state=0;
charge_red_off();
}
@@ -562,6 +566,8 @@
// TCPClient_Init();
gpio_open();
+
+
board_output_init();//配置adcGND引脚
// battery_monitor_open();
// Voltage_input=battery_monitor_get();
@@ -572,7 +578,7 @@
Accelerometer_Init();
IO_control_init();
io_pin_mux_set(SCL_PIN, IO_FUNC0);//测试测距波形
- gpio_pin_set_dir(SCL_PIN , GPIO_DIR_IN, 0);
+ gpio_pin_set_dir(SCL_PIN , GPIO_DIR_OUT, 0);
io_pull_set(SCL_PIN , IO_PULL_UP, IO_PULL_UP_LEVEL4);
//gps_air780_power_change(0,1);//开启gps，4G
//加速度计初始化必须在IO_control_init之前因为复用SDA引脚
@@ -597,8 +603,8 @@
// LOG_INFO(TRACE_MODULE_APP, "测试进入app");
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