Browse Source

【BLE V1.1】1、修改CAN波特率和扩展帧;2、修改DIO模块;3、修改PORT模块GPIO定义

BJQX-ZHENGCHAO\Zhengchao 2 years ago
parent
commit
4175fcae01
6 changed files with 79 additions and 80 deletions
  1. 1 1
      .prefs/pref_general.xdm
  2. 9 21
      config/Can.xdm
  3. 36 5
      config/Dio.xdm
  4. 16 36
      config/Platform.xdm
  5. 16 16
      config/Port.xdm
  6. 1 1
      config/Uart.xdm

+ 1 - 1
.prefs/pref_general.xdm

@@ -273,7 +273,7 @@
     <d:var name="ECUId" value="S32K1xx"/>
     <d:var name="ConfigurationPath" value="config"/>
     <d:var name="GenerationPath" 
-           value="D:\Work\NXPWorkSpace\S32K144_Project_CAN_UART_DIO\generate"/>
+           value="D:\Work\NXPWorkSpace\S32K144_BLE\generate"/>
     <d:var name="UnixLF" value="FALSE"/>
     <d:var name="UnixLFConfigData" value="FALSE"/>
     <d:var name="DisableMinListChildCreation" value="FALSE"/>

+ 9 - 21
config/Can.xdm

@@ -36,8 +36,7 @@
                 </d:var>
                 <d:var name="CanMainFunctionBusoffPeriod" type="FLOAT" 
                        value="0.001">
-                  <a:a name="ENABLE" value="false"/>
-                  <a:a name="IMPORTER_INFO" value="@DEF"/>
+                  <a:a name="ENABLE" value="true"/>
                 </d:var>
                 <d:var name="CanMainFunctionWakeupPeriod" type="FLOAT" 
                        value="0.001">
@@ -111,9 +110,7 @@
                     </d:var>
                   </d:ctr>
                 </d:lst>
-                <d:var name="CanPublicIcomSupport" type="BOOLEAN" value="false">
-                  <a:a name="IMPORTER_INFO" value="@DEF"/>
-                </d:var>
+                <d:var name="CanPublicIcomSupport" type="BOOLEAN" value="true"/>
                 <d:ctr name="CanIcomGeneral" type="IDENTIFIABLE">
                   <a:a name="ENABLE" value="false"/>
                   <d:var name="CanIcomLevel" type="ENUMERATION" 
@@ -488,9 +485,7 @@
                     <d:var name="CanHandleType" type="ENUMERATION" value="BASIC">
                       <a:a name="IMPORTER_INFO" value="@DEF"/>
                     </d:var>
-                    <d:var name="CanIdType" type="ENUMERATION" value="STANDARD">
-                      <a:a name="IMPORTER_INFO" value="@DEF"/>
-                    </d:var>
+                    <d:var name="CanIdType" type="ENUMERATION" value="EXTENDED"/>
                     <d:var name="CanObjectId" type="INTEGER" value="0">
                       <a:a name="IMPORTER_INFO">
                         <a:v>@DEF</a:v>
@@ -600,9 +595,7 @@
                     <d:var name="CanHandleType" type="ENUMERATION" value="BASIC">
                       <a:a name="IMPORTER_INFO" value="@DEF"/>
                     </d:var>
-                    <d:var name="CanIdType" type="ENUMERATION" value="STANDARD">
-                      <a:a name="IMPORTER_INFO" value="@DEF"/>
-                    </d:var>
+                    <d:var name="CanIdType" type="ENUMERATION" value="EXTENDED"/>
                     <d:var name="CanObjectId" type="INTEGER" value="1"/>
                     <d:var name="CanObjectType" type="ENUMERATION" 
                            value="TRANSMIT"/>
@@ -636,7 +629,7 @@
                   </d:ctr>
                 </d:lst>
                 <d:ctr name="CanIcom" type="IDENTIFIABLE">
-                  <a:a name="ENABLE" value="false"/>
+                  <a:a name="ENABLE" value="true"/>
                   <d:lst name="CanIcomConfig" type="MAP">
                     <d:ctr name="CanIcomConfig_0" type="IDENTIFIABLE">
                       <d:var name="CanIcomConfigId" type="INTEGER" value="1">
