From 5107d6f78114c6795d7d17e317238ea2d50b506b Mon Sep 17 00:00:00 2001
From: marshallma21 <marshall.ma@aliyun.com>
Date: Sun, 8 Sep 2019 00:26:17 +0800
Subject: [PATCH] Change the PWM output channel in LightApp

---
 .../generated/output/IntegrationFramework.epc | 28 +------------------
 mcal_cfg/generated/src/SwcRte_PBcfg.c         | 19 +++----------
 2 files changed, 5 insertions(+), 42 deletions(-)

diff --git a/mcal_cfg/generated/output/IntegrationFramework.epc b/mcal_cfg/generated/output/IntegrationFramework.epc
index 7a3db69..9fbf291 100644
--- a/mcal_cfg/generated/output/IntegrationFramework.epc
+++ b/mcal_cfg/generated/output/IntegrationFramework.epc
@@ -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>
@@ -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>
diff --git a/mcal_cfg/generated/src/SwcRte_PBcfg.c b/mcal_cfg/generated/src/SwcRte_PBcfg.c
index 8275b69..9591934 100644
--- a/mcal_cfg/generated/src/SwcRte_PBcfg.c
+++ b/mcal_cfg/generated/src/SwcRte_PBcfg.c
@@ -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*/
     {
@@ -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*/
@@ -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*/
     }
@@ -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*/
     }
 };
 
@@ -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*/
     },