From ac3eb3210f17aedfed086520c022befb28f7599c Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 19 七月 2023 17:46:10 +0800
Subject: [PATCH] 测试提交
---
Src/main.c | 76 ++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 1184712..a6f3880 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -33,7 +33,7 @@
#define NSH1 0x0001
#define GP 0x0002
#define FLASH_HARDWARE_VERSION_MAP (uint32_t)0x08004F00 //硬件版本号和批次信息位置
-//#define DEBUG_MODE
+#define DEBUG_MODE
/* USER CODE END Includes */
/* Private typedef -----------------------------------------------------------*/
@@ -221,7 +221,7 @@
hardware_pici = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+2);
hardware_type = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4);
//deca_sleep(1000);
- g_com_map[VERSION] = (1<<8)|67;
+ g_com_map[VERSION] = (1<<8)|68;
#ifdef DEBUG_MODE
// g_com_map[GROUP_ID]=21;
@@ -310,7 +310,7 @@
static uint16_t bat_count = 0;
//if(bat_count++%600==0)
{
- temp2=dwt_readtempvbat(1);
+ temp2=dwt_readtempvbat();
dw_vbat=(float)((temp2&0xff)-173)/173+3.3;
if(fabs(dw_vbat-dw_vbat)>0.2)
{
@@ -339,6 +339,7 @@
HAL_ADC_DeInit(&hadc);
HAL_ADCEx_DisableVREFINT();
}
+extern uint32_t dw3000_id;
/* USER CODE END 0 */
/**
@@ -375,7 +376,7 @@
MX_SPI1_Init();
MX_ADC_Init();
- MX_IWDG_Init();
+// MX_IWDG_Init();
/* USER CODE BEGIN 2 */
LED_LG_ON;
Program_Init();
@@ -383,14 +384,17 @@
Dw1000_Init();
Dw1000_App_Init();
// HardWareTypeDiffConfig();
- dwt_configuresleep(DWT_PRESRV_SLEEP | DWT_CONFIG, DWT_WAKE_CS | DWT_WAKE_WK| DWT_SLP_EN);
- dwt_entersleep();
- DW_DISABLE;
+ dwt_configuresleep(DWT_CONFIG|DWT_PGFCAL, DWT_PRES_SLEEP | DWT_WAKE_CSN | DWT_WAKE_WUP | DWT_SLP_EN);
+// dwt_configuresleep(DWT_PRESRV_SLEEP | DWT_CONFIG, DWT_WAKE_CS | DWT_WAKE_WK| DWT_SLP_EN);
+// dwt_entersleep();
+// DW_DISABLE;
+ Tag_App666();
if(HAL_UART_Receive_DMA(&huart1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE))
{
Error_Handler();
}
HAL_Delay(2000);
+ // dw3000_id=dwt_read32bitreg(0x44);;
// mcu_sleep();
//LED0_BLINK;
// SystemPower_Config();
@@ -406,9 +410,9 @@
/* USER CODE BEGIN 3 */
if(g_start_send_flag)
{ static uint16_t blink_count=0;
- SystemClock_Config();
+// SystemClock_Config();
g_start_send_flag = 0;
- HAL_IWDG_Refresh(&hiwdg);
+// HAL_IWDG_Refresh(&hiwdg);
// if(current_count>slot_startcount&¤t_count<slot_startcount+interval_count)
// {
// HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_SET);
@@ -416,32 +420,32 @@
// HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_RESET);
// }
// LED_TR_BLINK;s
-
+ Tag_App();
- if(bat_percent>15)
- { LED_TB_ON;
- Tag_App();
- LED_TB_OFF;
- }else{
- LED_TR_ON;
- Tag_App();
- LED_TR_OFF;
- }
- //LED0_BLINK;
- IdleTask();
- if(waitusart_timer>0)
- {
- waitusart_timer--;
- }
- }else{
- IdleTask();
- }
- if(m_bEUARTTxEn==0&&waitusart_timer==0)
- {
- if(memcmp(g_com_map2,g_com_map,200)!=0)
- {
- SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
- }
+// if(bat_percent>15)
+// { LED_TB_ON;
+// Tag_App();
+// LED_TB_OFF;
+// }else{
+// LED_TR_ON;
+// Tag_App();
+// LED_TR_OFF;
+// }
+// //LED0_BLINK;
+// IdleTask();
+// if(waitusart_timer>0)
+// {
+// waitusart_timer--;
+// }
+// }else{
+// IdleTask();
+// }
+// if(m_bEUARTTxEn==0&&waitusart_timer==0)
+// {
+// if(memcmp(g_com_map2,g_com_map,200)!=0)
+// {
+// SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
+// }
#ifndef DEBUG_MODE
if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
@@ -863,7 +867,7 @@
if(freqlost_count>FREQ_LOST_TIME)
{
tag_frequency = NOTAG_FREQ;
- if(lost_jumpcount++>=4) //无测距情况下，每5秒发一次；
+ if(lost_jumpcount++>=0) //无测距情况下，每5秒发一次；
{
lost_jumpcount = 0;
g_start_send_flag=1;
@@ -875,7 +879,7 @@
{
SetNextPollTime(0);
}else{
- SetNextPollTime(5);
+ SetNextPollTime(0);
}
nomove_count+=1/(float)tag_frequency;
if(motor_keeptime>0)
--
Gitblit v1.9.3