zhang / BootLoader

Commit 73d815018fcbe9950c59e5ff3358bad649f64fc6

Authored by NightIsDark
1 parent 51d0bbfb

little mistake modified

Inline Side-by-side
Showing 4 changed files with 29 additions and 13 deletions
.gitignore
  View file @73d8150
1 OBJ/ 1 OBJ/
2 USER/JLinkLog.txt 2 USER/JLinkLog.txt
3 USER/JLinkSettings.ini 3 USER/JLinkSettings.ini
4 -USER/IAP.uvguix.Admin  
5 -USER/uvguix.Administrator 4 +USER/*.uvguix.Admin
  5 +USER/*.uvguix.Administrator
6 USER/DebugConfig/ 6 USER/DebugConfig/
SYSTEM/usart/uart5.c
  View file @73d8150
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 #include "dev.h" 2 #include "dev.h"
3 #include "delay.h" 3 #include "delay.h"
4 #include "string.h" 4 #include "string.h"
5 -#include "timer4.h" 5 +
6 6
7 #define UART5_RX_MAX 40 7 #define UART5_RX_MAX 40
8 #define UART5_TX_MAX 40 8 #define UART5_TX_MAX 40
SYSTEM/usart/usart1.c
  View file @73d8150
@@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
2 #include "dev.h" 2 #include "dev.h"
3 #include "delay.h" 3 #include "delay.h"
4 #include "string.h" 4 #include "string.h"
5 -#include "timer3.h"  
6 5
7 #define USART1_RX_MAX 40 6 #define USART1_RX_MAX 40
8 #define USART1_TX_MAX 40 7 #define USART1_TX_MAX 40
@@ -14,7 +13,6 @@ void usart1_init(void) @@ -14,7 +13,6 @@ void usart1_init(void)
14 { 13 {
15 GPIO_InitTypeDef GPIO_InitStructure; 14 GPIO_InitTypeDef GPIO_InitStructure;
16 USART_InitTypeDef USART_InitStructure; 15 USART_InitTypeDef USART_InitStructure;
17 - NVIC_InitTypeDef NVIC_InitStructure;  
18 16
19 RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOA,ENABLE); //ʹÄÜGPIOAʱÖÓ 17 RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOA,ENABLE); //ʹÄÜGPIOAʱÖÓ
20 RCC_APB2PeriphClockCmd(RCC_APB2Periph_USART1,ENABLE); //ʹÄÜUSART1ʱÖÓ 18 RCC_APB2PeriphClockCmd(RCC_APB2Periph_USART1,ENABLE); //ʹÄÜUSART1ʱÖÓ
USER/IAP.uvguix.Admin
  View file @73d8150
@@ -16,12 +16,12 @@ @@ -16,12 +16,12 @@
16 <View> 16 <View>
17 <WinId>346</WinId> 17 <WinId>346</WinId>
18 <ViewName>Code Coverage</ViewName> 18 <ViewName>Code Coverage</ViewName>
19 - <TableColWidths>1010 656</TableColWidths> 19 + <TableColWidths>514 656</TableColWidths>
20 </View> 20 </View>
21 <View> 21 <View>
22 <WinId>204</WinId> 22 <WinId>204</WinId>
23 <ViewName>Performance Analyzer</ViewName> 23 <ViewName>Performance Analyzer</ViewName>
24 - <TableColWidths>1170 175 175 146</TableColWidths> 24 + <TableColWidths>674 175 175 146</TableColWidths>
25 </View> 25 </View>
26 </SECTreeCtrl> 26 </SECTreeCtrl>
27 27
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 <WinId>466</WinId> 66 <WinId>466</WinId>
67 <ViewName>Source Browser</ViewName> 67 <ViewName>Source Browser</ViewName>
68 <UserString>500</UserString> 68 <UserString>500</UserString>
69 - <TableColWidths>166</TableColWidths> 69 + <TableColWidths>300</TableColWidths>
70 </View> 70 </View>
71 </TreeListPane> 71 </TreeListPane>
72 72
@@ -106,8 +106,8 @@ @@ -106,8 +106,8 @@
106 <MDIClientArea> 106 <MDIClientArea>
107 <RegID>0</RegID> 107 <RegID>0</RegID>
108 <MDITabState> 108 <MDITabState>
109 - <Len>235</Len>  
110 - <Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000001000000000000000100000025453A5C6769745C6769746C61625C426F6F744C6F616465725C4941505C796D6F64656D2E630000000008796D6F64656D2E6300000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F40000006600000080070000FD020000</Data> 109 + <Len>377</Len>
  110 + <Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000003000000020000000100000025453A5C6769745C6769746C61625C426F6F744C6F616465725C4941505C796D6F64656D2E630000000008796D6F64656D2E6300000000BECEA100FFFFFFFF2D453A5C6769745C6769746C61625C426F6F744C6F616465725C53595354454D5C75736172745C75617274352E63000000000775617274352E6300000000FFDC7800FFFFFFFF2E453A5C6769745C6769746C61625C426F6F744C6F616465725C53595354454D5C75736172745C7573617274312E6300000000087573617274312E6300000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F40000006600000080070000FD020000</Data>
111 </MDITabState> 111 </MDITabState>
112 </MDIClientArea> 112 </MDIClientArea>
113 <ViewEx> 113 <ViewEx>
@@ -1818,7 +1818,7 @@ @@ -1818,7 +1818,7 @@
1818 <Name>Build</Name> 1818 <Name>Build</Name>
1819 <Buttons> 1819 <Buttons>
1820 <Len>966</Len> 1820 <Len>966</Len>
1821 - <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205000000000034941509600000000000000010003494150000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data> 1821 + <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205000000000034941509600000000000000010003494150000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data>
1822 </Buttons> 1822 </Buttons>
1823 <OriginalItems> 1823 <OriginalItems>
1824 <Len>583</Len> 1824 <Len>583</Len>
@@ -1834,7 +1834,7 @@ @@ -1834,7 +1834,7 @@
1834 <Name>Debug</Name> 1834 <Name>Debug</Name>
1835 <Buttons> 1835 <Buttons>
1836 <Len>2373</Len> 1836 <Len>2373</Len>
1837 - <Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data> 1837 + <Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
1838 </Buttons> 1838 </Buttons>
1839 <OriginalItems> 1839 <OriginalItems>
1840 <Len>898</Len> 1840 <Len>898</Len>
@@ -3599,7 +3599,7 @@ @@ -3599,7 +3599,7 @@
3599 <ActiveMDIGroup>0</ActiveMDIGroup> 3599 <ActiveMDIGroup>0</ActiveMDIGroup>
3600 <MDIGroup> 3600 <MDIGroup>
3601 <Size>100</Size> 3601 <Size>100</Size>
3602 - <ActiveTab>0</ActiveTab> 3602 + <ActiveTab>2</ActiveTab>
3603 <Doc> 3603 <Doc>
3604 <Name>..\IAP\ymodem.c</Name> 3604 <Name>..\IAP\ymodem.c</Name>
3605 <ColumnNumber>0</ColumnNumber> 3605 <ColumnNumber>0</ColumnNumber>
@@ -3609,6 +3609,24 @@ @@ -3609,6 +3609,24 @@
3609 <ContractedFolders>76,95,102,123</ContractedFolders> 3609 <ContractedFolders>76,95,102,123</ContractedFolders>
3610 <PaneID>0</PaneID> 3610 <PaneID>0</PaneID>
3611 </Doc> 3611 </Doc>
  3612 + <Doc>
  3613 + <Name>..\SYSTEM\usart\uart5.c</Name>
  3614 + <ColumnNumber>0</ColumnNumber>
  3615 + <TopLine>48</TopLine>
  3616 + <CurrentLine>5</CurrentLine>
  3617 + <Folding>1</Folding>
  3618 + <ContractedFolders>67,73,80</ContractedFolders>
  3619 + <PaneID>0</PaneID>
  3620 + </Doc>
  3621 + <Doc>
  3622 + <Name>..\SYSTEM\usart\usart1.c</Name>
  3623 + <ColumnNumber>42</ColumnNumber>
  3624 + <TopLine>1</TopLine>
  3625 + <CurrentLine>15</CurrentLine>
  3626 + <Folding>1</Folding>
  3627 + <ContractedFolders></ContractedFolders>
  3628 + <PaneID>0</PaneID>
  3629 + </Doc>
3612 </MDIGroup> 3630 </MDIGroup>
3613 </MDIGroups> 3631 </MDIGroups>
3614 3632