5 Коммиты 4175fcae01 ... 31366ece99

Автор SHA1 Сообщение Дата
  BJQX-ZHENGCHAO\Zhengchao 31366ece99 1、配置PLL,内核时钟采用PLL_CLK(80M),LSPI使用PLL时钟,UART、CAN使用SOSC时钟(16M) 2 лет назад
  BJQX-ZHENGCHAO\Zhengchao cc9cca7a7f no message 2 лет назад
  BJQX-ZHENGCHAO\Zhengchao a4f83286a1 no message 2 лет назад
  BJQX-ZHENGCHAO\Zhengchao b9acbf1eab no message 2 лет назад
  BJQX-ZHENGCHAO\Zhengchao b789bc91dd 修改Mcl DMA配置 2 лет назад
7 измененных файлов с 2166 добавлено и 613 удалено
  1. 17 2
      config/Base.xdm
  2. 5 8
      config/Can.xdm
  3. 1 1
      config/EcuM.xdm
  4. 1987 252
      config/Mcl.xdm
  5. 149 179
      config/Mcu.xdm
  6. 6 6
      config/Platform.xdm
  7. 1 165
      config/Uart.xdm

+ 17 - 2
config/Base.xdm

@@ -33,7 +33,7 @@
                 <d:var name="OsIfDevErrorDetect" type="BOOLEAN" value="false">
                   <a:a name="IMPORTER_INFO" value="@DEF"/>
                 </d:var>
-                <d:var name="OsIfUseSystemTimer" type="BOOLEAN" value="false"/>
+                <d:var name="OsIfUseSystemTimer" type="BOOLEAN" value="true"/>
                 <d:var name="OsIfUseCustomTimer" type="BOOLEAN" value="false">
                   <a:a name="IMPORTER_INFO" value="@DEF"/>
                 </d:var>
@@ -47,7 +47,22 @@
                   <d:ctr name="OsIfBaremetalType" type="IDENTIFIABLE"/>
                 </d:chc>
                 <d:lst name="OsIfEcucPartitionRef"/>
-                <d:lst name="OsIfCounterConfig" type="MAP"/>
+                <d:lst name="OsIfCounterConfig" type="MAP">
+                  <d:ctr name="OsIfCounterConfig_0" type="IDENTIFIABLE">
+                    <d:ref name="OsIfCounterEcucPartitionRef" type="REFERENCE" 
+                           value="ASPath:/EcuC/EcuC/EcucPartitionCollection_0/EcucPartition_0">
+                      <a:a name="ENABLE" value="false"/>
+                    </d:ref>
+                    <d:ref name="OsIfSystemTimerClockRef" type="REFERENCE" 
+                           value="ASPath:/Mcu/Mcu/McuModuleConfiguration/McuClockSettingConfig_0/McuClockReferencePoint_LPUART0_CLK">
+                      <a:a name="ENABLE" value="true"/>
+                    </d:ref>
+                    <d:ref name="OsIfOsCounterRef" type="REFERENCE" 
+                           value="ASPath:/Os/Os/OsCounter_0">
+                      <a:a name="ENABLE" value="false"/>
+                    </d:ref>
+                  </d:ctr>
+                </d:lst>
               </d:ctr>
               <d:ctr name="CommonPublishedInformation" type="IDENTIFIABLE">
                 <d:var name="ArReleaseMajorVersion" type="INTEGER" value="4">

+ 5 - 8
config/Can.xdm

@@ -22,7 +22,7 @@
               <d:var name="IMPLEMENTATION_CONFIG_VARIANT" type="ENUMERATION" 
                      value="VariantPreCompile"/>
               <d:ctr name="CanGeneral" type="IDENTIFIABLE">
-                <d:var name="CanDevErrorDetect" type="BOOLEAN" value="true"/>
+                <d:var name="CanDevErrorDetect" type="BOOLEAN" value="false"/>
                 <d:var name="CanEnableUserModeSupport" type="BOOLEAN" 
                        value="false">
                   <a:a name="IMPORTER_INFO" value="@DEF"/>
@@ -112,16 +112,13 @@
                 </d:lst>
                 <d:var name="CanPublicIcomSupport" type="BOOLEAN" value="true"/>
                 <d:ctr name="CanIcomGeneral" type="IDENTIFIABLE">
-                  <a:a name="ENABLE" value="false"/>
+                  <a:a name="ENABLE" value="true"/>
                   <d:var name="CanIcomLevel" type="ENUMERATION" 
                          value="CAN_ICOM_LEVEL_ONE">
-                    <a:a name="ENABLE" value="false"/>
-                    <a:a name="IMPORTER_INFO" value="@DEF"/>
+                    <a:a name="ENABLE" value="true"/>
                   </d:var>
                   <d:var name="CanIcomVariant" type="ENUMERATION" 
-                         value="CAN_ICOM_VARIANT_NONE">
-                    <a:a name="IMPORTER_INFO" value="@DEF"/>
-                  </d:var>
+                         value="CAN_ICOM_VARIANT_NONE"/>
                 </d:ctr>
               </d:ctr>
               <d:ctr name="CanConfigSet" type="IDENTIFIABLE">
@@ -224,7 +221,7 @@
                           </a:a>
                         </d:var>
                         <d:var name="CanControllerPrescaller" type="INTEGER" 
