From 549a8abdc9d1a64bc6cde50f979633eb5e43c555 Mon Sep 17 00:00:00 2001
From: guanjiao ren <guanjiao.ren@ninebot.com>
Date: 星期三, 16 五月 2018 19:02:00 +0800
Subject: [PATCH] 去掉port.c文件
---
源码/核心板/Src/main.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 995e3b7..22f9c37 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"
@@ -27,7 +27,7 @@
#include "Rcc_Nvic_Systick.h"
#include "Usart.h"
#include "Spi.h"
-#include "dw_driver.h
+#include "dw_driver.h"
#include "led.h"
/* Example application name and version to display on LCD screen. */
@@ -140,10 +140,10 @@
*ts += ts_field[i] << (i * 8);
}
}
-void GPIO_Toggle(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin)
-{
- GPIO_WriteBit(GPIOx, GPIO_Pin, (BitAction)!GPIO_ReadOutputDataBit(GPIOx, GPIO_Pin));
-}
+//void GPIO_Toggle(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin)
+//{
+// GPIO_WriteBit(GPIOx, GPIO_Pin, (BitAction)!GPIO_ReadOutputDataBit(GPIOx, GPIO_Pin));
+//}
int fputc(int ch, FILE *f)
{
@@ -202,7 +202,7 @@
deca_sleep(100);
}
}
-extern volatile unsigned long time32_reset;
+//extern volatile unsigned long time32_reset;
extern uint8_t Work_Mode;
uint32 frame_len;
uint8_t send[9];
@@ -366,7 +366,7 @@
/* Increment frame sequence number after transmission of the final message (modulo 256). */
frame_seq_nb++;
- time32_reset = 0;
+// time32_reset = 0;
GPIO_Toggle(GPIOA, LED_PIN); //LED闪烁
jumptime = 0;
}
@@ -496,7 +496,7 @@
dis = dist2 * 100; //dis 为单位为cm的距离
dist[TAG_ID] = LP(dis, TAG_ID); //LP 为低通滤波器，让数据更稳定
- time32_reset = 0;
+// time32_reset = 0;
GPIO_Toggle(GPIOA, LED_PIN);
if (GPIO_ReadInputDataBit(GPIOA, SW2) != RESET) //通过拨码开关判断数据输出格式
{
--
Gitblit v1.9.3