From 4b17b94262059c9df78922b5198c5fc972e67d31 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@apple.com>
Date: Sat, 10 Jul 2021 11:09:34 -0400
Subject: [PATCH] Fix merge conflict between PR #7996 and PR #7183 that causes
 ZAP CI to fail (#8280)

---
 src/app/common/gen/attributes/Accessors.cpp | 6 +++---
 src/app/common/gen/attributes/Accessors.h   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/common/gen/attributes/Accessors.cpp b/src/app/common/gen/attributes/Accessors.cpp
index 3378ea7c58a6d6..9494c4d514ba44 100644
--- a/src/app/common/gen/attributes/Accessors.cpp
+++ b/src/app/common/gen/attributes/Accessors.cpp
@@ -4751,15 +4751,15 @@ EmberAfStatus SetMaxScaledValue(chip::EndpointId endpoint, int16_t maxScaledValu
     return emberAfWriteServerAttribute(endpoint, PressureMeasurement::Id, Ids::MaxScaledValue, (uint8_t *) &maxScaledValue,
                                        ZCL_INT16S_ATTRIBUTE_TYPE);
 }
-EmberAfStatus GetScaledTolerance(chip::EndpointId endpoint, int16_t * scaledTolerance)
+EmberAfStatus GetScaledTolerance(chip::EndpointId endpoint, uint16_t * scaledTolerance)
 {
     return emberAfReadServerAttribute(endpoint, PressureMeasurement::Id, Ids::ScaledTolerance, (uint8_t *) scaledTolerance,
                                       sizeof(*scaledTolerance));
 }
-EmberAfStatus SetScaledTolerance(chip::EndpointId endpoint, int16_t scaledTolerance)
+EmberAfStatus SetScaledTolerance(chip::EndpointId endpoint, uint16_t scaledTolerance)
 {
     return emberAfWriteServerAttribute(endpoint, PressureMeasurement::Id, Ids::ScaledTolerance, (uint8_t *) &scaledTolerance,
-                                       ZCL_INT16S_ATTRIBUTE_TYPE);
+                                       ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 EmberAfStatus GetScale(chip::EndpointId endpoint, int8_t * scale)
 {
diff --git a/src/app/common/gen/attributes/Accessors.h b/src/app/common/gen/attributes/Accessors.h
index b2b876e61d1fcd..d9bd7fe4f7c9c0 100644
--- a/src/app/common/gen/attributes/Accessors.h
+++ b/src/app/common/gen/attributes/Accessors.h
@@ -1169,8 +1169,8 @@ EmberAfStatus GetMinScaledValue(chip::EndpointId endpoint, int16_t * minScaledVa
 EmberAfStatus SetMinScaledValue(chip::EndpointId endpoint, int16_t minScaledValue);
 EmberAfStatus GetMaxScaledValue(chip::EndpointId endpoint, int16_t * maxScaledValue); // int16s
 EmberAfStatus SetMaxScaledValue(chip::EndpointId endpoint, int16_t maxScaledValue);
-EmberAfStatus GetScaledTolerance(chip::EndpointId endpoint, int16_t * scaledTolerance); // int16s
-EmberAfStatus SetScaledTolerance(chip::EndpointId endpoint, int16_t scaledTolerance);
+EmberAfStatus GetScaledTolerance(chip::EndpointId endpoint, uint16_t * scaledTolerance); // int16u
+EmberAfStatus SetScaledTolerance(chip::EndpointId endpoint, uint16_t scaledTolerance);
 EmberAfStatus GetScale(chip::EndpointId endpoint, int8_t * scale); // int8s
 EmberAfStatus SetScale(chip::EndpointId endpoint, int8_t scale);
 } // namespace Attributes