Merge branch 'AW-CCS' of https://git.phihong.com.tw:30000/System_Integration/CSU3_AM335x into AW-CCS

EVSE/Projects/DD360/Apps/CSU/Primary.c

@@ -136,11 +136,15 @@ void PrimaryLedIndicatorCtrlFork(void)
 
                 case S_CHARGING:
                     pLedConfig->RedLED = NO;
+#ifdef DD360ComBox
                     if (pLedConfig->YellowLED == YES) {
                         pLedConfig->YellowLED = NO;
                     } else {
                         pLedConfig->YellowLED = YES;
                     }
+#else
+                        pLedConfig->YellowLED = YES;
+#endif
                     pLedConfig->GreenLED = NO;
                     break;
 
@@ -166,7 +170,15 @@ void PrimaryLedIndicatorCtrlFork(void)
                     //    pLedConfig->RedLED = YES;
                     //} else {
                     pLedConfig->RedLED = NO;
+#ifdef DD360ComBox
                     pLedConfig->YellowLED = YES;
+#else
+                    if (pLedConfig->YellowLED == YES) {
+                        pLedConfig->YellowLED = NO;
+                    } else {
+                        pLedConfig->YellowLED = YES;
+                    }
+#endif
                     pLedConfig->GreenLED = NO;
                     //}
                     break;

EVSE/Projects/DD360/Apps/ModulePrimary/Module_PrimaryComm.c

@@ -185,9 +185,8 @@ void GetInputGpioStatus(int fd)
     }
 
     ShmPrimaryMcuData->InputDet.bits.SpdDetec = gpio_in.SPD;
-
 #if defined DD360ComBox
-    if (~gpio_in.Emergency_Btn)
+    if (gpio_in.Emergency_Btn == 0 && (EmgBtn_flag == gpio_in.Emergency_Btn))
 #else
     if (gpio_in.Emergency_Btn && (EmgBtn_flag != gpio_in.Emergency_Btn))
 #endif //defined DD360ComBox
@@ -197,7 +196,11 @@ void GetInputGpioStatus(int fd)
            EmgBtn_flag = 1;
            EmgBtn_count = 0; // Avoid Overflow
        }
-    } else if (EmgBtn_flag != gpio_in.Emergency_Btn) {
+#ifdef DD360ComBox
+    } else if ( gpio_in.Emergency_Btn && EmgBtn_flag ) {
+#else
+    } else if (EmgBtn_flag != gpio_in.Emergency_Btn ) {
+#endif    
         EmgBtn_count++;
         if (EmgBtn_count > SensorTrigCount) {
             EmgBtn_flag = 0;
@@ -239,7 +242,7 @@ void GetInputGpioStatus(int fd)
     }
 
 #if defined DD360ComBox
-    if (gpio_in.Door_Open)
+    if (gpio_in.Door_Open && (Door_flag != gpio_in.Door_Open))
 #else
     if (gpio_in.Door_Open == 0 && (Door_flag == gpio_in.Door_Open))
 #endif //defined DD360ComBox
@@ -249,7 +252,11 @@ void GetInputGpioStatus(int fd)
             Door_flag = 1;
             Door_count = 0; // Avoid Overflow
        }
+#ifdef DD360ComBox
+    } else if (gpio_in.Door_Open == 0 && Door_flag) {
+#else
     } else if (gpio_in.Door_Open && Door_flag) {
+#endif
         Door_count++;
         if (Door_count > SensorTrigCount) {
             Door_flag = 0;

EVSE/Projects/DD360Audi/Apps/CSU/Primary.c

@@ -136,11 +136,15 @@ void PrimaryLedIndicatorCtrlFork(void)
 
                 case S_CHARGING:
                     pLedConfig->RedLED = NO;
+#ifdef DD360ComBox
                     if (pLedConfig->YellowLED == YES) {
                         pLedConfig->YellowLED = NO;
                     } else {
                         pLedConfig->YellowLED = YES;
                     }
+#else
+                        pLedConfig->YellowLED = YES;
+#endif
                     pLedConfig->GreenLED = NO;
                     break;
 
@@ -166,7 +170,15 @@ void PrimaryLedIndicatorCtrlFork(void)
                     //    pLedConfig->RedLED = YES;
                     //} else {
                     pLedConfig->RedLED = NO;
+#ifdef DD360ComBox
                     pLedConfig->YellowLED = YES;
+#else
+                    if (pLedConfig->YellowLED == YES) {
+                        pLedConfig->YellowLED = NO;
+                    } else {
+                        pLedConfig->YellowLED = YES;
+                    }
+#endif
                     pLedConfig->GreenLED = NO;
                     //}
                     break;

EVSE/Projects/DD360Audi/Apps/ModulePrimary/Module_PrimaryComm.c

@@ -185,9 +185,8 @@ void GetInputGpioStatus(int fd)
     }
 
     ShmPrimaryMcuData->InputDet.bits.SpdDetec = gpio_in.SPD;
-
 #if defined DD360ComBox
-    if (~gpio_in.Emergency_Btn)
+    if (gpio_in.Emergency_Btn == 0 && (EmgBtn_flag == gpio_in.Emergency_Btn))
 #else
     if (gpio_in.Emergency_Btn && (EmgBtn_flag != gpio_in.Emergency_Btn))
 #endif //defined DD360ComBox
@@ -197,7 +196,11 @@ void GetInputGpioStatus(int fd)
            EmgBtn_flag = 1;
            EmgBtn_count = 0; // Avoid Overflow
        }
-    } else if (EmgBtn_flag != gpio_in.Emergency_Btn) {
+#ifdef DD360ComBox
+    } else if ( gpio_in.Emergency_Btn && EmgBtn_flag ) {
+#else
+    } else if (EmgBtn_flag != gpio_in.Emergency_Btn ) {
+#endif    
         EmgBtn_count++;
         if (EmgBtn_count > SensorTrigCount) {
             EmgBtn_flag = 0;
@@ -239,7 +242,7 @@ void GetInputGpioStatus(int fd)
     }
 
 #if defined DD360ComBox
-    if (gpio_in.Door_Open)
+    if (gpio_in.Door_Open && (Door_flag != gpio_in.Door_Open))
 #else
     if (gpio_in.Door_Open == 0 && (Door_flag == gpio_in.Door_Open))
 #endif //defined DD360ComBox
@@ -249,7 +252,11 @@ void GetInputGpioStatus(int fd)
             Door_flag = 1;
             Door_count = 0; // Avoid Overflow
        }
+#ifdef DD360ComBox
+    } else if (gpio_in.Door_Open == 0 && Door_flag) {
+#else
     } else if (gpio_in.Door_Open && Door_flag) {
+#endif
         Door_count++;
         if (Door_count > SensorTrigCount) {
             Door_flag = 0;

EVSE/Projects/DD360ComBox/Apps/CSU/Primary.c

@@ -136,11 +136,15 @@ void PrimaryLedIndicatorCtrlFork(void)
 
                 case S_CHARGING:
                     pLedConfig->RedLED = NO;
-                    //if (pLedConfig->YellowLED == YES) {
-                    //    pLedConfig->YellowLED = NO;
-                    //} else {
+#ifdef DD360ComBox
+                    if (pLedConfig->YellowLED == YES) {
+                        pLedConfig->YellowLED = NO;
+                    } else {
                         pLedConfig->YellowLED = YES;
-                    //}
+                    }
+#else
+                        pLedConfig->YellowLED = YES;
+#endif
                     pLedConfig->GreenLED = NO;
                     break;
 
@@ -166,13 +170,15 @@ void PrimaryLedIndicatorCtrlFork(void)
                     //    pLedConfig->RedLED = YES;
                     //} else {
                     pLedConfig->RedLED = NO;
-                    //pLedConfig->YellowLED = YES;
+#ifdef DD360ComBox
+                    pLedConfig->YellowLED = YES;
+#else
                     if (pLedConfig->YellowLED == YES) {
                         pLedConfig->YellowLED = NO;
                     } else {
                         pLedConfig->YellowLED = YES;
                     }
-
+#endif
                     pLedConfig->GreenLED = NO;
                     //}
                     break;

EVSE/Projects/DD360ComBox/Apps/ModulePrimary/Module_PrimaryComm.c

@@ -185,9 +185,8 @@ void GetInputGpioStatus(int fd)
     }
 
     ShmPrimaryMcuData->InputDet.bits.SpdDetec = gpio_in.SPD;
-
 #if defined DD360ComBox
-    if (~gpio_in.Emergency_Btn)
+    if (gpio_in.Emergency_Btn == 0 && (EmgBtn_flag == gpio_in.Emergency_Btn))
 #else
     if (gpio_in.Emergency_Btn && (EmgBtn_flag != gpio_in.Emergency_Btn))
 #endif //defined DD360ComBox
@@ -197,7 +196,11 @@ void GetInputGpioStatus(int fd)
            EmgBtn_flag = 1;
            EmgBtn_count = 0; // Avoid Overflow
        }
-    } else if (EmgBtn_flag != gpio_in.Emergency_Btn) {
+#ifdef DD360ComBox
+    } else if ( gpio_in.Emergency_Btn && EmgBtn_flag ) {
+#else
+    } else if (EmgBtn_flag != gpio_in.Emergency_Btn ) {
+#endif    
         EmgBtn_count++;
         if (EmgBtn_count > SensorTrigCount) {
             EmgBtn_flag = 0;
@@ -239,7 +242,7 @@ void GetInputGpioStatus(int fd)
     }
 
 #if defined DD360ComBox
-    if (gpio_in.Door_Open)
+    if (gpio_in.Door_Open && (Door_flag != gpio_in.Door_Open))
 #else
     if (gpio_in.Door_Open == 0 && (Door_flag == gpio_in.Door_Open))
 #endif //defined DD360ComBox
@@ -249,7 +252,11 @@ void GetInputGpioStatus(int fd)
             Door_flag = 1;
             Door_count = 0; // Avoid Overflow
        }
+#ifdef DD360ComBox
+    } else if (gpio_in.Door_Open == 0 && Door_flag) {
+#else
     } else if (gpio_in.Door_Open && Door_flag) {
+#endif
         Door_count++;
         if (Door_count > SensorTrigCount) {
             Door_flag = 0;