From 6e7045056f9cb467f12bb2b3f2ce5ff7c75edaf2 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 31 八月 2021 09:47:00 +0800
Subject: [PATCH] 增加硬件版本号
---
源码/核心板/Src/main.c | 110 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 86 insertions(+), 24 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
index 953c548..5e6e514 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
@@ -2,6 +2,7 @@
#include "Rcc_Nvic_Systick.h"
#include "Usart.h"
#include "Spi.h"
+#include "Flash.h"
#include "led.h"
#include "beep.h"
#include "dw_driver.h"
@@ -12,7 +13,34 @@
#include "ADC.h"
//#define DEBUG_MODE
+/*
+ * rlv:重装载寄存器的值，取值范围为：0-0XFFF
+ * 函数调用举例：
+ * IWDG_Config(IWDG_Prescaler_64 ,625); // IWDG 1s 超时溢出
+ * （64/40）*625 = 1s
+ */
+void IWDG_Config(uint8_t prv ,uint16_t rlv)
+{
+ // 使能 预分频寄存器PR和重装载寄存器RLR可写
+ IWDG_WriteAccessCmd( IWDG_WriteAccess_Enable );
+
+ // 设置预分频器值
+ IWDG_SetPrescaler( prv );
+
+ // 设置重装载寄存器值
+ IWDG_SetReload( rlv );
+
+ // 把重装载寄存器的值放到计数器中
+ IWDG_ReloadCounter();
+
+ // 使能 IWDG
+ IWDG_Enable();
+}
+void IWDG_Feed(void)
+{
+ IWDG_ReloadCounter();
+}
void Device_Init(void)
{
RCC_Configuration();
@@ -27,7 +55,8 @@
Uart1_Init();
Spi_Init();
ADC_Configuration();
-
+ IWDG_Config(IWDG_Prescaler_128 ,4095); //10s
+ IWDG_Feed();
GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
}
u8 anchor_type;
@@ -44,10 +73,25 @@
checksum = Checksum_u16(&hbsend[2],12);
memcpy(&hbsend[14],&checksum,2);
}
-u16 tyncpoll_time;
+
+uint16_t vel_factor,pos_factor;
+u16 tyncpoll_time,dist_threshold,group_id;
u16 slottime,max_slotpos;
extern u8 module_power;
extern u16 total_slotnum;
+void ComMapCheck(void)
+{
+
+ if(g_com_map[WAR_JDQ_TIME]>1000||g_com_map[WAR_JDQ_TIME]<0)
+ {
+ g_com_map[WAR_JDQ_TIME] = 1;
+ }
+ if(dist_threshold<300)
+ {dist_threshold = 300;}
+ if(dist_threshold>15000)
+ {dist_threshold = 15000;}
+}
+u16 JDQ_time;
void Program_Init(void)
{ float temp;
u16 temp2;
@@ -71,30 +115,39 @@
{
g_com_map[COM_INTERVAL]=100;
}
- g_com_map[VERSION] = 0x011c;
+ JDQ_time = g_com_map[WAR_JDQ_TIME]*10;
+ g_com_map[VERSION] = 0x0135;
+ FLASH_Read(FLASH_HARDWARE_FLAG, (uint8_t*)&g_com_map[HARDWAREFLAG_INDEX], 16);
+ dist_threshold = (g_com_map[SPEEDFILTER_THRES]*10)/(1000/g_com_map[COM_INTERVAL]);
+ ComMapCheck();
+ g_com_map[SW_TYPE] = SW_FANGZHUANG;
dev_id = g_com_map[DEV_ID];
+ group_id=g_com_map[GROUP_ID];
slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
max_slotpos=g_com_map[COM_INTERVAL]/slottime;
tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;
module_power = g_com_map[POWER];
total_slotnum = 1000/g_com_map[COM_INTERVAL];
+ vel_factor=g_com_map[FILTER_COEFFICIENT];
+ pos_factor=g_com_map[FILTER_COEFFICIENT];
+
if(module_power>67)
{
module_power=67;
}
- if(g_com_map[DEV_ROLE])
- {
- printf("标签ID: %d .\r\n",dev_id);
- printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
- printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
- }else{
-
- anchor_type = dev_id%g_com_map[MAX_REPORT_ANC_NUM];
- printf("基站ID: %x .\r\n",dev_id);
- printf("基站类型: %c .\r\n",anchor_type+0x41);
- printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
- }
+// if(g_com_map[DEV_ROLE])
+// {
+// printf("标签ID: %d .\r\n",dev_id);
+// printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
+// printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
+// }else{
+//
+// anchor_type = dev_id%g_com_map[MAX_REPORT_ANC_NUM];
+// printf("基站ID: %x .\r\n",dev_id);
+// printf("基站类型: %c .\r\n",anchor_type+0x41);
+// printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
+// }
OUT485_DISABLE;
// 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]);
@@ -146,11 +199,21 @@
if(heartbeat_timer>1000)
{
heartbeat_timer=0;
- if(g_com_map[HEARTBEAT]&&g_com_map[DEV_ROLE]==0)
+ if(g_com_map[HEARTBEAT])
HeatBeat();
}
if(flag_newsecond)
{
+ uint32_t temp23;
+// temp23 = dwt_read32bitreg(CHAN_CTRL_ID) ;
+// if(temp23!=0x4A480022)
+// {
+// temp23 = dwt_read32bitreg(CHAN_CTRL_ID) ;
+// if(temp23!=0x4A480022)
+// {
+// NVIC_SystemReset();
+// }
+// }
flag_newsecond=0;
tagpos_binary=0;
memcpy(ancidlist_send,ancidlist_rec,ancidlist_num*2);
@@ -162,7 +225,7 @@
tagpos_rec[i] = 0;
}
}
- if(target_time>1000)
+ if(target_time>=1000)
{target_time-=1000;}
#ifdef USART_INTEGRATE_OUTPUT
if(g_com_map[DEV_ROLE]==0&&usart_send_flag)
@@ -193,12 +256,10 @@
// Delay_ms(100);
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
- if(g_com_map[CNT_REBOOT]==1)
+ if(g_com_map[CNT_REBOOT]==1)
{
- g_com_map[CNT_REBOOT]=0;
- g_com_map[MAP_SIGN_INDEX]=0;
- save_com_map_to_flash();
- delay_ms(100);
+ FactorySettings();
+
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
if(g_com_map[CNT_RESTART]==1)
@@ -208,16 +269,17 @@
delay_ms(100);
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
- if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0)
+ if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0)
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
}
+
int main(void)
{
- Device_Init();
+ Device_Init();
//StartUpTest();
Program_Init();
Dw1000_Init();
--
Gitblit v1.9.3