-                               value="12"/>
+                               value="8"/>
                         <d:var name="CanControllerPrescallerAlternate" 
                                type="INTEGER" value="10">
                           <a:a name="IMPORTER_INFO" value="@DEF"/>

+ 1 - 1
config/EcuM.xdm

@@ -115,7 +115,7 @@
                       <d:var name="EcuMSleepModeSuspend" type="BOOLEAN" 
                              value="true"/>
                       <d:ref name="EcuMSleepModeMcuModeRef" type="REFERENCE" 
-                             value="ASPath:/Mcu/Mcu/McuModuleConfiguration/McuModeSettingConf_0"/>
+                             value="ASPath:/Mcu/Mcu/McuModuleConfiguration/McuModeSettingConf_Run"/>
                       <d:lst name="EcuMWakeupSourceMask">
                         <d:ref type="REFERENCE" >
                           <a:a name="IMPORTER_INFO" value="@DEF"/>

Разница между файлами не показана из-за своего большого размера
+ 1987 - 252
config/Mcl.xdm


+ 149 - 179
config/Mcu.xdm

@@ -31,7 +31,7 @@
                 <d:var name="McuInitClock" type="BOOLEAN" value="true">
                   <a:a name="IMPORTER_INFO" value="@DEF"/>
                 </d:var>
-                <d:var name="McuNoPll" type="BOOLEAN" value="true"/>
+                <d:var name="McuNoPll" type="BOOLEAN" value="false"/>
                 <d:var name="McuEnterLowPowerMode" type="BOOLEAN" value="true">
                   <a:a name="IMPORTER_INFO" value="@DEF"/>
                 </d:var>
@@ -273,12 +273,7 @@
                 </d:var>
               </d:ctr>
               <d:ctr name="McuModuleConfiguration" type="IDENTIFIABLE">
-                <d:var name="McuNumberOfMcuModes" type="INTEGER" value="1">
-                  <a:a name="IMPORTER_INFO">
-                    <a:v>@DEF</a:v>
-                    <a:v>@CALC</a:v>
-                  </a:a>
-                </d:var>
+                <d:var name="McuNumberOfMcuModes" type="INTEGER" value="3"/>
                 <d:var name="McuRamSectors" type="INTEGER" value="0">
                   <a:a name="IMPORTER_INFO">
                     <a:v>@DEF</a:v>
@@ -313,13 +308,9 @@
                 </d:var>
                 <d:ctr name="McuAllowedModes" type="IDENTIFIABLE">
                   <d:var name="McuAllowHighSpeedRunMode" type="BOOLEAN" 
-                         value="false">
-                    <a:a name="IMPORTER_INFO" value="@DEF"/>
-                  </d:var>
+                         value="true"/>
                   <d:var name="McuAllowVeryLowPowerModes" type="BOOLEAN" 
-                         value="false">
-                    <a:a name="IMPORTER_INFO" value="@DEF"/>
-                  </d:var>
+                         value="true"/>
                 </d:ctr>
                 <d:lst name="McuClockSettingConfig" type="MAP">
                   <d:ctr name="McuClockSettingConfig_0" type="IDENTIFIABLE">
@@ -334,9 +325,7 @@
                       <a:a name="IMPORTER_INFO" value="@DEF"/>
                     </d:var>
                     <d:var name="McuScgClkOutSelect" type="ENUMERATION" 
-                           value="SLOW_CLK">
-                      <a:a name="IMPORTER_INFO" value="@DEF"/>
-                    </d:var>
+                           value="SPLL_CLK"/>
                     <d:ctr name="McuRunClockConfig" type="IDENTIFIABLE">
                       <d:var name="McuPreDivSystemClockFrequency" type="FLOAT" 
                              value="4.8E7">
@@ -346,54 +335,43 @@
                         </a:a>
                       </d:var>
                       <d:var name="McuCoreClockFrequency" type="FLOAT" 
-                             value="4.8E7">
+                             value="8.0E7">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
+                          <a:v>@DEF</a:v>
                         </a:a>
                       </d:var>
                       <d:var name="McuSystemClockFrequency" type="FLOAT" 
-                             value="4.8E7">
+                             value="8.0E7">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
+                          <a:v>@DEF</a:v>
                         </a:a>
                       </d:var>
                       <d:var name="McuBusClockFrequency" type="FLOAT" 
-                             value="4.8E7">
+                             value="4.0E7">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
+                          <a:v>@DEF</a:v>
                         </a:a>
                       </d:var>
                       <d:var name="McuFlashClockFrequency" type="FLOAT" 
-                             value="2.4E7">
+                             value="2.0E7">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
-                        </a:a>
-                      </d:var>
-                      <d:var name="McuSystemClockSwitch" type="ENUMERATION" 
-                             value="FIRC_CLK">
-                        <a:a name="IMPORTER_INFO">
                           <a:v>@DEF</a:v>
-                          <a:v>@CALC</a:v>
                         </a:a>
                       </d:var>
-                      <d:var name="McuCoreClockDivider" type="INTEGER" value="1">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="McuBusClockDivider" type="INTEGER" value="1">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="McuSlowClockDivider" type="INTEGER" value="2">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
+                      <d:var name="McuSystemClockSwitch" type="ENUMERATION" 
+                             value="SPLL_CLK"/>
+                      <d:var name="McuCoreClockDivider" type="INTEGER" value="2"/>
+                      <d:var name="McuBusClockDivider" type="INTEGER" value="2"/>
+                      <d:var name="McuSlowClockDivider" type="INTEGER" value="4"/>
                       <d:var name="McuScgClkOutFrequency" type="FLOAT" 
