struct-frame 0.0.22__tar.gz → 0.0.24__tar.gz

{struct_frame-0.0.22 → struct_frame-0.0.24}/.gitignore

@@ -4,4 +4,5 @@ node_modules
 main.exe
 dist
 generated
-__pycache__/
+__pycache__/
+gen

{struct_frame-0.0.22 → struct_frame-0.0.24}/DEVGUIDE.md

@@ -13,4 +13,8 @@ Update version in pyproject.toml if needed
 
 
 ### Running Locally
+Install dependancies
+```py -m pip install proto-schema-parser```
+
+Run module
 ```py .\src\main.py ```

{struct_frame-0.0.22 → struct_frame-0.0.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: struct-frame
-Version: 0.0.22
+Version: 0.0.24
 Summary: A framework for serializing data with headers
 Project-URL: Homepage, https://github.com/mylonics/struct-frame
 Project-URL: Issues, https://github.com/mylonics/struct-frame/issues
@@ -11,6 +11,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.8
 Requires-Dist: proto-schema-parser>=1.4.5
+Requires-Dist: structured-classes>=3.1.0
 Description-Content-Type: text/markdown
 
 

{struct_frame-0.0.22 → struct_frame-0.0.24}/index.ts

@@ -1,6 +1,6 @@
-import * as mv from './ts/myl_vehicle.sf';
-import { parse_char, parse_buffer } from './ts/struct_frame_parser';
-import { struct_frame_buffer, buffer_parser_result_t, } from './ts/struct_frame_types';
+import * as mv from './gen/ts/myl_vehicle.sf';
+import { parse_char, parse_buffer } from './gen/ts/struct_frame_parser';
+import { struct_frame_buffer, buffer_parser_result_t, } from './gen/ts/struct_frame_types';
 import { type ExtractType } from 'typed-struct';
 
 let tx_buffer = new struct_frame_buffer(256)
@@ -15,7 +15,7 @@ mv.myl_vehicle_pose_encode(tx_buffer, msg);
 let hb = new mv.myl_vehicle_heartbeat();
 
 hb.id = 23;
-hb.type = mv.myl_vehicle_VehicleType.myl_vehicle_VEHICLE_TYPE_FW;
+hb.type = mv.myl_vehicletype.FW;
 mv.myl_vehicle_heartbeat_encode(tx_buffer, hb);
 
 
@@ -61,6 +61,9 @@ while (parse_buffer(tx_buffer.data, tx_buffer.max_size, result)) {
 }
 
 if (hb && hb3 && hb5) {
-  console.log("%d %d  %d %d", hb.id, hb.type, hb3.id, hb3.type, hb5.id, hb5.type);
+  //console.log("%d %d  %d %d", hb.id, hb.type, hb3.id, hb3.type, hb5.id, hb5.type);
+  console.log(hb)
+  console.log(hb3)
+  console.log(hb5)
 }
 

struct_frame-0.0.24/main.c

@@ -0,0 +1,73 @@
+#include <stdio.h>
+
+#include "c/struct_frame_gen.h"
+#include "c/struct_frame_parser.h"
+
+// CREATE_DEFAULT_STRUCT_BUFFER(tx_buffer, 256);
+uint8_t tx_buffer_buffer[256];
+struct_buffer tx_buffer = {default_parser, tx_buffer_buffer, 256, 0, 0, false, 0, 0, 0};
+
+// CREATE_DEFAULT_STRUCT_BUFFER(rx_buffer, 256);
+uint8_t rx_buffer_buffer[256];
+struct_buffer rx_buffer = {default_parser, rx_buffer_buffer, 256, 0, 0, false, 0, 0, 0};
+
+int main() {
+  MylVehiclePose msg;
+  msg.pitch = 100;
+  msg.yaw_rate = -1.45;
+  msg.test = 4883;
+  myl_vehicle_pose_encode(&tx_buffer, &msg);
+
+  MylVehicleHeartbeat *hb;
+  if (myl_vehicle_heartbeat_reserve(&tx_buffer, &hb)) {
+    hb->id = 23;
+    hb->type = VEHICLE_TYPE_VEHICLE_TYPE_FW;
+    myl_vehicle_heartbeat_finish(&tx_buffer);
+  }
+
+  MylVehiclePose msg2;
+  MylVehicleHeartbeat *hb2;
+  MylVehicleHeartbeat hb3;
+  for (int i = 0; i < tx_buffer.size; i++) {
+    if (parse_char(&rx_buffer, tx_buffer.data[i])) {
+      switch (rx_buffer.msg_id_len.msg_id) {
+        case MYL_VEHICLE_HEARTBEAT_MSG_ID:
+          printf("got hb msg with id %d\n", rx_buffer.msg_id_len.msg_id);
+          hb2 = myl_vehicle_heartbeat_get_ref(&rx_buffer);
+          hb3 = myl_vehicle_heartbeat_get(&rx_buffer);
+          break;
+        case MYL_VEHICLE_POSE_MSG_ID:
+          printf("got pose msg with id %d\n", rx_buffer.msg_id_len.msg_id);
+          msg2 = myl_vehicle_pose_get(&rx_buffer);
+          break;
+
+        default:
+          break;
+      }
+    }
+  }
+
+  MylVehiclePose msg3;
+  MylVehicleHeartbeat *hb4;
+  MylVehicleHeartbeat hb5;
+  buffer_parser_result_t result = zero_initialized_parser_result;
+  while (parse_buffer(tx_buffer_buffer, 256, &result)) {
+    switch (result.msg_id_len.msg_id) {
+      case MYL_VEHICLE_HEARTBEAT_MSG_ID:
+        printf("got hb msg with id %d\n", result.msg_id_len.msg_id);
+        hb4 = myl_vehicle_heartbeat_get_ref_from_buffer_result(result);
+        hb5 = myl_vehicle_heartbeat_get_from_buffer_result(result);
+        break;
+      case MYL_VEHICLE_POSE_MSG_ID:
+        printf("got pose msg with id %d\n", result.msg_id_len.msg_id);
+        msg3 = myl_vehicle_pose_get_from_buffer_result(result);
+        break;
+
+      default:
+        break;
+    }
+  }
+  printf("%d %d  %d %d", hb->id, hb->type, hb2->id, hb2->type);
+
+  return 0;
+}

{struct_frame-0.0.22 → struct_frame-0.0.24}/myl_vehicle.proto

@@ -2,13 +2,13 @@ syntax = "proto3";
 import "nanopb.proto";
 package myl_vehicle;
 
-enum VehicleType {
-  VEHICLE_TYPE_UNSPECIFIED = 0;
-  VEHICLE_TYPE_ROVER = 1;
-  VEHICLE_TYPE_BOAT = 2;
-  VEHICLE_TYPE_FW = 3;
-  VEHICLE_TYPE_MR = 4;
-  VEHICLE_TYPE_CAR = 5;
+enum Type {
+  UNSPECIFIED = 0;
+  ROVER = 1;
+  BOAT = 2;
+  FW = 3;
+  MR = 4;
+  CAR = 5;
 }
 
 message position {
@@ -35,7 +35,7 @@ message pose {
 
 message heartbeat {
   option msgid = 3;
-  VehicleType type = 1;
+  Type type = 1;
   int32 id = 2;
 }
 

{struct_frame-0.0.22 → struct_frame-0.0.24}/pyproject.toml

@@ -4,11 +4,12 @@ build-backend = "hatchling.build"
 
 [project]
 name = "struct-frame"
-version = "0.0.22"
+version = "0.0.24"
 authors = [
   { name="Rijesh Augustine", email="rijesh@mylonics.com" },
 ]
 dependencies = [
+    "structured-classes>=3.1.0",
     "proto-schema-parser>=1.4.5",
 ]
 description = "A framework for serializing data with headers"

{struct_frame-0.0.22 → struct_frame-0.0.24}/src/struct_frame/__init__.py

@@ -2,8 +2,9 @@ from .base import version, NamingStyleC, CamelToSnakeCase, pascalCase
 
 from .c_gen import FileCGen
 from .ts_gen import FileTsGen
+from .py_gen import FilePyGen
 
 from .generate import main
 
-__all__ = ["main", "FileCGen", "FileTsGen", "version",
+__all__ = ["main", "FileCGen", "FileTsGen", "FilePyGen", "version",
            "NamingStyleC", "CamelToSnakeCase", "pascalCase"]

{struct_frame-0.0.22 → struct_frame-0.0.24}/src/struct_frame/boilerplate/c/struct_frame.h

@@ -88,11 +88,16 @@ static inline bool msg_finish(struct_buffer *buffer) {
     name msg = *(name *)(buffer->data);                                                            \
     return msg;                                                                                    \
   }                                                                                                \
+  static inline name funcname##_get(uint8_t *buffer) {                                             \
+    name msg = *(name *)(buffer);                                                                  \
+    return msg;                                                                                    \
+  }                                                                                                \
   static inline name funcname##_get_from_buffer_result(buffer_parser_result_t result) {            \
     name msg = *(name *)(result.msg_loc);                                                          \
     return msg;                                                                                    \
   }                                                                                                \
   static inline name *funcname##_get_ref(struct_buffer *buffer) { return (name *)(buffer->data); } \
+  static inline name *funcname##_get_ref(uint8_t *buffer) { return (name *)(buffer); }             \
   static inline name *funcname##_get_ref_from_buffer_result(buffer_parser_result_t result) {       \
     return (name *)(result.msg_loc);                                                               \
   }

struct_frame-0.0.24/src/struct_frame/boilerplate/c/struct_frame_cpp.h

@@ -0,0 +1,41 @@
+#pragma once
+
+#include "struct_frame_parser.h"
+#include "struct_frame_types.h"
+
+class StructFrameDevice : public struct_buffer {
+ public:
+  StructFrameDevice(struct_frame_config config)
+      : struct_buffer{config, nullptr, 0, 0, false, 0, LOOKING_FOR_START_BYTE, 0, {false, 0, 0}},
+        parser_result_{config, false, 0, 0, false, {0, 0}} {}
+
+  void RunRx() {
+    uint8_t *buffer;
+    size_t buffer_size;
+    GetArray(buffer, buffer_size);
+    if (buffer && buffer_size) {
+      while (!parser_result_.finished) {
+        if (parse_buffer(buffer, buffer_size, &parser_result_)) {
+          if (parser_result_.valid) {
+            HandleResult();
+          }
+        }
+      }
+    }
+  }
+
+  void RunTx() { PutArray(struct_buffer::data, struct_buffer::max_size, struct_buffer::size); }
+
+ protected:
+  void Init() { PutArray(struct_buffer::data, struct_buffer::max_size, 0); }
+
+  // Put Array must accept the full buffer of data and returns a pointer to either a new buffer or the same buffer
+  // that is free
+  virtual void PutArray(uint8_t *&buffer, size_t &max_length, size_t length) = 0;
+
+  // Get array, a pointer to an array and refernce to the array length is pased and mutated by this function
+  virtual void GetArray(uint8_t *&buffer, size_t &length) = 0;
+
+  virtual void HandleResult() = 0;
+  buffer_parser_result_t parser_result_;
+};

{struct_frame-0.0.22 → struct_frame-0.0.24}/src/struct_frame/boilerplate/c/struct_frame_parser.h

@@ -63,6 +63,7 @@ static inline bool parse_char(struct_buffer *pb, uint8_t c) {
 static inline bool parse_buffer(uint8_t *buffer, size_t size, buffer_parser_result_t *parser_result) {
   enum ParserState state = LOOKING_FOR_START_BYTE;
   parser_functions_t *parse_func_ptr;
+  parser_result->finished = false;
   for (size_t i = parser_result->r_loc; i < size; i++) {
     switch (state) {
       case LOOKING_FOR_START_BYTE:
@@ -81,7 +82,6 @@ static inline bool parse_buffer(uint8_t *buffer, size_t size, buffer_parser_resu
       case GETTING_PAYLOAD:
         parser_result->msg_loc = buffer + i;
         parser_result->r_loc = i + parser_result->msg_id_len.len;
-        parser_result->found = true;
         if (parse_func_ptr->validate_packet(parser_result->msg_loc, &parser_result->msg_id_len)) {
           parser_result->valid = true;
           return true;
@@ -95,5 +95,7 @@ static inline bool parse_buffer(uint8_t *buffer, size_t size, buffer_parser_resu
         break;
     }
   }
+  parser_result->finished = true;
+  parser_result->r_loc = 0;
   return false;
 }

{struct_frame-0.0.22 → struct_frame-0.0.24}/src/struct_frame/boilerplate/c/struct_frame_types.h

@@ -43,7 +43,6 @@ typedef struct _struct_frame_buffer {
 
 typedef struct _buffer_parser_result_t {
   struct_frame_config config;
-  bool found;
   bool valid;
   uint8_t *msg_loc;
   size_t r_loc;
@@ -56,7 +55,7 @@ typedef struct _buffer_parser_result_t {
 
 #define default_parser {0, 0, 0x90}
 
-#define zero_initialized_parser_result {default_parser, false, false, 0, 0, false, {0, 0}};
+#define zero_initialized_parser_result {default_parser, false, 0, 0, false, {0, 0}}
 
 #define CREATE_DEFAULT_STRUCT_BUFFER(name, size) \
   uint8_t name##_buffer[size];                   \

struct_frame-0.0.24/src/struct_frame/boilerplate/py/struct_frame_parser.py

@@ -0,0 +1,118 @@
+
+from enum import Enum
+
+
+def fletcher_checksum_calculation(buffer, start=0, end=None):
+    if end == None:
+        end = buffer.length
+
+    byte1 = 0
+    byte2 = 2
+
+    for x in range(start, end):
+        byte1 += buffer[x]
+        byte2 += byte1
+
+    return [byte1, byte2]
+
+
+class BasicPacket:
+    start_byte = None
+    header_length = 0
+    footer_length = 0
+
+    desired_packet_length = 0
+    packet = []
+
+    def __init__(self, start_byte, header_length, footer_length):
+        self.start_byte = start_byte
+        self.header_length = header_length
+        self.footer_length = footer_length
+
+    def add_header_byte(self, byte, clear):
+        if clear:
+            self.packet.clear()
+        self.packet.push(byte)
+        return len(self.packet) == self.header_length
+
+    def add_packet_byte(self, byte):
+        self.packet.push(byte)
+        return len(self.packet) == self.desired_packet_length
+
+    def get_msg_id(self):
+        return self.packet[1]
+
+    def get_full_packet_length(self, msg_length):
+        self.desired_packet_length = self.header_length + self.footer_length + msg_length
+        return self.desired_packet_length
+
+    def validate_packet(self):
+        checksum = fletcher_checksum_calculation(
+            self.packet, self.header_length, self.desired_packet_length - self.footer_length)
+        return checksum[0] == self.packet[-2] and checksum[1] == self.packet[-1]
+
+    def get_msg_buffer(self):
+        return self.packet[self.header_length:self.desired_packet_length - self.footer_length]
+
+    def encode(self, data, msg_id):
+        output = []
+        output.push(self.start_byte)
+        output.push(msg_id)
+        output.push(data)
+        checksum = fletcher_checksum_calculation(data)
+
+        output.push(checksum[0])
+        output.push(checksum[1])
+        return output
+
+
+class ParserState(Enum):
+    LOOKING_FOR_START_BYTE = 0
+    GETTING_HEADER = 1
+    GETTING_PACKET = 2
+
+
+class FrameParser:
+    state = ParserState.LOOKING_FOR_START_BYTE
+    buffer = []
+    parser = None
+    msg_definitions = None
+    msg_id_loc = None
+    msg_type = None
+
+    def __init__(self, parsers, msg_definitions):
+        self.parsers = parsers
+        self.msg_definitions = msg_definitions
+
+    def parse_char(self, c):
+        if state == ParserState.LOOKING_FOR_START_BYTE:
+            self.parser = self.parsers[c]
+            if self.parser:
+                if self.parser.add_header_byte(c, True):
+                    state = ParserState.GETTING_PACKET
+                else:
+                    state = ParserState.GETTING_HEADER
+
+        elif state == ParserState.GETTING_HEADER:
+            if self.parser.add_header_byte(c):
+                msg_id = self.parser.get_msg_id()
+                self.msg_type = self.msg_definitions[msg_id]
+                if self.msg_type:
+                    self.parser.get_full_packet_length(self.msg_type.msg_size)
+                    state = ParserState.GETTING_PACKET
+                else:
+                    state = ParserState.LOOKING_FOR_START_BYTE
+
+        elif state == ParserState.GETTING_PACKET:
+            if self.parser.add_packet_byte(c):
+                state = ParserState.LOOKING_FOR_START_BYTE
+                if self.parser.validatePackage:
+                    return self.msg_type.create_unpack(self.parser.get_msg_buffer())
+
+        return False
+
+
+def TestFunction():
+    parsers = {BasicPacket.start_byte, BasicPacket()}
+    frameParser = FrameParser(parsers)
+    frameParser.parse_char

struct_frame-0.0.24/src/struct_frame/boilerplate/ts/struct_frame_gen.ts

@@ -0,0 +1,7 @@
+
+import * as myl from './myl_vehicle.sf';
+
+export function get_message_length(msg_id: number) {
+  console.log(msg_id)
+  return myl.get_message_length(msg_id);
+}

{struct_frame-0.0.22 → struct_frame-0.0.24}/src/struct_frame/generate.py

@@ -6,6 +6,7 @@ import os
 import shutil
 from struct_frame import FileCGen
 from struct_frame import FileTsGen
+from struct_frame import FilePyGen
 from proto_schema_parser.parser import Parser
 from proto_schema_parser import ast
 
@@ -258,8 +259,10 @@ parser.add_argument('filename')
 parser.add_argument('--debug', action='store_true')
 parser.add_argument('--build_c', action='store_true')
 parser.add_argument('--build_ts', action='store_true')
+parser.add_argument('--build_py', action='store_true')
 parser.add_argument('--c_path', nargs=1, type=str, default=['c/'])
 parser.add_argument('--ts_path', nargs=1, type=str, default=['ts/'])
+parser.add_argument('--py_path', nargs=1, type=str, default=['py/'])
 
 
 def parseFile(filename):
@@ -334,11 +337,20 @@ def generateTsFileStrings(path):
     return out
 
 
+def generatePyFileStrings(path):
+    out = {}
+    for key, value in packages.items():
+        name = os.path.join(path, value.name + ".sf.py")
+        data = ''.join(FilePyGen.generate(value))
+        out[name] = data
+    return out
+
+
 def main():
     args = parser.parse_args()
     parseFile(args.filename)
 
-    if (not args.build_c and not args.build_ts):
+    if (not args.build_c and not args.build_ts and not args.build_py):
         print("Select at least one build argument")
         return
 
@@ -348,12 +360,16 @@ def main():
         print(
             f'Recursion Error. Messages most likely have a cyclical dependancy. Check Message: {recErrCurrentMessage} and Field: {recErrCurrentField}')
 
+    files = {}
     if (args.build_c):
-        files = generateCFileStrings(args.c_path[0])
+        files.update(generateCFileStrings(args.c_path[0]))
 
     if (args.build_ts):
         files.update(generateTsFileStrings(args.ts_path[0]))
 
+    if (args.build_py):
+        files.update(generatePyFileStrings(args.py_path[0]))
+
     for filename, filedata in files.items():
         dirname = os.path.dirname(filename)
         if dirname and not os.path.exists(dirname):
@@ -372,6 +388,10 @@ def main():
         shutil.copytree(os.path.join(dir_path, "boilerplate/ts"),
                         args.ts_path[0], dirs_exist_ok=True)
 
+    if (args.build_py):
+        shutil.copytree(os.path.join(dir_path, "boilerplate/py"),
+                        args.py_path[0], dirs_exist_ok=True)
+
     if args.debug:
         printPackages()
     print("Struct Frame successfully completed")

struct_frame-0.0.24/src/struct_frame/py_gen.py

@@ -0,0 +1,160 @@
+#!/usr/bin/env python3
+# kate: replace-tabs on; indent-width 4;
+
+from struct_frame import version, NamingStyleC, CamelToSnakeCase, pascalCase
+import time
+
+StyleC = NamingStyleC()
+
+py_types = {"uint8": "uint8",
+            "int8": "int8",
+            "uint16": "uint16",
+            "int16": "int16",
+            "uint32": "uint32",
+            "int32": "int32",
+            "bool": "bool8",
+            "float": "float32",
+            "double": "float64",
+            "uint64": 'uint64',
+            "int64":  'int64',
+            }
+
+
+class EnumPyGen():
+    @staticmethod
+    def generate(field):
+        leading_comment = field.comments
+
+        result = ''
+        if leading_comment:
+            for c in leading_comment:
+                result = '#%s\n' % c
+
+        enumName = '%s%s' % (pascalCase(field.package), field.name)
+        result += 'class %s(Enum):\n' % (enumName)
+
+        enum_length = len(field.data)
+        enum_values = []
+        for index, (d) in enumerate(field.data):
+            leading_comment = field.data[d][1]
+
+            if leading_comment:
+                for c in leading_comment:
+                    enum_values.append("#" + c)
+
+            enum_value = "    %s_%s = %d" % (CamelToSnakeCase(
+                field.name).upper(), StyleC.enum_entry(d), field.data[d][0])
+
+            enum_values.append(enum_value)
+
+        result += '\n'.join(enum_values)
+        return result
+
+
+class FieldPyGen():
+    @staticmethod
+    def generate(field):
+        result = ''
+
+        var_name = field.name
+        type_name = field.fieldType
+        if type_name in py_types:
+            type_name = py_types[type_name]
+        else:
+            type_name = '%s%s' % (pascalCase(field.package), type_name)
+            if field.isEnum:
+                type_name = 'uint8 #%s' % type_name
+
+        result += '    %s: %s' % (var_name, type_name)
+
+        leading_comment = field.comments
+        if leading_comment:
+            for c in leading_comment:
+                result = "#" + c + "\n" + result
+
+        return result
+
+
+class MessagePyGen():
+    @staticmethod
+    def generate(msg):
+        leading_comment = msg.comments
+
+        result = ''
+        if leading_comment:
+            for c in msg.comments:
+                result = '#%s\n' % c
+
+        structName = '%s%s' % (pascalCase(msg.package), msg.name)
+        result += 'class %s(Structured):\n' % structName
+        result += '    msg_size = %s\n' % msg.size
+        if msg.id:
+            result += '    msg_id = %s\n' % msg.id
+
+        size = 1
+        if not msg.fields:
+            # Empty structs are not allowed in C standard.
+            # Therefore add a dummy field if an empty message occurs.
+            result += '    dummy_field: pad'
+        else:
+            size = msg.size
+
+        result += '\n'.join([FieldPyGen.generate(f)
+                            for key, f in msg.fields.items()])
+
+        # defineName = '%s_%s' % (CamelToSnakeCase(
+        #    msg.package).upper(), CamelToSnakeCase(msg.name).upper())
+        # result += '#define %s_MAX_SIZE %d\n' % (defineName, size)
+#
+        # if msg.id:
+        #    result += '#define %s_MSG_ID %d\n' % (defineName, msg.id)
+#
+        # funcName = defineName.lower()
+        # if msg.id:
+        #    result += 'MESSAGE_HELPER(%s, %s, %d, %d);\n\n' % (funcName, structName,
+        #                                                       size, msg.id)
+#
+        return result + '\n'
+
+    @staticmethod
+    def get_initializer(msg, null_init):
+        if not msg.fields:
+            return '{0}'
+
+        parts = []
+        for field in msg.fields:
+            parts.append(field.get_initializer(null_init))
+        return '{' + ', '.join(parts) + '}'
+
+
+class FilePyGen():
+    @staticmethod
+    def generate(package):
+        yield '# Automatically generated struct frame header \n'
+        yield '# Generated by %s at %s. \n\n' % (version, time.asctime())
+
+        yield 'from structured import *\n'
+        yield 'from enum import Enum\n\n'
+
+        if package.enums:
+            yield '# Enum definitions\n'
+            for key, enum in package.enums.items():
+                yield EnumPyGen.generate(enum) + '\n\n'
+
+        if package.messages:
+            yield '# Struct definitions \n'
+            # Need to sort messages to make sure dependecies are properly met
+
+            for key, msg in package.sortedMessages().items():
+                yield MessagePyGen.generate(msg) + '\n'
+            yield '\n'
+
+        if package.messages:
+
+            yield '%s_definitions = {\n' % package.name
+            for key, msg in package.sortedMessages().items():
+                if msg.id:
+                    structName = '%s%s' % (pascalCase(msg.package), msg.name)
+                    yield '    %s: %s,\n' % (msg.id, structName)
+
+            yield '}\n'

{struct_frame-0.0.22 → struct_frame-0.0.24}/src/struct_frame/ts_gen.py

@@ -101,9 +101,10 @@ class MessageTsGen():
             for c in msg.comments:
                 result = '%s\n' % c
 
-        struct_name = '%s_%s' % (packageName, StyleC.type_name(msg.name))
+        package_msg_name = '%s_%s' % (packageName, msg.name)
+
         result += 'export const %s = new typed_struct.Struct(\'%s\') ' % (
-            struct_name, struct_name)
+            package_msg_name, package_msg_name)
 
         result += '\n'
 
@@ -119,25 +120,26 @@ class MessageTsGen():
                             for key, f in msg.fields.items()])
         result += '\n    .compile();\n\n'
 
-        result += 'export const %s_max_size = %d;\n' % (struct_name, size)
+        result += 'export const %s_max_size = %d;\n' % (package_msg_name, size)
 
         if msg.id:
-            result += 'export const %s_msgid = %d\n' % (msg.name, msg.id)
+            result += 'export const %s_msgid = %d\n' % (
+                package_msg_name, msg.id)
 
             result += 'export function %s_encode(buffer: struct_frame_buffer, msg: any) {\n' % (
-                msg.name)
-            result += '    msg_encode(buffer, msg, %s_msgid)\n}\n' % (msg.name)
+                package_msg_name)
+            result += '    msg_encode(buffer, msg, %s_msgid)\n}\n' % (package_msg_name)
 
             result += 'export function %s_reserve(buffer: struct_frame_buffer) {\n' % (
-                msg.name)
+                package_msg_name)
             result += '    const msg_buffer = msg_reserve(buffer, %s_msgid, %s_max_size);\n' % (
-                msg.name, msg.name)
+                package_msg_name, package_msg_name)
             result += '    if (msg_buffer){\n'
             result += '        return new %s(msg_buffer)\n    }\n    return;\n}\n' % (
-                msg.name)
+                package_msg_name)
 
             result += 'export function %s_finish(buffer: struct_frame_buffer) {\n' % (
-                msg.name)
+                package_msg_name)
             result += '    msg_finish(buffer);\n}\n'
         return result + '\n'
 
@@ -182,8 +184,9 @@ class FileTsGen():
         if package.messages:
             yield 'export function get_message_length(msg_id : number){\n switch (msg_id)\n {\n'
             for key, msg in package.sortedMessages().items():
-                name = StyleC.type_name(msg.name)
-                yield '  case %s_msgid: return %s_max_size;\n' % (name, name)
+
+                package_msg_name = '%s_%s' % (package.name, msg.name)
+                yield '  case %s_msgid: return %s_max_size;\n' % (package_msg_name, package_msg_name)
 
             yield '  default: break;\n } return 0;\n}'
             yield '\n'

{struct_frame-0.0.22 → struct_frame-0.0.24}/tsconfig.json

@@ -1,7 +1,6 @@
 {
   "compilerOptions": {
     /* Visit https://aka.ms/tsconfig to read more about this file */
-
     /* Projects */
     // "incremental": true,                              /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
     // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
@@ -9,9 +8,8 @@
     // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects. */
     // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
-
     /* Language and Environment */
-    "target": "ES6",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "ES6", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
@@ -23,9 +21,8 @@
     // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
     // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
-
     /* Modules */
-    "module": "commonjs",                                /* Specify what module code is generated. */
+    "module": "commonjs", /* Specify what module code is generated. */
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
     // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
@@ -44,12 +41,10 @@
     // "resolveJsonModule": true,                        /* Enable importing .json files. */
     // "allowArbitraryExtensions": true,                 /* Enable importing files with any extension, provided a declaration file is present. */
     // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
-
     /* JavaScript Support */
     // "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
     // "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
     // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
-
     /* Emit */
     // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
     // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
@@ -58,7 +53,7 @@
     // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
-    "outDir": "./ts_out",                                   /* Specify an output folder for all emitted files. */
+    "outDir": "./ts_out", /* Specify an output folder for all emitted files. */
     // "removeComments": true,                           /* Disable emitting comments. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
@@ -72,18 +67,16 @@
     // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
     // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
     // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-
     /* Interop Constraints */
     // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
     // "verbatimModuleSyntax": true,                     /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
     // "isolatedDeclarations": true,                     /* Require sufficient annotation on exports so other tools can trivially generate declaration files. */
     // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
-    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
+    "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
     // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
-    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
-
+    "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */
     /* Type Checking */
-    "strict": true,                                      /* Enable all strict type-checking options. */
+    "strict": true, /* Enable all strict type-checking options. */
     // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
     // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
@@ -103,9 +96,12 @@
     // "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type. */
     // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
     // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
-
     /* Completeness */
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
-  }
-}
+    "skipLibCheck": true /* Skip type checking all .d.ts files. */
+  },
+  "exclude": [
+    "node_modules",
+    "src",
+  ]
+}

