Decompression function working

Added example test file

Author: siliconwitch

source/application/lua_libraries/compression.c

@@ -29,72 +29,6 @@
 #include "lua.h"
 #include "watchdog.h"
 
-/*
- * Test steps:
- *
- * 1. Create a test file with some text
- *
- * 2. Compress the file
- *
- *    lz4 -9 -B32 test.txt test.lz4
- *
- * 3. Convert to header data
- *
- *    xxd -include test.lz4 test.h
- *
- * 4. Copy the header data to the test buffer below
- */
-
-const unsigned char test_data[] = {
-    0x04, 0x22, 0x4d, 0x18, 0x64, 0x40, 0xa7, 0x24, 0x02, 0x00, 0x00, 0xf0,
-    0x30, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20,
-    0x69, 0x73, 0x20, 0x61, 0x20, 0x74, 0x65, 0x73, 0x74, 0x20, 0x66, 0x69,
-    0x6c, 0x65, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x63, 0x6f, 0x6e, 0x74,
-    0x61, 0x69, 0x6e, 0x73, 0x20, 0x73, 0x6f, 0x6d, 0x65, 0x20, 0x74, 0x65,
-    0x78, 0x74, 0x2e, 0x0a, 0x0a, 0x4c, 0x6f, 0x72, 0x65, 0x6d, 0x20, 0x49,
-    0x70, 0x73, 0x75, 0x6d, 0x35, 0x00, 0xc1, 0x73, 0x69, 0x6d, 0x70, 0x6c,
-    0x79, 0x20, 0x64, 0x75, 0x6d, 0x6d, 0x79, 0x23, 0x00, 0xf1, 0x0d, 0x20,
-    0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x72, 0x69, 0x6e, 0x74,
-    0x69, 0x6e, 0x67, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65,
-    0x73, 0x65, 0x74, 0x10, 0x00, 0xa8, 0x69, 0x6e, 0x64, 0x75, 0x73, 0x74,
-    0x72, 0x79, 0x2e, 0x20, 0x4b, 0x00, 0x81, 0x68, 0x61, 0x73, 0x20, 0x62,
-    0x65, 0x65, 0x6e, 0x3c, 0x00, 0x04, 0x23, 0x00, 0xb8, 0x27, 0x73, 0x20,
-    0x73, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x62, 0x00, 0xa1, 0x65,
-    0x76, 0x65, 0x72, 0x20, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x2e, 0x00, 0xf2,
-    0x07, 0x31, 0x35, 0x30, 0x30, 0x73, 0x2c, 0x20, 0x77, 0x68, 0x65, 0x6e,
-    0x20, 0x61, 0x6e, 0x20, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x81,
-    0x00, 0xf1, 0x01, 0x65, 0x72, 0x20, 0x74, 0x6f, 0x6f, 0x6b, 0x20, 0x61,
-    0x20, 0x67, 0x61, 0x6c, 0x6c, 0x65, 0x79, 0x9e, 0x00, 0x31, 0x79, 0x70,
-    0x65, 0x96, 0x00, 0xf2, 0x07, 0x73, 0x63, 0x72, 0x61, 0x6d, 0x62, 0x6c,
-    0x65, 0x64, 0x20, 0x69, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x6d, 0x61, 0x6b,
-    0x65, 0x20, 0x61, 0x20, 0x00, 0xf1, 0x02, 0x73, 0x70, 0x65, 0x63, 0x69,
-    0x6d, 0x65, 0x6e, 0x20, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x20, 0x49, 0x74,
-    0xa2, 0x00, 0xf1, 0x1b, 0x73, 0x75, 0x72, 0x76, 0x69, 0x76, 0x65, 0x64,
-    0x20, 0x6e, 0x6f, 0x74, 0x20, 0x6f, 0x6e, 0x6c, 0x79, 0x20, 0x66, 0x69,
-    0x76, 0x65, 0x20, 0x63, 0x65, 0x6e, 0x74, 0x75, 0x72, 0x69, 0x65, 0x73,
-    0x2c, 0x20, 0x62, 0x75, 0x74, 0x20, 0x61, 0x6c, 0x73, 0x6f, 0x9a, 0x00,
-    0xf8, 0x05, 0x6c, 0x65, 0x61, 0x70, 0x20, 0x69, 0x6e, 0x74, 0x6f, 0x20,
-    0x65, 0x6c, 0x65, 0x63, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x63, 0x0c, 0x01,
-    0x80, 0x2c, 0x20, 0x72, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x17, 0x01, 0xf1,
-    0x06, 0x65, 0x73, 0x73, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x6c, 0x79,
-    0x20, 0x75, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x79, 0x00,
-    0xd0, 0x77, 0x61, 0x73, 0x20, 0x70, 0x6f, 0x70, 0x75, 0x6c, 0x61, 0x72,
-    0x69, 0x73, 0xad, 0x00, 0x02, 0x25, 0x01, 0xa1, 0x31, 0x39, 0x36, 0x30,
-    0x73, 0x20, 0x77, 0x69, 0x74, 0x68, 0x0f, 0x00, 0x70, 0x72, 0x65, 0x6c,
-    0x65, 0x61, 0x73, 0x65, 0xe1, 0x00, 0xf4, 0x00, 0x4c, 0x65, 0x74, 0x72,
-    0x61, 0x73, 0x65, 0x74, 0x20, 0x73, 0x68, 0x65, 0x65, 0x74, 0x73, 0xc8,
-    0x01, 0x00, 0x66, 0x00, 0x08, 0x73, 0x01, 0x60, 0x70, 0x61, 0x73, 0x73,
-    0x61, 0x67, 0xb5, 0x00, 0x00, 0x0d, 0x01, 0x30, 0x6d, 0x6f, 0x72, 0x45,
-    0x00, 0x00, 0xcb, 0x00, 0x22, 0x6c, 0x79, 0x57, 0x00, 0xf0, 0x00, 0x64,
-    0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x20, 0x70, 0x75, 0x62, 0x6c, 0x69,
-    0x73, 0x68, 0x40, 0x00, 0xf0, 0x15, 0x73, 0x6f, 0x66, 0x74, 0x77, 0x61,
-    0x72, 0x65, 0x20, 0x6c, 0x69, 0x6b, 0x65, 0x20, 0x41, 0x6c, 0x64, 0x75,
-    0x73, 0x20, 0x50, 0x61, 0x67, 0x65, 0x4d, 0x61, 0x6b, 0x65, 0x72, 0x20,
-    0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x28, 0x00, 0x81, 0x76, 0x65, 0x72,
-    0x73, 0x69, 0x6f, 0x6e, 0x73, 0x8f, 0x00, 0xb0, 0x6f, 0x72, 0x65, 0x6d,
-    0x20, 0x49, 0x70, 0x73, 0x75, 0x6d, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x31,
-    0xb8, 0x0d, 0xa8};
-
 static int registered_function = 0;
 static uint8_t decompression_buffer[4096];
 static size_t decompression_buffer_size = 0;