-                             value="2.4E7">
+                             value="1.6E8">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
+                          <a:v>@DEF</a:v>
                         </a:a>
                       </d:var>
                     </d:ctr>
@@ -406,31 +384,31 @@
                         </a:a>
                       </d:var>
                       <d:var name="McuCoreClockFrequency" type="FLOAT" 
-                             value="1000000.0">
+                             value="2000000.0">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
+                          <a:v>@DEF</a:v>
                         </a:a>
                       </d:var>
                       <d:var name="McuSystemClockFrequency" type="FLOAT" 
-                             value="1000000.0">
+                             value="2000000.0">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
+                          <a:v>@DEF</a:v>
                         </a:a>
                       </d:var>
                       <d:var name="McuBusClockFrequency" type="FLOAT" 
-                             value="125000.0">
+                             value="500000.0">
                         <a:a name="IMPORTER_INFO">
                           <a:v>@CALC</a:v>
                           <a:v>@DEF</a:v>
                         </a:a>
                       </d:var>
                       <d:var name="McuFlashClockFrequency" type="FLOAT" 
-                             value="250000.0">
+                             value="1000000.0">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
+                          <a:v>@DEF</a:v>
                         </a:a>
                       </d:var>
                       <d:var name="McuSystemClockSwitch" type="ENUMERATION" 
@@ -440,18 +418,14 @@
                           <a:v>@CALC</a:v>
                         </a:a>
                       </d:var>
-                      <d:var name="McuCoreClockDivider" type="INTEGER" value="8">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="McuBusClockDivider" type="INTEGER" value="8"/>
-                      <d:var name="McuSlowClockDivider" type="INTEGER" value="4">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
+                      <d:var name="McuCoreClockDivider" type="INTEGER" value="4"/>
+                      <d:var name="McuBusClockDivider" type="INTEGER" value="4"/>
+                      <d:var name="McuSlowClockDivider" type="INTEGER" value="2"/>
                       <d:var name="McuScgClkOutFrequency" type="FLOAT" 
-                             value="250000.0">
+                             value="0.0">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
+                          <a:v>@DEF</a:v>
                         </a:a>
                       </d:var>
                     </d:ctr>
@@ -464,54 +438,43 @@
                         </a:a>
                       </d:var>
                       <d:var name="McuCoreClockFrequency" type="FLOAT" 
-                             value="4.8E7">
+                             value="8.0E7">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
+                          <a:v>@DEF</a:v>
                         </a:a>
                       </d:var>
                       <d:var name="McuSystemClockFrequency" type="FLOAT" 
-                             value="4.8E7">
+                             value="8.0E7">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
+                          <a:v>@DEF</a:v>
                         </a:a>
                       </d:var>
                       <d:var name="McuBusClockFrequency" type="FLOAT" 
-                             value="4.8E7">
+                             value="4.0E7">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
+                          <a:v>@DEF</a:v>
                         </a:a>
                       </d:var>
                       <d:var name="McuFlashClockFrequency" type="FLOAT" 
-                             value="2.4E7">
+                             value="2.0E7">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
-                        </a:a>
-                      </d:var>
-                      <d:var name="McuSystemClockSwitch" type="ENUMERATION" 
-                             value="FIRC_CLK">
-                        <a:a name="IMPORTER_INFO">
                           <a:v>@DEF</a:v>
-                          <a:v>@CALC</a:v>
                         </a:a>
                       </d:var>
-                      <d:var name="McuCoreClockDivider" type="INTEGER" value="1">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="McuBusClockDivider" type="INTEGER" value="1">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="McuSlowClockDivider" type="INTEGER" value="2">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
+                      <d:var name="McuSystemClockSwitch" type="ENUMERATION" 
+                             value="SPLL_CLK"/>
+                      <d:var name="McuCoreClockDivider" type="INTEGER" value="2"/>
+                      <d:var name="McuBusClockDivider" type="INTEGER" value="2"/>
+                      <d:var name="McuSlowClockDivider" type="INTEGER" value="4"/>
                       <d:var name="McuScgClkOutFrequency" type="FLOAT" 
-                             value="2.4E7">
+                             value="1.6E8">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
+                          <a:v>@DEF</a:v>
                         </a:a>
                       </d:var>
                     </d:ctr>
@@ -520,22 +483,19 @@
                              value="true">
                         <a:a name="IMPORTER_INFO" value="@DEF"/>
                       </d:var>
-                      <d:var name="McuSOSCFrequency" type="FLOAT" 
-                             value="8000000.0">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
+                      <d:var name="McuSOSCFrequency" type="FLOAT" value="1.6E7"/>
                       <d:var name="McuSOSCDiv2Frequency" type="FLOAT" 
-                             value="8000000.0">
+                             value="1.6E7">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
+                          <a:v>@DEF</a:v>
                         </a:a>
                       </d:var>
                       <d:var name="McuSOSCDiv1Frequency" type="FLOAT" 
-                             value="8000000.0">
+                             value="4000000.0">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
+                          <a:v>@DEF</a:v>
                         </a:a>
                       </d:var>
                       <d:var name="McuSOSCEnable" type="BOOLEAN" value="true">