@@ -650,22 +643,17 @@
                         <d:lst name="CanIcomRxMessage" type="MAP">
                           <d:ctr name="CanIcomRxMessage_0" type="IDENTIFIABLE">
                             <d:var name="CanIcomCounterValue" type="INTEGER" 
-                                   value="1">
-                              <a:a name="ENABLE" value="false"/>
-                              <a:a name="IMPORTER_INFO" value="@DEF"/>
+                                   value="2">
+                              <a:a name="ENABLE" value="true"/>
                             </d:var>
                             <d:var name="CanIcomMessageIdType" 
-                                   type="ENUMERATION" value="STANDARD">
-                              <a:a name="IMPORTER_INFO" value="@DEF"/>
-                            </d:var>
+                                   type="ENUMERATION" value="EXTENDED"/>
                             <d:var name="CanIcomMessageId" type="INTEGER" 
                                    value="0">
                               <a:a name="IMPORTER_INFO" value="@DEF"/>
                             </d:var>
                             <d:var name="CanIcomIdOperation" type="ENUMERATION" 
-                                   value="EXACTLY">
-                              <a:a name="IMPORTER_INFO" value="@DEF"/>
-                            </d:var>
+                                   value="GREATER_MINNUM"/>
                             <d:var name="CanIcomMessageIdMask" type="INTEGER" 
                                    value="0">
                               <a:a name="ENABLE" value="false"/>

+ 36 - 5
config/Dio.xdm

@@ -27,11 +27,42 @@
               </d:var>
               <d:ctr name="DioConfig" type="IDENTIFIABLE">
                 <d:lst name="DioPort" type="MAP">
-                  <d:ctr name="DioPort_0" type="IDENTIFIABLE">
-                    <d:var name="DioPortId" type="INTEGER" value="0">
-                      <a:a name="IMPORTER_INFO" value="@DEF"/>
-                    </d:var>
-                    <d:lst name="DioChannel" type="MAP"/>
+                  <d:ctr name="DioPort_D" type="IDENTIFIABLE">
+                    <d:var name="DioPortId" type="INTEGER" value="3"/>
+                    <d:lst name="DioChannel" type="MAP">
+                      <d:ctr name="PTD16_GPIO_OUT_MCU_WIFI_POW_EN" 
+                             type="IDENTIFIABLE">
+                        <d:var name="DioChannelId" type="INTEGER" value="16"/>
+                        <d:lst name="DioChannelEcucPartitionRef"/>
+                      </d:ctr>
+                      <d:ctr name="PTD15_GPIO_OUT_MCU_WIFI_RESET" 
+                             type="IDENTIFIABLE">
+                        <d:var name="DioChannelId" type="INTEGER" value="15"/>
+                        <d:lst name="DioChannelEcucPartitionRef"/>
+                      </d:ctr>
+                    </d:lst>
+                    <d:lst name="DioChannelGroup" type="MAP"/>
+                    <d:lst name="DioPortEcucPartitionRef"/>
+                  </d:ctr>
+                  <d:ctr name="DioPort_E" type="IDENTIFIABLE">
+                    <d:var name="DioPortId" type="INTEGER" value="4"/>
+                    <d:lst name="DioChannel" type="MAP">
+                      <d:ctr name="PTE9_GPIO_OUT_MCU_BT_POW_EN" 
+                             type="IDENTIFIABLE">
+                        <d:var name="DioChannelId" type="INTEGER" value="9"/>
+                        <d:lst name="DioChannelEcucPartitionRef"/>
+                      </d:ctr>
+                      <d:ctr name="PTE8_GPIO_OUT_MCU_BT_RESET" 
+                             type="IDENTIFIABLE">
+                        <d:var name="DioChannelId" type="INTEGER" value="8"/>
+                        <d:lst name="DioChannelEcucPartitionRef"/>
+                      </d:ctr>
+                      <d:ctr name="PTE7_GPIO_OUT_MCU_BT_MOD" 
+                             type="IDENTIFIABLE">
+                        <d:var name="DioChannelId" type="INTEGER" value="7"/>
+                        <d:lst name="DioChannelEcucPartitionRef"/>
+                      </d:ctr>
+                    </d:lst>
                     <d:lst name="DioChannelGroup" type="MAP"/>
                     <d:lst name="DioPortEcucPartitionRef"/>
                   </d:ctr>

