From e5a63e116baa62fdce3b35264cd886c53f6ed1e4 Mon Sep 17 00:00:00 2001 From: JFeng <2834294740@qq.com> Date: Sat, 20 Jan 2024 22:45:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HARDWARE/menu/menu.c | 118 ++++++++--------- STM32F103.uvguix.JFeng | 50 +++---- STM32F103.uvoptx | 288 ++++++++++++++--------------------------- STM32F103.uvprojx | 42 +----- 4 files changed, 180 insertions(+), 318 deletions(-) diff --git a/HARDWARE/menu/menu.c b/HARDWARE/menu/menu.c index 498751d..7b5e28a 100644 --- a/HARDWARE/menu/menu.c +++ b/HARDWARE/menu/menu.c @@ -19,26 +19,20 @@ typedef struct Error Error Cursor; -/* Page*/ -xpMenu NowPage; xMenu - MainPage, // 一级Page - Page1, Page2, Page3, Page4, Page5, // 二级Page - No3Page1, No3Page2, No3Page3; // 三级Page + Main_Page, + Application_Page, Files_Page, Image_Page, ResetAll_Page, About_Page, + System_Page, Games_Page; /* item */ -// 一级Page的item -xpItem Selectitm; -xItem Mainitem1, Mainitem2, Mainitem3, Mainitem4, Mainitem5, Mainitem6,Mainitem7; -// 二级Page的item -xItem Page1item1, Page1item2, Page1item3, Page1item4; -xItem Page2item1, Page2item2, Page2item3, Page2item4; -xItem Page3item1, Page3item2, Page3item3, Page3item4; -xItem Page4item1, Page4item2, Page4item3, Page4item4; -xItem Page5item1, Page5item2, Page5item3, Page5item4; -// 三级Page的item -xItem No3Page1item1, No3Page1item2, No3Page1item3, No3Page1item4, No3Page1item5, - No3Page2item1, No3Page2item2, No3Page2item3, No3Page2item4; +xItem Application_Item, Files_Item, Image_Item, ResetAll_Item, About_Item; +xItem System_Item, Games_Item, Screen_Item, ApplicationReturn_Item; +xItem Files1_Item, Files2_Item, Files3_Item, FilesReturn_Item; +xItem Image1_Item, Image2_Item, Image3_Item, ImageReturn_Item; +xItem ResetName_Item, ResetTime_Item, ResetSetting_Item, ResetReturn_Item; +xItem Github_Item, Bilibili_Item, ReadME_Item, AboutReturn_Item; +xItem MPU6050_Item, Speed_Item, Mode_Item, SystemReturn_Item, + DinoGame_Item, AirPlaneGame_Item, GamesReturn_Item; void AddPage(const char *name, xpMenu page) { @@ -51,7 +45,6 @@ void AddItem(const char *Name, xpItem item, xpMenu LocalPage, xpMenu nextpage, I { item->itemName = Name; item->location = LocalPage; - item->JumpPage = nextpage; item->Itemfunction = function; /* 新建item的下一个肯定是null */ item->nextiTem = NULL; @@ -59,6 +52,7 @@ void AddItem(const char *Name, xpItem item, xpMenu LocalPage, xpMenu nextpage, I if (nextpage != NULL) nextpage->ParentiTem = item; else nextpage = LocalPage; + item->JumpPage = nextpage; /* 链式结构创建item */ if (LocalPage->itemHead == NULL) // 如果是第一个iTem { @@ -304,62 +298,58 @@ void Draw_Menu(uint8_t pos, xpMenu Page, uint8_t LineSpacing, xpItem now_item,xp void Menu_Team(void) { - NowPage = &MainPage; - Selectitm = &Mainitem1; - MainPage.ParentiTem = NULL; + AddPage("[MainPage]", &Main_Page); + AddItem(" -Application", &Application_Item, &Main_Page, &Application_Page, NULL); + AddItem(" -Files", &Files_Item, &Main_Page, &Files_Page, NULL); + AddItem(" -Image", &Image_Item, &Main_Page, &Image_Page, NULL); + AddItem(" -Reset All", &ResetAll_Item, &Main_Page, &ResetAll_Page, NULL); + AddItem(" -About", &About_Item, &Main_Page, &About_Page, NULL); - AddPage("[MainPage]", &MainPage); - AddItem(" -Application", &Mainitem1, &MainPage, &Page1, NULL); - AddItem(" -Files", &Mainitem2, &MainPage, &Page2, NULL); - AddItem(" -Image", &Mainitem3, &MainPage, &Page3, NULL); - AddItem(" -Reset All", &Mainitem4, &MainPage, &Page4, NULL); - AddItem(" -About", &Mainitem5, &MainPage, &Page5, NULL); + AddPage("[Application]", &Application_Page); + AddItem(" -System", &System_Item, &Application_Page, &System_Page, NULL); + AddItem(" -Games", &Games_Item, &Application_Page, &Games_Page, NULL); + AddItem(" -Screen", &Screen_Item, &Application_Page, NULL, Screen); + AddItem(" -Return", &ApplicationReturn_Item, &Application_Page, &Main_Page, NULL); - AddPage("[Application]", &Page1); - AddItem(" -System", &Page1item1, &Page1, &No3Page1, NULL); - AddItem(" -Games", &Page1item2, &Page1, &No3Page2, NULL); - AddItem(" -Screen", &Page1item3, &Page1, NULL, Screen); - AddItem(" -Return", &Page1item4, &Page1, &MainPage, NULL); + AddPage("[System]", &System_Page); + AddItem(" -MPU6050", &MPU6050_Item, &System_Page, NULL, Show_MPU6050); + AddItem(" -Speed", &Speed_Item, &System_Page, NULL, Setting_Speed); + AddItem(" -Mode", &Mode_Item, &System_Page, NULL, White_Dark_Day); + AddItem(" -Return", &SystemReturn_Item, &System_Page, &Application_Page, NULL); - AddPage("[System]", &No3Page1); - AddItem(" -MPU6050", &No3Page1item1, &No3Page1, NULL, Show_MPU6050); - AddItem(" -Speed", &No3Page1item2, &No3Page1, NULL, Setting_Speed); - AddItem(" -Mode", &No3Page1item3, &No3Page1, NULL, White_Dark_Day); - AddItem(" -Return", &No3Page1item5, &No3Page1, &Page1, NULL); + AddPage("[Games]", &Games_Page); + AddItem(" -Dino Game", &DinoGame_Item, &Games_Page, NULL, DinoGame_Run); + AddItem(" -AirPlane Game", &AirPlaneGame_Item, &Games_Page, NULL, AirPlane_Run); + AddItem(" -Return", &GamesReturn_Item, &Games_Page, &Application_Page, NULL); - AddPage("[Games]", &No3Page2); - AddItem(" -Dino Game", &No3Page2item1, &No3Page2, NULL, DinoGame_Run); - AddItem(" -AirPlane Game", &No3Page2item2, &No3Page2, NULL, AirPlane_Run); - AddItem(" -Return", &No3Page2item4, &No3Page2, &Page1, NULL); + AddPage("[Files]", &Files_Page); + AddItem(" -New Project", &Files1_Item, &Files_Page, NULL, NULL); + AddItem(" -New Project", &Files2_Item, &Files_Page, NULL, NULL); + AddItem(" -New Project", &Files3_Item, &Files_Page, NULL, NULL); + AddItem(" -Return", &FilesReturn_Item, &Files_Page, &Main_Page, NULL); - AddPage("[Files]", &Page2); - AddItem(" -New Project", &Page2item1, &Page2, NULL, NULL); - AddItem(" -New Project", &Page2item2, &Page2, NULL, NULL); - AddItem(" -New Project", &Page2item3, &Page2, NULL, NULL); - AddItem(" -Return", &Page2item4, &Page2, &MainPage, NULL); + AddPage("[Image]", &Image_Page); + AddItem(" -New Project", &Image1_Item, &Image_Page, NULL, NULL); + AddItem(" -New Project", &Image2_Item, &Image_Page, NULL, NULL); + AddItem(" -New Project", &Image3_Item, &Image_Page, NULL, NULL); + AddItem(" -Return", &ImageReturn_Item, &Image_Page, &Main_Page, NULL); - AddPage("[Image]", &Page3); - AddItem(" -New Project", &Page3item1, &Page3, NULL, NULL); - AddItem(" -New Project", &Page3item2, &Page3, NULL, NULL); - AddItem(" -New Project", &Page3item3, &Page3, NULL, NULL); - AddItem(" -Return", &Page3item4, &Page3, &MainPage, NULL); + AddPage("[Reset All]", &ResetAll_Page); + AddItem(" -Reset Name", &ResetName_Item, &ResetAll_Page, NULL, NULL); + AddItem(" -Reset Time", &ResetTime_Item, &ResetAll_Page, NULL, NULL); + AddItem(" -Reset Setting", &ResetSetting_Item, &ResetAll_Page, NULL, NULL); + AddItem(" -Return", &ResetReturn_Item, &ResetAll_Page, &Main_Page, NULL); - AddPage("[Reset All]", &Page4); - AddItem(" -Reset Name", &Page4item1, &Page4, NULL, NULL); - AddItem(" -Reset Time", &Page4item2, &Page4, NULL, NULL); - AddItem(" -Reset Setting", &Page4item3, &Page4, NULL, NULL); - AddItem(" -Return", &Page4item4, &Page4, &MainPage, NULL); - - AddPage("[About]", &Page5); - AddItem(" -Github", &Page5item1, &Page5, NULL, Show_GitHub); - AddItem(" -Bilibili", &Page5item2, &Page5, NULL, Show_Bilibili); - AddItem(" -ReadME", &Page5item3, &Page5, NULL, NULL); - AddItem(" -Return", &Page5item4, &Page5, &MainPage, NULL); + AddPage("[About]", &About_Page); + AddItem(" -Github", &Github_Item, &About_Page, NULL, Show_GitHub); + AddItem(" -Bilibili", &Bilibili_Item, &About_Page, NULL, Show_Bilibili); + AddItem(" -ReadME", &ReadME_Item, &About_Page, NULL, NULL); + AddItem(" -Return", &AboutReturn_Item, &About_Page, &Main_Page, NULL); } uint8_t MENU_STATE=MENU_RUN; uint8_t disapper = 1; -xpItem temp_item=&Mainitem1; +xpItem temp_item=&Application_Item; Itemfunction App_Function; void Switch_Menu_State(uint8_t state) @@ -462,5 +452,5 @@ void Menu_Init(void) { Menu_Team(); Draw_Process(); - Draw_Menu(FirstPos,&MainPage,Font_Size,&Mainitem1,&Mainitem1); + Draw_Menu(FirstPos,&Main_Page,Font_Size,&Application_Item,&Application_Item); } \ No newline at end of file diff --git a/STM32F103.uvguix.JFeng b/STM32F103.uvguix.JFeng index 7b4a359..d23482b 100644 --- a/STM32F103.uvguix.JFeng +++ b/STM32F103.uvguix.JFeng @@ -11,7 +11,7 @@ 38003 Registers - 115 67 + 115 163 346 @@ -83,25 +83,25 @@ 0 1 - -32000 - -32000 + -1 + -1 -1 -1 - 136 - 129 - 1281 - 754 + 133 + 329 + 1481 + 751 0 275 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000002000000010000000100000017443A5C4D756C744D656E755C557365725C6D61696E2E6300000000066D61696E2E6300000000FFDC7800FFFFFFFF20443A5C4D756C744D656E755C48415244574152455C4D454E555C4D656E752E6300000000064D656E752E6300000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000AD010000F6000000F904000066020000 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000002000000010000000100000017443A5C4D756C744D656E755C557365725C6D61696E2E6300000000066D61696E2E6300000000FFDC7800FFFFFFFF20443A5C4D756C744D656E755C48415244574152455C4D454E555C4D656E752E6300000000064D656E752E6300000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000075020000F3000000C105000063020000 @@ -124,7 +124,7 @@ 16 - 4D010000F6000000F904000063010000 + 15020000F3000000C105000060010000 @@ -520,7 +520,7 @@ 0 16 - 03000000DA010000FD05000017020000 + 03000000DA0100006D04000017020000 16 @@ -1120,7 +1120,7 @@ 0 16 - 0300000066000000BD0000007C020000 + 03000000660000001D010000A6010000 16 @@ -1140,7 +1140,7 @@ 0 16 - 03000000DA010000FD05000017020000 + 03000000DA0100006D04000017020000 16 @@ -1160,7 +1160,7 @@ 0 16 - 03000000DA010000FD05000017020000 + 03000000DA0100006D04000017020000 16 @@ -1220,7 +1220,7 @@ 0 16 - 03000000DA010000FD05000017020000 + 03000000DA0100006D04000017020000 16 @@ -1240,7 +1240,7 @@ 0 16 - 03000000DA010000FD05000017020000 + 03000000DA0100006D04000017020000 16 @@ -1290,7 +1290,7 @@ 50002 50002 - 0 + 1 0 0 0 @@ -1300,11 +1300,11 @@ 0 16 - B3030000660000006D04000087010000 + 020500000A010000BE05000025010000 16 - BE000000D50000007E01000073010000 + 0A0000000A0000006E0000006E000000 @@ -1590,7 +1590,7 @@ 50017 50017 - 0 + 1 0 0 0 @@ -1600,11 +1600,11 @@ 0 16 - B3030000660000006D04000087010000 + 01000000DA0100006D040000F5010000 16 - BE000000D50000007E01000073010000 + 0A0000000A0000006E0000006E000000 @@ -1749,14 +1749,14 @@ 3236 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFC4000000BC00000070040000C0000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E6500200000000000004D010000F6000000F904000063010000C40000004F00000070040000BC0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A0010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C300000180004000000000000039040000F6000000F904000047020000B00300004F00000070040000A001000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF200100004F00000024010000BF0100000100000002000010040000000100000042FFFFFFA7030000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000089000000F6000000490100003C030000000000004F00000020010000BF0100000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF000000008C010000700400009001000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000000000008900000037020000F9040000B80200000000000090010000700400001102000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF38020000900100003C0200001102000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000BF01000070040000C3010000010000000100001004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000890000004003000089060000AD03000000000000C301000070040000300200000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF1346696E6420416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFC4000000BC00000070040000C0000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E65002000000000000015020000F3000000C105000060010000C40000004F00000070040000BC0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A0010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C300000180004000000000000001050000F3000000C105000044020000B00300004F00000070040000A001000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF200100004F00000024010000BF0100000100000002000010040000000100000042FFFFFFA7030000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000051010000F30000007102000063020000000000004F00000020010000BF0100000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF000000008C010000700400009001000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000000000005101000034020000C1050000B50200000000000090010000700400001102000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF38020000900100003C0200001102000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000BF01000070040000C3010000010000000100001004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF01000077940000018000800000010000005101000067020000C1050000D402000000000000C301000070040000300200000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF1346696E6420416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2376 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A5F434F44455F50414745960000000000000014000A5F434F44455F50414745085F5553455F4C464E0A66665F636F6E7665727408665F7072696E7466085350495F6D6F6465125350495F436C6F636B5F506F6C61726974791043757272656E7454657874436F6C6F7219494C49393334315F44697370537472696E674C696E655F454E1C494C49393334315F44697370537472696E674C696E655F454E5F434811546F7563685F427574746F6E5F446F776E155350495F464C4153485F536563746F72457261736510494C49393334315F4772616D5363616E03434D4412D3C3494C49393334315F4772616D5363616E084949435F496E69740C52656D6F74655F5370656564124C656674416E6452696768745F537065656404616163780B42616C616E63655F50776D054D6F746F310000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000 + 2372 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000018636865636B5F686F6C7465725F646174615F75706C6F61649600000000000000140018636865636B5F686F6C7465725F646174615F75706C6F6164065F4445425547034551550A7468756D625F66756E6305537461636B01320969734F757453656E640A5F434F44455F50414745085F5553455F4C464E0A66665F636F6E7665727408665F7072696E7466085350495F6D6F6465125350495F436C6F636B5F506F6C61726974791043757272656E7454657874436F6C6F7219494C49393334315F44697370537472696E674C696E655F454E1C494C49393334315F44697370537472696E674C696E655F454E5F434811546F7563685F427574746F6E5F446F776E155350495F464C4153485F536563746F72457261736510494C49393334315F4772616D5363616E03434D440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000 1423 @@ -1788,7 +1788,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 diff --git a/STM32F103.uvoptx b/STM32F103.uvoptx index 4c2cf75..a506d3e 100644 --- a/STM32F103.uvoptx +++ b/STM32F103.uvoptx @@ -175,7 +175,7 @@ FREERTOS/SRC - 0 + 1 0 0 0 @@ -255,7 +255,7 @@ FREERTOS/PORT/RVDS/ARM_CM3 - 0 + 1 0 0 0 @@ -275,7 +275,7 @@ FREERTOS/PORT/MEMMANG - 0 + 1 0 0 0 @@ -295,7 +295,7 @@ HARDWARE/UART - 0 + 1 0 0 0 @@ -315,7 +315,7 @@ HARDWARE/U8G2LIB/SRC - 0 + 1 0 0 0 @@ -838,8 +838,8 @@ - HARDWARE/MPU6050 - 0 + HARDWARE/MENU + 1 0 0 0 @@ -850,70 +850,6 @@ 0 0 0 - HARDWARE/MPU6050/mpu6050.c - mpu6050.c - 0 - 0 - - - 6 - 54 - 1 - 0 - 0 - 0 - HARDWARE/MPU6050/mpuiic.c - mpuiic.c - 0 - 0 - - - - - HARDWARE/MPU6050/EMPL - 0 - 0 - 0 - 0 - - 7 - 55 - 1 - 0 - 0 - 0 - HARDWARE/MPU6050/eMPL/inv_mpu.c - inv_mpu.c - 0 - 0 - - - 7 - 56 - 1 - 0 - 0 - 0 - HARDWARE/MPU6050/eMPL/inv_mpu_dmp_motion_driver.c - inv_mpu_dmp_motion_driver.c - 0 - 0 - - - - - HARDWARE/MENU - 0 - 0 - 0 - 0 - - 8 - 57 - 1 - 0 - 0 - 0 HARDWARE/MENU/Menu.c Menu.c 0 @@ -923,13 +859,13 @@ HARDWARE/LED - 0 + 1 0 0 0 - 9 - 58 + 7 + 54 1 0 0 @@ -943,13 +879,13 @@ HARDWARE/KEY - 0 + 1 0 0 0 - 10 - 59 + 8 + 55 1 0 0 @@ -960,8 +896,8 @@ 0 - 10 - 60 + 8 + 56 1 0 0 @@ -975,13 +911,13 @@ USER - 0 + 1 0 0 0 - 11 - 61 + 9 + 57 5 0 0 @@ -992,8 +928,8 @@ 0 - 11 - 62 + 9 + 58 1 0 0 @@ -1004,8 +940,8 @@ 0 - 11 - 63 + 9 + 59 5 0 0 @@ -1016,8 +952,8 @@ 0 - 11 - 64 + 9 + 60 1 0 0 @@ -1028,8 +964,8 @@ 0 - 11 - 65 + 9 + 61 5 0 0 @@ -1043,13 +979,13 @@ STARTUP - 0 + 1 0 0 0 - 12 - 66 + 10 + 62 2 0 0 @@ -1063,13 +999,13 @@ FWLIB - 0 + 1 0 0 0 - 13 - 67 + 11 + 63 1 0 0 @@ -1080,8 +1016,8 @@ 0 - 13 - 68 + 11 + 64 1 0 0 @@ -1092,8 +1028,8 @@ 0 - 13 - 69 + 11 + 65 1 0 0 @@ -1104,8 +1040,8 @@ 0 - 13 - 70 + 11 + 66 1 0 0 @@ -1116,8 +1052,8 @@ 0 - 13 - 71 + 11 + 67 1 0 0 @@ -1128,8 +1064,8 @@ 0 - 13 - 72 + 11 + 68 1 0 0 @@ -1140,8 +1076,8 @@ 0 - 13 - 73 + 11 + 69 1 0 0 @@ -1152,8 +1088,8 @@ 0 - 13 - 74 + 11 + 70 1 0 0 @@ -1164,8 +1100,8 @@ 0 - 13 - 75 + 11 + 71 1 0 0 @@ -1176,8 +1112,8 @@ 0 - 13 - 76 + 11 + 72 1 0 0 @@ -1188,8 +1124,8 @@ 0 - 13 - 77 + 11 + 73 1 0 0 @@ -1200,8 +1136,8 @@ 0 - 13 - 78 + 11 + 74 1 0 0 @@ -1212,8 +1148,8 @@ 0 - 13 - 79 + 11 + 75 1 0 0 @@ -1224,8 +1160,8 @@ 0 - 13 - 80 + 11 + 76 1 0 0 @@ -1236,8 +1172,8 @@ 0 - 13 - 81 + 11 + 77 1 0 0 @@ -1248,8 +1184,8 @@ 0 - 13 - 82 + 11 + 78 1 0 0 @@ -1260,8 +1196,8 @@ 0 - 13 - 83 + 11 + 79 1 0 0 @@ -1272,8 +1208,8 @@ 0 - 13 - 84 + 11 + 80 1 0 0 @@ -1284,8 +1220,8 @@ 0 - 13 - 85 + 11 + 81 1 0 0 @@ -1296,8 +1232,8 @@ 0 - 13 - 86 + 11 + 82 1 0 0 @@ -1308,8 +1244,8 @@ 0 - 13 - 87 + 11 + 83 1 0 0 @@ -1320,8 +1256,8 @@ 0 - 13 - 88 + 11 + 84 1 0 0 @@ -1332,8 +1268,8 @@ 0 - 13 - 89 + 11 + 85 1 0 0 @@ -1347,13 +1283,13 @@ DOC - 0 + 1 0 0 0 - 14 - 90 + 12 + 86 5 0 0 @@ -1367,13 +1303,13 @@ CMSIS - 0 + 1 0 0 0 - 15 - 91 + 13 + 87 1 0 0 @@ -1384,8 +1320,8 @@ 0 - 15 - 92 + 13 + 88 1 0 0 @@ -1399,13 +1335,13 @@ HARDWARE/APP - 0 + 1 0 0 0 - 16 - 93 + 14 + 89 1 0 0 @@ -1416,8 +1352,8 @@ 0 - 16 - 94 + 14 + 90 1 0 0 @@ -1428,8 +1364,8 @@ 0 - 16 - 95 + 14 + 91 1 0 0 @@ -1439,29 +1375,17 @@ 0 0 - - 16 - 96 - 1 - 0 - 0 - 0 - .\HARDWARE\APP\Time.c - Time.c - 0 - 0 - HARDWARE/I2cDrive - 0 + 1 0 0 0 - 17 - 97 + 15 + 92 1 0 0 @@ -1475,13 +1399,13 @@ HARDWARE/U8G2Drive - 0 + 1 0 0 0 - 18 - 98 + 16 + 93 1 0 0 @@ -1491,29 +1415,17 @@ 0 0 - - 18 - 99 - 1 - 0 - 0 - 0 - .\HARDWARE\U8G2Drive\U8g2_User.c - U8g2_User.c - 0 - 0 - HARDWARE/TimerTick - 0 + 1 0 0 0 - 19 - 100 + 17 + 94 1 0 0 diff --git a/STM32F103.uvprojx b/STM32F103.uvprojx index 9652fc6..0b2288a 100644 --- a/STM32F103.uvprojx +++ b/STM32F103.uvprojx @@ -336,7 +336,7 @@ USE_STDPERIPH_DRIVER,STM32F10X_HD - .cmsis\include;RTE\_Target 1;.eide\deps;HARDWARE;HARDWARE\Encoder;HARDWARE\KEY;HARDWARE\LED;HARDWARE\uart;FreeRTOS\include;FreeRTOS\src;FreeRTOS\port\RVDS\ARM_CM3;FreeRTOS\port\MemMang;User;Libraries\CMSIS;Libraries\STM32F10x_StdPeriph_Driver\inc;HARDWARE\MPU6050;HARDWARE\MPU6050\eMPL;HARDWARE\MENU;HARDWARE\APP;.\HARDWARE\I2cDrive;.\HARDWARE\U8G2Drive;.\HARDWARE\U8G2LIB\inc;.\HARDWARE\TimerTick + .cmsis\include;RTE\_Target 1;.eide\deps;HARDWARE;HARDWARE\KEY;HARDWARE\LED;FreeRTOS\include;FreeRTOS\src;FreeRTOS\port\RVDS\ARM_CM3;FreeRTOS\port\MemMang;User;Libraries\CMSIS;Libraries\STM32F10x_StdPeriph_Driver\inc;HARDWARE\MENU;HARDWARE\APP;.\HARDWARE\I2cDrive;.\HARDWARE\U8G2Drive;.\HARDWARE\U8G2LIB\inc;.\HARDWARE\TimerTick;.\HARDWARE\UART @@ -662,36 +662,6 @@ - - HARDWARE/MPU6050 - - - mpu6050.c - 1 - HARDWARE/MPU6050/mpu6050.c - - - mpuiic.c - 1 - HARDWARE/MPU6050/mpuiic.c - - - - - HARDWARE/MPU6050/EMPL - - - inv_mpu.c - 1 - HARDWARE/MPU6050/eMPL/inv_mpu.c - - - inv_mpu_dmp_motion_driver.c - 1 - HARDWARE/MPU6050/eMPL/inv_mpu_dmp_motion_driver.c - - - HARDWARE/MENU @@ -930,11 +900,6 @@ 1 .\HARDWARE\APP\Other_Function.c - - Time.c - 1 - .\HARDWARE\APP\Time.c - @@ -955,11 +920,6 @@ 1 .\HARDWARE\U8G2Drive\stm32_u8g2.c - - U8g2_User.c - 1 - .\HARDWARE\U8G2Drive\U8g2_User.c -