From 01a4f3f406a7484738d27550aec8125fa9d33d40 Mon Sep 17 00:00:00 2001 From: Arthur Van Betsbrugge <avbetsbr@gmail.com> Date: Sun, 26 Jan 2020 12:24:21 -0500 Subject: [PATCH] Ajustements --- .../MDK-ARM/Standard_BoardB.uvguix.avbet | 210 ++++---- .../MDK-ARM/Standard_BoardB.uvoptx | 244 ++++++--- .../MDK-ARM/Standard_BoardB.uvprojx | 132 ++--- .../Standard_BoardB/Standard_BoardB.hex | 464 +++++++++++------- Standard_BoardB/Src/main.c | 196 -------- 5 files changed, 651 insertions(+), 595 deletions(-) delete mode 100644 Standard_BoardB/Src/main.c diff --git a/Standard_BoardB/MDK-ARM/Standard_BoardB.uvguix.avbet b/Standard_BoardB/MDK-ARM/Standard_BoardB.uvguix.avbet index f8eebda..61f2aee 100644 --- a/Standard_BoardB/MDK-ARM/Standard_BoardB.uvguix.avbet +++ b/Standard_BoardB/MDK-ARM/Standard_BoardB.uvguix.avbet @@ -6,7 +6,7 @@ <Header>### uVision Project, (C) Keil Software</Header> <PrjGuiSettings> - <LastAddFilePath></LastAddFilePath> + <LastAddFilePath>C:\Users\avbet\Documents\PolyStar\controle-et-systeme\Standard_BoardB\BSP\Device</LastAddFilePath> </PrjGuiSettings> <ViewPool/> @@ -93,8 +93,8 @@ <flags>2</flags> <showCmd>3</showCmd> <MinPosition> - <xPos>-1</xPos> - <yPos>-1</yPos> + <xPos>-32000</xPos> + <yPos>-32000</yPos> </MinPosition> <MaxPosition> <xPos>-1</xPos> @@ -110,8 +110,8 @@ <MDIClientArea> <RegID>0</RegID> <MDITabState> - <Len>276</Len> - <Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000001000000000000000100000050433A5C55736572735C61766265745C446F63756D656E74735C506F6C79537461725C636F6E74726F6C652D65742D73797374656D655C5374616E646172645F426F617264425C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000C40000006600000000060000B3020000</Data> + <Len>736</Len> + <Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000005000000040000000100000050433A5C55736572735C61766265745C446F63756D656E74735C506F6C79537461725C636F6E74726F6C652D65742D73797374656D655C5374616E646172645F426F617264425C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF5B433A5C55736572735C61766265745C446F63756D656E74735C506F6C79537461725C636F6E74726F6C652D65742D73797374656D655C5374616E646172645F426F617264425C4253505C4472697665725C6273705F6F6C65642E63000000000A6273705F6F6C65642E6300000000FFDC7800FFFFFFFF57433A5C55736572735C61766265745C446F63756D656E74735C506F6C79537461725C636F6E74726F6C652D65742D73797374656D655C5374616E646172645F426F617264425C4253505C4465766963655C6F6C65642E6300000000066F6C65642E6300000000BECEA100FFFFFFFF57433A5C55736572735C61766265745C446F63756D656E74735C506F6C79537461725C636F6E74726F6C652D65742D73797374656D655C5374616E646172645F426F617264425C4253505C4465766963655C6F6C65642E6800000000066F6C65642E6800000000F0A0A100FFFFFFFF5B433A5C55736572735C61766265745C446F63756D656E74735C506F6C79537461725C636F6E74726F6C652D65742D73797374656D655C5374616E646172645F426F617264425C4253505C4472697665725C6273705F6F6C65642E68000000000A6273705F6F6C65642E6800000000BCA8E100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000C4000000660000000006000032020000</Data> </MDITabState> </MDIClientArea> <ViewEx> @@ -134,7 +134,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000074020000C1000000</Data> + <Data>C40000006600000070040000D4000000</Data> </RectRecentFloat> </Window> <Window> @@ -150,7 +150,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000BD00000083020000</Data> + <Data>0300000066000000BD00000002020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -170,7 +170,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000BD00000083020000</Data> + <Data>0300000066000000BD00000002020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -190,7 +190,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>00000000A90100007004000017020000</Data> + <Data>03000000AC0100006D040000FE010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -210,7 +210,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000EA010000</Data> + <Data>03000000AC0100006D040000FE010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -230,7 +230,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000EA010000</Data> + <Data>03000000AC0100006D040000FE010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -250,7 +250,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000EA010000</Data> + <Data>03000000AC0100006D040000FE010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -270,7 +270,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D040000D6000000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -330,7 +330,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000EA010000</Data> + <Data>03000000AC0100006D040000FE010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -350,7 +350,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000EA010000</Data> + <Data>03000000AC0100006D040000FE010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -370,7 +370,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000EA010000</Data> + <Data>03000000AC0100006D040000FE010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -390,7 +390,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000EA010000</Data> + <Data>03000000AC0100006D040000FE010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -410,7 +410,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000EA010000</Data> + <Data>03000000AC0100006D040000FE010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -430,7 +430,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000EA010000</Data> + <Data>03000000AC0100006D040000FE010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -450,7 +450,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000BD00000083020000</Data> + <Data>0300000066000000BD00000002020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -470,7 +470,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000BD00000083020000</Data> + <Data>0300000066000000BD00000002020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -490,7 +490,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>00000000B4020000000600000E030000</Data> + <Data>0000000033020000000600000E030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -530,7 +530,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000B70200006D040000F5020000</Data> + <Data>0300000036020000FD05000074020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -550,7 +550,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>C40000006300000070040000BD000000</Data> + <Data>C7000000660000006D040000A4000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -610,7 +610,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B00300006300000070040000A5010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -630,7 +630,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>00000000A90100007004000003020000</Data> + <Data>03000000AC0100006D040000FE010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -690,7 +690,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>C40000006300000070040000BD000000</Data> + <Data>C7000000660000006D040000A4000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -730,7 +730,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -750,7 +750,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -770,7 +770,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -790,7 +790,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -810,7 +810,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -830,7 +830,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -850,7 +850,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -870,7 +870,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -890,7 +890,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -910,7 +910,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -930,7 +930,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -950,7 +950,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -970,7 +970,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -990,7 +990,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1010,7 +1010,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1030,7 +1030,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1050,7 +1050,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1070,7 +1070,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1090,7 +1090,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1110,7 +1110,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1130,7 +1130,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1150,7 +1150,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000BD000000FE010000</Data> + <Data>0300000066000000BD00000083020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1170,7 +1170,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>00000000B4020000700400000E030000</Data> + <Data>0300000036020000FD05000074020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1190,7 +1190,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000B70200006D040000F5020000</Data> + <Data>0300000036020000FD05000074020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1210,7 +1210,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000EA010000</Data> + <Data>03000000AC0100006D040000FE010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1230,7 +1230,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000EA010000</Data> + <Data>03000000AC0100006D040000FE010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1250,7 +1250,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000B70200006D040000F5020000</Data> + <Data>0300000036020000FD05000074020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1270,7 +1270,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000B70200006D040000F5020000</Data> + <Data>0300000036020000FD05000074020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1310,7 +1310,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1330,7 +1330,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1350,7 +1350,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1370,7 +1370,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1390,7 +1390,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1410,7 +1410,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1430,7 +1430,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1450,7 +1450,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1470,7 +1470,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1490,7 +1490,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1510,7 +1510,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1530,7 +1530,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1550,7 +1550,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1570,7 +1570,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1590,7 +1590,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1610,7 +1610,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1630,7 +1630,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1650,7 +1650,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1670,7 +1670,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1690,7 +1690,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400001A010000</Data> + <Data>B3030000660000006D0400008C010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1704,7 +1704,7 @@ <IsFloating>0</IsFloating> <IsTabbed>0</IsTabbed> <IsActivated>0</IsActivated> - <MRUWidth>32767</MRUWidth> + <MRUWidth>966</MRUWidth> <PinState>0</PinState> <RecentFrameAlignment>8192</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> @@ -1744,7 +1744,7 @@ <IsFloating>0</IsFloating> <IsTabbed>0</IsTabbed> <IsActivated>0</IsActivated> - <MRUWidth>32767</MRUWidth> + <MRUWidth>476</MRUWidth> <PinState>0</PinState> <RecentFrameAlignment>8192</RecentFrameAlignment> <RecentRowIndex>1</RecentRowIndex> @@ -1764,7 +1764,7 @@ <IsFloating>0</IsFloating> <IsTabbed>0</IsTabbed> <IsActivated>0</IsActivated> - <MRUWidth>32767</MRUWidth> + <MRUWidth>612</MRUWidth> <PinState>0</PinState> <RecentFrameAlignment>8192</RecentFrameAlignment> <RecentRowIndex>2</RecentRowIndex> @@ -1790,7 +1790,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000EA010000</Data> + <Data>03000000AC0100006D040000FE010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1799,14 +1799,14 @@ </Window> <DockMan> <Len>3312</Len> - <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFC4000000BD00000070040000C1000000000000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E6500200000000000003C0000005300000074020000C1000000C40000004F00000070040000BD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200001004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000003C00000053000000FC000000F3000000B00300004F00000070040000A501000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFC00000004F000000C40000009C020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000003C00000053000000FC000000F3000000000000004F000000C00000009C0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000091010000700400009501000000000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000000000003C00000053000000FC000000F30000000000000095010000700400001702000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF38020000950100003C0200001702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000009C02000000060000A0020000010000000100001004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF01000077940000018000800000010000003C0000005300000074020000C100000000000000A0020000000600000E0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data> + <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFC4000000BD00000070040000C1000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000C40000006600000070040000D4000000C40000004F00000070040000BD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000B00300006600000070040000BC010000B00300004F00000070040000A501000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFC00000004F000000C40000001B020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000C0000000B3020000000000004F000000C00000001B0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000091010000700400009501000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB0900000180008000000000000000000000AC010000700400002E0200000000000095010000700400001702000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF38020000950100003C0200001702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000001B020000000600001F02000001000000010000100400000001000000B8FDFFFF6C000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000000000000B70200000006000025030000000000001F020000000600000E0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data> </DockMan> <ToolBar> <RegID>59392</RegID> <Name>File</Name> <Buttons> <Len>2537</Len> - <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000000000000010000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65FF7F0000</Data> + <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data> </Buttons> <OriginalItems> <Len>1423</Len> @@ -1822,7 +1822,7 @@ <Name>Build</Name> <Buttons> <Len>990</Len> - <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000F5374616E646172645F426F61726442960000000000000001000F5374616E646172645F426F61726442000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64FF7F0000</Data> + <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000F5374616E646172645F426F61726442960000000000000001000F5374616E646172645F426F61726442000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data> </Buttons> <OriginalItems> <Len>583</Len> @@ -1838,7 +1838,7 @@ <Name>Debug</Name> <Buttons> <Len>2373</Len> - <Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000000000000100000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000000000000100000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000000000000100000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F720100000000000000000000000100000001000000000000000000000001000000000000000000054465627567FF7F0000</Data> + <Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data> </Buttons> <OriginalItems> <Len>898</Len> @@ -1862,12 +1862,48 @@ <ActiveMDIGroup>0</ActiveMDIGroup> <MDIGroup> <Size>100</Size> - <ActiveTab>0</ActiveTab> + <ActiveTab>4</ActiveTab> <Doc> <Name>../Src/main.c</Name> - <ColumnNumber>19</ColumnNumber> - <TopLine>91</TopLine> - <CurrentLine>104</CurrentLine> + <ColumnNumber>11</ColumnNumber> + <TopLine>105</TopLine> + <CurrentLine>117</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\BSP\Driver\bsp_oled.c</Name> + <ColumnNumber>16</ColumnNumber> + <TopLine>1</TopLine> + <CurrentLine>14</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\BSP\Device\oled.c</Name> + <ColumnNumber>0</ColumnNumber> + <TopLine>1</TopLine> + <CurrentLine>1</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>../BSP/Device/oled.h</Name> + <ColumnNumber>21</ColumnNumber> + <TopLine>1</TopLine> + <CurrentLine>9</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\BSP\Driver\bsp_oled.h</Name> + <ColumnNumber>2</ColumnNumber> + <TopLine>19</TopLine> + <CurrentLine>14</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> diff --git a/Standard_BoardB/MDK-ARM/Standard_BoardB.uvoptx b/Standard_BoardB/MDK-ARM/Standard_BoardB.uvoptx index 67df785..e67afe4 100644 --- a/Standard_BoardB/MDK-ARM/Standard_BoardB.uvoptx +++ b/Standard_BoardB/MDK-ARM/Standard_BoardB.uvoptx @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8" standalone="no" ?> <ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd"> <SchemaVersion>1.0</SchemaVersion> @@ -45,7 +45,7 @@ <PageWidth>79</PageWidth> <PageLength>66</PageLength> <TabStop>8</TabStop> - <ListingPath /> + <ListingPath></ListingPath> </OPTLEX> <ListingPage> <CreateCListing>1</CreateCListing> @@ -77,7 +77,7 @@ <tvExpOptDlg>0</tvExpOptDlg> <IsCurrentTarget>1</IsCurrentTarget> </OPTFL> - <CpuCode>0</CpuCode> + <CpuCode>18</CpuCode> <DebugOpt> <uSim>0</uSim> <uTrg>1</uTrg> @@ -104,16 +104,16 @@ <bSchkAxf>0</bSchkAxf> <bTchkAxf>0</bTchkAxf> <nTsel>6</nTsel> - <sDll /> - <sDllPa /> - <sDlgDll /> - <sDlgPa /> - <sIfile /> - <tDll /> - <tDllPa /> - <tDlgDll /> - <tDlgPa /> - <tIfile /> + <sDll></sDll> + <sDllPa></sDllPa> + <sDlgDll></sDlgDll> + <sDlgPa></sDlgPa> + <sIfile></sIfile> + <tDll></tDll> + <tDllPa></tDllPa> + <tDlgDll></tDlgDll> + <tDlgPa></tDlgPa> + <tIfile></tIfile> <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon> </DebugOpt> <TargetDriverDllRegistry> @@ -128,7 +128,7 @@ <Name>-U-O142 -O2254 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_CL -FS08000000 -FL010000 -FP0($$Device:STM32F105R8$Flash\STM32F10x_CL.FLM)</Name> </SetRegEntry> </TargetDriverDllRegistry> - <Breakpoint /> + <Breakpoint/> <Tracepoint> <THDelay>0</THDelay> </Tracepoint> @@ -158,19 +158,19 @@ <newCpu>0</newCpu> <uProt>0</uProt> </DebugFlag> - <LintExecutable /> - <LintConfigFile /> + <LintExecutable></LintExecutable> + <LintConfigFile></LintConfigFile> <bLintAuto>0</bLintAuto> <bAutoGenD>0</bAutoGenD> <LntExFlags>0</LntExFlags> - <pMisraName /> - <pszMrule /> - <pSingCmds /> - <pMultCmds /> - <pMisraNamep /> - <pszMrulep /> - <pSingCmdsp /> - <pMultCmdsp /> + <pMisraName></pMisraName> + <pszMrule></pszMrule> + <pSingCmds></pSingCmds> + <pMultCmds></pMultCmds> + <pMisraNamep></pMisraNamep> + <pszMrulep></pszMrulep> + <pSingCmdsp></pSingCmdsp> + <pMultCmdsp></pMultCmdsp> <DebugDescription> <Enable>1</Enable> <EnableFlashSeq>1</EnableFlashSeq> @@ -183,7 +183,7 @@ <Group> <GroupName>Application/MDK-ARM</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -201,22 +201,14 @@ </File> </Group> - <Group> - <GroupName>::CMSIS</GroupName> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <cbSel>0</cbSel> - <RteFlg>1</RteFlg> - </Group> - <Group> <GroupName>Application/User</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> - <GroupNumber>3</GroupNumber> + <GroupNumber>2</GroupNumber> <FileNumber>2</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> @@ -228,7 +220,7 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>3</GroupNumber> + <GroupNumber>2</GroupNumber> <FileNumber>3</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> @@ -240,20 +232,44 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>3</GroupNumber> + <GroupNumber>2</GroupNumber> <FileNumber>4</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> + <PathWithFileName>../Src/adc.c</PathWithFileName> + <FilenameWithoutPath>adc.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>2</GroupNumber> + <FileNumber>5</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>../Src/spi.c</PathWithFileName> + <FilenameWithoutPath>spi.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>2</GroupNumber> + <FileNumber>6</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> <PathWithFileName>../Src/stm32f1xx_it.c</PathWithFileName> <FilenameWithoutPath>stm32f1xx_it.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> - <GroupNumber>3</GroupNumber> - <FileNumber>5</FileNumber> + <GroupNumber>2</GroupNumber> + <FileNumber>7</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -267,13 +283,13 @@ <Group> <GroupName>Drivers/STM32F1xx_HAL_Driver</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> - <GroupNumber>4</GroupNumber> - <FileNumber>6</FileNumber> + <GroupNumber>3</GroupNumber> + <FileNumber>8</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -284,32 +300,32 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>4</GroupNumber> - <FileNumber>7</FileNumber> + <GroupNumber>3</GroupNumber> + <FileNumber>9</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c</PathWithFileName> - <FilenameWithoutPath>stm32f1xx_hal_tim.c</FilenameWithoutPath> + <PathWithFileName>../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c</PathWithFileName> + <FilenameWithoutPath>stm32f1xx_hal_adc.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> - <GroupNumber>4</GroupNumber> - <FileNumber>8</FileNumber> + <GroupNumber>3</GroupNumber> + <FileNumber>10</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c</PathWithFileName> - <FilenameWithoutPath>stm32f1xx_hal_tim_ex.c</FilenameWithoutPath> + <PathWithFileName>../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c</PathWithFileName> + <FilenameWithoutPath>stm32f1xx_hal_adc_ex.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> - <GroupNumber>4</GroupNumber> - <FileNumber>9</FileNumber> + <GroupNumber>3</GroupNumber> + <FileNumber>11</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -320,8 +336,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>4</GroupNumber> - <FileNumber>10</FileNumber> + <GroupNumber>3</GroupNumber> + <FileNumber>12</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -332,8 +348,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>4</GroupNumber> - <FileNumber>11</FileNumber> + <GroupNumber>3</GroupNumber> + <FileNumber>13</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -344,8 +360,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>4</GroupNumber> - <FileNumber>12</FileNumber> + <GroupNumber>3</GroupNumber> + <FileNumber>14</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -356,8 +372,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>4</GroupNumber> - <FileNumber>13</FileNumber> + <GroupNumber>3</GroupNumber> + <FileNumber>15</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -368,8 +384,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>4</GroupNumber> - <FileNumber>14</FileNumber> + <GroupNumber>3</GroupNumber> + <FileNumber>16</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -380,8 +396,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>4</GroupNumber> - <FileNumber>15</FileNumber> + <GroupNumber>3</GroupNumber> + <FileNumber>17</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -392,8 +408,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>4</GroupNumber> - <FileNumber>16</FileNumber> + <GroupNumber>3</GroupNumber> + <FileNumber>18</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -404,8 +420,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>4</GroupNumber> - <FileNumber>17</FileNumber> + <GroupNumber>3</GroupNumber> + <FileNumber>19</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -416,8 +432,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>4</GroupNumber> - <FileNumber>18</FileNumber> + <GroupNumber>3</GroupNumber> + <FileNumber>20</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -427,6 +443,42 @@ <RteFlg>0</RteFlg> <bShared>0</bShared> </File> + <File> + <GroupNumber>3</GroupNumber> + <FileNumber>21</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c</PathWithFileName> + <FilenameWithoutPath>stm32f1xx_hal_spi.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>3</GroupNumber> + <FileNumber>22</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c</PathWithFileName> + <FilenameWithoutPath>stm32f1xx_hal_tim.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>3</GroupNumber> + <FileNumber>23</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c</PathWithFileName> + <FilenameWithoutPath>stm32f1xx_hal_tim_ex.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> </Group> <Group> @@ -436,8 +488,8 @@ <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> - <GroupNumber>5</GroupNumber> - <FileNumber>19</FileNumber> + <GroupNumber>4</GroupNumber> + <FileNumber>24</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -449,4 +501,52 @@ </File> </Group> + <Group> + <GroupName>BSP</GroupName> + <tvExp>1</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <cbSel>0</cbSel> + <RteFlg>0</RteFlg> + <File> + <GroupNumber>5</GroupNumber> + <FileNumber>25</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\BSP\Driver\bsp_oled.c</PathWithFileName> + <FilenameWithoutPath>bsp_oled.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + </Group> + + <Group> + <GroupName>Device</GroupName> + <tvExp>1</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <cbSel>0</cbSel> + <RteFlg>0</RteFlg> + <File> + <GroupNumber>6</GroupNumber> + <FileNumber>26</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\BSP\Device\oled.c</PathWithFileName> + <FilenameWithoutPath>oled.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + </Group> + + <Group> + <GroupName>::CMSIS</GroupName> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <cbSel>0</cbSel> + <RteFlg>1</RteFlg> + </Group> + </ProjectOpt> diff --git a/Standard_BoardB/MDK-ARM/Standard_BoardB.uvprojx b/Standard_BoardB/MDK-ARM/Standard_BoardB.uvprojx index 0ab909a..252272d 100644 --- a/Standard_BoardB/MDK-ARM/Standard_BoardB.uvprojx +++ b/Standard_BoardB/MDK-ARM/Standard_BoardB.uvprojx @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" noNamespaceSchemaLocation="project_projx.xsd"> +<?xml version="1.0" encoding="UTF-8" standalone="no" ?> +<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd"> <SchemaVersion>2.1</SchemaVersion> @@ -9,6 +10,7 @@ <TargetName>Standard_BoardB</TargetName> <ToolsetNumber>0x4</ToolsetNumber> <ToolsetName>ARM-ADS</ToolsetName> + <pCCUsed>5060750::V5.06 update 6 (build 750)::ARMCC</pCCUsed> <uAC6>0</uAC6> <TargetOption> <TargetCommonOption> @@ -17,28 +19,28 @@ <PackID>Keil.STM32F1xx_DFP.2.3.0</PackID> <PackURL>http://www.keil.com/pack/</PackURL> <Cpu>IRAM(0x20000000-0x2000FFFF) IROM(0x8000000-0x800FFFF) CLOCK(25000000) CPUTYPE("Cortex-M3")</Cpu> - <FlashUtilSpec/> - <StartupFile/> - <FlashDriverDll/> - <DeviceId/> - <RegisterFile/> - <MemoryEnv/> - <Cmp/> - <Asm/> - <Linker/> - <OHString/> - <InfinionOptionDll/> - <SLE66CMisc/> - <SLE66AMisc/> - <SLE66LinkerMisc/> + <FlashUtilSpec></FlashUtilSpec> + <StartupFile></StartupFile> + <FlashDriverDll></FlashDriverDll> + <DeviceId></DeviceId> + <RegisterFile></RegisterFile> + <MemoryEnv></MemoryEnv> + <Cmp></Cmp> + <Asm></Asm> + <Linker></Linker> + <OHString></OHString> + <InfinionOptionDll></InfinionOptionDll> + <SLE66CMisc></SLE66CMisc> + <SLE66AMisc></SLE66AMisc> + <SLE66LinkerMisc></SLE66LinkerMisc> <SFDFile>$$Device:STM32F105R8$SVD\STM32F105xx.svd</SFDFile> <bCustSvd>0</bCustSvd> <UseEnv>0</UseEnv> - <BinPath/> - <IncludePath/> - <LibPath/> - <RegisterFilePath/> - <DBRegisterFilePath/> + <BinPath></BinPath> + <IncludePath></IncludePath> + <LibPath></LibPath> + <RegisterFilePath></RegisterFilePath> + <DBRegisterFilePath></DBRegisterFilePath> <TargetStatus> <Error>0</Error> <ExitCodeStop>0</ExitCodeStop> @@ -53,15 +55,15 @@ <CreateHexFile>1</CreateHexFile> <DebugInformation>1</DebugInformation> <BrowseInformation>1</BrowseInformation> - <ListingPath/> + <ListingPath></ListingPath> <HexFormatSelection>1</HexFormatSelection> <Merge32K>0</Merge32K> <CreateBatchFile>0</CreateBatchFile> <BeforeCompile> <RunUserProg1>0</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name/> - <UserProg2Name/> + <UserProg1Name></UserProg1Name> + <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> <nStopU1X>0</nStopU1X> @@ -70,8 +72,8 @@ <BeforeMake> <RunUserProg1>0</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name/> - <UserProg2Name/> + <UserProg1Name></UserProg1Name> + <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> <nStopB1X>0</nStopB1X> @@ -80,15 +82,15 @@ <AfterMake> <RunUserProg1>0</RunUserProg1> <RunUserProg2>0</RunUserProg2> - <UserProg1Name/> - <UserProg2Name/> + <UserProg1Name></UserProg1Name> + <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> <nStopA1X>0</nStopA1X> <nStopA2X>0</nStopA2X> </AfterMake> <SelectedForBatchBuild>0</SelectedForBatchBuild> - <SVCSIdString/> + <SVCSIdString></SVCSIdString> </TargetCommonOption> <CommonProperty> <UseCPPCompiler>0</UseCPPCompiler> @@ -102,8 +104,8 @@ <AssembleAssemblyFile>0</AssembleAssemblyFile> <PublicsOnly>0</PublicsOnly> <StopOnExitCode>3</StopOnExitCode> - <CustomArgument/> - <IncludeLibraryModules/> + <CustomArgument></CustomArgument> + <IncludeLibraryModules></IncludeLibraryModules> <ComprImg>0</ComprImg> </CommonProperty> <DllOption> @@ -112,7 +114,7 @@ <SimDlgDll>DCM.DLL</SimDlgDll> <SimDlgDllArguments>-pCM3</SimDlgDllArguments> <TargetDllName>SARMCM3.DLL</TargetDllName> - <TargetDllArguments/> + <TargetDllArguments></TargetDllArguments> <TargetDlgDll>TCM.DLL</TargetDlgDll> <TargetDlgDllArguments>-pCM3</TargetDlgDllArguments> </DllOption> @@ -136,11 +138,11 @@ </Flash1> <bUseTDR>1</bUseTDR> <Flash2>STLink\ST-LINKIII-KEIL_SWO.dll</Flash2> - <Flash3/> - <Flash4/> - <pFcarmOut/> - <pFcarmGrp/> - <pFcArmRoot/> + <Flash3></Flash3> + <Flash4></Flash4> + <pFcarmOut></pFcarmOut> + <pFcarmGrp></pFcarmGrp> + <pFcArmRoot></pFcArmRoot> <FcArmLst>0</FcArmLst> </Utilities> <TargetArmAds> @@ -173,7 +175,7 @@ <RvctClst>0</RvctClst> <GenPPlst>0</GenPPlst> <AdsCpuType>"Cortex-M3"</AdsCpuType> - <RvctDeviceName/> + <RvctDeviceName></RvctDeviceName> <mOS>0</mOS> <uocRom>0</uocRom> <uocRam>0</uocRam> @@ -306,7 +308,7 @@ <Size>0x0</Size> </OCR_RVCT10> </OnChipMemories> - <RvctStartVector/> + <RvctStartVector></RvctStartVector> </ArmAdsMisc> <Cads> <interw>1</interw> @@ -333,10 +335,10 @@ <v6WtE>0</v6WtE> <v6Rtti>0</v6Rtti> <VariousControls> - <MiscControls/> + <MiscControls></MiscControls> <Define>USE_HAL_DRIVER,STM32F105xC</Define> - <Undefine/> - <IncludePath>../Inc; ../Drivers/STM32F1xx_HAL_Driver/Inc; ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy; ../Drivers/CMSIS/Device/ST/STM32F1xx/Include; ../Drivers/CMSIS/Include</IncludePath> + <Undefine></Undefine> + <IncludePath>../Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;../BSP/Algorithm;../BSP/Controller;../BSP/Device;../BSP/Driver;../BSP/Modules</IncludePath> </VariousControls> </Cads> <Aads> @@ -351,10 +353,10 @@ <useXO>0</useXO> <uClangAs>0</uClangAs> <VariousControls> - <MiscControls/> - <Define/> - <Undefine/> - <IncludePath/> + <MiscControls></MiscControls> + <Define></Define> + <Undefine></Undefine> + <IncludePath></IncludePath> </VariousControls> </Aads> <LDads> @@ -366,13 +368,13 @@ <useFile>0</useFile> <TextAddressRange>0x08000000</TextAddressRange> <DataAddressRange>0x20000000</DataAddressRange> - <pXoBase/> - <ScatterFile/> - <IncludeLibs/> - <IncludeLibsPath/> - <Misc/> - <LinkerInputFile/> - <DisabledWarnings/> + <pXoBase></pXoBase> + <ScatterFile></ScatterFile> + <IncludeLibs></IncludeLibs> + <IncludeLibsPath></IncludeLibsPath> + <Misc></Misc> + <LinkerInputFile></LinkerInputFile> + <DisabledWarnings></DisabledWarnings> </LDads> </TargetArmAds> </TargetOption> @@ -387,9 +389,6 @@ </File> </Files> </Group> - <Group> - <GroupName>::CMSIS</GroupName> - </Group> <Group> <GroupName>Application/User</GroupName> <Files> @@ -520,6 +519,29 @@ </File> </Files> </Group> + <Group> + <GroupName>BSP</GroupName> + <Files> + <File> + <FileName>bsp_oled.c</FileName> + <FileType>1</FileType> + <FilePath>..\BSP\Driver\bsp_oled.c</FilePath> + </File> + </Files> + </Group> + <Group> + <GroupName>Device</GroupName> + <Files> + <File> + <FileName>oled.c</FileName> + <FileType>1</FileType> + <FilePath>..\BSP\Device\oled.c</FilePath> + </File> + </Files> + </Group> + <Group> + <GroupName>::CMSIS</GroupName> + </Group> </Groups> </Target> </Targets> diff --git a/Standard_BoardB/MDK-ARM/Standard_BoardB/Standard_BoardB.hex b/Standard_BoardB/MDK-ARM/Standard_BoardB/Standard_BoardB.hex index ddd7cca..1699560 100644 --- a/Standard_BoardB/MDK-ARM/Standard_BoardB/Standard_BoardB.hex +++ b/Standard_BoardB/MDK-ARM/Standard_BoardB/Standard_BoardB.hex @@ -1,8 +1,8 @@ :020000040800F2 -:1000000010040020650100081B0C0008A50B000867 -:10001000190C000871020008D90C0008000000004B -:100020000000000000000000000000001F0C00089D -:1000300073020008000000001D0C0008210C0008DD +:100000009804002065010008E3110008D9100008D9 +:10001000E1110008BD020008B11200080000000054 +:10002000000000000000000000000000E7110008D0 +:10003000BF02000800000000E5110008E9110008F7 :100040007F0100087F0100087F0100087F01000890 :100050007F0100087F0100087F0100087F01000880 :100060007F0100087F0100087F0100087F01000870 @@ -20,10 +20,10 @@ :100120007F0100087F0100087F0100087F010008AF :100130007F01000800000000000000007F010008AF :100140007F0100087F0100087F0100087F0100088F -:10015000DFF80CD000F07AF800480047190D0008CD -:10016000100400200648804706480047FEE7FEE7E7 +:10015000DFF80CD000F07AF800480047F1120008F0 +:10016000980400200648804706480047FEE7FEE75F :10017000FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE757 -:10018000850C0008510100082DE9F05F05460020AC +:100180005D120008510100082DE9F05F05460020CE :1001900092469B4688460646814640241BE02846F8 :1001A00041464746224600F020F853465A46C01AB8 :1001B000914110D311461846224600F038F82D1A06 @@ -37,183 +37,277 @@ :1002300004DB203A00FA02F1002070479140C2F13D :10024000200320FA03F3194390407047064C074DF2 :1002500006E0E06840F0010394E807009847103496 -:10026000AC42F6D3FFF778FF500D0008700D000880 -:10027000FEE7704770B5044600F00AF90546601CB9 -:1002800002D004480078044400F002F9401BA04268 -:10029000FAD370BD000000202DE9F84FDFF8B891C7 -:1002A000002409F1040A0AF1040B23460F270BF17D -:1002B000040EC9E00125A5402A40AA427DD1674E1F -:1002C000D1F804C0ACEB0608B44532D014DCBCF164 -:1002D000030F3AD009DCBCF1000F2AD0BCF1010FAA -:1002E0001CD0BCF1020F31D11DE0BCF1110F17D0B1 -:1002F000BCF1120F2AD119E0B8F5881F19D006DC1D -:10030000B8F5803F15D0B8F5801F1FD111E0B8F5C2 -:10031000001F0ED0B8F5041F18D10AE0CB6815E015 -:10032000CB681B1D12E0CB6808330FE0CB680C33A1 -:100330000CE08B682BB1012B4FF0080303D0456113 -:1003400004E0042302E0056100E00023FF2A01D855 -:10035000064601E000F104064FEA840501D9A5F143 -:100360002005D6F8008007FA05FC28EA0C0803FAF5 -:1003700005F548EA0508C6F800804D68ED0062D52D -:10038000374DAE6946F00106AE61AD6924F0030653 -:1003900005F001050095334D06EB050CDCF808501F -:1003A000A607360F07FA06F825EA0805DFF8B88031 -:1003B000404503D14FF0000817E044E0DFF8AC807F -:1003C000404502D14FF001080FE0DFF8A48040451E -:1003D00002D14FF0020808E0DFF89880404502D1D2 -:1003E0004FF0030801E04FF0040808FA06F848EA65 -:1003F0000508CCF808804D68D9F80060ED034D463B -:1004000001D5164300E096432E604D68DAF800608F -:10041000AD03554601D5164300E096432E604D6866 -:10042000DBF80060ED025D4601D5164300E096431F -:100430002E604D68DEF80060AD02754601D51643AA -:1004400000E096432E60641C0D682A46E5407FF468 -:1004500031AFBDE8F88F000000040140000011102A -:10046000001002400000014000080140000C014063 -:100470000010014000140140C2680A4201D04161ED -:100480007047016170470AB1016170470904FBE7D9 -:100490000148806870470000000000200248816821 -:1004A000027811448160704700000020074810B5B1 -:1004B000016841F010010160032000F067F800209E -:1004C00000F006F800F024F8002010BD00200240E3 -:1004D00070B50D4D04464FF47A712878B1FBF0F0F9 -:1004E0000A490968B1FBF0F000F048FB48B9102C4C -:1004F00007D200222146501E00F028F800206C6030 -:1005000070BD012070BD0000000000200C00002024 -:100510000C4808B5816941F001018161816901F0F0 -:1005200001010091C16941F08051C161C06900F0D1 -:10053000805000900448416821F0E06141F0007172 -:10054000416008BD0010024000000140F0B40E4BB5 -:100550001B680C46C3F30223C3F10705042D00D921 -:100560000425191D072901D2002300E0DB1E012606 -:1005700006FA05F1491E214099409E40761E16401C -:100580003143F0BC00F0A9BB0CED00E0064900F0DF -:10059000070208684FF6FF03184040EA0220034AAA -:1005A00010430860704700000CED00E00000FA0501 -:1005B0002DE9F0470F46050061D0434E306800F04A -:1005C0000700B84209D2306820F007003843306095 -:1005D000306800F00700B84251D128683B4C8107D1 -:1005E00012D5400703D5606840F4E0606060287869 -:1005F000000703D5606840F4605060606068A968D7 -:1006000020F0F000084360602878C00728D06868B0 -:10061000012810D02168022810D0890700292EDA7D -:10062000616821F0030101436160FFF731FF8046FB -:1006300041F288390DE021688903EFE78901EDE790 -:10064000FFF726FFA0EB0801494502D90320BDE8CA -:10065000F0876068696800F00C00B0EB810FEFD1A3 -:10066000306800F00700B8420BD9306820F007006E -:1006700038433060306800F00700B84201D00120F4 -:10068000E5E72878400705D56068E96820F4E06070 -:10069000084360602878000706D56068296920F45F -:1006A000605040EAC100606000F018F86168084AD4 -:1006B000C1F30311515CC840064908600648006850 -:1006C000FFF706FF0020C2E70020024000100240B2 -:1006D000400D00080C00002004000020F0B523A20B -:1006E00089B00FCA04AC84E80F0024A10FC98DE8BB -:1006F0000F0026494A68264802F00C03042B2FD02D -:10070000082B2DD104A8C2F38343C45CD00329D5A0 -:10071000C86A00F00F001DF80020C86AC00316D593 -:10072000C86AC96AC0F30310C1F30321401C891CC5 -:10073000A0FB0223A1FB0416154F0025A1FB070C0B -:1007400006FB07C601FB0561FFF71EFD03E010482D -:100750006043B0FBF2F09DF81D10A14200D14008AB -:1007600009B0F0BD0B486043FAE700000000040543 -:100770000607080900000000000D00000102030444 -:1007800005060708090A0B0C0D0E0F100010024099 -:1007900000127A0000093D002DE9F84F040070D0E6 -:1007A0002078F14DC00749D06868C0F38100012866 -:1007B00007D06868C0F38100022809D16868C003C7 -:1007C00006D52868800339D5A0680028E7D035E031 -:1007D000A068B0F5803F0BD010B1B0F5A02F11D0BC -:1007E000286820F480302860286820F4802002E007 -:1007F000286840F480302860A06890B1FFF748FE78 -:1008000006460AE0286840F480202860F0E700BF30 -:10081000FFF73EFE801B642876D828688003F7D552 -:100820000CE0FFF735FE064605E000BFFFF730FE9F -:10083000801B6428F0D828688003F7D42078CB4E3A -:1008400080074FF001094FF000073AD5686810F0B3 -:100850000C0F07D06868C0F38100022809D16868CE -:10086000C00306D42868800715D56069012808D11F -:1008700011E06069B8B1C6F80090FFF709FE804644 -:1008800006E042E1FFF704FEA0EB08000228C3D80F -:1008900028688007F6D52868A16920F0F80040EAAA -:1008A000C10028600DE03760FFF7F2FD804605E0EB -:1008B000FFF7EEFDA0EB08000228ADD828688007FE -:1008C000F6D4207800072ED5A948E169E9B1C0F82F -:1008D0000090FFF7DDFD804606E000BFFFF7D8FD82 -:1008E000A0EB0800022897D8686A8007F6D5A148CF -:1008F0004FF4FA510068B0FBF1F0009000BF00988F -:10090000411E0091FAD20EE0B0E00760FFF7C0FD93 -:10091000804605E0FFF7BCFDA0EB0800022889D85F -:10092000686A8007F6D42078400763D5E8694FF0FD -:100930000008C00009D4E86940F08050E861E86927 -:100940004FF0010800F0805000908B480168C90505 -:1009500012D40168834641F480710160FFF798FD6D -:10096000824605E0FFF794FDA0EB0A0064287DD8DD -:10097000DBF80000C005F5D5206901280AD008B1D0 -:10098000052813D0286A20F001002862286A20F088 -:10099000040002E0286A40F001002862206941F268 -:1009A000883B98B1FFF774FD82460BE0286A40F05F -:1009B00004002862EEE700BFFFF76AFDA0EB0A0122 -:1009C000594553D8286A8007F6D50CE0FFF760FD3B -:1009D000824605E0FFF75CFDA0EB0A01594545D8CA -:1009E000286A8007F6D4B8F1000F03D0E86920F038 -:1009F0008050E861E06AD0B36968C90307D56968C7 -:100A0000C1F38101022902D1E96AC9037DD4022818 -:100A100008D0E86A20F48030E862B766FFF738FD56 -:100A200080463BE02868C00005D5E86A616B00F0AD -:100A3000F000884269D1B766FFF72AFD804605E0DD -:100A4000FFF726FDA0EB0800642874D82868000191 -:100A5000F6D4E86A616B20F0F0000843E862E86AC7 -:100A6000216B20F470600843E86201E063E018E065 -:100A7000C6F86890FFF70CFD804605E0FFF708FD1B -:100A8000A0EB0800642856D828680001F6D508E0D5 -:100A9000FFF7FEFCA0EB080064284CD82868000192 -:100AA000F6D4206A90B36968C1F38101022949D064 -:100AB0000228376603D0FFF7EBFC04463EE0FFF761 -:100AC000E7FC074605E000BFFFF7E2FCC01B022879 -:100AD00031D828688001F7D4606AB0F5803F09D129 -:100AE000E86A61680843E862E86AE16820F00F009C -:100AF0000843E862D4E909010843696821F47411E4 -:100B000008436860C6F8609001E028E029E0FFF73C -:100B1000BFFC044605E000BFFFF7BAFC001B02283B -:100B200009D828688001F7D51BE000BFFFF7B0FCAB -:100B3000001B022802D90320BDE8F88F2868800135 -:100B4000F4D40EE00128F7D06868626A00F48031BE -:100B5000914204D1A16A00F47010884201D00120B2 -:100B6000EAE70020E8E700000010024000004242EF -:100B7000800442420C0000200070004010B5401E6E -:100B8000B0F1807F01D3012010BD4FF0E0246061FF -:100B90000F21601700F0A1F80020A061072020615C -:100BA000002010BDFEE7000030B585B000241848D5 -:100BB0000094019402940394816941F020018161C1 -:100BC000816901F020010491816941F0080181618E -:100BD000816901F008010491816941F0040181619A -:100BE00080690C4D00F00400049000220321284687 -:100BF000FFF749FC032000900120CDE90104022009 -:100C0000039069462846FFF747FB05B030BD00005A -:100C100000100240000C0140FEE77047704770472B -:100C2000FFF73CBC70B594B038216846FFF7F4FA82 -:100C300014210EA8FFF7F0FA012500242804CDE9BD -:100C400002040226CDE908600095059501944FF451 -:100C5000C010CDE90A046846FFF79EFD0F20CDE9DC -:100C60000E064FF4A060CDE91040A80212900221B8 -:100C70000EA8FFF79DFC0248056714B070BD000088 -:100C8000000042421048016841F0010101604168E2 -:100C90000E4A1140416001680D4A1140016001682F -:100CA00021F480210160416821F4FE014160016866 -:100CB00021F0A05101604FF47F0181600021C162E9 -:100CC0000449C00308607047001002400000FFF0B4 -:100CD000FFFFF6FE08ED00E0FEE70907090E002819 -:100CE00004DB00F1E02080F80014704700F00F00F2 -:100CF00000F1E02080F8141D704702E008C8121FC0 -:100D000008C1002AFAD170477047002001E001C1F4 -:100D1000121F002AFBD17047FFF7C8FBFFF782FFC5 -:100D2000FFF742FF054C4FF4FA7501212046FFF70B -:100D3000A3FB2846FFF79EFAF7E70000000C0140EE -:100D4000000000000000000001020304060708097B -:100D5000700D00080000002010000000FA0C0008D0 -:100D6000800D000810000020000400000A0D00089B -:100D70000100000010000000000000000024F4004A +:10026000AC42F6D3FFF778FF3013000850130008B4 +:1002700070B5044600688168C943C9071CD181680C +:1002800021F00101816000F063FA05460FE000BF34 +:1002900000F05EFA401B022809D9A06A40F0100065 +:1002A000A062E06A40F00100E062012070BD2068B9 +:1002B0008068C043C007EBD0002070BDFEE77047E8 +:1002C00070470000F8B50024009490F824202546DB +:1002D000012A12D0012280F824204A681F23072A0D +:1002E0000DD20668776B521E02EB820293409F4349 +:1002F0000B6893401F43776319E00220F8BD06683E +:100300000D2A0AD2376BD21F02EB820293409F4321 +:100310000B6893401F43376309E0F76A0D3A02EB1D +:10032000820293409F430B6893401F43F7620A6821 +:10033000072306680A2A0AD3F7680A3A02EB420240 +:1003400093409F438B6893401F43F76008E03769F1 +:1003500002EB420293409F438B6893401F433761F7 +:100360000A68102A01D0112A20D1124B02689A4241 +:1003700017D193681B0219D4936843F40003936068 +:100380000968102912D10C490C4A0968B1FBF2F135 +:1003900001EB8101490000E0491E00910029FBD1D9 +:1003A00004E0816A41F020018162012480F8245038 +:1003B0002046F8BD002401400C00002040420F0000 +:1003C0002DE9F0414FF0000704003D467ED0A06AC1 +:1003D000002628B9E66284F82460204600F07EF802 +:1003E0002046FFF745FFA16AC90600D420B1A06AE4 +:1003F00040F01000A06269E0A16A21F4885141F048 +:100400000201A1626268E169237B0A4347EA430172 +:100410000A43A1684FF48077B94209D0012907D077 +:100420005FF0000194F814C0BCF1010F02D00AE0A3 +:100430003946F7E7F3B1A36A43F02003A362E36A06 +:1004400043F00103E3622368D3F804C02CF4694C41 +:100450004CEA010CC3F804C021688B68DFF870C057 +:1004600003EA0C0313438B60A168B9420BD0012946 +:1004700009D00CE0DFF85CC0A3690CEB43330B43FD +:1004800043F40061DFE7218A0D05A5F58015216899 +:10049000CB6A23F470032B43CB62216889680E4B2F +:1004A0001940914208D1E662A16A21F0020141F0AF +:1004B0000101A162BDE8F081A06A20F0020040F0D5 +:1004C0001000A062E06A40F00100E0620120F1E764 +:1004D000FDF7E1FF00E0FFFFFE0E1FFF00B585B056 +:1004E0000021009101910291039100680E49884218 +:1004F00018D10E48816941F400718161816901F46C +:1005000000710491816941F004018161806969464B +:1005100000F00400049002200090032001900448A1 +:1005200000F01AF805B000BD0024014000100240A0 +:100530000008014070B5044600F00AF90546601C49 +:1005400002D004480078044400F002F9401BA042A5 +:10055000FAD370BD000000202DE9F84FDFF8B89104 +:10056000002409F1040A0AF1040B23460F270BF1BA +:10057000040EC9E00125A5402A40AA427DD1674E5C +:10058000D1F804C0ACEB0608B44532D014DCBCF1A1 +:10059000030F3AD009DCBCF1000F2AD0BCF1010FE7 +:1005A0001CD0BCF1020F31D11DE0BCF1110F17D0EE +:1005B000BCF1120F2AD119E0B8F5881F19D006DC5A +:1005C000B8F5803F15D0B8F5801F1FD111E0B8F500 +:1005D000001F0ED0B8F5041F18D10AE0CB6815E053 +:1005E000CB681B1D12E0CB6808330FE0CB680C33DF +:1005F0000CE08B682BB1012B4FF0080303D0456151 +:1006000004E0042302E0056100E00023FF2A01D892 +:10061000064601E000F104064FEA840501D9A5F180 +:100620002005D6F8008007FA05FC28EA0C0803FA32 +:1006300005F548EA0508C6F800804D68ED0062D56A +:10064000374DAE6946F00106AE61AD6924F0030690 +:1006500005F001050095334D06EB050CDCF808505C +:10066000A607360F07FA06F825EA0805DFF8B8806E +:10067000404503D14FF0000817E044E0DFF8AC80BC +:10068000404502D14FF001080FE0DFF8A48040455B +:1006900002D14FF0020808E0DFF89880404502D10F +:1006A0004FF0030801E04FF0040808FA06F848EAA2 +:1006B0000508CCF808804D68D9F80060ED034D4678 +:1006C00001D5164300E096432E604D68DAF80060CD +:1006D000AD03554601D5164300E096432E604D68A4 +:1006E000DBF80060ED025D4601D5164300E096435D +:1006F0002E604D68DEF80060AD02754601D51643E8 +:1007000000E096432E60641C0D682A46E5407FF4A5 +:1007100031AFBDE8F88F0000000401400000111067 +:10072000001002400000014000080140000C0140A0 +:100730000010014000140140C2680A4201D041612A +:100740007047016170470AB1016170470904FBE716 +:10075000014880687047000000000020024881685E +:10076000027811448160704700000020074810B5EE +:10077000016841F010010160032000F067F80020DB +:1007800000F006F800F024F8002010BD0020024020 +:1007900070B50D4D04464FF47A712878B1FBF0F036 +:1007A0000A490968B1FBF0F000F082FC48B9102C4E +:1007B00007D200222146501E00F028F800206C606D +:1007C00070BD012070BD0000000000200C00002062 +:1007D0000C4808B5816941F001018161816901F02E +:1007E00001010091C16941F08051C161C06900F00F +:1007F000805000900448416821F0E06141F00071B0 +:10080000416008BD0010024000000140F0B40E4BF2 +:100810001B680C46C3F30223C3F10705042D00D95E +:100820000425191D072901D2002300E0DB1E012643 +:1008300006FA05F1491E214099409E40761E164059 +:100840003143F0BC00F035BD0CED00E0064900F08E +:10085000070208684FF6FF03184040EA0220034AE7 +:1008600010430860704700000CED00E00000FA053E +:100870002DE9F843044600785B4DC0074FF00109AD +:1008800051D0E8690026C00008D4E86940F08050E3 +:10089000E861E869012600F0805000905348016843 +:1008A000C90512D40168804641F480710160FFF7E8 +:1008B0004FFF074605E000BFFFF74AFFC01B642853 +:1008C00077D8D8F80000C005F6D5286A10F4407033 +:1008D0001ED0A18801F44071814219D0286A444990 +:1008E00020F44070C1F8009000220A602862C0071E +:1008F0000ED0FFF72DFF074641F2883805E000BF14 +:10090000FFF726FFC11B414553D8286A8007F7D55A +:10091000286A616820F44070084328621EB1E869C3 +:1009200020F08050E8612078800705D56868A168CC +:1009300020F44040084368602078400705D5E86A05 +:10094000E16820F400300843E8622078000705D50C +:10095000E86A216920F480200843E862E86A80039D +:1009600002D4E86A400333D52868C00028D4286838 +:10097000400105D5E86AA16900F0F000884225D160 +:10098000E86AA16920F0F0000843E862E86A61695A +:1009900020F470400843E8621649C1F87090FFF7F0 +:1009A000D7FE064608E004E0FFF7D2FE801B64286D +:1009B00002D90320BDE8F88328688000F4D507E059 +:1009C000E86A616900F47040884201D00120F1E7D3 +:1009D0002078C00605D56868E16920F480000843E6 +:1009E00068600020E6E70000001002400070004050 +:1009F00040044242000042422DE9F0470F46050004 +:100A000061D0434E306800F00700B84209D2306828 +:100A100020F0070038433060306800F00700B8422B +:100A200051D128683B4C810712D5400703D5606837 +:100A300040F4E06060602878000703D5606840F407 +:100A4000605060606068A96820F0F0000843606052 +:100A50002878C00728D06868012810D021680228AB +:100A600010D0890700292EDA616821F003010143C3 +:100A70006160FFF76DFE804641F288390DE0216824 +:100A80008903EFE78901EDE7FFF762FEA0EB0801BC +:100A9000494502D90320BDE8F0876068696800F025 +:100AA0000C00B0EB810FEFD1306800F00700B842C6 +:100AB0000BD9306820F0070038433060306800F010 +:100AC0000700B84201D00120E5E72878400705D5A6 +:100AD0006068E96820F4E0600843606028780007F7 +:100AE00006D56068296920F4605040EAC100606062 +:100AF00000F018F86168084AC1F30311515CC8405E +:100B00000649086006480068FFF742FE0020C2E779 +:100B10000020024000100240201300080C000020BA +:100B200004000020F0B523A289B00FCA04AC84E809 +:100B30000F0024A10FC98DE80F0026494A682648F6 +:100B400002F00C03042B2FD0082B2DD104A8C2F3E4 +:100B50008343C45CD00329D5C86A00F00F001DF898 +:100B60000020C86AC00316D5C86AC96AC0F303105A +:100B7000C1F30321401C891CA0FB0223A1FB041626 +:100B8000154F0025A1FB070C06FB07C601FB0561FD +:100B9000FFF7FAFA03E010486043B0FBF2F09DF86B +:100BA0001D10A14200D1400809B0F0BD0B486043C0 +:100BB000FAE700000000040506070809000000002D +:100BC000000D00000102030405060708090A0B0CCA +:100BD0000D0E0F100010024000127A0000093D00B7 +:100BE0002DE9F84F040070D02078F14DC00749D0AE +:100BF0006868C0F38100012807D06868C0F38100ED +:100C0000022809D16868C00306D52868800339D551 +:100C1000A0680028E7D035E0A068B0F5803F0BD091 +:100C200010B1B0F5A02F11D0286820F480302860D2 +:100C3000286820F4802002E0286840F48030286092 +:100C4000A06890B1FFF784FD06460AE0286840F4EA +:100C500080202860F0E700BFFFF77AFD801B642842 +:100C600076D828688003F7D50CE0FFF771FD0646BB +:100C700005E000BFFFF76CFD801B6428F0D82868F2 +:100C80008003F7D42078CB4E80074FF001094FF056 +:100C900000073AD5686810F00C0F07D06868C0F3F9 +:100CA0008100022809D16868C00306D4286880073B +:100CB00015D56069012808D111E06069B8B1C6F89E +:100CC0000090FFF745FD804606E042E1FFF740FD5A +:100CD000A0EB08000228C3D828688007F6D528684A +:100CE000A16920F0F80040EAC10028600DE03760FB +:100CF000FFF72EFD804605E0FFF72AFDA0EB080078 +:100D00000228ADD828688007F6D4207800072ED5B1 +:100D1000A948E169E9B1C0F80090FFF719FD8046E4 +:100D200006E000BFFFF714FDA0EB0800022897D8EB +:100D3000686A8007F6D5A1484FF4FA510068B0FB05 +:100D4000F1F0009000BF0098411E0091FAD20EE031 +:100D5000B0E00760FFF7FCFC804605E0FFF7F8FC19 +:100D6000A0EB0800022889D8686A8007F6D42078AA +:100D7000400763D5E8694FF00008C00009D4E8696E +:100D800040F08050E861E8694FF0010800F08050C1 +:100D900000908B480168C90512D40168834641F46C +:100DA00080710160FFF7D4FC824605E0FFF7D0FCBC +:100DB000A0EB0A0064287DD8DBF80000C005F5D55B +:100DC000206901280AD008B1052813D0286A20F02C +:100DD00001002862286A20F0040002E0286A40F03E +:100DE00001002862206941F2883B98B1FFF7B0FC0E +:100DF00082460BE0286A40F004002862EEE700BF5C +:100E0000FFF7A6FCA0EB0A01594553D8286A8007D2 +:100E1000F6D50CE0FFF79CFC824605E0FFF798FC56 +:100E2000A0EB0A01594545D8286A8007F6D4B8F1E5 +:100E3000000F03D0E86920F08050E861E06AD0B389 +:100E40006968C90307D56968C1F38101022902D124 +:100E5000E96AC9037DD4022808D0E86A20F480300A +:100E6000E862B766FFF774FC80463BE02868C00084 +:100E700005D5E86A616B00F0F000884269D1B76679 +:100E8000FFF766FC804605E0FFF762FCA0EB080078 +:100E9000642874D828680001F6D4E86A616B20F0F1 +:100EA000F0000843E862E86A216B20F470600843B0 +:100EB000E86201E063E018E0C6F86890FFF748FCDC +:100EC000804605E0FFF744FCA0EB0800642856D8F4 +:100ED00028680001F6D508E0FFF73AFCA0EB08000F +:100EE00064284CD828680001F6D4206A90B3696859 +:100EF000C1F38101022949D00228376603D0FFF7E8 +:100F000027FC04463EE0FFF723FC074605E000BF50 +:100F1000FFF71EFCC01B022831D828688001F7D4D7 +:100F2000606AB0F5803F09D1E86A61680843E86209 +:100F3000E86AE16820F00F000843E862D4E909019B +:100F40000843696821F4741108436860C6F860902A +:100F500001E028E029E0FFF7FBFB044605E000BFC5 +:100F6000FFF7F6FB001B022809D828688001F7D597 +:100F70001BE000BFFFF7ECFB001B022802D9032097 +:100F8000BDE8F88F28688001F4D40EE00128F7D07E +:100F90006868626A00F48031914204D1A16A00F469 +:100FA0007010884201D00120EAE70020E8E7000045 +:100FB0000010024000004242800442420C00002027 +:100FC0000070004070B5040005D00025A56294F8BB +:100FD000510010B106E0012070BD84F85050204649 +:100FE00000F02EF8022084F851002068016821F0FA +:100FF00040010160D4E901010843D4E9031211431F +:10100000084361690843218B01F400710843E169D9 +:101010000843216A0843A16A084321680860A0695F +:10102000042101EA1040216848602068C16921F468 +:101030000061C1616565012084F85100002070BD28 +:1010400000B585B0002100910191029103910068E3 +:101050001349884221D11348816941F4805181614B +:10106000816901F480510491816941F00801816135 +:101070008069694600F00800049028200090022052 +:101080000190032003900848FFF766FA074841687B +:1010900041F0E06141F00101416005B000BD000098 +:1010A0000030014000100240000C014000000140EF +:1010B00010B5401EB0F1807F01D3012010BD4FF06C +:1010C000E02460610F21601700F0F3F80020A061B8 +:1010D00007202061002010BDFEE700003EB500247F +:1010E00010480094019402940D49846001600473D7 +:1010F0000475012505614FF460214460C161FFF76B +:101100005FF908B1FFF7DCF80095CDE901546946B5 +:101110000448FFF7D7F8002801D0FFF7D1F83EBD0B +:10112000002401401000002030B585B0002418488C +:101130000094019402940394816941F0200181613B +:10114000816901F020010491816941F0040181610C +:10115000816901F004010491816941F00801816114 +:1011600080690C4D00F008000490002253212846AD +:10117000FFF7E9FA532000900120CDE90104022095 +:10118000039069462846FFF7E7F905B030BD000037 +:1011900000100240000C0140104810B50E490160DB +:1011A0004FF4827141604FF4004181600021C160C1 +:1011B0004FF400720161C0E90512C1610162416230 +:1011C00081620A21C162FFF7FDFE002803D0BDE85D +:1011D0001040FFF775B810BD0030014040000020FE +:1011E000FEE7704770477047FFF7B8BA70B59CB01C +:1011F00038216846FFF710F814210EA8FFF70CF805 +:10120000202113A8FFF708F8012500242804CDE9C0 +:1012100002040226CDE90860009505950194C000FE +:10122000CDE90A046846FFF7DBFC0F20CDE90E0686 +:101230004FF4A060CDE9104001210EA81294FFF7F1 +:10124000DBFBA8031590139613A8FFF711FB0248C8 +:1012500005671CB070BD00000000424210480168E4 +:1012600041F00101016041680E4A1140416001688E +:101270000D4A11400160016821F48021016041683C +:1012800021F4FE014160016821F0A05101604FF49A +:101290007F0181600021C1620449C003086070477A +:1012A000001002400000FFF0FFFFF6FE08ED00E036 +:1012B000FEE70907090E002804DB00F1E02080F8B2 +:1012C0000014704700F00F0000F1E02080F8141DBA +:1012D000704702E008C8121F08C1002AFAD17047FF +:1012E0007047002001E001C1121F002AFBD17047A6 +:1012F000FFF73CFAFFF77AFFFFF716FFFFF7EEFE66 +:10130000FFF74AFF054C4FF4FA7501212046FFF71D +:1013100013FA2846FFF70EF9F7E70000000C01402A +:101320000000000000000000010203040607080995 +:10133000501300080000002010000000D212000826 +:10134000601300081000002088040000E21200086A +:101350000100000010000000000000000024F40064 :04000005080001519D :00000001FF diff --git a/Standard_BoardB/Src/main.c b/Standard_BoardB/Src/main.c deleted file mode 100644 index 7c2f189..0000000 --- a/Standard_BoardB/Src/main.c +++ /dev/null @@ -1,196 +0,0 @@ -/* USER CODE BEGIN Header */ -/** - ****************************************************************************** - * @file : main.c - * @brief : Main program body - ****************************************************************************** - * @attention - * - * <h2><center>© Copyright (c) 2020 STMicroelectronics. - * All rights reserved.</center></h2> - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ -/* USER CODE END Header */ - -/* Includes ------------------------------------------------------------------*/ -#include "main.h" -#include "adc.h" -#include "spi.h" -#include "gpio.h" - -/* Private includes ----------------------------------------------------------*/ -/* USER CODE BEGIN Includes */ - -/* USER CODE END Includes */ - -/* Private typedef -----------------------------------------------------------*/ -/* USER CODE BEGIN PTD */ - -/* USER CODE END PTD */ - -/* Private define ------------------------------------------------------------*/ -/* USER CODE BEGIN PD */ -/* USER CODE END PD */ - -/* Private macro -------------------------------------------------------------*/ -/* USER CODE BEGIN PM */ - -/* USER CODE END PM */ - -/* Private variables ---------------------------------------------------------*/ - -/* USER CODE BEGIN PV */ - -/* USER CODE END PV */ - -/* Private function prototypes -----------------------------------------------*/ -void SystemClock_Config(void); -/* USER CODE BEGIN PFP */ - -/* USER CODE END PFP */ - -/* Private user code ---------------------------------------------------------*/ -/* USER CODE BEGIN 0 */ - -/* USER CODE END 0 */ - -/** - * @brief The application entry point. - * @retval int - */ -int main(void) -{ - /* USER CODE BEGIN 1 */ - - /* USER CODE END 1 */ - - - /* MCU Configuration--------------------------------------------------------*/ - - /* Reset of all peripherals, Initializes the Flash interface and the Systick. */ - HAL_Init(); - - /* USER CODE BEGIN Init */ - - /* USER CODE END Init */ - - /* Configure the system clock */ - SystemClock_Config(); - - /* USER CODE BEGIN SysInit */ - - /* USER CODE END SysInit */ - - /* Initialize all configured peripherals */ - MX_GPIO_Init(); - MX_ADC1_Init(); - MX_SPI1_Init(); - /* USER CODE BEGIN 2 */ - - /* USER CODE END 2 */ - - - - /* Infinite loop */ - /* USER CODE BEGIN WHILE */ - while (1) - { - /* USER CODE END WHILE */ - - /* USER CODE BEGIN 3 */ - HAL_GPIO_TogglePin(Led_Blink_GPIO_Port, Led_Blink_Pin); - HAL_Delay(500); - - } - /* USER CODE END 3 */ -} - -/** - * @brief System Clock Configuration - * @retval None - */ -void SystemClock_Config(void) -{ - RCC_OscInitTypeDef RCC_OscInitStruct = {0}; - RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInit = {0}; - - /** Initializes the CPU, AHB and APB busses clocks - */ - RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE; - RCC_OscInitStruct.HSEState = RCC_HSE_ON; - RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1; - RCC_OscInitStruct.HSIState = RCC_HSI_ON; - RCC_OscInitStruct.Prediv1Source = RCC_PREDIV1_SOURCE_HSE; - RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; - RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE; - RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL4; - RCC_OscInitStruct.PLL2.PLL2State = RCC_PLL_NONE; - if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) - { - Error_Handler(); - } - /** Initializes the CPU, AHB and APB busses clocks - */ - RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK - |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2; - RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK; - RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; - RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4; - RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1; - - if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) - { - Error_Handler(); - } - PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC; - PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV4; - if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) - { - Error_Handler(); - } - /** Configure the Systick interrupt time - */ - __HAL_RCC_PLLI2S_ENABLE(); -} - -/* USER CODE BEGIN 4 */ - -/* USER CODE END 4 */ - -/** - * @brief This function is executed in case of error occurrence. - * @retval None - */ -void Error_Handler(void) -{ - /* USER CODE BEGIN Error_Handler_Debug */ - /* User can add his own implementation to report the HAL error return state */ - - /* USER CODE END Error_Handler_Debug */ -} - -#ifdef USE_FULL_ASSERT -/** - * @brief Reports the name of the source file and the source line number - * where the assert_param error has occurred. - * @param file: pointer to the source file name - * @param line: assert_param error line source number - * @retval None - */ -void assert_failed(uint8_t *file, uint32_t line) -{ - /* USER CODE BEGIN 6 */ - /* User can add his own implementation to report the file name and line number, - tex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */ - /* USER CODE END 6 */ -} -#endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ -- GitLab