+ 16 - 36
config/Platform.xdm

@@ -29,7 +29,7 @@
                 <d:var name="PlatformMcmConfigurable" type="BOOLEAN" 
                        value="false"/>
                 <d:var name="PlatformMscmConfigurable" type="BOOLEAN" 
-                       value="false"/>
+                       value="true"/>
                 <d:var name="PlatformIpAPIsAvailable" type="BOOLEAN" 
                        value="false"/>
                 <d:var name="PlatformEnableUserModeSupport" type="BOOLEAN" 
@@ -1326,9 +1326,7 @@
                       <a:a name="IMPORTER_INFO" value="@DEF"/>
                     </d:var>
                     <d:var name="IsrHandler" type="FUNCTION-NAME" 
-                           value="undefined_handler">
-                      <a:a name="IMPORTER_INFO" value="@DEF"/>
-                    </d:var>
+                           value="Dma0_Ch0_IRQHandler"/>
                   </d:ctr>
                   <d:ctr name="PlatformIsrConfig_1" type="IDENTIFIABLE">
                     <d:var name="IsrName" type="ENUMERATION" value="DMA1_IRQn">
@@ -1341,9 +1339,7 @@
                       <a:a name="IMPORTER_INFO" value="@DEF"/>
                     </d:var>
                     <d:var name="IsrHandler" type="FUNCTION-NAME" 
-                           value="undefined_handler">
-                      <a:a name="IMPORTER_INFO" value="@DEF"/>
-                    </d:var>
+                           value="Dma0_Ch1_IRQHandler"/>
                   </d:ctr>
                   <d:ctr name="PlatformIsrConfig_2" type="IDENTIFIABLE">
                     <d:var name="IsrName" type="ENUMERATION" value="DMA2_IRQn">
@@ -1356,9 +1352,7 @@
                       <a:a name="IMPORTER_INFO" value="@DEF"/>
                     </d:var>
                     <d:var name="IsrHandler" type="FUNCTION-NAME" 
-                           value="undefined_handler">
-                      <a:a name="IMPORTER_INFO" value="@DEF"/>
-                    </d:var>
+                           value="Dma0_Ch2_IRQHandler"/>
                   </d:ctr>
                   <d:ctr name="PlatformIsrConfig_3" type="IDENTIFIABLE">
                     <d:var name="IsrName" type="ENUMERATION" value="DMA3_IRQn">
@@ -1371,9 +1365,7 @@
                       <a:a name="IMPORTER_INFO" value="@DEF"/>
                     </d:var>
                     <d:var name="IsrHandler" type="FUNCTION-NAME" 
-                           value="undefined_handler">
-                      <a:a name="IMPORTER_INFO" value="@DEF"/>
-                    </d:var>
+                           value="Dma0_Ch3_IRQHandler"/>
                   </d:ctr>
                   <d:ctr name="PlatformIsrConfig_4" type="IDENTIFIABLE">
                     <d:var name="IsrName" type="ENUMERATION" value="DMA4_IRQn">
@@ -1386,9 +1378,7 @@
                       <a:a name="IMPORTER_INFO" value="@DEF"/>
                     </d:var>
                     <d:var name="IsrHandler" type="FUNCTION-NAME" 
-                           value="undefined_handler">
-                      <a:a name="IMPORTER_INFO" value="@DEF"/>
-                    </d:var>
+                           value="Dma0_Ch4_IRQHandler"/>
                   </d:ctr>
                   <d:ctr name="PlatformIsrConfig_5" type="IDENTIFIABLE">
                     <d:var name="IsrName" type="ENUMERATION" value="DMA5_IRQn">