@@ -552,9 +512,7 @@
                       <d:var name="McuSOSCDiv2" type="INTEGER" value="1">
                         <a:a name="IMPORTER_INFO" value="@DEF"/>
                       </d:var>
-                      <d:var name="McuSOSCDiv1" type="INTEGER" value="1">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
+                      <d:var name="McuSOSCDiv1" type="INTEGER" value="4"/>
                       <d:var name="McuSOSCRangeSelect" type="ENUMERATION" 
                              value="HIGH_FREQ_RANGE">
                         <a:a name="IMPORTER_INFO" value="@DEF"/>
@@ -579,8 +537,8 @@
                       <d:var name="McuSIRCDiv2Frequency" type="FLOAT" 
                              value="4000000.0">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
+                          <a:v>@DEF</a:v>
                         </a:a>
                       </d:var>
                       <d:var name="McuSIRCDiv1Frequency" type="FLOAT" 
@@ -599,12 +557,8 @@
                              value="false">
                         <a:a name="IMPORTER_INFO" value="@DEF"/>
                       </d:var>
-                      <d:var name="McuSIRCDiv2" type="INTEGER" value="2">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="McuSIRCDiv1" type="INTEGER" value="1">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
+                      <d:var name="McuSIRCDiv2" type="INTEGER" value="2"/>
+                      <d:var name="McuSIRCDiv1" type="INTEGER" value="1"/>
                       <d:var name="McuSIRCRangeSelect" type="ENUMERATION" 
                              value="HIGH_RANGE_CLOCK">
                         <a:a name="IMPORTER_INFO" value="@DEF"/>
@@ -612,9 +566,7 @@
                     </d:ctr>
                     <d:ctr name="McuFIRCClockConfig" type="IDENTIFIABLE">
                       <d:var name="McuFIRCUnderMcuControl" type="BOOLEAN" 
-                             value="false">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
+                             value="true"/>
                       <d:var name="McuFIRCFrequency" type="FLOAT" value="4.8E7">
                         <a:a name="IMPORTER_INFO">
                           <a:v>@DEF</a:v>
@@ -655,58 +607,43 @@
                     </d:ctr>
                     <d:ctr name="McuSystemPll" type="IDENTIFIABLE">
                       <d:var name="McuSystemPllUnderMcuControl" type="BOOLEAN" 
-                             value="false"/>
-                      <d:var name="McuSPLLFrequency" type="FLOAT" value="9.6E7">
+                             value="true"/>
+                      <d:var name="McuSPLLFrequency" type="FLOAT" value="1.6E8">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
+                          <a:v>@DEF</a:v>
                         </a:a>
                       </d:var>
                       <d:var name="McuSPLLDiv2Frequency" type="FLOAT" 
-                             value="4.8E7">
+                             value="4.0E7">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
+                          <a:v>@DEF</a:v>
                         </a:a>
                       </d:var>
                       <d:var name="McuSPLLDiv1Frequency" type="FLOAT" 
-                             value="9.6E7">
+                             value="8.0E7">
                         <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
                           <a:v>@CALC</a:v>
+                          <a:v>@DEF</a:v>
                         </a:a>
                       </d:var>
-                      <d:var name="McuSPLLEnable" type="BOOLEAN" value="false">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
+                      <d:var name="McuSPLLEnable" type="BOOLEAN" value="true"/>
                       <d:var name="McuSPLLClockMonitorResetEnable" 
                              type="BOOLEAN" value="false">
                         <a:a name="IMPORTER_INFO" value="@DEF"/>
                       </d:var>
                       <d:var name="McuSPLLClockMonitorEnable" type="BOOLEAN" 
-                             value="false">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="McuSPLLDiv2" type="INTEGER" value="2">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="McuSPLLDiv1" type="INTEGER" value="1">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
+                             value="true"/>
+                      <d:var name="McuSPLLDiv2" type="INTEGER" value="4"/>
+                      <d:var name="McuSPLLDiv1" type="INTEGER" value="2"/>
                       <d:var name="McuSPLLInputClkPreDivider" type="INTEGER" 
                              value="1">
                         <a:a name="IMPORTER_INFO" value="@DEF"/>
                       </d:var>
                       <d:var name="McuSPLLInputFrequency" type="FLOAT" 
-                             value="8000000.0">
-                        <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
-                          <a:v>@CALC</a:v>
-                        </a:a>
-                      </d:var>
-                      <d:var name="McuSPLLMultiplier" type="INTEGER" value="24">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
+                             value="1.6E7"/>
+                      <d:var name="McuSPLLMultiplier" type="INTEGER" value="20"/>
                       <d:var name="McuSPLLSelectSourceClock" type="ENUMERATION" 
                              value="SOSC_CLK">
                         <a:a name="IMPORTER_INFO" value="@DEF"/>
@@ -1813,12 +1750,7 @@
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
                         </d:var>
                         <d:var name="McuPeripheralClockFrequency" type="FLOAT" 
-                               value="4000000.0">
-                          <a:a name="IMPORTER_INFO">
-                            <a:v>@CALC</a:v>
-                            <a:v>@DEF</a:v>
-                          </a:a>
-                        </d:var>
+                               value="4000000.0"/>
                       </d:ctr>
                       <d:ctr name="McuPeripheralClockConfig_26" 
                              type="IDENTIFIABLE">
@@ -1911,7 +1843,7 @@
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
                         </d:var>
                         <d:var name="McuPeripheralClockSelect" 
