From e0168d36f7b3dcc0bf4c4f3ab95485d1e2df7832 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期三, 23 十月 2024 14:12:55 +0800
Subject: [PATCH] 车载标签V1.5版本，加入上电灯逻辑
---
keil/include/main/main.c | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 3414938..3dcabcb 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -131,9 +131,12 @@
uart_close(UART_ID0);
uart_close(UART_ID1);
}
+int test3;
static void sleep_timer_callback(void *dev, uint32_t time)
{
//sleep_timer_start(__MS_TO_32K_CNT(1000));
+ gpio_pin_set(LED_PIN);
+ test3=gpio_pin_get_val(LED_PIN);
enable_sleep_count++;
if(enable_sleep_count==SLEEP_START_TIME){
@@ -141,8 +144,11 @@
sleep_flag=1;
}
g_start_send_flag=1;
+ gpio_pin_clr(LED_PIN);
+ test3=gpio_pin_get_val(LED_PIN);
//LOG_INFO(TRACE_MODULE_APP, "Sleep timer interrupt callback\r\n");
}
+
static void adc_callback(void *data, uint32_t number)
{
uint32_t *result = (uint32_t *)data;
@@ -178,7 +184,7 @@
group_id=g_com_map[GROUP_ID];
memcpy(&dev_id ,&g_com_map[DEV_ID],2);
tag_frequence=1000/g_com_map[COM_INTERVAL];
-g_com_map[VERSION] = (1<<8)|4;
+g_com_map[VERSION] = (1<<8)|5;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
LOG_INFO(TRACE_MODULE_APP,"固件版本:UWB-标签 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
}
@@ -250,7 +256,7 @@
//sys_timer_open();
gpio_open();
- //board_led_init();
+ board_led_init();
//uart_open(UART_ID0, &test_uart_cfg);
@@ -271,6 +277,7 @@
gpio_pin_set_dir( IO_PIN_5, GPIO_DIR_OUT, 0);
io_pull_set(IO_PIN_5 , IO_PULL_DOWN, IO_PULL_UP_LEVEL4);
#endif
+
//Serial0_PutString("进入app测试\r\n");
while (1)
{
@@ -279,8 +286,9 @@
//LOG_INFO(TRACE_MODULE_APP, "测距ing");
g_start_send_flag = 0;
-
+ gpio_pin_set(LED_PIN);
TagRange();
+ gpio_pin_clr(LED_PIN);
IdleTask();
}else{
IdleTask();
--
Gitblit v1.9.3