@@ -1401,9 +1391,7 @@
                       <a:a name="IMPORTER_INFO" value="@DEF"/>
                     </d:var>
                     <d:var name="IsrHandler" type="FUNCTION-NAME" 
-                           value="undefined_handler">
-                      <a:a name="IMPORTER_INFO" value="@DEF"/>
-                    </d:var>
+                           value="Dma0_Ch5_IRQHandler"/>
                   </d:ctr>
                   <d:ctr name="PlatformIsrConfig_6" type="IDENTIFIABLE">
                     <d:var name="IsrName" type="ENUMERATION" value="DMA6_IRQn">
@@ -1770,9 +1758,7 @@
                       <a:a name="IMPORTER_INFO" value="@DEF"/>
                     </d:var>
                     <d:var name="IsrHandler" type="FUNCTION-NAME" 
-                           value="undefined_handler">
-                      <a:a name="IMPORTER_INFO" value="@DEF"/>
-                    </d:var>
+                           value="LPUART_UART_IP_0_IRQHandler"/>
                   </d:ctr>
                   <d:ctr name="PlatformIsrConfig_30" type="IDENTIFIABLE">
                     <d:var name="IsrName" type="ENUMERATION" 
@@ -1786,9 +1772,7 @@
                       <a:a name="IMPORTER_INFO" value="@DEF"/>
                     </d:var>
                     <d:var name="IsrHandler" type="FUNCTION-NAME" 
-                           value="undefined_handler">
-                      <a:a name="IMPORTER_INFO" value="@DEF"/>
-                    </d:var>
+                           value="LPUART_UART_IP_1_IRQHandler"/>
                   </d:ctr>
                   <d:ctr name="PlatformIsrConfig_31" type="IDENTIFIABLE">
                     <d:var name="IsrName" type="ENUMERATION" 
@@ -1802,9 +1786,7 @@
                       <a:a name="IMPORTER_INFO" value="@DEF"/>
                     </d:var>
                     <d:var name="IsrHandler" type="FUNCTION-NAME" 
-                           value="undefined_handler">
-                      <a:a name="IMPORTER_INFO" value="@DEF"/>
-                    </d:var>
+                           value="LPUART_UART_IP_2_IRQHandler"/>
                   </d:ctr>
                   <d:ctr name="PlatformIsrConfig_32" type="IDENTIFIABLE">
                     <d:var name="IsrName" type="ENUMERATION" value="ADC0_IRQn">
@@ -2139,9 +2121,7 @@
                       <a:a name="IMPORTER_INFO" value="@DEF"/>
                     </d:var>
                     <d:var name="IsrHandler" type="FUNCTION-NAME" 
-                           value="undefined_handler">
-                      <a:a name="IMPORTER_INFO" value="@DEF"/>
-                    </d:var>
+                           value="MCL_FLEXIO_ISR"/>
                   </d:ctr>
                   <d:ctr name="PlatformIsrConfig_54" type="IDENTIFIABLE">
                     <d:var name="IsrName" type="ENUMERATION" 
@@ -2155,7 +2135,7 @@
                       <a:a name="IMPORTER_INFO" value="@DEF"/>
                     </d:var>
                     <d:var name="IsrHandler" type="FUNCTION-NAME" 
-                           value="undefined_handler"/>
+                           value="CAN0_ORED_IRQHandler"/>
                   </d:ctr>
                   <d:ctr name="PlatformIsrConfig_55" type="IDENTIFIABLE">
                     <d:var name="IsrName" type="ENUMERATION" 
@@ -2169,7 +2149,7 @@
                       <a:a name="IMPORTER_INFO" value="@DEF"/>
                     </d:var>
                     <d:var name="IsrHandler" type="FUNCTION-NAME" 
-                           value="undefined_handler"/>
+                           value="CAN0_Error_IRQHandler"/>
                   </d:ctr>
                   <d:ctr name="PlatformIsrConfig_56" type="IDENTIFIABLE">
                     <d:var name="IsrName" type="ENUMERATION" 
@@ -2183,7 +2163,7 @@
                       <a:a name="IMPORTER_INFO" value="@DEF"/>
                     </d:var>
                     <d:var name="IsrHandler" type="FUNCTION-NAME" 
