wallhero add model ACL-401S3I

[thinkaName]

Manufacturers wallhero add new model ACL-401S3I zigbee-switch.
Please review it.

[liuyd96]

From a single commit point of view, your code has no problems.
And It’s okay if you don’t add a comma at the end of the line.

But this may introduce problems when the maintainer merges #981.
In that case, the codes would like

local FINGERPRINTS = {
  { mfr = "WALL HERO", model = "ACL-401S4I", switches = 4, buttons = 0 },
  { mfr = "WALL HERO", model = "ACL-401S8I", switches = 4, buttons = 4 },
  { mfr = "WALL HERO", model = "ACL-401S2I", switches = 2, buttons = 0 } -- Syntax Error
  { mfr = "WALL HERO", model = "ACL-401S3I", switches = 3, buttons = 0 }
}

[greens]

branch should also be rebased here, and yes @liuyd96 is correct: these three fingerprint additions will create conflicts that require a rebase after each is merged

[github-actions]

Channel deleted.

[github-actions]

Test Results

     54 files     345 suites   0s ⏱️
1 622 tests 1 622 ✔️ 0 💤 0 ❌
2 842 runs  2 842 ✔️ 0 💤 0 ❌

Results for commit c75eafb.

♻️ This comment has been updated with latest results.

[github-actions]

Minimum allowed coverage is 90%

Generated by 🐒 cobertura-action against 62111a3

[liuyd96]

Hi, @thinkaName

Please refer to below steps to rebase your branch.

(Now I am using your s3i branch as an example)

1. Add official repo (If you have already added it, please skip this step )

 SmartThingsEdgeDrivers on  vensi-jian/s3i
❯ git remote add upstream https://github.com/SmartThingsCommunity/SmartThingsEdgeDrivers.git

2. Do git rebase
   As you can see there are some conflicts that needed to be solved.

in SmartThingsEdgeDrivers on  vensi-jian/s3i
❯ git pull --rebase upstream main
From https://github.com/SmartThingsCommunity/SmartThingsEdgeDrivers
 * branch            main       -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: wallhero add model ACL-401S3I
Using index info to reconstruct a base tree...
M       drivers/SmartThings/zigbee-switch/fingerprints.yml
Falling back to patching base and 3-way merge...
Auto-merging drivers/SmartThings/zigbee-switch/fingerprints.yml
CONFLICT (content): Merge conflict in drivers/SmartThings/zigbee-switch/fingerprints.yml
error: Failed to merge in the changes.
Patch failed at 0001 wallhero add model ACL-401S3I
hint: Use 'git am --show-current-patch' to see the failed patch
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

3. Fix Conflicts

• Show Conflicts

in SmartThingsEdgeDrivers (63214e1) (REBASING 1/2) [=+]
❯ git diff
diff --cc drivers/SmartThings/zigbee-switch/fingerprints.yml
index e12d675,30f1098..0000000
--- a/drivers/SmartThings/zigbee-switch/fingerprints.yml
+++ b/drivers/SmartThings/zigbee-switch/fingerprints.yml
@@@ -2146,10 -2146,10 +2146,17 @@@ zigbeeManufacturer
      manufacturer: WALL HERO
      model: ACL-401S8I
      deviceProfileName: basic-switch
++<<<<<<< HEAD
 +  - id: "Insta GmbH/Switching Actuator"
 +    deviceLabel: NEXENTRO Switching Actuator
 +    manufacturer: Insta GmbH
 +    model: NEXENTRO Switching Actuator
++=======
+   - id: "WALL HERO/ACL-401S3I"
+     deviceLabel: 三位智能开关面板 1
+     manufacturer: WALL HERO
+     model: ACL-401S3I
++>>>>>>> wallhero add model ACL-401S3I
      deviceProfileName: basic-switch
    - id: "Insta GmbH/Dimming Actuator"
      deviceLabel: NEXENTRO Dimming Actuator

• Fix conflicts

in SmartThingsEdgeDrivers (63214e1) (REBASING 1/2) [=+] took 21s
❯ git diff
diff --cc drivers/SmartThings/zigbee-switch/fingerprints.yml
index e12d675,30f1098..0000000
--- a/drivers/SmartThings/zigbee-switch/fingerprints.yml
+++ b/drivers/SmartThings/zigbee-switch/fingerprints.yml
@@@ -2146,11 -2146,11 +2146,16 @@@ zigbeeManufacturer
      manufacturer: WALL HERO
      model: ACL-401S8I
      deviceProfileName: basic-switch
 +  - id: "Insta GmbH/Switching Actuator"
 +    deviceLabel: NEXENTRO Switching Actuator
 +    manufacturer: Insta GmbH
 +    model: NEXENTRO Switching Actuator
 +    deviceProfileName: basic-switch
+   - id: "WALL HERO/ACL-401S3I"
+     deviceLabel: 三位智能开关面板 1
+     manufacturer: WALL HERO
+     model: ACL-401S3I
+     deviceProfileName: basic-switch
    - id: "Insta GmbH/Dimming Actuator"
      deviceLabel: NEXENTRO Dimming Actuator
      manufacturer: Insta GmbH

• Add file

in SmartThingsEdgeDrivers (63214e1) (REBASING 1/2) [=+]
❯ git add drivers/SmartThings/zigbee-switch/fingerprints.yml

4. Continue rebase

in SmartThingsEdgeDrivers (63214e1) (REBASING 1/2) [+]
❯ git rebase --continue
Applying: wallhero add model ACL-401S3I
Applying: Update init.lua

Now everything is done. You could see there is no merge commit in changelog.

in SmartThingsEdgeDrivers on  vensi-jian/s3i
❯ git log --oneline
0a66887 (HEAD -> vensi-jian/s3i) Update init.lua
9010fd7 wallhero add model ACL-401S3I
63214e1 (upstream/main) Merge pull request #926 from SmartThingsCommunity/fix/hue-poll-connectivity-on-refresh

I recommend to use git rebase instead of git merge when developing git projects : )
And remember to do git rebase regularly : ）