-                               type="ENUMERATION" value="SIRC"/>
+                               type="ENUMERATION" value="SOSC"/>
                         <d:var name="McuPeripheralClockDivider" type="INTEGER" 
                                value="1">
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
@@ -1921,7 +1853,7 @@
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
                         </d:var>
                         <d:var name="McuPeripheralClockFrequency" type="FLOAT" 
-                               value="4000000.0">
+                               value="1.6E7">
                           <a:a name="IMPORTER_INFO">
                             <a:v>@CALC</a:v>
                             <a:v>@DEF</a:v>
@@ -1946,7 +1878,7 @@
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
                         </d:var>
                         <d:var name="McuPeripheralClockSelect" 
-                               type="ENUMERATION" value="SIRC"/>
+                               type="ENUMERATION" value="SOSC"/>
                         <d:var name="McuPeripheralClockDivider" type="INTEGER" 
                                value="1">
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
@@ -1956,12 +1888,7 @@
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
                         </d:var>
                         <d:var name="McuPeripheralClockFrequency" type="FLOAT" 
-                               value="4000000.0">
-                          <a:a name="IMPORTER_INFO">
-                            <a:v>@CALC</a:v>
-                            <a:v>@DEF</a:v>
-                          </a:a>
-                        </d:var>
+                               value="1.6E7"/>
                       </d:ctr>
                       <d:ctr name="McuPeripheralClockConfig_30" 
                              type="IDENTIFIABLE">
@@ -1981,7 +1908,7 @@
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
                         </d:var>
                         <d:var name="McuPeripheralClockSelect" 
-                               type="ENUMERATION" value="SIRC"/>
+                               type="ENUMERATION" value="SOSC"/>
                         <d:var name="McuPeripheralClockDivider" type="INTEGER" 
                                value="1">
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
@@ -1991,12 +1918,7 @@
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
                         </d:var>
                         <d:var name="McuPeripheralClockFrequency" type="FLOAT" 
-                               value="4000000.0">
-                          <a:a name="IMPORTER_INFO">
-                            <a:v>@CALC</a:v>
-                            <a:v>@DEF</a:v>
-                          </a:a>
-                        </d:var>
+                               value="1.6E7"/>
                       </d:ctr>
                       <d:ctr name="McuPeripheralClockConfig_31" 
                              type="IDENTIFIABLE">
@@ -2039,50 +1961,40 @@
                       <d:ctr name="McuClockReferencePoint_CAN" 
                              type="IDENTIFIABLE">
                         <d:var name="McuClockReferencePointFrequency" 
-                               type="FLOAT" value="4.8E7">
+                               type="FLOAT" value="1.6E7">
                           <a:a name="IMPORTER_INFO">
                             <a:v>@CALC</a:v>
                             <a:v>@DEF</a:v>
                           </a:a>
                         </d:var>
                         <d:var name="McuClockFrequencySelect" 
-                               type="ENUMERATION" value="CUSTOM"/>
+                               type="ENUMERATION" value="SOSC_CLK"/>
                       </d:ctr>
                       <d:ctr name="McuClockReferencePoint_LPUART0_CLK" 
                              type="IDENTIFIABLE">
                         <d:var name="McuClockReferencePointFrequency" 
-                               type="FLOAT" value="4000000.0">
-                          <a:a name="IMPORTER_INFO">
-                            <a:v>@CALC</a:v>
-                            <a:v>@DEF</a:v>
-                          </a:a>
-                        </d:var>
+                               type="FLOAT" value="1.6E7"/>
                         <d:var name="McuClockFrequencySelect" 
                                type="ENUMERATION" value="LPUART0_CLK"/>
                       </d:ctr>
                       <d:ctr name="McuClockReferencePoint_LPUART1_CLK" 
                              type="IDENTIFIABLE">
                         <d:var name="McuClockReferencePointFrequency" 
-                               type="FLOAT" value="4000000.0"/>
+                               type="FLOAT" value="1.6E7"/>
                         <d:var name="McuClockFrequencySelect" 
                                type="ENUMERATION" value="LPUART1_CLK"/>
                       </d:ctr>
                       <d:ctr name="McuClockReferencePoint_LPUART2_CLK" 
                              type="IDENTIFIABLE">
                         <d:var name="McuClockReferencePointFrequency" 
-                               type="FLOAT" value="4000000.0"/>
+                               type="FLOAT" value="1.6E7"/>
                         <d:var name="McuClockFrequencySelect" 
                                type="ENUMERATION" value="LPUART2_CLK"/>
                       </d:ctr>
                       <d:ctr name="McuClockReferencePoint_FLEXIO_CLK" 
                              type="IDENTIFIABLE">
                         <d:var name="McuClockReferencePointFrequency" 
-                               type="FLOAT" value="4000000.0">
-                          <a:a name="IMPORTER_INFO">
-                            <a:v>@CALC</a:v>
-                            <a:v>@DEF</a:v>
-                          </a:a>
-                        </d:var>
+                               type="FLOAT" value="4000000.0"/>
                         <d:var name="McuClockFrequencySelect" 
                                type="ENUMERATION" value="FlexIO_CLK"/>
                       </d:ctr>
@@ -2105,7 +2017,7 @@
                   </d:ref>
                 </d:ctr>
                 <d:lst name="McuModeSettingConf" type="MAP">
