Merge branch 'gaoshida' into 'dev'

Gaoshida

See merge request !9

HJ232_Source/tim4DelayCounter.uvprojx

@@ -339,7 +339,7 @@
               <MiscControls></MiscControls>
               <Define></Define>
               <Undefine></Undefine>
-              <IncludePath>.\source\System;.\source\Driver\inc;.\source\Application;.\source\Application\LINE_IN;.\source\Application\PowerManagement;.\source\Application\RTE;.\source\Application\MCU_Core_Protocol;.\source\Application\Telltales;.\source\Application\CalcFrequency;.\source\Application\Fuel;.\source\Application\Eeprom;.\source\Application\DataProcessor;.\source\Application\LightDetect;.\source\Application\BackLight;.\source\Application\Key;.\source\Application\Menu;.\source\Application\APPCan;.\source\UDS;.\source\Application\Gauges;.\source\Application\CoolantTemp;.\source\UDS2;.\\RTE\Device\BAT32A239KK64FB</IncludePath>
+              <IncludePath>.\source\System;.\source\Driver\inc;.\source\Application;.\source\Application\LINE_IN;.\source\Application\PowerManagement;.\source\Application\RTE;.\source\Application\MCU_Core_Protocol;.\source\Application\Telltales;.\source\Application\CalcFrequency;.\source\Application\Fuel;.\source\Application\Eeprom;.\source\Application\DataProcessor;.\source\Application\LightDetect;.\source\Application\BackLight;.\source\Application\Key;.\source\Application\Menu;.\source\Application\APPCan;.\source\UDS;.\source\Application\Gauges;.\source\Application\CoolantTemp;.\source\UDS2;.\\RTE\Device\BAT32A239KK64FB;.\source\Application\Mileage;.\source\Application\Display\GUI_LCD_DIS;.\source\Application\Display\SEG_LCD_DIS</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -533,16 +533,6 @@
               <FileType>1</FileType>
               <FilePath>.\source\Driver\src\BU98R10.C</FilePath>
             </File>
-            <File>
-              <FileName>SEG_LCD.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>.\source\Driver\inc\SEG_LCD.h</FilePath>
-            </File>
-            <File>
-              <FileName>SEG_LCD.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>.\source\Driver\src\SEG_LCD.c</FilePath>
-            </File>
             <File>
               <FileName>flash.h</FileName>
               <FileType>5</FileType>
@@ -753,16 +743,6 @@
               <FileType>5</FileType>
               <FilePath>.\source\Application\Eeprom\eeprom_includes.h</FilePath>
             </File>
-            <File>
-              <FileName>Services_Mileage_User.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>.\source\Application\DataProcessor\Services_Mileage_User.h</FilePath>
-            </File>
-            <File>
-              <FileName>Services_Mileage_User.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>.\source\Application\DataProcessor\Services_Mileage_User.c</FilePath>
-            </File>
             <File>
               <FileName>Data_Gear.h</FileName>
               <FileType>5</FileType>
@@ -878,6 +858,46 @@
               <FileType>5</FileType>
               <FilePath>.\source\Application\Telltales\app_Telltales.h</FilePath>
             </File>
+            <File>
+              <FileName>libMileage.lib</FileName>
+              <FileType>4</FileType>
+              <FilePath>.\source\Application\Mileage\libMileage.lib</FilePath>
+            </File>
+            <File>
+              <FileName>Services_Mileage.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>.\source\Application\Mileage\Services_Mileage.h</FilePath>
+            </File>
+            <File>
+              <FileName>Services_Mileage_User.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>.\source\Application\Mileage\Services_Mileage_User.c</FilePath>
+            </File>
+            <File>
+              <FileName>Services_Mileage_User.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>.\source\Application\Mileage\Services_Mileage_User.h</FilePath>
+            </File>
+            <File>
+              <FileName>Gui_Lcd_Dis.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>.\source\Application\Display\GUI_LCD_DIS\Gui_Lcd_Dis.c</FilePath>
+            </File>
+            <File>
+              <FileName>Gui_Lcd_Dis.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>.\source\Application\Display\GUI_LCD_DIS\Gui_Lcd_Dis.h</FilePath>
+            </File>
+            <File>
+              <FileName>Gui_Seg_Dis.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>.\source\Application\Display\SEG_LCD_DIS\Gui_Seg_Dis.c</FilePath>
+            </File>
+            <File>
+              <FileName>Gui_Seg_Dis.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>.\source\Application\Display\SEG_LCD_DIS\Gui_Seg_Dis.h</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>