lzc56/MiaoUI
1
0
Fork 0
mirror of https://gitee.com/lzc56/MiaoUI.git synced 2025-08-12 12:22:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复一些bug

Browse Source
This commit is contained in:
JFeng 2024-01-20 22:45:48 +08:00
parent 71773e364b
commit e5a63e116b
4 changed files with 180 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
HARDWARE/menu/menu.c
View File

@ -19,26 +19,20 @@ typedef struct Error
Error Cursor; Error Cursor;
/* Page*/
xpMenu NowPage;
xMenu xMenu
MainPage, // 一级Page Main_Page,
Page1, Page2, Page3, Page4, Page5, // 二级Page Application_Page, Files_Page, Image_Page, ResetAll_Page, About_Page,
No3Page1, No3Page2, No3Page3; // 三级Page System_Page, Games_Page;
/* item */ /* item */
// 一级Page的item xItem Application_Item, Files_Item, Image_Item, ResetAll_Item, About_Item;
xpItem Selectitm; xItem System_Item, Games_Item, Screen_Item, ApplicationReturn_Item;
xItem Mainitem1, Mainitem2, Mainitem3, Mainitem4, Mainitem5, Mainitem6,Mainitem7; xItem Files1_Item, Files2_Item, Files3_Item, FilesReturn_Item;
// 二级Page的item xItem Image1_Item, Image2_Item, Image3_Item, ImageReturn_Item;
xItem Page1item1, Page1item2, Page1item3, Page1item4; xItem ResetName_Item, ResetTime_Item, ResetSetting_Item, ResetReturn_Item;
xItem Page2item1, Page2item2, Page2item3, Page2item4; xItem Github_Item, Bilibili_Item, ReadME_Item, AboutReturn_Item;
xItem Page3item1, Page3item2, Page3item3, Page3item4; xItem MPU6050_Item, Speed_Item, Mode_Item, SystemReturn_Item,
xItem Page4item1, Page4item2, Page4item3, Page4item4; DinoGame_Item, AirPlaneGame_Item, GamesReturn_Item;
xItem Page5item1, Page5item2, Page5item3, Page5item4;
// 三级Page的item
xItem No3Page1item1, No3Page1item2, No3Page1item3, No3Page1item4, No3Page1item5,
No3Page2item1, No3Page2item2, No3Page2item3, No3Page2item4;
void AddPage(const char *name, xpMenu page) 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->itemName = Name;
item->location = LocalPage; item->location = LocalPage;
item->JumpPage = nextpage;
item->Itemfunction = function; item->Itemfunction = function;
/* 新建item的下一个肯定是null */ /* 新建item的下一个肯定是null */
item->nextiTem = NULL; item->nextiTem = NULL;
@ -59,6 +52,7 @@ void AddItem(const char *Name, xpItem item, xpMenu LocalPage, xpMenu nextpage, I
if (nextpage != NULL) if (nextpage != NULL)
nextpage->ParentiTem = item; nextpage->ParentiTem = item;
else nextpage = LocalPage; else nextpage = LocalPage;
item->JumpPage = nextpage;
/* 链式结构创建item */ /* 链式结构创建item */
if (LocalPage->itemHead == NULL) // 如果是第一个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) void Menu_Team(void)
{ {
NowPage = &MainPage; AddPage("[MainPage]", &Main_Page);
Selectitm = &Mainitem1; AddItem(" -Application", &Application_Item, &Main_Page, &Application_Page, NULL);
MainPage.ParentiTem = 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); AddPage("[Application]", &Application_Page);
AddItem(" -Application", &Mainitem1, &MainPage, &Page1, NULL); AddItem(" -System", &System_Item, &Application_Page, &System_Page, NULL);
AddItem(" -Files", &Mainitem2, &MainPage, &Page2, NULL); AddItem(" -Games", &Games_Item, &Application_Page, &Games_Page, NULL);
AddItem(" -Image", &Mainitem3, &MainPage, &Page3, NULL); AddItem(" -Screen", &Screen_Item, &Application_Page, NULL, Screen);
AddItem(" -Reset All", &Mainitem4, &MainPage, &Page4, NULL); AddItem(" -Return", &ApplicationReturn_Item, &Application_Page, &Main_Page, NULL);
AddItem(" -About", &Mainitem5, &MainPage, &Page5, NULL);
AddPage("[Application]", &Page1); AddPage("[System]", &System_Page);
AddItem(" -System", &Page1item1, &Page1, &No3Page1, NULL); AddItem(" -MPU6050", &MPU6050_Item, &System_Page, NULL, Show_MPU6050);
AddItem(" -Games", &Page1item2, &Page1, &No3Page2, NULL); AddItem(" -Speed", &Speed_Item, &System_Page, NULL, Setting_Speed);
AddItem(" -Screen", &Page1item3, &Page1, NULL, Screen); AddItem(" -Mode", &Mode_Item, &System_Page, NULL, White_Dark_Day);
AddItem(" -Return", &Page1item4, &Page1, &MainPage, NULL); AddItem(" -Return", &SystemReturn_Item, &System_Page, &Application_Page, NULL);
AddPage("[System]", &No3Page1); AddPage("[Games]", &Games_Page);
AddItem(" -MPU6050", &No3Page1item1, &No3Page1, NULL, Show_MPU6050); AddItem(" -Dino Game", &DinoGame_Item, &Games_Page, NULL, DinoGame_Run);
AddItem(" -Speed", &No3Page1item2, &No3Page1, NULL, Setting_Speed); AddItem(" -AirPlane Game", &AirPlaneGame_Item, &Games_Page, NULL, AirPlane_Run);
AddItem(" -Mode", &No3Page1item3, &No3Page1, NULL, White_Dark_Day); AddItem(" -Return", &GamesReturn_Item, &Games_Page, &Application_Page, NULL);
AddItem(" -Return", &No3Page1item5, &No3Page1, &Page1, NULL);
AddPage("[Games]", &No3Page2); AddPage("[Files]", &Files_Page);
AddItem(" -Dino Game", &No3Page2item1, &No3Page2, NULL, DinoGame_Run); AddItem(" -New Project", &Files1_Item, &Files_Page, NULL, NULL);
AddItem(" -AirPlane Game", &No3Page2item2, &No3Page2, NULL, AirPlane_Run); AddItem(" -New Project", &Files2_Item, &Files_Page, NULL, NULL);
AddItem(" -Return", &No3Page2item4, &No3Page2, &Page1, NULL); AddItem(" -New Project", &Files3_Item, &Files_Page, NULL, NULL);
AddItem(" -Return", &FilesReturn_Item, &Files_Page, &Main_Page, NULL);
AddPage("[Files]", &Page2); AddPage("[Image]", &Image_Page);
AddItem(" -New Project", &Page2item1, &Page2, NULL, NULL); AddItem(" -New Project", &Image1_Item, &Image_Page, NULL, NULL);
AddItem(" -New Project", &Page2item2, &Page2, NULL, NULL); AddItem(" -New Project", &Image2_Item, &Image_Page, NULL, NULL);
AddItem(" -New Project", &Page2item3, &Page2, NULL, NULL); AddItem(" -New Project", &Image3_Item, &Image_Page, NULL, NULL);
AddItem(" -Return", &Page2item4, &Page2, &MainPage, NULL); AddItem(" -Return", &ImageReturn_Item, &Image_Page, &Main_Page, NULL);
AddPage("[Image]", &Page3); AddPage("[Reset All]", &ResetAll_Page);
AddItem(" -New Project", &Page3item1, &Page3, NULL, NULL); AddItem(" -Reset Name", &ResetName_Item, &ResetAll_Page, NULL, NULL);
AddItem(" -New Project", &Page3item2, &Page3, NULL, NULL); AddItem(" -Reset Time", &ResetTime_Item, &ResetAll_Page, NULL, NULL);
AddItem(" -New Project", &Page3item3, &Page3, NULL, NULL); AddItem(" -Reset Setting", &ResetSetting_Item, &ResetAll_Page, NULL, NULL);
AddItem(" -Return", &Page3item4, &Page3, &MainPage, NULL); AddItem(" -Return", &ResetReturn_Item, &ResetAll_Page, &Main_Page, NULL);
AddPage("[Reset All]", &Page4); AddPage("[About]", &About_Page);
AddItem(" -Reset Name", &Page4item1, &Page4, NULL, NULL); AddItem(" -Github", &Github_Item, &About_Page, NULL, Show_GitHub);
AddItem(" -Reset Time", &Page4item2, &Page4, NULL, NULL); AddItem(" -Bilibili", &Bilibili_Item, &About_Page, NULL, Show_Bilibili);
AddItem(" -Reset Setting", &Page4item3, &Page4, NULL, NULL); AddItem(" -ReadME", &ReadME_Item, &About_Page, NULL, NULL);
AddItem(" -Return", &Page4item4, &Page4, &MainPage, NULL); AddItem(" -Return", &AboutReturn_Item, &About_Page, &Main_Page, 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);
} }
uint8_t MENU_STATE=MENU_RUN; uint8_t MENU_STATE=MENU_RUN;
uint8_t disapper = 1; uint8_t disapper = 1;
xpItem temp_item=&Mainitem1; xpItem temp_item=&Application_Item;
Itemfunction App_Function; Itemfunction App_Function;
void Switch_Menu_State(uint8_t state) void Switch_Menu_State(uint8_t state)
@ -462,5 +452,5 @@ void Menu_Init(void)
{ {
Menu_Team(); Menu_Team();
Draw_Process(); Draw_Process();
Draw_Menu(FirstPos,&MainPage,Font_Size,&Mainitem1,&Mainitem1); Draw_Menu(FirstPos,&Main_Page,Font_Size,&Application_Item,&Application_Item);
} }

