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 ++--
源码/核心板/MDK-ARM/Project.uvprojx | 66 ++--------------------
源码/核心板/MDK-ARM/Project.uvoptx | 76 ++++++++++++++----------
3 files changed, 58 insertions(+), 100 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx"
index 9d74f2c..9470837 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx"
@@ -101,6 +101,8 @@
<sRunDeb>0</sRunDeb>
<sLrtime>0</sLrtime>
<bEvRecOn>1</bEvRecOn>
+ <bSchkAxf>0</bSchkAxf>
+ <bTchkAxf>0</bTchkAxf>
<nTsel>1</nTsel>
<sDll></sDll>
<sDllPa></sDllPa>
@@ -208,6 +210,10 @@
<pszMrule></pszMrule>
<pSingCmds></pSingCmds>
<pMultCmds></pMultCmds>
+ <pMisraNamep></pMisraNamep>
+ <pszMrulep></pszMrulep>
+ <pSingCmdsp></pSingCmdsp>
+ <pMultCmdsp></pMultCmdsp>
</TargetOption>
</Target>
@@ -291,6 +297,8 @@
<sRunDeb>0</sRunDeb>
<sLrtime>0</sLrtime>
<bEvRecOn>1</bEvRecOn>
+ <bSchkAxf>0</bSchkAxf>
+ <bTchkAxf>0</bTchkAxf>
<nTsel>1</nTsel>
<sDll></sDll>
<sDllPa></sDllPa>
@@ -398,6 +406,10 @@
<pszMrule></pszMrule>
<pSingCmds></pSingCmds>
<pMultCmds></pMultCmds>
+ <pMisraNamep></pMisraNamep>
+ <pszMrulep></pszMrulep>
+ <pSingCmdsp></pSingCmdsp>
+ <pMultCmdsp></pMultCmdsp>
</TargetOption>
</Target>
@@ -481,6 +493,8 @@
<sRunDeb>0</sRunDeb>
<sLrtime>0</sLrtime>
<bEvRecOn>1</bEvRecOn>
+ <bSchkAxf>0</bSchkAxf>
+ <bTchkAxf>0</bTchkAxf>
<nTsel>1</nTsel>
<sDll></sDll>
<sDllPa></sDllPa>
@@ -588,6 +602,10 @@
<pszMrule></pszMrule>
<pSingCmds></pSingCmds>
<pMultCmds></pMultCmds>
+ <pMisraNamep></pMisraNamep>
+ <pszMrulep></pszMrulep>
+ <pSingCmdsp></pSingCmdsp>
+ <pMultCmdsp></pMultCmdsp>
</TargetOption>
</Target>
@@ -671,6 +689,8 @@
<sRunDeb>0</sRunDeb>
<sLrtime>0</sLrtime>
<bEvRecOn>1</bEvRecOn>
+ <bSchkAxf>0</bSchkAxf>
+ <bTchkAxf>0</bTchkAxf>
<nTsel>1</nTsel>
<sDll></sDll>
<sDllPa></sDllPa>
@@ -778,6 +798,10 @@
<pszMrule></pszMrule>
<pSingCmds></pSingCmds>
<pMultCmds></pMultCmds>
+ <pMisraNamep></pMisraNamep>
+ <pszMrulep></pszMrulep>
+ <pSingCmdsp></pSingCmdsp>
+ <pMultCmdsp></pMultCmdsp>
</TargetOption>
</Target>
@@ -861,6 +885,8 @@
<sRunDeb>0</sRunDeb>
<sLrtime>0</sLrtime>
<bEvRecOn>1</bEvRecOn>
+ <bSchkAxf>0</bSchkAxf>
+ <bTchkAxf>0</bTchkAxf>
<nTsel>1</nTsel>
<sDll></sDll>
<sDllPa></sDllPa>
@@ -968,6 +994,10 @@
<pszMrule></pszMrule>
<pSingCmds></pSingCmds>
<pMultCmds></pMultCmds>
+ <pMisraNamep></pMisraNamep>
+ <pszMrulep></pszMrulep>
+ <pSingCmdsp></pSingCmdsp>
+ <pMultCmdsp></pMultCmdsp>
</TargetOption>
</Target>
@@ -1051,6 +1081,8 @@
<sRunDeb>0</sRunDeb>
<sLrtime>0</sLrtime>
<bEvRecOn>1</bEvRecOn>
+ <bSchkAxf>0</bSchkAxf>
+ <bTchkAxf>0</bTchkAxf>
<nTsel>3</nTsel>
<sDll></sDll>
<sDllPa></sDllPa>
@@ -1073,7 +1105,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>JL2CM3</Key>
- <Name>-U20090928 -O14 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103CB$Flash/STM32F10x_128.FLM)</Name>
+ <Name>-U20090928 -O14 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103T8$Flash\STM32F10x_128.FLM)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -1213,6 +1245,10 @@
<pszMrule></pszMrule>
<pSingCmds></pSingCmds>
<pMultCmds></pMultCmds>
+ <pMisraNamep></pMisraNamep>
+ <pszMrulep></pszMrulep>
+ <pSingCmdsp></pSingCmdsp>
+ <pMultCmdsp></pMultCmdsp>
<DebugDescription>
<Enable>1</Enable>
<EnableLog>0</EnableLog>
@@ -1639,30 +1675,6 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
- <PathWithFileName>..\Src\platform\port.c</PathWithFileName>
- <FilenameWithoutPath>port.c</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
- <File>
- <GroupNumber>5</GroupNumber>
- <FileNumber>33</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>..\Src\platform\lcd.c</PathWithFileName>
- <FilenameWithoutPath>lcd.c</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
- <File>
- <GroupNumber>5</GroupNumber>
- <FileNumber>34</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
<PathWithFileName>..\Src\platform\deca_spi.c</PathWithFileName>
<FilenameWithoutPath>deca_spi.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
@@ -1670,7 +1682,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>33</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1682,7 +1694,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>36</FileNumber>
+ <FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1702,7 +1714,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>37</FileNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1714,7 +1726,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>38</FileNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1726,7 +1738,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>39</FileNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1746,7 +1758,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>40</FileNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1758,7 +1770,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>41</FileNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvprojx" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvprojx"
index b4aeddd..3d410e6 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvprojx"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvprojx"
@@ -10,6 +10,7 @@
<TargetName>STM32100E-EVAL</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
+ <uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STM32F100ZE</Device>
@@ -554,16 +555,6 @@
<GroupName>platform</GroupName>
<Files>
<File>
- <FileName>port.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\port.c</FilePath>
- </File>
- <File>
- <FileName>lcd.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\lcd.c</FilePath>
- </File>
- <File>
<FileName>deca_spi.c</FileName>
<FileType>1</FileType>
<FilePath>..\Src\platform\deca_spi.c</FilePath>
@@ -621,6 +612,7 @@
<TargetName>STM3210E-EVAL_XL</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
+ <uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STM32F103ZG</Device>
@@ -1165,16 +1157,6 @@
<GroupName>platform</GroupName>
<Files>
<File>
- <FileName>port.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\port.c</FilePath>
- </File>
- <File>
- <FileName>lcd.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\lcd.c</FilePath>
- </File>
- <File>
<FileName>deca_spi.c</FileName>
<FileType>1</FileType>
<FilePath>..\Src\platform\deca_spi.c</FilePath>
@@ -1232,6 +1214,7 @@
<TargetName>STM32100B-EVAL</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
+ <uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STM32F102CB</Device>
@@ -1776,16 +1759,6 @@
<GroupName>platform</GroupName>
<Files>
<File>
- <FileName>port.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\port.c</FilePath>
- </File>
- <File>
- <FileName>lcd.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\lcd.c</FilePath>
- </File>
- <File>
<FileName>deca_spi.c</FileName>
<FileType>1</FileType>
<FilePath>..\Src\platform\deca_spi.c</FilePath>
@@ -1843,6 +1816,7 @@
<TargetName>STM3210C-EVAL</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
+ <uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STM32F107VC</Device>
@@ -2387,16 +2361,6 @@
<GroupName>platform</GroupName>
<Files>
<File>
- <FileName>port.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\port.c</FilePath>
- </File>
- <File>
- <FileName>lcd.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\lcd.c</FilePath>
- </File>
- <File>
<FileName>deca_spi.c</FileName>
<FileType>1</FileType>
<FilePath>..\Src\platform\deca_spi.c</FilePath>
@@ -2454,6 +2418,7 @@
<TargetName>STM3210E-EVAL</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
+ <uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STM32F103ZE</Device>
@@ -2998,16 +2963,6 @@
<GroupName>platform</GroupName>
<Files>
<File>
- <FileName>port.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\port.c</FilePath>
- </File>
- <File>
- <FileName>lcd.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\lcd.c</FilePath>
- </File>
- <File>
<FileName>deca_spi.c</FileName>
<FileType>1</FileType>
<FilePath>..\Src\platform\deca_spi.c</FilePath>
@@ -3066,6 +3021,7 @@
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060422::V5.06 update 4 (build 422)::ARMCC</pCCUsed>
+ <uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
<Device>STM32F103T8</Device>
@@ -3609,16 +3565,6 @@
<Group>
<GroupName>platform</GroupName>
<Files>
- <File>
- <FileName>port.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\port.c</FilePath>
- </File>
- <File>
- <FileName>lcd.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Src\platform\lcd.c</FilePath>
- </File>
<File>
<FileName>deca_spi.c</FileName>
<FileType>1</FileType>
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