@@ -125,8 +59,6 @@ static void process_function_callback(void *context,
     decompression_buffer_size = data_size;
     memcpy(decompression_buffer, data, data_size);
 
-    LOG("decompression_buffer_size: %d", decompression_buffer_size);
-
     lua_sethook(L_global,
                 decompression_lua_handler,
                 LUA_MASKCALL | LUA_MASKRET | LUA_MASKLINE | LUA_MASKCOUNT,
@@ -154,22 +86,24 @@ static int lua_compression_register_process_function(lua_State *L)
 
 static int lua_compression_decompress(lua_State *L)
 {
-    lua_Integer block_size = luaL_checkinteger(L, 1);
+    size_t length;
+    const char *data = luaL_checklstring(L, 1, &length);
+
+    lua_Integer block_size = luaL_checkinteger(L, 2);
 
     if (block_size <= 0)
     {
         luaL_error(L, "bytes must be greater than 0");
     }
 
     int status = compression_decompress(block_size,
-                                        test_data,         // TODO pass the source data to the decompression function
-                                        sizeof(test_data), // TODO set the source data size
+                                        data,
+                                        length,
                                         process_function_callback,
                                         NULL);
 
     if (status)
     {
-        LOG("%d", status);
         luaL_error(L, "decompression failed");
     }
 

tests/test_compression.py

@@ -3,17 +3,47 @@
 
 
 async def main():
+
+    lua_script = """
+        -- Decompression function
+        function decomp_func(data)
+            print(data)
+        end
+
+        -- Register the decompression function
+        frame.compression.process_function(decomp_func)
+
+        -- Variable where the compressed data will be stored
+        compressed_data = ''
+
+        -- Function to handle the compressed data received from Bluetooth
+        function ble_func(data)    
+            frame.compression.decompress(data, 1024)
+        end
+
+        -- Register the Bluetooth receive callback
+        frame.bluetooth.receive_callback(ble_func)
+
+    """
+
+    compressed_data = bytearray(
+        b"\x04\x22\x4d\x18\x64\x40\xa7\x6f\x00\x00\x00\xf5\x3d\x48\x65\x6c\x6c\x6f\x21\x20\x49\x20\x77\x61\x73\x20\x73\x6f\x6d\x65\x20\x63\x6f\x6d\x70\x72\x65\x73\x73\x65\x64\x20\x64\x61\x74\x61\x2e\x20\x49\x6e\x20\x74\x68\x69\x73\x20\x63\x61\x73\x65\x2c\x20\x73\x74\x72\x69\x6e\x67\x73\x20\x61\x72\x65\x6e\x27\x74\x20\x70\x61\x72\x74\x69\x63\x75\x6c\x61\x72\x6c\x79\x3b\x00\xf1\x01\x69\x62\x6c\x65\x2c\x20\x62\x75\x74\x20\x73\x70\x72\x69\x74\x65\x49\x00\xa0\x20\x77\x6f\x75\x6c\x64\x20\x62\x65\x2e\x00\x00\x00\x00\x5f\xd0\xa3\x47"
+    )
+
     b = Bluetooth()
 
     await b.connect(print_response_handler=lambda s: print(s))
 
-    await b.send_lua("function process_function(data) print(data) end")
-    await b.send_lua("frame.compression.process_function(process_function)")
-    await b.send_lua("frame.compression.decompress(1024)")
-    await b.send_lua("process_function(1)")
+    # Upload the Lua script
+    await b.upload_file(lua_script, "main.lua")
+    await b.send_reset_signal()
 
     await asyncio.sleep(1)
 
+    # Send compressed data
+    await b.send_data(compressed_data)
+
+    await b.send_break_signal()
     await b.disconnect()