Add contents to read dir and read file.

Author: mfine

c/include/libsbp/file_io.h

@@ -64,6 +64,7 @@ typedef struct __attribute__((packed)) {
   u32 offset;        /**< File offset [bytes] */
   u8 chunk_size;    /**< Chunk size read [bytes] */
   char filename[20];  /**< Name of the file read from (NULL padded) */
+  u8 contents[0];   /**< Contents of read file */
 } msg_fileio_read_response_t;
 
 
@@ -98,9 +99,10 @@ typedef struct __attribute__((packed)) {
  */
 #define SBP_MSG_FILEIO_READ_DIR_RESPONSE 0x00AA
 typedef struct __attribute__((packed)) {
-  u32 offset;     /**< The offset to skip the first n elements of the file list
+  u32 offset;      /**< The offset to skip the first n elements of the file list
  */
   char dirname[20]; /**< Name of the directory to list (NULL padded) */
+  u8 contents[0]; /**< Contents of read directory */
 } msg_fileio_read_dir_response_t;
 
 

python/sbp/file_io.py

@@ -142,14 +142,17 @@ class MsgFileioReadResponse(SBP):
     Chunk size read
   filename : string
     Name of the file read from (NULL padded)
+  contents : array
+    Contents of read file
   sender : int
     Optional sender ID, defaults to 0
 
   """
   _parser = Struct("MsgFileioReadResponse",
                    ULInt32('offset'),
                    ULInt8('chunk_size'),
-                   String('filename', 20),)
+                   String('filename', 20),
+                   OptionalGreedyRange(ULInt8('contents')),)
 
   def __init__(self, sbp=None, **kwargs):
     if sbp:
@@ -162,6 +165,7 @@ def __init__(self, sbp=None, **kwargs):
       self.offset = kwargs.pop('offset')
       self.chunk_size = kwargs.pop('chunk_size')
       self.filename = kwargs.pop('filename')
+      self.contents = kwargs.pop('contents')
 
   def __repr__(self):
     return fmt_repr(self)
@@ -307,13 +311,16 @@ class MsgFileioReadDirResponse(SBP):
 
   dirname : string
     Name of the directory to list (NULL padded)
+  contents : array
+    Contents of read directory
   sender : int
     Optional sender ID, defaults to 0
 
   """
   _parser = Struct("MsgFileioReadDirResponse",
                    ULInt32('offset'),
-                   String('dirname', 20),)
+                   String('dirname', 20),
+                   OptionalGreedyRange(ULInt8('contents')),)
 
   def __init__(self, sbp=None, **kwargs):
     if sbp:
@@ -325,6 +332,7 @@ def __init__(self, sbp=None, **kwargs):
       self.sender = kwargs.pop('sender', 0)
       self.offset = kwargs.pop('offset')
       self.dirname = kwargs.pop('dirname')
+      self.contents = kwargs.pop('contents')
 
   def __repr__(self):
     return fmt_repr(self)

spec/yaml/swiftnav/sbp/file_io.yaml

@@ -71,6 +71,10 @@ definitions:
           type: string
           size: 20
           desc: Name of the file read from (NULL padded)
+      - contents:
+          type: array
+          fill: u8
+          desc: Contents of read file
 
  - MSG_FILEIO_READ_DIR_REQUEST:
     id: 0x00A9
@@ -114,6 +118,10 @@ definitions:
           type: string
           size: 20
           desc: Name of the directory to list (NULL padded)
+      - contents:
+          type: array
+          fill: u8
+          desc: Contents of read directory
 
  - MSG_FILEIO_REMOVE:
     id: 0x00AC