Start adding sh2

Author: rkalnins

common.py

@@ -0,0 +1,98 @@
+
+from saleae.analyzers import HighLevelAnalyzer, AnalyzerFrame, StringSetting, NumberSetting, ChoicesSetting
+
+class Packet:
+    is_continuation_header: bool
+    header_idx: int
+    start_time: float
+    end_time: float
+    length_lsb: int
+    length_msb: int
+    length: int
+    channel: int
+    sequence_number: int
+    data: bytearray
+
+    def __init__(self, start_time) -> None:
+        self.is_continuation_header = False
+        self.length = 0xFFFF
+        self.header_idx = 0
+        self.sequence_number = 0xFF
+        self.channel = 0xFF
+        self.start_time = start_time
+        self.data = bytearray()
+
+
+class SHTPParser:
+    def __init__(self):
+        self.packet = None
+
+    def fill_header(self, d):
+        if self.packet.header_idx == 0:
+            self.packet.length_lsb = d[0]
+        elif self.packet.header_idx == 1:
+            self.packet.length_msb = d[0]
+            length = self.packet.length_lsb | (self.packet.length_msb << 8)
+            length = length & 0x7FFF
+
+            print("len: ", length)
+
+            self.packet.length = length
+        elif self.packet.header_idx == 2:
+            self.packet.channel = d[0]
+        elif self.packet.header_idx == 3:
+            self.packet.sequence_number = d[0]
+
+        self.packet.header_idx += 1
+
+
+    def decode(self, frame: AnalyzerFrame):
+        type = frame.type
+
+        if type == 'start' and self.packet is None:
+            self.packet = Packet(frame.start_time)
+        elif type == 'start':
+            self.packet.is_continuation_header = True
+            self.packet.header_idx = 0
+        elif (type == 'stop' or type == 'data') and self.packet is not None:
+            if self.packet.length - 4 == len(self.packet.data):
+                self.packet.end_time = frame.end_time
+
+                f = AnalyzerFrame(
+                    'packet',
+                    self.packet.start_time,
+                    self.packet.end_time,
+                    {
+                        'contents': self.packet.data,
+                        'channel': self.packet.channel,
+                        'sequence': self.packet.sequence_number,
+                        'length': self.packet.length
+                    },
+                )
+
+                self.packet = None
+
+                return f
+        elif type != 'data':
+            pass
+
+
+        if self.packet is not None:
+            if type == 'data':
+                if self.packet.is_continuation_header:
+                    self.packet.header_idx += 1
+
+                    if self.packet.header_idx >= 4:
+                        self.packet.is_continuation_header = False
+                else:
+                    d = frame.data['data']
+
+                    if self.packet.header_idx < 4:
+                        self.fill_header(d)
+                    else:
+                        # print(d)
+                        self.packet.data.extend(d)
+
+                
+                
+

extension.json

@@ -1,13 +1,17 @@
 {
-  "name": "SHTP",
+  "name": "SHTP+SH2",
   "apiVersion": "1.0.0",
   "author": "Roberts Kalnins",
   "version": "0.0.1",
-  "description": "SHTP parser",
+  "description": "SHTP parser with SH2 interpretation",
   "extensions": {
+    "SH2": {
+        "type": "HighLevelAnalyzer",
+        "entryPoint": "sh2_analyzer.SH2Hla"
+    },
     "SHTP": {
       "type": "HighLevelAnalyzer",
       "entryPoint": "shtp_analyzer.SHTPHla"
     }
   }
-}
+}

sh2_analyzer.py

