move handling of latch pulling to door lock example

project-chip · May 25, 2023 · b27dd44 · b27dd44
1 parent 8ec73af
commit b27dd44
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 38 deletions.
diff --git a/examples/lock-app/lock-common/src/LockEndpoint.cpp b/examples/lock-app/lock-common/src/LockEndpoint.cpp
@@ -32,7 +32,7 @@ bool LockEndpoint::Unlock(const Optional<chip::ByteSpan> & pin, OperationErrorEn
  if (DoorLockServer::Instance().SupportsUnbolt(mEndpointId))
  {
  // If Unbolt is supported Unlock is supposed to pull the latch
- return setLockState(DlLockState::kUnlatched, pin, err, opSource);
+ setLockState(DlLockState::kUnlatched, pin, err, opSource);
  }
 
  return setLockState(DlLockState::kUnlocked, pin, err, opSource);
@@ -406,7 +406,7 @@ bool LockEndpoint::setLockState(DlLockState lockState, const Optional<chip::Byte
  ChipLogProgress(Zcl, "Door Lock App: setting door lock state to \"%s\" [endpointId=%d]", lockStateToString(lockState),
  mEndpointId);
 
- DoorLockServer::Instance().SetLockState(mEndpointId, lockState, opSource, Nullable<uint16_t>(), Nullable<List<const LockOpCredentials>>());
+ DoorLockServer::Instance().SetLockState(mEndpointId, lockState);
 
  return true;
  }

diff --git a/src/app/clusters/door-lock-server/door-lock-server.cpp b/src/app/clusters/door-lock-server/door-lock-server.cpp
@@ -108,17 +108,6 @@ bool DoorLockServer::SetLockState(chip::EndpointId endpointId, DlLockState newLo
 {
  bool success = SetLockState(endpointId, newLockState);
 
- if (success && DlLockState::kUnlatched == newLockState)
- {
- if (OperationSourceEnum::kRemote != opSource)
- {
- SendLockOperationEvent(endpointId, LockOperationTypeEnum::kUnlatch, opSource, OperationErrorEnum::kUnspecified, userIndex,
- Nullable<chip::FabricIndex>(), Nullable<chip::NodeId>(), credentials, success);
- }
-
- success = SetLockState(endpointId, DlLockState::kUnlocked);
- }
-
  // Remote operations are handled separately as they use more data unavailable here
  VerifyOrReturnError(OperationSourceEnum::kRemote != opSource, success);
 

diff --git a/src/test_driver/openiotsdk/integration-tests/lock-app/test_app.py b/src/test_driver/openiotsdk/integration-tests/lock-app/test_app.py
@@ -174,36 +174,12 @@ def test_lock_ctrl(device, controller):
  assert err == 0
  assert res.value == DoorLock.Enums.DlLockState.kLocked
 
- err, res = send_zcl_command(devCtrl, "DoorLock", "UnboltDoor", nodeId, LOCK_CTRL_TEST_ENDPOINT_ID,
- dict(PINCode=LOCK_CTRL_TEST_PIN_CODE),
- requestTimeoutMs=1000)
- assert err == 0
-
- ret = device.wait_for_output("setting door lock state to \"Unlocked\"")
- assert ret is not None and len(ret) > 0
-
- err, res = read_zcl_attribute(devCtrl, "DoorLock", "LockState", nodeId, LOCK_CTRL_TEST_ENDPOINT_ID)
- assert err == 0
- assert res.value == DoorLock.Enums.DlLockState.kUnlocked
-
- err, res = send_zcl_command(devCtrl, "DoorLock", "LockDoor", nodeId, LOCK_CTRL_TEST_ENDPOINT_ID,
- dict(PINCode=LOCK_CTRL_TEST_PIN_CODE),
- requestTimeoutMs=1000)
- assert err == 0
-
- ret = device.wait_for_output("setting door lock state to \"Locked\"")
- assert ret is not None and len(ret) > 0
-
- err, res = read_zcl_attribute(devCtrl, "DoorLock", "LockState", nodeId, LOCK_CTRL_TEST_ENDPOINT_ID)
- assert err == 0
- assert res.value == DoorLock.Enums.DlLockState.kLocked
-
  err, res = send_zcl_command(devCtrl, "DoorLock", "UnlockDoor", nodeId, LOCK_CTRL_TEST_ENDPOINT_ID,
  dict(PINCode=LOCK_CTRL_TEST_PIN_CODE),
  requestTimeoutMs=1000)
  assert err == 0
 
- ret = device.wait_for_output("setting door lock state to \"Unlatched\"")
+ ret = device.wait_for_output("setting door lock state to \"Unlocked\"")
  assert ret is not None and len(ret) > 0
 
  err, res = read_zcl_attribute(devCtrl, "DoorLock", "LockState", nodeId, LOCK_CTRL_TEST_ENDPOINT_ID)