transitionTime only set to NonNull if value is available (#21883)

project-chip · Oct 17, 2022 · b39e5b3 · b39e5b3
1 parent 577130f
commit b39e5b3
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp
@@ -993,6 +993,7 @@ void emberAfOnOffClusterLevelControlEffectCallback(EndpointId endpoint, bool new
 {
     app::DataModel::Nullable<uint8_t> resolvedLevel;
     app::DataModel::Nullable<uint8_t> temporaryCurrentLevelCache;
+    app::DataModel::Nullable<uint16_t> transitionTime;
 
     uint16_t currentOnOffTransitionTime;
     EmberAfStatus status;
@@ -1059,18 +1060,16 @@ void emberAfOnOffClusterLevelControlEffectCallback(EndpointId endpoint, bool new
             emberAfLevelControlClusterPrintln("ERR: reading current level %x", status);
             return;
         }
+        transitionTime.SetNonNull(currentOnOffTransitionTime);
     }
     else
     {
-        currentOnOffTransitionTime = 0xFFFF;
+        transitionTime.SetNull();
     }
 #else
-    currentOnOffTransitionTime = 0xFFFF;
+    transitionTime.SetNull();
 #endif // IGNORE_LEVEL_CONTROL_CLUSTER_ON_OFF_TRANSITION_TIME
 
-    app::DataModel::Nullable<uint16_t> transitionTime;
-    transitionTime.SetNonNull(currentOnOffTransitionTime);
-
     if (newValue)
     {
         // If newValue is OnOff::Commands::On::Id...