-                  <d:ctr name="McuModeSettingConf_0" type="IDENTIFIABLE">
+                  <d:ctr name="McuModeSettingConf_Run" type="IDENTIFIABLE">
                     <d:var name="McuMode" type="INTEGER" value="0">
                       <a:a name="IMPORTER_INFO">
                         <a:v>@DEF</a:v>
@@ -2120,6 +2032,70 @@
                       <a:a name="IMPORTER_INFO" value="@DEF"/>
                     </d:var>
                   </d:ctr>
+                  <d:ctr name="McuModeSettingConf_HSRun" type="IDENTIFIABLE">
+                    <d:var name="McuMode" type="INTEGER" value="1">
+                      <a:a name="IMPORTER_INFO">
+                        <a:v>@DEF</a:v>
+                        <a:v>@CALC</a:v>
+                      </a:a>
+                    </d:var>
+                    <d:var name="McuPowerMode" type="ENUMERATION" value="HSRUN">
+                      <a:a name="VARIANTS" type="Variant">
+                        <variant:pbvcond>
+                          <variant:criterion 
+                                             value="ASPath:/EB/PostBuildSelectable/Criterions/PostBuildSelectableCriterion"/>
+                          <variant:cond>
+                            <variant:tst expr="0"/>
+                          </variant:cond>
+                        </variant:pbvcond>
+                      </a:a>
+                    </d:var>
+                    <d:var name="McuEnableSleepOnExit" type="BOOLEAN" 
+                           value="false">
+                      <a:a name="IMPORTER_INFO" value="@DEF"/>
+                      <a:a name="VARIANTS" type="Variant">
+                        <variant:pbvcond>
+                          <variant:criterion 
+                                             value="ASPath:/EB/PostBuildSelectable/Criterions/PostBuildSelectableCriterion"/>
+                          <variant:cond>
+                            <variant:tst expr="0"/>
+                          </variant:cond>
+                        </variant:pbvcond>
+                      </a:a>
+                    </d:var>
+                  </d:ctr>
+                  <d:ctr name="McuModeSettingConf_VLPR" type="IDENTIFIABLE">
+                    <d:var name="McuMode" type="INTEGER" value="2">
+                      <a:a name="IMPORTER_INFO">
+                        <a:v>@DEF</a:v>
+                        <a:v>@CALC</a:v>
+                      </a:a>
+                    </d:var>
+                    <d:var name="McuPowerMode" type="ENUMERATION" value="VLPR">
+                      <a:a name="VARIANTS" type="Variant">
+                        <variant:pbvcond>
+                          <variant:criterion 
+                                             value="ASPath:/EB/PostBuildSelectable/Criterions/PostBuildSelectableCriterion"/>
+                          <variant:cond>
+                            <variant:tst expr="0"/>
+                          </variant:cond>
+                        </variant:pbvcond>
+                      </a:a>
+                    </d:var>
+                    <d:var name="McuEnableSleepOnExit" type="BOOLEAN" 
+                           value="false">
+                      <a:a name="IMPORTER_INFO" value="@DEF"/>
+                      <a:a name="VARIANTS" type="Variant">
+                        <variant:pbvcond>
+                          <variant:criterion 
+                                             value="ASPath:/EB/PostBuildSelectable/Criterions/PostBuildSelectableCriterion"/>
+                          <variant:cond>
+                            <variant:tst expr="0"/>
+                          </variant:cond>
+                        </variant:pbvcond>
+                      </a:a>
+                    </d:var>
+                  </d:ctr>
                 </d:lst>
                 <d:lst name="McuRamSectorSettingConf" type="MAP"/>
                 <d:ctr name="McuInterruptEvents" type="IDENTIFIABLE">
@@ -2198,17 +2174,11 @@
                 </d:ctr>
                 <d:ctr name="McuPowerControl" type="IDENTIFIABLE">
                   <d:var name="McuLowVoltageDetectInterruptEnable" 
-                         type="BOOLEAN" value="false">
-                    <a:a name="IMPORTER_INFO" value="@DEF"/>
-                  </d:var>
+                         type="BOOLEAN" value="true"/>
                   <d:var name="McuLowVoltageDetectResetEnable" type="BOOLEAN" 
-                         value="false">
-                    <a:a name="IMPORTER_INFO" value="@DEF"/>
-                  </d:var>
+                         value="true"/>
                   <d:var name="McuLowVoltageWarningInterruptEnable" 
-                         type="BOOLEAN" value="false">
-                    <a:a name="IMPORTER_INFO" value="@DEF"/>
-                  </d:var>
+                         type="BOOLEAN" value="true"/>
                   <d:var name="McuLPODisable" type="BOOLEAN" value="false">
                     <a:a name="IMPORTER_INFO" value="@DEF"/>
                   </d:var>

+ 6 - 6
config/Platform.xdm

@@ -54,7 +54,7 @@
                         </a:a>
                       </d:var>
                       <d:var name="IsrEnabled" type="BOOLEAN" value="true"/>
-                      <d:var name="IsrPriority" type="INTEGER" value="3"/>
+                      <d:var name="IsrPriority" type="INTEGER" value="0"/>
                     </d:ctr>
                     <d:ctr name="PlatformIsrConfig_1" type="IDENTIFIABLE">
                       <d:var name="IsrName" type="ENUMERATION" value="DMA1_IRQn">