50
STM32F103.uvguix.JFeng
View File

File diff suppressed because one or more lines are too long

288
STM32F103.uvoptx
View File

@ -175,7 +175,7 @@
<Group> <Group>
<GroupName>FREERTOS/SRC</GroupName> <GroupName>FREERTOS/SRC</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@ -255,7 +255,7 @@
<Group> <Group>
<GroupName>FREERTOS/PORT/RVDS/ARM_CM3</GroupName> <GroupName>FREERTOS/PORT/RVDS/ARM_CM3</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@ -275,7 +275,7 @@
<Group> <Group>
<GroupName>FREERTOS/PORT/MEMMANG</GroupName> <GroupName>FREERTOS/PORT/MEMMANG</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@ -295,7 +295,7 @@
<Group> <Group>
<GroupName>HARDWARE/UART</GroupName> <GroupName>HARDWARE/UART</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@ -315,7 +315,7 @@
<Group> <Group>
<GroupName>HARDWARE/U8G2LIB/SRC</GroupName> <GroupName>HARDWARE/U8G2LIB/SRC</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@ -838,8 +838,8 @@
</Group> </Group>
<Group> <Group>
<GroupName>HARDWARE/MPU6050</GroupName> <GroupName>HARDWARE/MENU</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@ -850,70 +850,6 @@
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>HARDWARE/MPU6050/mpu6050.c</PathWithFileName>
<FilenameWithoutPath>mpu6050.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>54</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>HARDWARE/MPU6050/mpuiic.c</PathWithFileName>
<FilenameWithoutPath>mpuiic.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group>
<Group>
<GroupName>HARDWARE/MPU6050/EMPL</GroupName>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>7</GroupNumber>
<FileNumber>55</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>HARDWARE/MPU6050/eMPL/inv_mpu.c</PathWithFileName>
<FilenameWithoutPath>inv_mpu.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>7</GroupNumber>
<FileNumber>56</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>HARDWARE/MPU6050/eMPL/inv_mpu_dmp_motion_driver.c</PathWithFileName>
<FilenameWithoutPath>inv_mpu_dmp_motion_driver.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group>
<Group>
<GroupName>HARDWARE/MENU</GroupName>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>8</GroupNumber>
<FileNumber>57</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>HARDWARE/MENU/Menu.c</PathWithFileName> <PathWithFileName>HARDWARE/MENU/Menu.c</PathWithFileName>
<FilenameWithoutPath>Menu.c</FilenameWithoutPath> <FilenameWithoutPath>Menu.c</FilenameWithoutPath>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@ -923,13 +859,13 @@
<Group> <Group>
<GroupName>HARDWARE/LED</GroupName> <GroupName>HARDWARE/LED</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>9</GroupNumber> <GroupNumber>7</GroupNumber>
<FileNumber>58</FileNumber> <FileNumber>54</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -943,13 +879,13 @@
<Group> <Group>
<GroupName>HARDWARE/KEY</GroupName> <GroupName>HARDWARE/KEY</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>10</GroupNumber> <GroupNumber>8</GroupNumber>
<FileNumber>59</FileNumber> <FileNumber>55</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -960,8 +896,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>10</GroupNumber> <GroupNumber>8</GroupNumber>
<FileNumber>60</FileNumber> <FileNumber>56</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -975,13 +911,13 @@
<Group> <Group>
<GroupName>USER</GroupName> <GroupName>USER</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>11</GroupNumber> <GroupNumber>9</GroupNumber>
<FileNumber>61</FileNumber> <FileNumber>57</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -992,8 +928,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>11</GroupNumber> <GroupNumber>9</GroupNumber>
<FileNumber>62</FileNumber> <FileNumber>58</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1004,8 +940,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>11</GroupNumber> <GroupNumber>9</GroupNumber>
<FileNumber>63</FileNumber> <FileNumber>59</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1016,8 +952,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>11</GroupNumber> <GroupNumber>9</GroupNumber>
<FileNumber>64</FileNumber> <FileNumber>60</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1028,8 +964,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>11</GroupNumber> <GroupNumber>9</GroupNumber>
<FileNumber>65</FileNumber> <FileNumber>61</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1043,13 +979,13 @@
<Group> <Group>
<GroupName>STARTUP</GroupName> <GroupName>STARTUP</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>12</GroupNumber> <GroupNumber>10</GroupNumber>
<FileNumber>66</FileNumber> <FileNumber>62</FileNumber>
<FileType>2</FileType> <FileType>2</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1063,13 +999,13 @@
<Group> <Group>
<GroupName>FWLIB</GroupName> <GroupName>FWLIB</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>67</FileNumber> <FileNumber>63</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1080,8 +1016,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>68</FileNumber> <FileNumber>64</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1092,8 +1028,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>69</FileNumber> <FileNumber>65</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1104,8 +1040,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>70</FileNumber> <FileNumber>66</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1116,8 +1052,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>71</FileNumber> <FileNumber>67</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1128,8 +1064,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>72</FileNumber> <FileNumber>68</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1140,8 +1076,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>73</FileNumber> <FileNumber>69</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1152,8 +1088,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>74</FileNumber> <FileNumber>70</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1164,8 +1100,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>75</FileNumber> <FileNumber>71</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1176,8 +1112,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>76</FileNumber> <FileNumber>72</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1188,8 +1124,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>77</FileNumber> <FileNumber>73</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1200,8 +1136,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>78</FileNumber> <FileNumber>74</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1212,8 +1148,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>79</FileNumber> <FileNumber>75</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1224,8 +1160,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>80</FileNumber> <FileNumber>76</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1236,8 +1172,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>81</FileNumber> <FileNumber>77</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1248,8 +1184,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>82</FileNumber> <FileNumber>78</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1260,8 +1196,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>83</FileNumber> <FileNumber>79</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1272,8 +1208,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>84</FileNumber> <FileNumber>80</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1284,8 +1220,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>85</FileNumber> <FileNumber>81</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1296,8 +1232,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>86</FileNumber> <FileNumber>82</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1308,8 +1244,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>87</FileNumber> <FileNumber>83</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1320,8 +1256,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>88</FileNumber> <FileNumber>84</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1332,8 +1268,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>13</GroupNumber> <GroupNumber>11</GroupNumber>
<FileNumber>89</FileNumber> <FileNumber>85</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1347,13 +1283,13 @@
<Group> <Group>
<GroupName>DOC</GroupName> <GroupName>DOC</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>14</GroupNumber> <GroupNumber>12</GroupNumber>
<FileNumber>90</FileNumber> <FileNumber>86</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1367,13 +1303,13 @@
<Group> <Group>
<GroupName>CMSIS</GroupName> <GroupName>CMSIS</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>15</GroupNumber> <GroupNumber>13</GroupNumber>
<FileNumber>91</FileNumber> <FileNumber>87</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1384,8 +1320,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>15</GroupNumber> <GroupNumber>13</GroupNumber>
<FileNumber>92</FileNumber> <FileNumber>88</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1399,13 +1335,13 @@
<Group> <Group>
<GroupName>HARDWARE/APP</GroupName> <GroupName>HARDWARE/APP</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>16</GroupNumber> <GroupNumber>14</GroupNumber>
<FileNumber>93</FileNumber> <FileNumber>89</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1416,8 +1352,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>16</GroupNumber> <GroupNumber>14</GroupNumber>
<FileNumber>94</FileNumber> <FileNumber>90</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1428,8 +1364,8 @@
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File> <File>
<GroupNumber>16</GroupNumber> <GroupNumber>14</GroupNumber>
<FileNumber>95</FileNumber> <FileNumber>91</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1439,29 +1375,17 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File>
<GroupNumber>16</GroupNumber>
<FileNumber>96</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\HARDWARE\APP\Time.c</PathWithFileName>
<FilenameWithoutPath>Time.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group> </Group>
<Group> <Group>
<GroupName>HARDWARE/I2cDrive</GroupName> <GroupName>HARDWARE/I2cDrive</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>17</GroupNumber> <GroupNumber>15</GroupNumber>
<FileNumber>97</FileNumber> <FileNumber>92</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1475,13 +1399,13 @@
<Group> <Group>
<GroupName>HARDWARE/U8G2Drive</GroupName> <GroupName>HARDWARE/U8G2Drive</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>18</GroupNumber> <GroupNumber>16</GroupNumber>
<FileNumber>98</FileNumber> <FileNumber>93</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -1491,29 +1415,17 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File>
<GroupNumber>18</GroupNumber>
<FileNumber>99</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\HARDWARE\U8G2Drive\U8g2_User.c</PathWithFileName>
<FilenameWithoutPath>U8g2_User.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group> </Group>
<Group> <Group>
<GroupName>HARDWARE/TimerTick</GroupName> <GroupName>HARDWARE/TimerTick</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>19</GroupNumber> <GroupNumber>17</GroupNumber>
<FileNumber>100</FileNumber> <FileNumber>94</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>

