From 97ce9d99e6c8a56d40d18376be3d0f8ce1fdf6b4 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 23 十一月 2023 15:35:19 +0800
Subject: [PATCH] V1.1 6.5G版本
---
Src/main.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 6274914..6191d5e 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -30,6 +30,7 @@
#include "TrackingDiff.h"
#include "dw_app.h"
#include "Flash.h"
+
#define NSH1 0x0001
#define GP 0x0002
#define FLASH_HARDWARE_VERSION_MAP (uint32_t)0x08004F00 //硬件版本号和批次信息位置
@@ -221,7 +222,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)|68;
+ g_com_map[VERSION] = (1<<8)|1;
#ifdef DEBUG_MODE
// g_com_map[GROUP_ID]=21;
@@ -230,7 +231,7 @@
// g_com_map[MAX_REPORT_ANC_NUM]=1;
// g_com_map[NOMOVESLEEP_TIME]=10;
#endif
- g_com_map[GROUP_ID]=3;
+// g_com_map[GROUP_ID]=3;
g_com_map[COM_INTERVAL] = 1000;
active_flag = g_com_map[ACTIVE_INDEX];
module_power = g_com_map[POWER];
@@ -271,7 +272,7 @@
Error_Handler();
}
//g_com_map[NOMOVESLEEP_TIME]=5;
- printf("固件版本: 免布线基站 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
+ printf("固件版本: 免布线基站-带气压 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
// printf("DEVICE PAIRID: %d .\r\n",g_com_map[PAIR_ID]);
// printf("DEVICE ALARM DISTANCE: 1.%d 2.%d 3.%d .\r\n",g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],g_com_map[ALARM_DISTANCE3]);
@@ -339,6 +340,8 @@
HAL_ADC_DeInit(&hadc);
HAL_ADCEx_DisableVREFINT();
}
+
+
/* USER CODE END 0 */
/**
@@ -386,11 +389,13 @@
dwt_configuresleep(DWT_PRESRV_SLEEP | DWT_CONFIG, DWT_WAKE_CS | DWT_WAKE_WK| DWT_SLP_EN);
dwt_entersleep();
DW_DISABLE;
+ BarInit();
if(HAL_UART_Receive_DMA(&huart1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE))
{
Error_Handler();
}
HAL_Delay(2000);
+
// mcu_sleep();
//LED0_BLINK;
// SystemPower_Config();
--
Gitblit v1.9.3