@@ -64,7 +64,7 @@
                         </a:a>
                       </d:var>
                       <d:var name="IsrEnabled" type="BOOLEAN" value="true"/>
-                      <d:var name="IsrPriority" type="INTEGER" value="3"/>
+                      <d:var name="IsrPriority" type="INTEGER" value="0"/>
                     </d:ctr>
                     <d:ctr name="PlatformIsrConfig_2" type="IDENTIFIABLE">
                       <d:var name="IsrName" type="ENUMERATION" value="DMA2_IRQn">
@@ -74,7 +74,7 @@
                         </a:a>
                       </d:var>
                       <d:var name="IsrEnabled" type="BOOLEAN" value="true"/>
-                      <d:var name="IsrPriority" type="INTEGER" value="3"/>
+                      <d:var name="IsrPriority" type="INTEGER" value="0"/>
                     </d:ctr>
                     <d:ctr name="PlatformIsrConfig_3" type="IDENTIFIABLE">
                       <d:var name="IsrName" type="ENUMERATION" value="DMA3_IRQn">
@@ -454,7 +454,7 @@
                         </a:a>
                       </d:var>
                       <d:var name="IsrEnabled" type="BOOLEAN" value="true"/>
-                      <d:var name="IsrPriority" type="INTEGER" value="3"/>
+                      <d:var name="IsrPriority" type="INTEGER" value="0"/>
                     </d:ctr>
                     <d:ctr name="PlatformIsrConfig_30" type="IDENTIFIABLE">
                       <d:var name="IsrName" type="ENUMERATION" 
@@ -465,7 +465,7 @@
                         </a:a>
                       </d:var>
                       <d:var name="IsrEnabled" type="BOOLEAN" value="true"/>
-                      <d:var name="IsrPriority" type="INTEGER" value="3"/>
+                      <d:var name="IsrPriority" type="INTEGER" value="0"/>
                     </d:ctr>
                     <d:ctr name="PlatformIsrConfig_31" type="IDENTIFIABLE">
                       <d:var name="IsrName" type="ENUMERATION" 
@@ -476,7 +476,7 @@
                         </a:a>
                       </d:var>
                       <d:var name="IsrEnabled" type="BOOLEAN" value="true"/>
-                      <d:var name="IsrPriority" type="INTEGER" value="3"/>
+                      <d:var name="IsrPriority" type="INTEGER" value="0"/>
                     </d:ctr>
                     <d:ctr name="PlatformIsrConfig_32" type="IDENTIFIABLE">
                       <d:var name="IsrName" type="ENUMERATION" value="ADC0_IRQn">

+ 1 - 165
config/Uart.xdm

@@ -39,9 +39,7 @@
                   <a:a name="IMPORTER_INFO" value="@DEF"/>
                 </d:var>
                 <d:var name="UartTimeoutMethod" type="ENUMERATION" 
-                       value="OSIF_COUNTER_DUMMY">
-                  <a:a name="IMPORTER_INFO" value="@DEF"/>
-                </d:var>
+                       value="OSIF_COUNTER_SYSTEM"/>
                 <d:var name="UartTimeoutDuration" type="INTEGER" value="500000"/>
                 <d:var name="UartDmaEnable" type="BOOLEAN" value="true"/>
                 <d:var name="UartVersionInfoApi" type="BOOLEAN" value="true">
@@ -302,168 +300,6 @@
                       </d:var>
                     </d:ctr>
                   </d:ctr>
