Changeset 2

Timestamp:

2012-10-22 10:57:40 (12 years ago)

Author:

mcvflorin

Message:

Implemented the packet handling mechanism.

Location:

trunk

Files:

• I_EnOceanESP3.xml (modified) (1 diff)
• L_EnOceanESP3.lua (modified) (8 diffs)

trunk/I_EnOceanESP3.xml ¶

@@ -10 +10 @@
 
             -- Callbacks
-            clearTask = enoceanPlugin.clearTask
-            sendMessage = enoceanPlugin.sendMessage
+            handleRadioTelegram = enoceanPlugin.handleRadioTelegram
+            handleEventMessage = enoceanPlugin.handleEventMessage
 
             return enoceanPlugin.init(lul_device)

trunk/L_EnOceanESP3.lua ¶

@@ -36 +36 @@
 
 local SYNC_BYTE = string.char(0x55)
+local DELAY_PROCESS = 1
 
 local CRC8_TABLE = {
@@ -96 +97 @@
 local getinfo  = debug.getinfo -- Get the 'getinfo' function from the 'debug' module before overwriting the 'debug' keyword.
 
-local function debug (text)
-    if (DEBUG_MODE == true) then
-        log(text)
-    end
+local function debug()
+    return
 end
 
@@ -259 +258 @@
 
 -------------------------------------------------------------------------------
--- Message handler functions
--------------------------------------------------------------------------------
+-- Radio telegram handlers
+-------------------------------------------------------------------------------
+
+local RADIO_TELEGRAM_HANDLERS = {
+    -- RPS
+    [0xF6] = function (data)
+        log("(RADIO_TELEGRAM_HANDLERS::RPS) RPS telegram handler")
+    end,
+    
+    -- 1BS
+    [0xD5] = function (data)
+        log("(RADIO_TELEGRAM_HANDLERS::1BS) 1BS telegram handler")
+    end,
+    
+    -- 4BS
+    [0xA5] = function (data)
+        log("(RADIO_TELEGRAM_HANDLERS::4BS) 4BS telegram handler")
+    end
+}
+
+-------------------------------------------------------------------------------
+-- Packet handler functions
+-------------------------------------------------------------------------------
+
+local PACKET_HANDLERS = {
+    [0x1] = "handleRadioTelegram",
+    [0x4] = "handleEventMessage"
+}
+
+
+function handleRadioTelegram (data)
+    log("(EnOceanPlugin::handleRadioTelegram) Handle radio telegram")
+    RADIO_TELEGRAM_HANDLERS[string.byte(data:sub(1, 1))](data:sub(2))
+end
+
+
+function handleEventMessage (data)
+    log("(EnOceanPlugin::handleEventMessage) Handle event message")
+end
 
 
@@ -267 +303 @@
 -------------------------------------------------------------------------------
 
--- 0x55 0x0 0xa 0x7 0x1 0xeb 0xa5 0xce 0x79 0x0 0xf 0x0 0x81 0x1 0x75 0x0 0x1 0xff 0xff 0xff 0xff 0x44 0x0 0x6e
+-- 4BS
+-- 0x55 | 0x0 0xa 0x7 0x1 | 0xeb | 0xa5 - 0xce 0x79 0x0 0xf - 0x0 0x81 0x1 0x75 - 0x0 | 0x1 0xff 0xff 0xff 0xff 0x44 0x0 | 0x6e
+-- 0x55 | 0x0 0xa 0x7 0x1 | 0xeb | 0xa5 - 0xc6 0x79 0x0 0xf - 0x0 0x81 0x1 0x75 - 0x0 | 0x1 0xff 0xff 0xff 0xff 0x43 0x0 | 0x15
+-- 0x55 | 0x0 0xa 0x7 0x1 | 0xeb | 0xa5 - 0xc6 0x79 0x0 0xf - 0x0 0x81 0x1 0x75 - 0x0 | 0x1 0xff 0xff 0xff 0xff 0x43 0x0 | 0x15
+
+-- 1BS
+-- 0x55 | 0x0 0x7 0x7 0x1 | 0x7a | 0xd5 - 0x8 - 0x0 0x1 0x8a 0xbb - 0x0 | 0x1 0xff 0xff 0xff 0xff 0x3a 0x0 | 0xbc
+-- 0x55 | 0x0 0x7 0x7 0x1 | 0x7a | 0xd5 - 0x8 - 0x0 0x0 0x85 0xe - 0x0 | 0x1 0xff 0xff 0xff 0xff 0x37 0x0 | 0x3a
+
 
 local state        = STATE.GET_SYNC_STATE -- The current state
@@ -274 +318 @@
 local rxDataLen    = 0  -- The length of the data field
 local rxOptDataLen = 0  -- The length of the optional data field
+local rxPacketType = 0  -- The packet type
 
 -- State machine to load incoming packet bytes
@@ -375 +420 @@
         state = STATE.GET_DATA_STATE
         rxCount = 0
+        rxPacketType = string.byte(rxBuf[4])
     end,
 
@@ -396 +442 @@
         if (computeCrc(rxBuf, rxCount) == string.byte(byte)) then
             -- Correct packet received
-            log("(EnOceanPlugin::CHECK_CRC8D_STATE) Correct packet received, go to GET_SYNC_STATE")
-            -- TODO: DO SOMETHING WITH THE DATA (use luup.call_delay)
+            log("(EnOceanPlugin::CHECK_CRC8D_STATE) Correct packet received, schedule the packet handler function and go to GET_SYNC_STATE")
+            if (PACKET_HANDLERS[rxPacketType] ~= nil) then
+                luup.call_delay(PACKET_HANDLERS[rxPacketType], DELAY_PROCESS, table.concat(rxBuf, "", 1, rxCount))
+            else
+                debug("(EnOceanPlugin::CHECK_CRC8D_STATE) Unhandled packet type ".. rxPacketType)
+            end
             return
         end
@@ -450 +500 @@
         DEBUG_MODE = (debugMode == "1") and true or false
     end
+    
+    if (DEBUG_MODE) then
+        debug = log
+    end
 
     -- Check if the panel is connected through the serial port, or via Ethernet.