Skip to content

Commit

Permalink
Change the PWM output channel in LightApp
Browse files Browse the repository at this point in the history
  • Loading branch information
@marshallma21
marshallma21 committed Sep 7, 2019
1 parent 22c8263 commit 5107d6f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 42 deletions.
28 changes: 1 addition & 27 deletions mcal_cfg/generated/output/IntegrationFramework.epc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,32 +93,6 @@
</ECUC-REFERENCE-VALUE>
</REFERENCE-VALUES>
</ECUC-CONTAINER-VALUE>
<ECUC-CONTAINER-VALUE>
<SHORT-NAME>LightingChannels_0</SHORT-NAME>
<DEFINITION-REF DEST="ECUC-PARAM-CONF-CONTAINER-DEF">/TS_T40D2M10I1R0/IntegrationFramework/IntegrationAppFeaturesConfig/IntegrationAppDataConfig/AppConfig/LightingControlApp/LightingChannels</DEFINITION-REF>
<PARAMETER-VALUES>
<ECUC-NUMERICAL-PARAM-VALUE>
<DEFINITION-REF DEST="ECUC-BOOLEAN-PARAM-DEF">/TS_T40D2M10I1R0/IntegrationFramework/IntegrationAppFeaturesConfig/IntegrationAppDataConfig/AppConfig/LightingControlApp/LightingChannels/ChannelHasFeedback</DEFINITION-REF>
<VALUE>1</VALUE>
</ECUC-NUMERICAL-PARAM-VALUE>
</PARAMETER-VALUES>
<REFERENCE-VALUES>
<ECUC-REFERENCE-VALUE>
<DEFINITION-REF DEST="ECUC-REFERENCE-DEF">/TS_T40D2M10I1R0/IntegrationFramework/IntegrationAppFeaturesConfig/IntegrationAppDataConfig/AppConfig/LightingControlApp/LightingChannels/IoChannelFeedbackChannel</DEFINITION-REF>
<VALUE-REF DEST="ECUC-CONTAINER-VALUE">/IntegrationFramework/IntegrationFramework/IntegrationAppFeaturesConfig/IntegrationAppDataConfig_0/BswConfig_0/GeneralConfig_0/IoDAL_AN_FBK_PWM0</VALUE-REF>
</ECUC-REFERENCE-VALUE>
<ECUC-REFERENCE-VALUE>
<DEFINITION-REF DEST="ECUC-REFERENCE-DEF">/TS_T40D2M10I1R0/IntegrationFramework/IntegrationAppFeaturesConfig/IntegrationAppDataConfig/AppConfig/LightingControlApp/LightingChannels/IoDioOutput</DEFINITION-REF>
</ECUC-REFERENCE-VALUE>
<ECUC-REFERENCE-VALUE>
<DEFINITION-REF DEST="ECUC-REFERENCE-DEF">/TS_T40D2M10I1R0/IntegrationFramework/IntegrationAppFeaturesConfig/IntegrationAppDataConfig/AppConfig/LightingControlApp/LightingChannels/IoOcuOutput</DEFINITION-REF>
</ECUC-REFERENCE-VALUE>
<ECUC-REFERENCE-VALUE>
<DEFINITION-REF DEST="ECUC-REFERENCE-DEF">/TS_T40D2M10I1R0/IntegrationFramework/IntegrationAppFeaturesConfig/IntegrationAppDataConfig/AppConfig/LightingControlApp/LightingChannels/IoPwmOutput</DEFINITION-REF>
<VALUE-REF DEST="ECUC-CONTAINER-VALUE">/IntegrationFramework/IntegrationFramework/IntegrationAppFeaturesConfig/IntegrationAppDataConfig_0/BswConfig_0/GeneralConfig_0/IoDAL_PWM0</VALUE-REF>
</ECUC-REFERENCE-VALUE>
</REFERENCE-VALUES>
</ECUC-CONTAINER-VALUE>
<ECUC-CONTAINER-VALUE>
<SHORT-NAME>LightingChannels_1</SHORT-NAME>
<DEFINITION-REF DEST="ECUC-PARAM-CONF-CONTAINER-DEF">/TS_T40D2M10I1R0/IntegrationFramework/IntegrationAppFeaturesConfig/IntegrationAppDataConfig/AppConfig/LightingControlApp/LightingChannels</DEFINITION-REF>
Expand Down Expand Up @@ -284,7 +258,7 @@
</ECUC-REFERENCE-VALUE>
<ECUC-REFERENCE-VALUE>
<DEFINITION-REF DEST="ECUC-REFERENCE-DEF">/TS_T40D2M10I1R0/IntegrationFramework/IntegrationAppFeaturesConfig/IntegrationAppDataConfig/AppConfig/LightingControlApp/LightingChannels/IoPwmOutput</DEFINITION-REF>
<VALUE-REF DEST="ECUC-CONTAINER-VALUE">/IntegrationFramework/IntegrationFramework/IntegrationAppFeaturesConfig/IntegrationAppDataConfig_0/BswConfig_0/GeneralConfig_0/IoDAL_PMW2</VALUE-REF>
<VALUE-REF DEST="ECUC-CONTAINER-VALUE">/IntegrationFramework/IntegrationFramework/IntegrationAppFeaturesConfig/IntegrationAppDataConfig_0/BswConfig_0/GeneralConfig_0/IoDAL_PWM0</VALUE-REF>
</ECUC-REFERENCE-VALUE>
</REFERENCE-VALUES>
</ECUC-CONTAINER-VALUE>
Expand Down
19 changes: 4 additions & 15 deletions mcal_cfg/generated/src/SwcRte_PBcfg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ extern "C"{
==================================================================================================*/

/*array of configuration data containing the configuration for each input channel (sensors and feedback channels) for instance 0*/
const SwcRte_InputChannelConfigType SwcRte_LightingInputChannelMap_0_PB[3] =
const SwcRte_InputChannelConfigType SwcRte_LightingInputChannelMap_0_PB[2] =
{
/*Sensor channel*/
{
Expand All @@ -140,12 +140,6 @@ const SwcRte_InputChannelConfigType SwcRte_LightingInputChannelMap_0_PB[3] =
},

/*feedback channel for channel 0*/
{
IoDAL_AN_FBK_PWM0, /*IO Channel ID*/
SWCRTE_ANALOG_FDBK_SENS /*IO Channel Type*/
},

/*feedback channel for channel 1*/
{
IoDAL_AN_FBK_PWM1, /*IO Channel ID*/
SWCRTE_ANALOG_FDBK_SENS /*IO Channel Type*/
Expand Down Expand Up @@ -191,15 +185,10 @@ const SwcRte_InputChannelConfigType SwcRte_LightingInputChannelMap_2_PB[2] =
};


const SwcRte_OutputChannelConfigType SwcRte_LightingOutputChannelMap_0_PB[2] =
const SwcRte_OutputChannelConfigType SwcRte_LightingOutputChannelMap_0_PB[1] =
{

/*Output Channel 0*/
{
IoDAL_PWM0 /*IO Channel ID*/
},

/*Output Channel 1*/
{
IoDAL_PMW1 /*IO Channel ID*/
}
Expand All @@ -224,7 +213,7 @@ const SwcRte_OutputChannelConfigType SwcRte_LightingOutputChannelMap_2_PB[1] =

/*Output Channel 0*/
{
IoDAL_PMW2 /*IO Channel ID*/
IoDAL_PWM0 /*IO Channel ID*/
}
};

Expand All @@ -235,7 +224,7 @@ const SwcRte_GlobalConfigType SwcRte_AppInstanceMapPB[SWCRTE_MAX_APP_INSTANCES]
SWCRTE_LIGHTING, /*Application type*/
SWCRTE_PWM_OUT, /*Output signal type*/
1, /*Number of input channels*/
2, /*Number of output channels*/
1, /*Number of output channels*/
SwcRte_LightingInputChannelMap_0_PB, /*Input channel map configuration structure*/
SwcRte_LightingOutputChannelMap_0_PB /*Output channel map configuration structure*/
},
Expand Down

0 comments on commit 5107d6f

Please sign in to comment.