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 | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 521a520..982bb0a 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -322,8 +322,9 @@
second_count = 0;
MinuteTask();
}
- TagListUpdate_person_num();
- LOG_INFO(TRACE_MODULE_APP,"车内：%d 人,车外: %d 人\r\n",get_in_num,get_out_num);
+ TagListUpdate_person_num_car();
+ in_table_log();
+
// if(!power_low_flag)
// Gps_change();
// else{
@@ -383,7 +384,7 @@
}
if(enbale_blink_flag)
{
- delay_us(5000);
+ //delay_us(5000);
green_charge_state=0;
charge_red_off();
}
@@ -565,6 +566,8 @@
// TCPClient_Init();
gpio_open();
+
+
board_output_init();//配置adcGND引脚
// battery_monitor_open();
// Voltage_input=battery_monitor_get();
@@ -575,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引脚
@@ -592,7 +595,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采样
@@ -600,7 +603,7 @@
// 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)//确认是否休眠下才开启功能
// {
--
Gitblit v1.9.3