@@ -0,0 +1,27 @@
+
+from saleae.analyzers import HighLevelAnalyzer, AnalyzerFrame, StringSetting, NumberSetting, ChoicesSetting
+
+from common import Packet, SHTPParser
+
+
+class SH2Hla(HighLevelAnalyzer):
+    result_types = {
+        'accel': {
+            'format': '[x,y,z] = [{{data.x}} {{data.y}} {{data.z}}]',
+        },
+        'gyro': {
+            'format': '[x,y,z] = [{{data.x}} {{data.y}} {{data.z}}]',
+        },
+        'rotv': {
+            'format': '[r,p,y,a] = [{{data.x}} {{data.y}} {{data.z}} {{data.accuracy}}]',
+        },
+    }
+
+    def __init__(self):
+        self.shtp_parser = SHTPParser()
+        self.packet = None
+        self.reports = None
+
+    def decode(self, frame: AnalyzerFrame):
+        return self.shtp_parser.decode(frame)
+

shtp_analyzer.py

@@ -1,28 +1,6 @@
-# High Level Analyzer
-# For more information and documentation, please go to https://support.saleae.com/extensions/high-level-analyzer-extensions
-
 from saleae.analyzers import HighLevelAnalyzer, AnalyzerFrame, StringSetting, NumberSetting, ChoicesSetting
 
-class Packet:
-    is_continuation_header: bool
-    header_idx: int
-    start_time: float
-    end_time: float
-    length_lsb: int
-    length_msb: int
-    length: int
-    channel: int
-    sequence_number: int
-    data: bytearray
-
-    def __init__(self, start_time) -> None:
-        self.is_continuation_header = False
-        self.length = 0xFFFF
-        self.header_idx = 0
-        self.sequence_number = 0xFF
-        self.channel = 0xFF
-        self.start_time = start_time
-        self.data = bytearray()
+from common import Packet, SHTPParser
 
 class SHTPHla(HighLevelAnalyzer):
     result_types = {
@@ -31,83 +9,10 @@ class SHTPHla(HighLevelAnalyzer):
         }
     }
 
-    def fill_header(self, d):
-        if self.packet.header_idx == 0:
-            self.packet.length_lsb = d[0]
-        elif self.packet.header_idx == 1:
-            self.packet.length_msb = d[0]
-            length = self.packet.length_lsb | (self.packet.length_msb << 8)
-            length = length & 0x7FFF
-
-            print("len: ", length)
-            print("lsb: ", self.packet.length_lsb)
-            print("msb: ", self.packet.length_msb)
-
-
-            self.packet.length = length
-        elif self.packet.header_idx == 2:
-            self.packet.channel = d[0]
-        elif self.packet.header_idx == 3:
-            self.packet.sequence_number = d[0]
-
-        self.packet.header_idx += 1
 
     def __init__(self):
-        self.packet = None
-
-        pass
+        self.shtp_parser = SHTPParser()
 
     def decode(self, frame: AnalyzerFrame):
-        type = frame.type
-
-        if type == 'start' and self.packet is None:
-            self.packet = Packet(frame.start_time)
-        elif type == 'start':
-            self.packet.is_continuation_header = True
-            self.packet.header_idx = 0
-        elif (type == 'stop' or type == 'data') and self.packet is not None:
-            if self.packet.length - 4 == len(self.packet.data):
-                self.packet.end_time = frame.end_time
-
-                f = AnalyzerFrame(
-                    'packet',
-                    self.packet.start_time,
-                    self.packet.end_time,
-                    {
-                        'contents': self.packet.data,
-                        'channel': self.packet.channel,
-                        'sequence': self.packet.sequence_number,
-                        'length': self.packet.length
-                    },
-                )
-
-                self.packet = None
-
-                return f
-        elif type != 'data':
-            print("not enough length")
-
-
-        if self.packet is not None:
-            if type == 'data':
-                if self.packet.is_continuation_header:
-                    print('skipping header')
-                    self.packet.header_idx += 1
-
-                    if self.packet.header_idx >= 4:
-                        print("current len:", len(self.packet.data))
-                        self.packet.is_continuation_header = False
-                else:
-                    d = frame.data['data']
-
-                    if self.packet.header_idx < 4:
-                        self.fill_header(d)
-                    else:
-                        # print(d)
-                        self.packet.data.extend(d)
-
-                        print(len(self.packet.data), d)
-
-                
-                
+        return self.shtp_parser.decode(frame)