Skip to content

Z
ZhongTong-ZR5-A
Commit 85379b6e authored by 赵康弘's avatar 赵康弘
Browse files
Options

feat: U16AD采集有反应

parent c38edc2c
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 52 deletions
Config/Config292/Config/ECUC/test_Adc_Adc_ecuc.arxml
View file @ 85379b6e
......@@ -221,7 +221,7 @@
<PARAMETER-VALUES>
<ECUC-NUMERICAL-PARAM-VALUE>
<DEFINITION-REF DEST="ECUC-INTEGER-PARAM-DEF">/Renesas/EcucDefs_Adc/Adc/AdcConfigSet/AdcHwUnit/AdcChannel/AdcChannelId</DEFINITION-REF>
<VALUE>1</VALUE>
<VALUE>0</VALUE>
</ECUC-NUMERICAL-PARAM-VALUE>
<ECUC-TEXTUAL-PARAM-VALUE>
<DEFINITION-REF DEST="ECUC-ENUMERATION-PARAM-DEF">/Renesas/EcucDefs_Adc/Adc/AdcConfigSet/AdcHwUnit/AdcChannel/AdcChannelRangeSelect</DEFINITION-REF>
......@@ -371,6 +371,10 @@
<DEFINITION-REF DEST="ECUC-REFERENCE-DEF">/Renesas/EcucDefs_Adc/Adc/AdcConfigSet/AdcHwUnit/AdcGroup/AdcGroupDefinition</DEFINITION-REF>
<VALUE-REF DEST="ECUC-CONTAINER-VALUE">/ActiveEcuC/Adc/AdcConfigSet_000/AdcHwUnit_00/AdcChannel_003</VALUE-REF>
</ECUC-REFERENCE-VALUE>
<ECUC-REFERENCE-VALUE>
<DEFINITION-REF DEST="ECUC-REFERENCE-DEF">/Renesas/EcucDefs_Adc/Adc/AdcConfigSet/AdcHwUnit/AdcGroup/AdcGroupDefinition</DEFINITION-REF>
<VALUE-REF DEST="ECUC-CONTAINER-VALUE">/ActiveEcuC/Adc/AdcConfigSet_000/AdcHwUnit_00/AdcChannel_015</VALUE-REF>
</ECUC-REFERENCE-VALUE>
</REFERENCE-VALUES>
</ECUC-CONTAINER-VALUE>
<ECUC-CONTAINER-VALUE UUID="f7681e82-dd69-40ef-90ad-54ecaf0084bd">
......@@ -924,13 +928,53 @@
</PARAMETER-VALUES>
</ECUC-CONTAINER-VALUE>
<ECUC-CONTAINER-VALUE UUID="c76100c7-96b2-404d-b803-4fe9063ba336">
<SHORT-NAME>AdcChannel_012</SHORT-NAME>
<SHORT-NAME>AdcChannel_015</SHORT-NAME>
<DEFINITION-REF DEST="ECUC-PARAM-CONF-CONTAINER-DEF">/Renesas/EcucDefs_Adc/Adc/AdcConfigSet/AdcHwUnit/AdcChannel</DEFINITION-REF>
<PARAMETER-VALUES>
<ECUC-NUMERICAL-PARAM-VALUE>
<DEFINITION-REF DEST="ECUC-INTEGER-PARAM-DEF">/Renesas/EcucDefs_Adc/Adc/AdcConfigSet/AdcHwUnit/AdcChannel/AdcChannelId</DEFINITION-REF>
<VALUE>15</VALUE>
</ECUC-NUMERICAL-PARAM-VALUE>
<ECUC-NUMERICAL-PARAM-VALUE>
<DEFINITION-REF DEST="ECUC-INTEGER-PARAM-DEF">/Renesas/EcucDefs_Adc/Adc/AdcConfigSet/AdcHwUnit/AdcChannel/AdcChannelConvTime</DEFINITION-REF>
<VALUE>0</VALUE>
</ECUC-NUMERICAL-PARAM-VALUE>
<ECUC-NUMERICAL-PARAM-VALUE>
<DEFINITION-REF DEST="ECUC-INTEGER-PARAM-DEF">/Renesas/EcucDefs_Adc/Adc/AdcConfigSet/AdcHwUnit/AdcChannel/AdcChannelHighLimit</DEFINITION-REF>
<VALUE>0</VALUE>
</ECUC-NUMERICAL-PARAM-VALUE>
<ECUC-NUMERICAL-PARAM-VALUE>
<DEFINITION-REF DEST="ECUC-INTEGER-PARAM-DEF">/Renesas/EcucDefs_Adc/Adc/AdcConfigSet/AdcHwUnit/AdcChannel/AdcChannelLowLimit</DEFINITION-REF>
<VALUE>0</VALUE>
</ECUC-NUMERICAL-PARAM-VALUE>
<ECUC-NUMERICAL-PARAM-VALUE>
<DEFINITION-REF DEST="ECUC-BOOLEAN-PARAM-DEF">/Renesas/EcucDefs_Adc/Adc/AdcConfigSet/AdcHwUnit/AdcChannel/AdcChannelLimitCheck</DEFINITION-REF>
<VALUE>false</VALUE>
</ECUC-NUMERICAL-PARAM-VALUE>
<ECUC-TEXTUAL-PARAM-VALUE>
<DEFINITION-REF DEST="ECUC-ENUMERATION-PARAM-DEF">/Renesas/EcucDefs_Adc/Adc/AdcConfigSet/AdcHwUnit/AdcChannel/AdcChannelRangeSelect</DEFINITION-REF>
<VALUE>ADC_RANGE_ALWAYS</VALUE>
</ECUC-TEXTUAL-PARAM-VALUE>
<ECUC-TEXTUAL-PARAM-VALUE>
<DEFINITION-REF DEST="ECUC-ENUMERATION-PARAM-DEF">/Renesas/EcucDefs_Adc/Adc/AdcConfigSet/AdcHwUnit/AdcChannel/AdcChannelRefVoltsrcHigh</DEFINITION-REF>
<VALUE>NOT_USED</VALUE>
</ECUC-TEXTUAL-PARAM-VALUE>
<ECUC-TEXTUAL-PARAM-VALUE>
<DEFINITION-REF DEST="ECUC-ENUMERATION-PARAM-DEF">/Renesas/EcucDefs_Adc/Adc/AdcConfigSet/AdcHwUnit/AdcChannel/AdcChannelRefVoltsrcLow</DEFINITION-REF>
<VALUE>NOT_USED</VALUE>
</ECUC-TEXTUAL-PARAM-VALUE>
<ECUC-NUMERICAL-PARAM-VALUE>
<DEFINITION-REF DEST="ECUC-INTEGER-PARAM-DEF">/Renesas/EcucDefs_Adc/Adc/AdcConfigSet/AdcHwUnit/AdcChannel/AdcChannelResolution</DEFINITION-REF>
<VALUE>1</VALUE>
</ECUC-NUMERICAL-PARAM-VALUE>
<ECUC-NUMERICAL-PARAM-VALUE>
<DEFINITION-REF DEST="ECUC-INTEGER-PARAM-DEF">/Renesas/EcucDefs_Adc/Adc/AdcConfigSet/AdcHwUnit/AdcChannel/AdcChannelSampTime</DEFINITION-REF>
<VALUE>0</VALUE>
</ECUC-NUMERICAL-PARAM-VALUE>
<ECUC-TEXTUAL-PARAM-VALUE>
<DEFINITION-REF DEST="ECUC-ENUMERATION-PARAM-DEF">/Renesas/EcucDefs_Adc/Adc/AdcConfigSet/AdcHwUnit/AdcChannel/AdcSelfDiagConvCktRef</DEFINITION-REF>
<VALUE>AVREFH_MUL_BY_0</VALUE>
</ECUC-TEXTUAL-PARAM-VALUE>
</PARAMETER-VALUES>
</ECUC-CONTAINER-VALUE>
</SUB-CONTAINERS>
......
Config/Config292/Output/Adc_OutPut/include/Adc_Cbk.h
View file @ 85379b6e
......@@ -62,12 +62,12 @@
** Input File **
***********************************************************************************************************************/
/*
* INPUT FILE: D:\sharedir\Test_MCAL_U2A8_292_43.03_240129_canfd\Test_MCAL_U2A8_292_43.03_240129\Config\Config292\Config\ECUC\test_Adc_Adc_ecuc.arxml
* D:\sharedir\Test_MCAL_U2A8_292_43.03_240129_canfd\Test_MCAL_U2A8_292_43.03_240129\Config\Config292\Config\ECUC\test_Mcu_Mcu_ecuc.arxml
* D:\sharedir\Test_MCAL_U2A8_292_43.03_240129_canfd\Test_MCAL_U2A8_292_43.03_240129\Config\Config292\generator\BSWMDT\R431_ADC_U2A8_BSWMDT.arxml
* D:\sharedir\Test_MCAL_U2A8_292_43.03_240129_canfd\Test_MCAL_U2A8_292_43.03_240129\Config\Config292\stubs\Dem\xml\Dem_Adc.arxml
* D:\sharedir\Test_MCAL_U2A8_292_43.03_240129_canfd\Test_MCAL_U2A8_292_43.03_240129\Config\Config292\Translation.trxml
* GENERATED ON: 07 May 2025 - 14:13:00
* INPUT FILE: E:\Git\中通\ZhongTong-ZR5-A\Config\Config292\Config\ECUC\test_Adc_Adc_ecuc.arxml
* E:\Git\中通\ZhongTong-ZR5-A\Config\Config292\Config\ECUC\test_Mcu_Mcu_ecuc.arxml
* E:\Git\中通\ZhongTong-ZR5-A\Config\Config292\generator\BSWMDT\R431_ADC_U2A8_BSWMDT.arxml
* E:\Git\中通\ZhongTong-ZR5-A\Config\Config292\stubs\Dem\xml\Dem_Adc.arxml
* E:\Git\中通\ZhongTong-ZR5-A\Config\Config292\Translation.trxml
* GENERATED ON: 28 Sep 2025 - 14:36:23
*/
......
Config/Config292/Output/Adc_OutPut/include/Adc_Cfg.h
View file @ 85379b6e
......@@ -62,12 +62,12 @@
** Input File **
***********************************************************************************************************************/
/*
* INPUT FILE: D:\sharedir\Test_MCAL_U2A8_292_43.03_240129_canfd\Test_MCAL_U2A8_292_43.03_240129\Config\Config292\Config\ECUC\test_Adc_Adc_ecuc.arxml
* D:\sharedir\Test_MCAL_U2A8_292_43.03_240129_canfd\Test_MCAL_U2A8_292_43.03_240129\Config\Config292\Config\ECUC\test_Mcu_Mcu_ecuc.arxml
* D:\sharedir\Test_MCAL_U2A8_292_43.03_240129_canfd\Test_MCAL_U2A8_292_43.03_240129\Config\Config292\generator\BSWMDT\R431_ADC_U2A8_BSWMDT.arxml
* D:\sharedir\Test_MCAL_U2A8_292_43.03_240129_canfd\Test_MCAL_U2A8_292_43.03_240129\Config\Config292\stubs\Dem\xml\Dem_Adc.arxml
* D:\sharedir\Test_MCAL_U2A8_292_43.03_240129_canfd\Test_MCAL_U2A8_292_43.03_240129\Config\Config292\Translation.trxml
* GENERATED ON: 07 May 2025 - 14:13:00
* INPUT FILE: E:\Git\中通\ZhongTong-ZR5-A\Config\Config292\Config\ECUC\test_Adc_Adc_ecuc.arxml
* E:\Git\中通\ZhongTong-ZR5-A\Config\Config292\Config\ECUC\test_Mcu_Mcu_ecuc.arxml
* E:\Git\中通\ZhongTong-ZR5-A\Config\Config292\generator\BSWMDT\R431_ADC_U2A8_BSWMDT.arxml
* E:\Git\中通\ZhongTong-ZR5-A\Config\Config292\stubs\Dem\xml\Dem_Adc.arxml
* E:\Git\中通\ZhongTong-ZR5-A\Config\Config292\Translation.trxml
* GENERATED ON: 28 Sep 2025 - 14:36:23
*/
......@@ -338,15 +338,10 @@
#define AdcConf_AdcGroup_AdcGroup_003 (Adc_GroupType)0x03
/* ADC Channel Handles */
#define AdcConf_AdcChannel_AdcChannel_000 (Adc_ChannelType)0x00
#define AdcConf_AdcChannel_AdcChannel_001 (Adc_ChannelType)0x01 /* PRQA S 0791 # JV-01 */
#define AdcConf_AdcChannel_AdcChannel_002 (Adc_ChannelType)0x02 /* PRQA S 0791 # JV-01 */
#define AdcConf_AdcChannel_AdcChannel_003 (Adc_ChannelType)0x03 /* PRQA S 0791 # JV-01 */
#define AdcConf_AdcChannel_AdcChannel_004 (Adc_ChannelType)0x04 /* PRQA S 0791 # JV-01 */
#define AdcConf_AdcChannel_AdcChannel_005 (Adc_ChannelType)0x05 /* PRQA S 0791 # JV-01 */
#define AdcConf_AdcChannel_AdcChannel_006 (Adc_ChannelType)0x06 /* PRQA S 0791 # JV-01 */
#define AdcConf_AdcChannel_AdcChannel_007 (Adc_ChannelType)0x07 /* PRQA S 0791 # JV-01 */
#define AdcConf_AdcChannel_AdcChannel_008 (Adc_ChannelType)0x08 /* PRQA S 0791 # JV-01 */
#define AdcConf_AdcChannel_AdcChannel_009 (Adc_ChannelType)0x09 /* PRQA S 0791 # JV-01 */
#define AdcConf_AdcChannel_AdcChannel_001 (Adc_ChannelType)0x02 /* PRQA S 0791 # JV-01 */
#define AdcConf_AdcChannel_AdcChannel_002 (Adc_ChannelType)0x04 /* PRQA S 0791 # JV-01 */
#define AdcConf_AdcChannel_AdcChannel_003 (Adc_ChannelType)0x05 /* PRQA S 0791 # JV-01 */
#define AdcConf_AdcChannel_AdcChannel_015 (Adc_ChannelType)0x0F /* PRQA S 0791 # JV-01 */
/***********************************************************************************************************************
** Global Data Types **
......
Config/Config292/Output/Adc_OutPut/src/Adc_PBcfg.c
View file @ 85379b6e
......@@ -62,12 +62,12 @@
** Input File **
***********************************************************************************************************************/
/*
* INPUT FILE: D:\sharedir\Test_MCAL_U2A8_292_43.03_240129_canfd\Test_MCAL_U2A8_292_43.03_240129\Config\Config292\Config\ECUC\test_Adc_Adc_ecuc.arxml
* D:\sharedir\Test_MCAL_U2A8_292_43.03_240129_canfd\Test_MCAL_U2A8_292_43.03_240129\Config\Config292\Config\ECUC\test_Mcu_Mcu_ecuc.arxml
* D:\sharedir\Test_MCAL_U2A8_292_43.03_240129_canfd\Test_MCAL_U2A8_292_43.03_240129\Config\Config292\generator\BSWMDT\R431_ADC_U2A8_BSWMDT.arxml
* D:\sharedir\Test_MCAL_U2A8_292_43.03_240129_canfd\Test_MCAL_U2A8_292_43.03_240129\Config\Config292\stubs\Dem\xml\Dem_Adc.arxml
* D:\sharedir\Test_MCAL_U2A8_292_43.03_240129_canfd\Test_MCAL_U2A8_292_43.03_240129\Config\Config292\Translation.trxml
* GENERATED ON: 07 May 2025 - 14:13:00
* INPUT FILE: E:\Git\中通\ZhongTong-ZR5-A\Config\Config292\Config\ECUC\test_Adc_Adc_ecuc.arxml
* E:\Git\中通\ZhongTong-ZR5-A\Config\Config292\Config\ECUC\test_Mcu_Mcu_ecuc.arxml
* E:\Git\中通\ZhongTong-ZR5-A\Config\Config292\generator\BSWMDT\R431_ADC_U2A8_BSWMDT.arxml
* E:\Git\中通\ZhongTong-ZR5-A\Config\Config292\stubs\Dem\xml\Dem_Adc.arxml
* E:\Git\中通\ZhongTong-ZR5-A\Config\Config292\Translation.trxml
* GENERATED ON: 28 Sep 2025 - 14:36:23
*/
......@@ -185,7 +185,7 @@ STATIC volatile VAR(Adc_PicTriggSelectValueType, ADC_VAR_NO_INIT) Adc_GaaPicTrig
#include "Adc_MemMap.h" /* PRQA S 5087 # JV-01 */
/* RAM Allocation to store channel enable or disable status */
volatile VAR(boolean, ADC_VAR_NO_INIT) Adc_GaaChannelToDisableEnable[22]; /* PRQA S 1504 # JV-01 */
volatile VAR(boolean, ADC_VAR_NO_INIT) Adc_GaaChannelToDisableEnable[17]; /* PRQA S 1504 # JV-01 */
#define ADC_STOP_SEC_VAR_NO_INIT_BOOLEAN
#include "Adc_MemMap.h" /* PRQA S 5087 # JV-01 */
......@@ -226,14 +226,13 @@ STATIC CONST(Adc_PicTriggSelectRegGroupType, ADC_CONFIG_DATA) Adc_GaaPicTriggSel
CONST(uint32, ADC_CONFIG_DATA) Adc_GaaChannelToGroup[] = /* PRQA S 1504 # JV-01 */
{
/* Index: 0 - Group Id 0 */
0x00000000UL, 0x00000001UL, 0x00000002UL, 0x00000003UL, 0x00000004UL, 0x00000005UL, 0x00000006UL, 0x00000007UL,
0x00000008UL, 0x00000009UL,
/* Index: 10 - Group Id 1 */
0x01000000UL, 0x01000001UL, 0x01000002UL, 0x01000003UL,
/* Index: 14 - Group Id 2 */
0x01000000UL, 0x01000001UL, 0x01000002UL, 0x01000003UL,
/* Index: 18 - Group Id 3 */
0x00000000UL, 0x00000001UL, 0x00000002UL, 0x00000003UL
0x00000000UL, 0x00000002UL, 0x00000004UL, 0x00000005UL, 0x0000000FUL,
/* Index: 5 - Group Id 1 */
0x01000000UL, 0x01000002UL, 0x01000004UL, 0x01000005UL,
/* Index: 9 - Group Id 2 */
0x01000000UL, 0x01000002UL, 0x01000004UL, 0x01000005UL,
/* Index: 13 - Group Id 3 */
0x00000000UL, 0x00000002UL, 0x00000004UL, 0x00000005UL
};
#define ADC_STOP_SEC_CONFIG_DATA_32
......@@ -343,7 +342,7 @@ CONST(Adc_HwUnitConfigType, ADC_CONFIG_DATA) Adc_GaaHWUnitConfig[] =
0x00U,
/* ucMaxVirtualChannel */
0x0EU
0x09U
}
};
......@@ -382,7 +381,7 @@ CONST(Adc_HwSgUnitType, ADC_CONFIG_DATA) Adc_GaaSgUnitConfig[] =
0x00000028UL,
/* ulDmaSourceAddress */
0xFFCA01B4UL
0xFFCA01ACUL
}
};
......@@ -419,25 +418,25 @@ CONST(Adc_GroupConfigType, ADC_CONFIG_DATA) Adc_GaaGroupConfig[] =
0x00U,
/* ucScanMode */
0x00U,
0x20U,
/* blEnableDmaTransfer */
ADC_FALSE,
ADC_TRUE,
/* enGroupAccessMode */
ADC_ACCESS_MODE_SINGLE,
/* enStreamBufferMode */
ADC_STREAM_BUFFER_CIRCULAR,
ADC_STREAM_BUFFER_LINEAR,
/* enGroupConvMode */
ADC_CONV_MODE_ONESHOT,
ADC_CONV_MODE_CONTINUOUS,
/* blImplicitlyStopped */
ADC_TRUE,
ADC_FALSE,
/* ucChannelCount */
0x0AU,
0x05U,
/* blAdcEnableAdTimerTriggMode */
ADC_FALSE,
......@@ -466,7 +465,7 @@ CONST(Adc_GroupConfigType, ADC_CONFIG_DATA) Adc_GaaGroupConfig[] =
0x00000000UL,
/* ucStartVirChPtr */
0x0AU,
0x06U,
/* ddNumberofSamples */
0x04U,
......@@ -478,7 +477,7 @@ CONST(Adc_GroupConfigType, ADC_CONFIG_DATA) Adc_GaaGroupConfig[] =
0x01U,
/* ucChannelToGroupIndex */
0x0AU,
0x05U,
/* ucScanMode */
0x00U,
......@@ -528,7 +527,7 @@ CONST(Adc_GroupConfigType, ADC_CONFIG_DATA) Adc_GaaGroupConfig[] =
0x00000000UL,
/* ucStartVirChPtr */
0x0AU,
0x06U,
/* ddNumberofSamples */
0x01U,
......@@ -540,7 +539,7 @@ CONST(Adc_GroupConfigType, ADC_CONFIG_DATA) Adc_GaaGroupConfig[] =
0x01U,
/* ucChannelToGroupIndex */
0x0EU,
0x09U,
/* ucScanMode */
0x20U,
......@@ -602,7 +601,7 @@ CONST(Adc_GroupConfigType, ADC_CONFIG_DATA) Adc_GaaGroupConfig[] =
0x00U,
/* ucChannelToGroupIndex */
0x12U,
0x0DU,
/* ucScanMode */
0x00U,
......@@ -836,7 +835,7 @@ CONST(Adc_ConfigType, ADC_CONFIG_DATA) Adc_GaaConfiguration[] =
0x02U,
/* ucNoOfChannels */
0x16U
0x11U
}
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment