From 6f2b3ed6eaf01e314808e6efa48bcd7168c0fb30 Mon Sep 17 00:00:00 2001
From: Hare <renilr0@outlook.com>
Date: Mon, 4 Sep 2023 16:45:46 +0800
Subject: [PATCH] Remove redundant pics values

---
 src/app/tests/suites/certification/PICS.yaml  | 11 +----
 .../tests/suites/certification/ci-pics-values | 41 +------------------
 2 files changed, 3 insertions(+), 49 deletions(-)

diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
index b3d8e330b10113..d26d399904833e 100644
--- a/src/app/tests/suites/certification/PICS.yaml
+++ b/src/app/tests/suites/certification/PICS.yaml
@@ -8901,15 +8901,6 @@ PICS:
     - label: "Does the device implement the InterconnectCOAlarm attribute?"
       id: SMOKECO.S.A0009
 
-    - label: "Does the device implement the ContaminationState attribute?"
-      id: SMOKECO.S.A0010
-
-    - label: "Does the device implement the SensitivityLevel attribute?"
-      id: SMOKECO.S.A0011
-
-    - label: "Does the device implement the ExpiryDate attribute?"
-      id: SMOKECO.S.A0012
-
     - label: "Does the device implement the ContaminationState attribute?"
       id: SMOKECO.S.A000a
 
@@ -8953,7 +8944,7 @@ PICS:
       id: SMOKECO.S.E09
 
     - label: "Does the device implement the AllClear event?"
-      id: SMOKECO.S.E10
+      id: SMOKECO.S.E0a
 
     #
     # server / manually
diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
index 66b40dbe81572d..d709e8f55d907b 100644
--- a/src/app/tests/suites/certification/ci-pics-values
+++ b/src/app/tests/suites/certification/ci-pics-values
@@ -700,40 +700,6 @@ S.C.AM-WRITE=0
 S.C.AO-READ=0
 S.C.AO-WRITE=0
 
-# Smoke CO Alarm Cluster
-SMOKECO.S=1
-SMOKECO.S.F00=1
-SMOKECO.S.F01=1
-SMOKECO.S.A0000=1
-SMOKECO.S.A0001=1
-SMOKECO.S.A0002=1
-SMOKECO.S.A0003=1
-SMOKECO.S.A0004=1
-SMOKECO.S.A0005=1
-SMOKECO.S.A0006=1
-SMOKECO.S.A0007=1
-SMOKECO.S.A0008=1
-SMOKECO.S.A0009=1
-SMOKECO.S.A000a=1
-SMOKECO.S.A000b=1
-SMOKECO.S.A000c=1
-SMOKECO.S.E00=1
-SMOKECO.S.E01=1
-SMOKECO.S.E02=1
-SMOKECO.S.E03=1
-SMOKECO.S.E04=1
-SMOKECO.S.E05=1
-SMOKECO.S.E06=1
-SMOKECO.S.E07=1
-SMOKECO.S.E08=1
-SMOKECO.S.E09=1
-SMOKECO.S.E0a=1
-SMOKECO.M.ManuallyControlledTest=1
-SMOKECO.M.ManuallyControlledMute=1
-SMOKECO.S.C00.Rsp=1
-
-SMOKECO.C=1
-
 # Switch Cluster
 SWTCH.S=1
 SWTCH.S.F00=1
@@ -2607,6 +2573,7 @@ ICDM.S.C01.Tx=1
 
 # Smoke CO Alarm Cluster
 SMOKECO.S=1
+SMOKECO.C=1
 SMOKECO.S.F00=1
 SMOKECO.S.F01=1
 SMOKECO.S.A0000=1
@@ -2619,9 +2586,6 @@ SMOKECO.S.A0006=1
 SMOKECO.S.A0007=1
 SMOKECO.S.A0008=1
 SMOKECO.S.A0009=1
-SMOKECO.S.A0010=1
-SMOKECO.S.A0011=1
-SMOKECO.S.A0012=1
 SMOKECO.S.A000a=1
 SMOKECO.S.A000b=1
 SMOKECO.S.A000c=1
@@ -2635,11 +2599,10 @@ SMOKECO.S.E06=1
 SMOKECO.S.E07=1
 SMOKECO.S.E08=1
 SMOKECO.S.E09=1
-SMOKECO.S.E10=1
+SMOKECO.S.E0a=1
 SMOKECO.M.ManuallyControlledTest=1
 SMOKECO.M.ManuallyControlledMute=1
 SMOKECO.S.C00.Rsp=1
-SMOKECO.C=1
 
 #Temperature Controlled Cabinet Mode Cluster
 TCCM.S=1