-                           value="undefined_handler"/>
+                           value="CAN0_Wake_Up_IRQHandler"/>
                   </d:ctr>
                   <d:ctr name="PlatformIsrConfig_57" type="IDENTIFIABLE">
                     <d:var name="IsrName" type="ENUMERATION" 
@@ -2197,7 +2177,7 @@
                       <a:a name="IMPORTER_INFO" value="@DEF"/>
                     </d:var>
                     <d:var name="IsrHandler" type="FUNCTION-NAME" 
-                           value="undefined_handler"/>
+                           value="CAN0_ORED_0_15_MB_IRQHandler"/>
                   </d:ctr>
                   <d:ctr name="PlatformIsrConfig_58" type="IDENTIFIABLE">
                     <d:var name="IsrName" type="ENUMERATION" 
@@ -2211,7 +2191,7 @@
                       <a:a name="IMPORTER_INFO" value="@DEF"/>
                     </d:var>
                     <d:var name="IsrHandler" type="FUNCTION-NAME" 
-                           value="undefined_handler"/>
+                           value="CAN0_ORED_16_31_MB_IRQHandler"/>
                   </d:ctr>
                   <d:ctr name="PlatformIsrConfig_59" type="IDENTIFIABLE">
                     <d:var name="IsrName" type="ENUMERATION" 

+ 16 - 16
config/Port.xdm

@@ -440,7 +440,7 @@
                       </a:a>
                     </d:var>
                     <d:lst name="PortPin" type="MAP">
-                      <d:ctr name="PTE11_GPIO_OUT_MCU_WIFI_POW_EN" 
+                      <d:ctr name="PTD16_GPIO_OUT_MCU_WIFI_POW_EN" 
                              type="IDENTIFIABLE">
                         <d:var name="PortPinPFE" type="BOOLEAN" value="false">
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
@@ -462,7 +462,7 @@
                             <a:v>@CALC</a:v>
                           </a:a>
                         </d:var>
-                        <d:var name="PortPinPcr" type="INTEGER" value="139"/>
+                        <d:var name="PortPinPcr" type="INTEGER" value="112"/>
                         <d:var name="PortPinMode" type="ENUMERATION" 
                                value="GPIO">
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
@@ -491,7 +491,7 @@
                         </d:var>
                         <d:lst name="PortPinEcucPartitionRef"/>
                       </d:ctr>
-                      <d:ctr name="PTD16_GPIO_OUT_MCU_WIFI_RESET" 
+                      <d:ctr name="PTD15_GPIO_OUT_MCU_WIFI_RESET" 
                              type="IDENTIFIABLE">
                         <d:var name="PortPinPFE" type="BOOLEAN" value="false">
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
@@ -513,17 +513,17 @@
                             <a:v>@CALC</a:v>
                           </a:a>
                         </d:var>
-                        <d:var name="PortPinPcr" type="INTEGER" value="112"/>
+                        <d:var name="PortPinPcr" type="INTEGER" value="111"/>
                         <d:var name="PortPinMode" type="ENUMERATION" 
                                value="GPIO">
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
                         </d:var>
                         <d:var name="PortPinDSE" type="ENUMERATION" 
-                               value="High_Drive_Strength"/>
+                               value="Low_Drive_Strength"/>
                         <d:var name="PortPinPE" type="ENUMERATION" 
-                               value="PullEnabled"/>
+                               value="PullDisabled"/>
                         <d:var name="PortPinPS" type="ENUMERATION" 
-                               value="PullUp"/>
+                               value="PullDown"/>
                         <d:var name="PortPinDirection" type="ENUMERATION" 
                                value="PORT_PIN_OUT"/>
                         <d:var name="PortPinInitialMode" type="ENUMERATION" 
@@ -534,7 +534,7 @@
                                value="PORT_PIN_LEVEL_HIGH"/>
                         <d:lst name="PortPinEcucPartitionRef"/>
                       </d:ctr>
