From f9d6ab1825d24e90177641bf90c5b5f9c527af0c Mon Sep 17 00:00:00 2001
From: Stephan Hadinger <stephan.hadinger@gmail.com>
Date: Mon, 23 Mar 2020 08:25:01 +0100
Subject: [PATCH] Better test for bulbtype

---
 tasmota/xdrv_23_zigbee_2_devices.ino | 2 +-
 tasmota/xdrv_23_zigbee_9_impl.ino    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tasmota/xdrv_23_zigbee_2_devices.ino b/tasmota/xdrv_23_zigbee_2_devices.ino
index 7443b5457..7b02e33ff 100644
--- a/tasmota/xdrv_23_zigbee_2_devices.ino
+++ b/tasmota/xdrv_23_zigbee_2_devices.ino
@@ -1007,7 +1007,7 @@ String Z_Devices::dump(uint32_t dump_mode, uint16_t status_shortaddr) const {
       if (device.modelId) {
         dev[F(D_JSON_MODEL D_JSON_ID)] = device.modelId;
       }
-      if (-1 != device.bulbtype) {
+      if (device.bulbtype >= 0) {
         dev[F(D_JSON_ZIGBEE_LIGHT)] = device.bulbtype;   // sign extend, 0xFF changed as -1
       }
       if (device.manufacturerId) {
diff --git a/tasmota/xdrv_23_zigbee_9_impl.ino b/tasmota/xdrv_23_zigbee_9_impl.ino
index f61979ea1..12c9ff98f 100644
--- a/tasmota/xdrv_23_zigbee_9_impl.ino
+++ b/tasmota/xdrv_23_zigbee_9_impl.ino
@@ -756,7 +756,8 @@ void CmndZbLight(void) {
 
   if (p) {
     int8_t bulbtype = strtol(p, nullptr, 10);
-    if (bulbtype > 5) { bulbtype = 5; }
+    if (bulbtype > 5)  { bulbtype = 5; }
+    if (bulbtype < -1) { bulbtype = -1; }
     zigbee_devices.setHueBulbtype(shortaddr, bulbtype);
   }
   String dump = zigbee_devices.dumpLightState(shortaddr);