42
STM32F103.uvprojx
View File

@ -336,7 +336,7 @@
<MiscControls></MiscControls> <MiscControls></MiscControls>
<Define>USE_STDPERIPH_DRIVER,STM32F10X_HD</Define> <Define>USE_STDPERIPH_DRIVER,STM32F10X_HD</Define>
<Undefine></Undefine> <Undefine></Undefine>
<IncludePath>.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</IncludePath> <IncludePath>.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</IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
<Aads> <Aads>
@ -662,36 +662,6 @@
</File> </File>
</Files> </Files>
</Group> </Group>
<Group>
<GroupName>HARDWARE/MPU6050</GroupName>
<Files>
<File>
<FileName>mpu6050.c</FileName>
<FileType>1</FileType>
<FilePath>HARDWARE/MPU6050/mpu6050.c</FilePath>
</File>
<File>
<FileName>mpuiic.c</FileName>
<FileType>1</FileType>
<FilePath>HARDWARE/MPU6050/mpuiic.c</FilePath>
</File>
</Files>
</Group>
<Group>
<GroupName>HARDWARE/MPU6050/EMPL</GroupName>
<Files>
<File>
<FileName>inv_mpu.c</FileName>
<FileType>1</FileType>
<FilePath>HARDWARE/MPU6050/eMPL/inv_mpu.c</FilePath>
</File>
<File>
<FileName>inv_mpu_dmp_motion_driver.c</FileName>
<FileType>1</FileType>
<FilePath>HARDWARE/MPU6050/eMPL/inv_mpu_dmp_motion_driver.c</FilePath>
</File>
</Files>
</Group>
<Group> <Group>
<GroupName>HARDWARE/MENU</GroupName> <GroupName>HARDWARE/MENU</GroupName>
<Files> <Files>
@ -930,11 +900,6 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>.\HARDWARE\APP\Other_Function.c</FilePath> <FilePath>.\HARDWARE\APP\Other_Function.c</FilePath>
</File> </File>
<File>
<FileName>Time.c</FileName>
<FileType>1</FileType>
<FilePath>.\HARDWARE\APP\Time.c</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
@ -955,11 +920,6 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>.\HARDWARE\U8G2Drive\stm32_u8g2.c</FilePath> <FilePath>.\HARDWARE\U8G2Drive\stm32_u8g2.c</FilePath>
</File> </File>
<File>
<FileName>U8g2_User.c</FileName>
<FileType>1</FileType>
<FilePath>.\HARDWARE\U8G2Drive\U8g2_User.c</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>