From 0336357cf8d72c0c17c6fed3d5233f1e352e32ae Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 16 二月 2022 19:57:40 +0800
Subject: [PATCH] 修改485控制BUG
---
源码/核心板/Src/main.c | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 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 b592840..2220961 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,6 +100,7 @@
if(dist_threshold>15000)
{dist_threshold = 15000;}
}
+extern u8 needanchorrx;
u16 JDQ_time;
int16_t g_commap_antdelay;
void Program_Init(void)
@@ -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;
@@ -145,7 +148,7 @@
OUT485_ENABLE;
ComMapCheck();
- g_com_map[VERSION] = 0x013a;
+ g_com_map[VERSION] = 1<<8|62;
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 = g_com_map[ANT_LENGTH];
@@ -168,11 +171,12 @@
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);
@@ -224,7 +228,7 @@
{
UART_CheckReceive();
- UART_CheckSend();
+ // UART_CheckSend();
if(heartbeat_timer>1000)
{
@@ -303,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)
{
@@ -321,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