Fix merge conflict between PR project-chip#7996 and PR project-chip#7183

that causes ZAP CI to fail (project-chip#8280)
nikita-s-wrk · Sep 23, 2021 · 4b17b94 · 4b17b94
1 parent 983c57a
commit 4b17b94
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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