-                      <d:ctr name="PTD15_GPIO_OUT_MCU_BT_POW_EN" 
+                      <d:ctr name="PTE9_GPIO_OUT_MCU_BT_POW_EN" 
                              type="IDENTIFIABLE">
                         <d:var name="PortPinPFE" type="BOOLEAN" value="false">
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
@@ -556,7 +556,7 @@
                             <a:v>@CALC</a:v>
                           </a:a>
                         </d:var>
-                        <d:var name="PortPinPcr" type="INTEGER" value="111"/>
+                        <d:var name="PortPinPcr" type="INTEGER" value="137"/>
                         <d:var name="PortPinMode" type="ENUMERATION" 
                                value="GPIO">
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
@@ -564,9 +564,9 @@
                         <d:var name="PortPinDSE" type="ENUMERATION" 
                                value="High_Drive_Strength"/>
                         <d:var name="PortPinPE" type="ENUMERATION" 
-                               value="PullEnabled"/>
+                               value="PullDisabled"/>
                         <d:var name="PortPinPS" type="ENUMERATION" 
-                               value="PullUp"/>
+                               value="PullDown"/>
                         <d:var name="PortPinDirection" type="ENUMERATION" 
                                value="PORT_PIN_OUT"/>
                         <d:var name="PortPinInitialMode" type="ENUMERATION" 
@@ -577,7 +577,7 @@
                                value="PORT_PIN_LEVEL_LOW"/>
                         <d:lst name="PortPinEcucPartitionRef"/>
                       </d:ctr>
-                      <d:ctr name="PTE9_GPIO_OUT_MCU_BT_RESET" 
+                      <d:ctr name="PTE8_GPIO_OUT_MCU_BT_RESET" 
                              type="IDENTIFIABLE">
                         <d:var name="PortPinPFE" type="BOOLEAN" value="false">
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
@@ -599,7 +599,7 @@
                             <a:v>@CALC</a:v>
                           </a:a>
                         </d:var>
-                        <d:var name="PortPinPcr" type="INTEGER" value="137"/>
+                        <d:var name="PortPinPcr" type="INTEGER" value="136"/>
                         <d:var name="PortPinMode" type="ENUMERATION" 
                                value="GPIO">
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
@@ -626,7 +626,7 @@
                                value="PORT_PIN_LEVEL_HIGH"/>
                         <d:lst name="PortPinEcucPartitionRef"/>
                       </d:ctr>
-                      <d:ctr name="PTE8_GPIO_OUT_MCU_BT_MOD" 
+                      <d:ctr name="PTE7_GPIO_OUT_MCU_BT_MOD" 
                              type="IDENTIFIABLE">
                         <d:var name="PortPinPFE" type="BOOLEAN" value="false">
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
@@ -648,7 +648,7 @@
                             <a:v>@CALC</a:v>
                           </a:a>
                         </d:var>
-                        <d:var name="PortPinPcr" type="INTEGER" value="136"/>
+                        <d:var name="PortPinPcr" type="INTEGER" value="135"/>
                         <d:var name="PortPinMode" type="ENUMERATION" 
                                value="GPIO">
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
@@ -672,7 +672,7 @@
                           <a:a name="IMPORTER_INFO" value="@DEF"/>
                         </d:var>
                         <d:var name="PortPinLevelValue" type="ENUMERATION" 
-                               value="PORT_PIN_LEVEL_HIGH"/>
+                               value="PORT_PIN_LEVEL_LOW"/>
                         <d:lst name="PortPinEcucPartitionRef"/>
                       </d:ctr>
                     </d:lst>

+ 1 - 1
config/Uart.xdm

@@ -242,7 +242,7 @@
                         </a:a>
                       </d:var>
                       <d:var name="DesireBaudrate" type="ENUMERATION" 
-                             value="LPUART_UART_BAUDRATE_9600"/>
+                             value="LPUART_UART_BAUDRATE_115200"/>
                       <d:var name="UartInteruptDmaMethod" type="ENUMERATION" 
                              value="LPUART_UART_IP_USING_DMA"/>
                       <d:ref name="UartDmaTxChannelRef" type="REFERENCE"