From 6e644cfd3663485778937131841fc286ee4174f2 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 14 十二月 2019 13:53:05 +0800
Subject: [PATCH] 改成115200版本 V1.11
---
源码/核心板/Src/main.c | 3 ++-
源码/核心板/Src/application/beep_logic_app.c | 4 ++--
源码/核心板/Src/OnChipDevices/Usart.c | 2 ++
源码/核心板/Src/OnChipDevices/Usart.h | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c"
index 90c60fd..bcf91be 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c"
@@ -313,6 +313,8 @@
t4++;
#ifdef BAUDRATE_19200
delay_us(500);
+ #else
+ delay_us(10);
#endif
// temp32 = GPIOC->CRH; //C10复用推挽输出
// temp32 &= ~(0x00000000F<<8);
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.h"
index f9b1436..0388100 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.h"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.h"
@@ -3,7 +3,7 @@
#define __USART_H__
#include "stm32f10x.h"
-#define BAUDRATE_19200
+//#define BAUDRATE_19200
#define EU_485_PIN GPIO_Pin_7
#define EU_485_GPIO GPIOB
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/beep_logic_app.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/beep_logic_app.c"
index 41b4659..3e82a67 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/beep_logic_app.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/beep_logic_app.c"
@@ -57,12 +57,12 @@
else{
beep_state=0;
}
- if (min_dist >= g_com_map[ALARM_DISTANCE1]+10)
+ if (min_dist >= g_com_map[ALARM_DISTANCE1]+20)
{
RELAY1_OFF;
}
- if (min_dist >= g_com_map[ALARM_DISTANCE2]+10)
+ if (min_dist >= g_com_map[ALARM_DISTANCE2]+20)
{
RELAY2_OFF;
}
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 7991713..78c42c8 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"
@@ -63,7 +63,8 @@
g_com_map[COM_INTERVAL]=50;
g_com_map[MAX_REPORT_ANC_NUM]=3;
g_com_map[DEV_ID]=1;
- g_com_map[ANC_POLL]=1;
+ g_com_map[ANC_POLL]=0;
+ g_com_map[ALARM_DISTANCE1]=100;
#endif
dev_id = g_com_map[DEV_ID];
g_com_map[VERSION] = 0x010b;
--
Gitblit v1.9.3