struct_frame-0.0.22/biostream.proto

@@ -1,41 +0,0 @@
-package biostream;
-
-enum AdcSamplingFrequency {
-  FREQ_1000 = 0;
-  FREQ_2000 = 1;
-  FREQ_4000 = 2;
-  FREQ_8000 = 3;
-  FREQ_16000 = 4;
-}
-
-//enum before comment
-enum TransImpedanceGain {
-  R_10 = 0;
-  R_100 = 1;
-  R_1k = 2;
-  //Enum inside comment
-  R_10k = 3;
-}
-
-
-message RawData {
-  option msgid = 1;
-  float refV = 1;
-  float drnC = 2;
-  float srcV = 3;
-  float drnV = 4;
-  float gteV = 5;
-  float phsV = 6;
-  float gteC = 7;
-  float temp = 8;
-  float time = 9;
-}
-
-message AdcCommand {
-  option msgid = 112;
-  bool enable = 1;
-  AdcSamplingFrequency sampligFreq= 2;
-  uint8 overSamplingRate = 3;
-  TransImpedanceGain drainRes = 4;
-  TransImpedanceGain gateRes = 5;
-}

struct_frame-0.0.22/main.c

@@ -1,80 +0,0 @@
-#include <stdio.h>
-#include "c/struct_frame_gen.h"
-
-#include "c/struct_frame_parser.h"
-
-// CREATE_DEFAULT_STRUCT_BUFFER(tx_buffer, 256);
-uint8_t tx_buffer_buffer[256];
-struct_buffer tx_buffer = {default_parser, tx_buffer_buffer, 256, 0, 0, false, 0, 0, 0};
-
-// CREATE_DEFAULT_STRUCT_BUFFER(rx_buffer, 256);
-uint8_t rx_buffer_buffer[256];
-struct_buffer rx_buffer = {default_parser, rx_buffer_buffer, 256, 0, 0, false, 0, 0, 0};
-
-int main()
-{
-   MylVehiclePose msg;
-   msg.pitch = 100;
-   msg.yaw_rate = -1.45;
-   msg.test = 4883;
-   myl_vehicle_pose_encode(&tx_buffer, &msg);
-
-   MylVehicleHeartbeat *hb;
-   if (myl_vehicle_heartbeat_reserve(&tx_buffer, &hb))
-   {
-      hb->id = 23;
-      hb->type = VEHICLE_TYPE_VEHICLE_TYPE_FW;
-      myl_vehicle_heartbeat_finish(&tx_buffer);
-   }
-
-   MylVehiclePose msg2;
-   MylVehicleHeartbeat *hb2;
-   MylVehicleHeartbeat hb3;
-    for (int i = 0; i < tx_buffer.size; i++)
-   {
-       if (parse_char(&rx_buffer, tx_buffer.data[i]))
-       {
-          switch (rx_buffer.msg_id_len.msg_id)
-          {
-          case MYL_VEHICLE_HEARTBEAT_MSG_ID:
-             printf("got hb msg with id %d\n", rx_buffer.msg_id_len.msg_id);
-             hb2 = myl_vehicle_heartbeat_get_ref(&rx_buffer);
-             hb3 = myl_vehicle_heartbeat_get(&rx_buffer);
-             break;
-          case MYL_VEHICLE_POSE_MSG_ID:
-             printf("got pose msg with id %d\n", rx_buffer.msg_id_len.msg_id);
-             msg2 = myl_vehicle_pose_get(&rx_buffer);
-             break;
-   
-         default:
-            break;
-         }
-      }
-   }
-
-   MylVehiclePose msg3;
-   MylVehicleHeartbeat *hb4;
-   MylVehicleHeartbeat hb5;
-   buffer_parser_result_t result = zero_initialized_parser_result;
-   while (parse_buffer(tx_buffer_buffer, 256, &result))
-   {
-      switch (result.msg_id_len.msg_id)
-      {
-      case MYL_VEHICLE_HEARTBEAT_MSG_ID:
-         printf("got hb msg with id %d\n", result.msg_id_len.msg_id);
-         hb4 = myl_vehicle_heartbeat_get_ref_from_buffer_result(result);
-         hb5 = myl_vehicle_heartbeat_get_from_buffer_result(result);
-         break;
-      case MYL_VEHICLE_POSE_MSG_ID:
-         printf("got pose msg with id %d\n", result.msg_id_len.msg_id);
-         msg3 = myl_vehicle_pose_get_from_buffer_result(result);
-         break;
-
-      default:
-         break;
-      }
-   }
-   printf("%d %d  %d %d", hb->id, hb->type, hb2->id,hb2->type);
-
-   return 0;
-}

struct_frame-0.0.22/src/struct_frame/boilerplate/ts/struct_frame_gen.ts

@@ -1,7 +0,0 @@
-
-import * as bs from './biostream.sf';
-
-export function get_message_length(msg_id: number) {
-  console.log(msg_id)
-  return bs.get_message_length(msg_id);
-}