From a6e5c60a9ec30574bf7c3d584046444b15f8680f Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 10 二月 2022 16:29:20 +0800
Subject: [PATCH] V1.61 修改成中断模式，测试不丢包。
---
源码/核心板/Src/main.c | 87 ++++++++++++++++++++++++++++++-------------
1 files changed, 61 insertions(+), 26 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 2be0a88..a6e0ca9 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"
@@ -46,7 +46,7 @@
RCC_Configuration();
//SystemInit();
NVIC_SetVectorTable(NVIC_VectTab_FLASH, 0x5000);
- Nvic_Init();
+
// Systick_Init();
TIM3_Int_Init();
Led_Init();
@@ -55,8 +55,9 @@
Uart1_Init();
Spi_Init();
ADC_Configuration();
- IWDG_Config(IWDG_Prescaler_128 ,4095); //10s
- IWDG_Feed();
+ //IWDG_Config(IWDG_Prescaler_128 ,4095); //10s
+ Nvic_Init();
+ IWDG_Feed();
GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
}
u8 anchor_type;
@@ -99,8 +100,9 @@
if(dist_threshold>15000)
{dist_threshold = 15000;}
}
+extern u8 needanchorrx;
u16 JDQ_time;
-u16 g_commap_antdelay;
+int16_t g_commap_antdelay;
void Program_Init(void)
{ float temp;
u16 temp2;
@@ -109,6 +111,7 @@
parameter_init();
//deca_sleep(1000);
HeartBeatInit();
+ Modbus_RegMap();
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
// g_com_map[DEV_ID]=1;
@@ -119,12 +122,36 @@
g_com_map[ANC_FLAG]=1;
save_com_map_to_flash();
#endif
+//
+// g_com_map[COM_INTERVAL]=100;
+// g_com_map[MAX_REPORT_ANC_NUM]=10;
+// g_com_map[GROUP_ID]=0;
+// g_com_map[DIST_OFFSET]=-116;
+
+// g_com_map[DEV_ROLE] =0x0; //基站
+//
+// g_com_map[ANC_POLL]=1;
+// g_com_map[ALARM_DEV] = 0;
+// g_com_map[ALARM_DISTANCE1] = 0; //默认报警距离50cm
+// g_com_map[ALARM_DISTANCE2] = 900; //默认报警距离50cm
+// g_com_map[ALARM_DISTANCE3] = 1400; //默认报警距离50cm
+// g_com_map[RELAY2_DISTANCE1] = 0; //默认报警距离50cm
+// g_com_map[RELAY2_DISTANCE2] = 900; //默认报警距离50cm
+// g_com_map[RELAY2_DISTANCE3] = 1400; //默认报警距离50cm
+// g_com_map[WAR_JDQ_TIME] = 1; //1秒
+// g_com_map[POWER]=30;
+// g_com_map[SPEEDFILTER_THRES]=10000;
+// g_com_map[FILTER_COEFFICIENT]=40;
+// g_com_map[ANT_LENGTH]=0;
+// g_com_map[NOMOVESLEEP_TIME]=728;
+
+
OUT485_ENABLE;
ComMapCheck();
- g_com_map[VERSION] = 0x0138;
+ g_com_map[VERSION] = 1<<8|61;
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]);
- g_commap_antdelay = (float)g_com_map[ANT_LENGTH]*5.8;
+ g_commap_antdelay = g_com_map[ANT_LENGTH];
JDQ_time = g_com_map[WAR_JDQ_TIME]*10;
g_com_map[SW_TYPE] = SW_FANGZHUANG;
dev_id = g_com_map[DEV_ID];
@@ -142,18 +169,19 @@
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])
+ {
+ needanchorrx = 0;
+ 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{
+ needanchorrx = 1;
+ 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]);
@@ -161,7 +189,7 @@
for(i=0;i<255;i++)
{
- g_Tagdist[i]=0xffff;
+ g_Tagdist[i]=0x1ffff;
}
}
@@ -200,7 +228,7 @@
{
UART_CheckReceive();
- UART_CheckSend();
+ // UART_CheckSend();
if(heartbeat_timer>1000)
{
@@ -279,9 +307,12 @@
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
+
+ g_com_map[RELAY1_STATE_INDEX] = READ_RELAY1;
+ g_com_map[RELAY2_STATE_INDEX] = READ_RELAY2;
}
-
+
int main(void)
{
@@ -297,19 +328,23 @@
usart_send[1]=0xAA;
usart_send_anc[0]=0x55;
usart_send_anc[1]=0xAA;
-
+ dwt_setrxtimeout(0);//设定接收超时时间，0位没有超时时间
+ dwt_rxenable(0);//打开接收
while(1)
{
- g_start_sync_flag=0;
+// g_start_sync_flag=0;
if(g_start_send_flag)
{
g_start_send_flag = 0;
Tag_App();
+ //needanchorrx = 1;
}
IdleTask();
-if(g_com_map[DEV_ROLE]==0)
- Anchor_App();
-
+//if(g_com_map[DEV_ROLE]==0)
+// {needanchorrx = 0;
+// Anchor_App();
+// // Anchor_Start();
+// }
}
}
--
Gitblit v1.9.3