From 557545cb56d774bfdfdeb32874a779b649a0fa2a Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 21 Sep 2018 16:19:31 +0200
Subject: [PATCH] Cleanup Driver

Cleanup Driver
---
 sonoff/sonoff.ino | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino
index 84293f5bc..b5d752a3b 100755
--- a/sonoff/sonoff.ino
+++ b/sonoff/sonoff.ino
@@ -679,7 +679,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len)
       }
       snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, (Settings.save_data > 1) ? stemp1 : GetStateText(Settings.save_data));
     }
-    else if (CMND_SENSOR == command_code) {
+    else if ((CMND_SENSOR == command_code) || (CMND_DRIVER == command_code)) {
       XdrvMailbox.index = index;
       XdrvMailbox.data_len = data_len;
       XdrvMailbox.payload16 = payload16;
@@ -687,18 +687,11 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len)
       XdrvMailbox.grpflg = grpflg;
       XdrvMailbox.topic = command;
       XdrvMailbox.data = dataBuf;
-      XsnsCall(FUNC_COMMAND);
-//      if (!XsnsCall(FUNC_COMMAND)) type = NULL;
-    }
-    else if (CMND_DRIVER == command_code) {
-      XdrvMailbox.index = index;
-      XdrvMailbox.data_len = data_len;
-      XdrvMailbox.payload16 = payload16;
-      XdrvMailbox.payload = payload;
-      XdrvMailbox.grpflg = grpflg;
-      XdrvMailbox.topic = command;
-      XdrvMailbox.data = dataBuf;
-      XdrvCall(FUNC_COMMAND);
+      if (CMND_SENSOR == command_code) {
+        XsnsCall(FUNC_COMMAND);
+      } else {
+        XdrvCall(FUNC_COMMAND);
+      }
     }
     else if ((CMND_SETOPTION == command_code) && (index < 82)) {
       byte ptype;