Добавлены субмодули-библиотеки STM32

UPP/MDK-ARM/UPP.uvprojx

@@ -1,39 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
+
   <Header>### uVision Project, (C) Keil Software</Header>
+
   <Targets>
     <Target>
       <TargetName>UPP</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
+      <pArmCC>6190000::V6.19::ARMCLANG</pArmCC>
+      <pCCUsed>6190000::V6.19::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
       <TargetOption>
         <TargetCommonOption>
           <Device>STM32F427ZGTx</Device>
           <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IRAM(0x20000000-0x2002FFFF) IRAM2(0x10000000-0x1000FFFF) IROM(0x8000000-0x80FFFFF) CLOCK(25000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
-          <FlashUtilSpec />
-          <StartupFile />
-          <FlashDriverDll />
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll></FlashDriverDll>
           <DeviceId>0</DeviceId>
-          <RegisterFile />
-          <MemoryEnv />
-          <Cmp />
-          <Asm />
-          <Linker />
-          <OHString />
-          <InfinionOptionDll />
-          <SLE66CMisc />
-          <SLE66AMisc />
-          <SLE66LinkerMisc />
-          <SFDFile />
+          <RegisterFile></RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32F427ZGTx$CMSIS\SVD\STM32F427x.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>
@@ -48,15 +56,15 @@
           <CreateHexFile>1</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>./UPP/</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>
@@ -65,8 +73,8 @@
           <BeforeMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name />
-            <UserProg2Name />
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
             <nStopB1X>0</nStopB1X>
@@ -74,16 +82,16 @@
           </BeforeMake>
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>1</RunUserProg2>
-            <UserProg1Name />
-            <UserProg2Name />
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
             <nStopA1X>0</nStopA1X>
             <nStopA2X>0</nStopA2X>
           </AfterMake>
           <SelectedForBatchBuild>1</SelectedForBatchBuild>
-          <SVCSIdString />
+          <SVCSIdString></SVCSIdString>
         </TargetCommonOption>
         <CommonProperty>
           <UseCPPCompiler>0</UseCPPCompiler>
@@ -97,8 +105,8 @@
           <AssembleAssemblyFile>0</AssembleAssemblyFile>
           <PublicsOnly>0</PublicsOnly>
           <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument />
-          <IncludeLibraryModules />
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
           <ComprImg>0</ComprImg>
         </CommonProperty>
         <DllOption>
@@ -131,11 +139,11 @@
           </Flash1>
           <bUseTDR>1</bUseTDR>
           <Flash2>BIN\UL2V8M.DLL</Flash2>
-          <Flash3 />
-          <Flash4 />
-          <pFcarmOut />
-          <pFcarmGrp />
-          <pFcArmRoot />
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
           <FcArmLst>0</FcArmLst>
         </Utilities>
         <TargetArmAds>
@@ -168,7 +176,7 @@
             <RvctClst>0</RvctClst>
             <GenPPlst>0</GenPPlst>
             <AdsCpuType>"Cortex-M4"</AdsCpuType>
-            <RvctDeviceName />
+            <RvctDeviceName></RvctDeviceName>
             <mOS>0</mOS>
             <uocRom>0</uocRom>
             <uocRam>0</uocRam>
@@ -179,8 +187,9 @@
             <RvdsVP>2</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
-            <hadIRAM2>0</hadIRAM2>
-            <hadIROM2>1</hadIROM2>
+            <nBranchProt>0</nBranchProt>
+            <hadIRAM2>1</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
             <useUlib>0</useUlib>
             <EndSel>0</EndSel>
@@ -199,7 +208,7 @@
             <Ro2Chk>0</Ro2Chk>
             <Ro3Chk>0</Ro3Chk>
             <Ir1Chk>1</Ir1Chk>
-            <Ir2Chk>1</Ir2Chk>
+            <Ir2Chk>0</Ir2Chk>
             <Ra1Chk>0</Ra1Chk>
             <Ra2Chk>0</Ra2Chk>
             <Ra3Chk>0</Ra3Chk>
@@ -238,13 +247,13 @@
               </Ocm6>
               <IRAM>
                 <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x30000</Size>
               </IRAM>
               <IROM>
                 <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x100000</Size>
               </IROM>
               <XRAM>
                 <Type>0</Type>
@@ -268,8 +277,8 @@
               </OCR_RVCT3>
               <OCR_RVCT4>
                 <Type>1</Type>
-                <StartAddress />
-                <Size />
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x100000</Size>
               </OCR_RVCT4>
               <OCR_RVCT5>
                 <Type>1</Type>
@@ -293,20 +302,20 @@
               </OCR_RVCT8>
               <OCR_RVCT9>
                 <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x30000</Size>
               </OCR_RVCT9>
               <OCR_RVCT10>
                 <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
+                <StartAddress>0x10000000</StartAddress>
+                <Size>0x10000</Size>
               </OCR_RVCT10>
             </OnChipMemories>
-            <RvctStartVector />
+            <RvctStartVector></RvctStartVector>
           </ArmAdsMisc>
           <Cads>
             <interw>1</interw>
-            <Optim>4</Optim>
+            <Optim>1</Optim>
             <oTime>0</oTime>
             <SplitLS>0</SplitLS>
             <OneElfS>1</OneElfS>
@@ -315,24 +324,24 @@
             <PlainCh>0</PlainCh>
             <Ropi>0</Ropi>
             <Rwpi>0</Rwpi>
-            <wLevel>2</wLevel>
+            <wLevel>3</wLevel>
             <uThumb>0</uThumb>
             <uSurpInc>0</uSurpInc>
             <uC99>1</uC99>
             <uGnu>0</uGnu>
             <useXO>0</useXO>
-            <v6Lang>5</v6Lang>
-            <v6LangP>3</v6LangP>
+            <v6Lang>3</v6Lang>
+            <v6LangP>5</v6LangP>
             <vShortEn>1</vShortEn>
             <vShortWch>1</vShortWch>
             <v6Lto>0</v6Lto>
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls />
+              <MiscControls></MiscControls>
               <Define>USE_HAL_DRIVER,STM32F427xx</Define>
-              <Undefine />
-              <IncludePath>../Core/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F4xx/Include;../Drivers/CMSIS/Include</IncludePath>
+              <Undefine></Undefine>
+              <IncludePath>../Core/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F4xx/Include;../Drivers/CMSIS/Include;..\AllLibs\ExtMemory\Inc;..\AllLibs\Modbus\Inc;..\AllLibs\MyLibs\MyLibs\Inc;..\AllLibs\MyLibs\RTT;..\AllLibs\PeriphGeneral\Inc;..\Core\Configs</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -347,10 +356,10 @@
             <useXO>0</useXO>
             <ClangAsOpt>1</ClangAsOpt>
             <VariousControls>
-              <MiscControls />
-              <Define />
-              <Undefine />
-              <IncludePath />
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
             </VariousControls>
           </Aads>
           <LDads>
@@ -360,26 +369,61 @@
             <noStLib>0</noStLib>
             <RepFail>1</RepFail>
             <useFile>0</useFile>
-            <TextAddressRange />
-            <DataAddressRange />
-            <pXoBase />
-            <ScatterFile />
-            <IncludeLibs />
-            <IncludeLibsPath />
-            <Misc />
-            <LinkerInputFile />
-            <DisabledWarnings />
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile></ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
           </LDads>
         </TargetArmAds>
       </TargetOption>
       <Groups>
         <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
+          <GroupName>Configs</GroupName>
           <Files>
             <File>
-              <FileName>startup_stm32f427xx.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32f427xx.s</FilePath>
+              <FileName>memspi_config.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\Core\Configs\memspi_config.h</FilePath>
+            </File>
+            <File>
+              <FileName>modbus_config.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\Core\Configs\modbus_config.h</FilePath>
+            </File>
+            <File>
+              <FileName>modbus_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Core\Configs\modbus_data.c</FilePath>
+            </File>
+            <File>
+              <FileName>modbus_data.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\Core\Configs\modbus_data.h</FilePath>
+            </File>
+            <File>
+              <FileName>mylibs_config.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\Core\Configs\mylibs_config.h</FilePath>
+            </File>
+            <File>
+              <FileName>mylibs_include.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\Core\Configs\mylibs_include.h</FilePath>
+            </File>
+            <File>
+              <FileName>SEGGER_RTT_Conf.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\Core\Configs\SEGGER_RTT_Conf.h</FilePath>
+            </File>
+            <File>
+              <FileName>upp_config.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\Core\Configs\upp_config.h</FilePath>
             </File>
           </Files>
         </Group>
@@ -448,6 +492,151 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>MyLibs</GroupName>
+          <Files>
+            <File>
+              <FileName>bench_time.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\AllLibs\MyLibs\MyLibs\Inc\bench_time.h</FilePath>
+            </File>
+            <File>
+              <FileName>bit_access.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\AllLibs\MyLibs\MyLibs\Inc\bit_access.h</FilePath>
+            </File>
+            <File>
+              <FileName>gen_optimizer.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\AllLibs\MyLibs\MyLibs\Inc\gen_optimizer.h</FilePath>
+            </File>
+            <File>
+              <FileName>mylibs_defs.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\AllLibs\MyLibs\MyLibs\Inc\mylibs_defs.h</FilePath>
+            </File>
+            <File>
+              <FileName>trace.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\AllLibs\MyLibs\MyLibs\Inc\trace.h</FilePath>
+            </File>
+            <File>
+              <FileName>trackers.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\AllLibs\MyLibs\MyLibs\Inc\trackers.h</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Modbus</GroupName>
+          <Files>
+            <File>
+              <FileName>__crc_algs.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\AllLibs\Modbus\Src\__crc_algs.c</FilePath>
+            </File>
+            <File>
+              <FileName>__modbus_compat.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\AllLibs\Modbus\Src\__modbus_compat.c</FilePath>
+            </File>
+            <File>
+              <FileName>modbus.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\AllLibs\Modbus\Src\modbus.c</FilePath>
+            </File>
+            <File>
+              <FileName>modbus_coils.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\AllLibs\Modbus\Src\modbus_coils.c</FilePath>
+            </File>
+            <File>
+              <FileName>modbus_core.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\AllLibs\Modbus\Src\modbus_core.c</FilePath>
+            </File>
+            <File>
+              <FileName>modbus_devid.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\AllLibs\Modbus\Src\modbus_devid.c</FilePath>
+            </File>
+            <File>
+              <FileName>modbus_diag.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\AllLibs\Modbus\Src\modbus_diag.c</FilePath>
+            </File>
+            <File>
+              <FileName>modbus_holdregs.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\AllLibs\Modbus\Src\modbus_holdregs.c</FilePath>
+            </File>
+            <File>
+              <FileName>modbus_inputregs.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\AllLibs\Modbus\Src\modbus_inputregs.c</FilePath>
+            </File>
+            <File>
+              <FileName>modbus_master.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\AllLibs\Modbus\Src\modbus_master.c</FilePath>
+            </File>
+            <File>
+              <FileName>modbus_slave.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\AllLibs\Modbus\Src\modbus_slave.c</FilePath>
+            </File>
+            <File>
+              <FileName>rs_message.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\AllLibs\Modbus\Src\rs_message.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>ExtMemory</GroupName>
+          <Files>
+            <File>
+              <FileName>memspi.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\AllLibs\ExtMemory\Src\memspi.c</FilePath>
+            </File>
+            <File>
+              <FileName>memspi_core.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\AllLibs\ExtMemory\Src\memspi_core.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>PeriphGeneral</GroupName>
+          <Files>
+            <File>
+              <FileName>__general_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\AllLibs\PeriphGeneral\Src\__general_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>general_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\AllLibs\PeriphGeneral\Src\general_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>general_spi.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\AllLibs\PeriphGeneral\Src\general_spi.c</FilePath>
+            </File>
+            <File>
+              <FileName>general_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\AllLibs\PeriphGeneral\Src\general_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>general_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\AllLibs\PeriphGeneral\Src\general_uart.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>Drivers/STM32F4xx_HAL_Driver</GroupName>
           <Files>
@@ -583,20 +772,52 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32f427xx.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32f427xx.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+        <Group>
+          <GroupName>::Compiler</GroupName>
+        </Group>
       </Groups>
     </Target>
   </Targets>
+
   <RTE>
-    <apis />
+    <apis/>
     <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0" />
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.7.7" url="http://www.keil.com/pack/" vendor="ARM" version="5.9.0"/>
         <targetInfos>
-          <targetInfo name="UPP" />
+          <targetInfo name="UPP"/>
+        </targetInfos>
+      </component>
+      <component Cbundle="ARM Compiler" Cclass="Compiler" Cgroup="I/O" Csub="STDOUT" Cvariant="ITM" Cvendor="Keil" Cversion="1.2.0" condition="ARMCC Cortex-M with ITM">
+        <package name="ARM_Compiler" schemaVersion="1.7.7" url="https://www.keil.com/pack/" vendor="Keil" version="1.7.2"/>
+        <targetInfos>
+          <targetInfo name="UPP"/>
         </targetInfos>
       </component>
     </components>
-    <files />
+    <files/>
   </RTE>
-</Project>
 
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>UPP</LayName>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>