exceeddata-sdk-vdata 2.9.10__tar.gz → 2.10.2__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 1.1
2
- Name: exceeddata-sdk-vdata
3
- Version: 2.9.10
2
+ Name: exceeddata_sdk_vdata
3
+ Version: 2.10.2
4
4
  Summary: ExceedData vData SDK for Python
5
5
  Home-page: http://www.smartsct.com
6
6
  Author: Nick Xie
@@ -1,6 +1,6 @@
1
1
  # -*- coding: utf-8 -*-
2
2
  #
3
- # Copyright (C) 2016-2024 Smart Software for Car Technologies Inc. and EXCEEDDATA
3
+ # Copyright (C) 2016-2025 Smart Software for Car Technologies Inc. and EXCEEDDATA
4
4
  # https://www.smartsct.com
5
5
  # https://www.exceeddata.com
6
6
  #
@@ -32,6 +32,6 @@
32
32
 
33
33
  name = 'vdata'
34
34
 
35
- __version__ = "2.9.10"
35
+ __version__ = "2.10.2"
36
36
  __author__ = 'Nick Xie'
37
37
  __credits__ = 'Smart Software for Car Technologies Inc'
@@ -73,6 +73,18 @@ class VswToBlfConverter:
73
73
  #写入BLF文件
74
74
  blfwriter.on_message_received(msg, frame_type)
75
75
 
76
+ elif row[i] != None and isinstance(row[i], (bytes, bytearray)) and can_info[i - 1][0] != -1:
77
+ # if length > 64, skip
78
+ if len(row[i]) > 64:
79
+ continue
80
+ msg = Message(timestamp=row[0] / 1000.0, channel=can_info[i - 1][0] - 1,
81
+ arbitration_id=can_info[i - 1][1], data=row[i], is_fd=True, is_extended_id=False)
82
+ frame_type = 0
83
+ if (can_info[i - 1][2] == 2):
84
+ frame_type = 11 # LIN_MESSAGE_TYPE in blf
85
+ # 写入BLF文件
86
+ blfwriter.on_message_received(msg, frame_type)
87
+
76
88
 
77
89
  elif row[i] != None and can_info[i-1][0]!=-1:
78
90
  data=[1]
@@ -134,6 +146,13 @@ class VswToAscConverter:
134
146
  msg = Message(timestamp=row[0]/1000.0, channel=can_info[i-1][0]-1,arbitration_id=can_info[i-1][1],data= row[i], is_fd=True, is_extended_id =can_info[i-1][2])
135
147
  #写入ASC文件
136
148
  writer.on_message_received(msg)
149
+ elif row[i] != None and isinstance(row[i], (bytes, bytearray)) and can_info[i-1][0]!=-1:
150
+ # if length > 64, skip
151
+ if len(row[i]) > 64:
152
+ continue
153
+ msg = Message(timestamp=row[0]/1000.0, channel=can_info[i-1][0]-1,arbitration_id=can_info[i-1][1],data= row[i], is_fd=True, is_extended_id =can_info[i-1][2])
154
+ #写入ASC文件
155
+ writer.on_message_received(msg)
137
156
  elif row[i] != None and can_info[i-1][0]!=-1:
138
157
  data=[1]
139
158
  data[0] =row[i]
@@ -1,6 +1,6 @@
1
1
  # -*- coding: utf-8 -*-
2
2
  #
3
- # Copyright (C) 2016-2024 Smart Software for Car Technologies Inc. and EXCEEDDATA
3
+ # Copyright (C) 2016-2025 Smart Software for Car Technologies Inc. and EXCEEDDATA
4
4
  # https://www.smartsct.com
5
5
  # https://www.exceeddata.com
6
6
  #
@@ -31,7 +31,7 @@
31
31
  # of the copyright holder.
32
32
  #
33
33
  # Author: Nick Xie
34
- # Version: 2.9.10
34
+ # Version: 2.10.2
35
35
  #
36
36
  # Note: for specification flag compatibility, it is rare that vsw uses snappy.
37
37
  # Uncomment the following if used and python-snappy is installed.
@@ -307,7 +307,7 @@ class VDataMeta:
307
307
  return 6
308
308
 
309
309
  def getSeriesTimestampLength (self):
310
- if (self._keyTypeCode & 0x0f ==1 ):
310
+ if (self._keyTypeCode & 0x0f == 1) and ((self._keyTypeCode >> 4) & 0x0F == 0):
311
311
  return 43
312
312
  else:
313
313
  return 41
@@ -4006,6 +4006,9 @@ class VDataDecoder:
4006
4006
  while (b[0] != 0):
4007
4007
  keydesc += chr(b[0])
4008
4008
  b = datareader.read(1)
4009
+
4010
+ if len(keydesc) == 0:
4011
+ keydesc = f"{keyid:X}"
4009
4012
  formula = fmbulider.build(keydesc, self._insensitiveCase)
4010
4013
  sname = self.getUniqueName(self._keys, formula._name)
4011
4014
  if (sname != formula._name):
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 1.1
2
2
  Name: exceeddata-sdk-vdata
3
- Version: 2.9.10
3
+ Version: 2.10.2
4
4
  Summary: ExceedData vData SDK for Python
5
5
  Home-page: http://www.smartsct.com
6
6
  Author: Nick Xie
@@ -32,8 +32,8 @@
32
32
 
33
33
  from setuptools import setup
34
34
 
35
- setup(name='exceeddata-sdk-vdata',
36
- version='2.9.10',
35
+ setup(name='exceeddata_sdk_vdata',
36
+ version='2.10.2',
37
37
  description='ExceedData vData SDK for Python',
38
38
  url='http://www.smartsct.com',
39
39
  author='Nick Xie',