-                  <d:ctr name="FLEXIO_RX" type="IDENTIFIABLE">
-                    <d:var name="UartHwUsing" type="ENUMERATION" 
-                           value="FLEXIO_IP"/>
-                    <d:var name="UartChannelId" type="INTEGER" value="3"/>
-                    <d:ref name="UartClockRef" type="REFERENCE" 
-                           value="ASPath:/Mcu/Mcu/McuModuleConfiguration/McuClockSettingConfig_0/McuClockReferencePoint_FLEXIO_CLK"/>
-                    <d:ref name="UartChannelEcucPartitionRef" type="REFERENCE" >
-                      <a:a name="ENABLE" value="false"/>
-                      <a:a name="IMPORTER_INFO" value="@DEF"/>
-                    </d:ref>
-                    <d:ctr name="DetailModuleConfiguration" type="IDENTIFIABLE">
-                      <d:var name="UartHwChannel" type="ENUMERATION" value="">
-                        <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
-                          <a:v>@CALC</a:v>
-                        </a:a>
-                      </d:var>
-                      <d:var name="DesireBaudrate" type="ENUMERATION" 
-                             value="LPUART_UART_BAUDRATE_9600">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="UartInteruptDmaMethod" type="ENUMERATION" 
-                             value="LPUART_UART_IP_USING_INTERRUPTS">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:ref name="UartDmaTxChannelRef" type="REFERENCE" >
-                        <a:a name="ENABLE" value="false"/>
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:ref>
-                      <d:ref name="UartDmaRxChannelRef" type="REFERENCE" >
-                        <a:a name="ENABLE" value="false"/>
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:ref>
-                      <d:var name="UartParityType" type="ENUMERATION" 
-                             value="LPUART_UART_IP_PARITY_DISABLED">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="UartStopBitNumber" type="ENUMERATION" 
-                             value="LPUART_UART_IP_ONE_STOP_BIT">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="UartWordLength" type="ENUMERATION" 
-                             value="LPUART_UART_IP_8_BITS_PER_CHAR">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="UartCallback" type="FUNCTION-NAME" 
-                             value="NULL_PTR">
-                        <a:a name="ENABLE" value="false"/>
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                    </d:ctr>
-                    <d:ctr name="FlexioModuleConfiguration" type="IDENTIFIABLE">
-                      <d:ref name="UartHwChannelRef" type="REFERENCE" 
-                             value="ASPath:/Mcl/Mcl/MclConfig/FlexioCommon_0/FLEXIO_RX"/>
-                      <d:var name="FlexioUartInteruptDmaMethod" 
-                             type="ENUMERATION" 
-                             value="FLEXIO_UART_IP_DRIVER_TYPE_INTERRUPTS">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:ref name="FlexioDmaChannelRef" type="REFERENCE" >
-                        <a:a name="ENABLE" value="false"/>
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:ref>
-                      <d:var name="DesireBaudrate" type="ENUMERATION" 
-                             value="FLEXIO_UART_BAUDRATE_9600">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="bitCount" type="ENUMERATION" 
-                             value="FLEXIO_UART_IP_8_BITS_PER_CHAR">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="driverDirection" type="ENUMERATION" 
-                             value="FLEXIO_UART_IP_DIRECTION_RX"/>
-                      <d:var name="FlexioCallbackFunction" type="FUNCTION-NAME" 
-                             value="NULL_PTR">
-                        <a:a name="ENABLE" value="false"/>
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                    </d:ctr>
-                  </d:ctr>
-                  <d:ctr name="FLEXIO_TX" type="IDENTIFIABLE">
-                    <d:var name="UartHwUsing" type="ENUMERATION" 
-                           value="FLEXIO_IP"/>
-                    <d:var name="UartChannelId" type="INTEGER" value="4"/>
-                    <d:ref name="UartClockRef" type="REFERENCE" 
-                           value="ASPath:/Mcu/Mcu/McuModuleConfiguration/McuClockSettingConfig_0/McuClockReferencePoint_FLEXIO_CLK"/>
-                    <d:ref name="UartChannelEcucPartitionRef" type="REFERENCE" >
-                      <a:a name="ENABLE" value="false"/>
-                      <a:a name="IMPORTER_INFO" value="@DEF"/>
-                    </d:ref>
-                    <d:ctr name="DetailModuleConfiguration" type="IDENTIFIABLE">
-                      <d:var name="UartHwChannel" type="ENUMERATION" value="">
-                        <a:a name="IMPORTER_INFO">
-                          <a:v>@DEF</a:v>
-                          <a:v>@CALC</a:v>
-                        </a:a>
-                      </d:var>
-                      <d:var name="DesireBaudrate" type="ENUMERATION" 
-                             value="LPUART_UART_BAUDRATE_9600">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="UartInteruptDmaMethod" type="ENUMERATION" 
-                             value="LPUART_UART_IP_USING_INTERRUPTS">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:ref name="UartDmaTxChannelRef" type="REFERENCE" >
-                        <a:a name="ENABLE" value="false"/>
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:ref>
-                      <d:ref name="UartDmaRxChannelRef" type="REFERENCE" >
-                        <a:a name="ENABLE" value="false"/>
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:ref>
-                      <d:var name="UartParityType" type="ENUMERATION" 
-                             value="LPUART_UART_IP_PARITY_DISABLED">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="UartStopBitNumber" type="ENUMERATION" 
-                             value="LPUART_UART_IP_ONE_STOP_BIT">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="UartWordLength" type="ENUMERATION" 
-                             value="LPUART_UART_IP_8_BITS_PER_CHAR">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="UartCallback" type="FUNCTION-NAME" 
-                             value="NULL_PTR">
-                        <a:a name="ENABLE" value="false"/>
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                    </d:ctr>
-                    <d:ctr name="FlexioModuleConfiguration" type="IDENTIFIABLE">
-                      <d:ref name="UartHwChannelRef" type="REFERENCE" 
-                             value="ASPath:/Mcl/Mcl/MclConfig/FlexioCommon_0/FLEXIO_TX"/>
-                      <d:var name="FlexioUartInteruptDmaMethod" 
-                             type="ENUMERATION" 
-                             value="FLEXIO_UART_IP_DRIVER_TYPE_INTERRUPTS">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:ref name="FlexioDmaChannelRef" type="REFERENCE" >
-                        <a:a name="ENABLE" value="false"/>
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:ref>
-                      <d:var name="DesireBaudrate" type="ENUMERATION" 
-                             value="FLEXIO_UART_BAUDRATE_9600">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="bitCount" type="ENUMERATION" 
-                             value="FLEXIO_UART_IP_8_BITS_PER_CHAR">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="driverDirection" type="ENUMERATION" 
-                             value="FLEXIO_UART_IP_DIRECTION_TX">
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                      <d:var name="FlexioCallbackFunction" type="FUNCTION-NAME" 
-                             value="NULL_PTR">
-                        <a:a name="ENABLE" value="false"/>
-                        <a:a name="IMPORTER_INFO" value="@DEF"/>
-                      </d:var>
-                    </d:ctr>
-                  </d:ctr>
                 </d:lst>
               </d:ctr>
               <d:ctr name="CommonPublishedInformation" type="IDENTIFIABLE">

Некоторые файлы не были показаны из-за большого количества измененных файлов