8000 Parse sym types by Seneda · Pull Request #479 · ebroecker/canmatrix · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Parse sym types #479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 7, 2020
Merged

Parse sym types #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
47e5e1a
Allow parsing of the main .sym signal types : string, raw, char.
Seneda Apr 28, 2020
67de5fc
Allow parsing of the main .sym signal types : string, raw, char.
Seneda Apr 28, 2020
a582e8f
Merge branch 'ParseSymTypes' of https://github.com/seneda/canmatrix i…
Seneda Apr 28, 2020
3f26414
Add fix for "isidentifier" fucntion on python 2.7
Seneda Apr 29, 2020
eff8b77
Fix logic to match variable name. (Functionality unchanged)
Seneda Apr 29, 2020
96c1fac
Merge branch 'development' into ParseSymTypes
ebroecker May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments. Retry
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/canmatrix/canmatrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ class Signal(object):

mux_value = attr.ib(default=None)
is_float = attr.ib(default=False) # type: bool
is_ascii = attr.ib(default=False) # type: bool
type_label = attr.ib(default="")
enumeration = attr.ib(default=None) # type: typing.Optional[str]
comments = attr.ib(factory=dict) # type: typing.MutableMapping[int, str]
attributes = attr.ib(factory=dict) # type: typing.MutableMapping[str, typing.Any]
Expand Down
50 changes: 33 additions & 17 deletions src/canmatrix/formats/sym.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,25 @@ def create_signal(db, signal): # type: (canmatrix.CanMatrix, canmatrix.Signal)
global enums
global enum_dict
output = ""
output += "Var=%s " % signal.name
if not signal.is_signed:
output += "unsigned "
if sys.version_info > (3, 0):
quote_name = not signal.name.isidentifier()
else:
output += "signed "
from future.utils import isidentifier
quote_name = not isidentifier(signal.name)
if quote_name:
output += 'Var="%s" ' % signal.name
else:
output += "Var=%s " % signal.name
if signal.type_label:
output += signal.type_label + " "
else:
if signal.is_signed:
output += "signed "
elif signal.is_float:
output += "float "
else:
output += "unsigned "

start_bit = signal.get_startbit()
if not signal.is_little_endian:
# Motorola
Expand Down Expand Up @@ -419,29 +433,29 @@ class Mode(object):
sig_name = temp_array[0]

is_float = False
is_ascii = False
if index_offset != 1:
is_signed = True
else:
is_signed = False

if temp_array[1] == 'unsigned':
type_label = temp_array[1]

if type_label == 'unsigned':
pass
elif type_label == 'bit':
pass
elif temp_array[1] == 'bit':
# TODO: actually support bit instead of interpreting as
# an unsigned
elif type_label == 'raw':
pass
elif temp_array[1] == 'signed':
elif type_label == 'signed':
is_signed = True
elif temp_array[1] in ['float', 'double']:
elif type_label in ['float', 'double']:
is_float = True
elif temp_array[1] in ['string']:
# TODO: actually support these variable types instead
# of skipping
print('Variable type \'{}\' found and skipped'
.format(temp_array[1]))
continue
elif type_label in ['char', 'string']:
is_ascii = True
pass
else:
raise ValueError('Unknown type \'{}\' found'.format(temp_array[1]))
raise ValueError('Unknown type \'{}\' found'.format(type_label))

start_bit = int(temp_array[index_offset + 1].split(',')[0])
signal_length = int(temp_array[index_offset + 1].split(',')[1])
Expand Down Expand Up @@ -521,6 +535,7 @@ class Mode(object):
is_little_endian=intel,
is_signed=is_signed,
is_float=is_float,
is_ascii=is_ascii,
factor=factor,
offset=offset,
unit=unit,
Expand Down Expand Up @@ -560,6 +575,7 @@ class Mode(object):
unit=unit,
multiplex=multiplexor,
comment=comment,
type_label=type_label,
**extras)
if min_value is not None:
signal.min = float_factory(min_value)
Expand Down
99 changes: 99 additions & 0 deletions src/canmatrix/tests/test_sym.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import io
import sys
import textwrap
from itertools import chain

import pytest

Expand Down Expand Up @@ -218,3 +219,101 @@ def test_enums_read(enum_str, enum_dict, enum_label):
assert matrix.value_tables == enum_dict, "Enum not parsed correctly : '{}'".format(enum_label)
f_out = io.BytesIO()
canmatrix.formats.sym.dump(matrix, f_out)


def test_types_read():
f = io.BytesIO('''\
FormatVersion=5.0 // Do not edit this line!
Title="Types Test"

{ENUMS}
enum EnumAnimals(0="Cat", // An enum value for cats
1="Dog", // An enum value for dogs
2="Horse", 3="Monkey",
4="Lion")// An enum with a comment for the final value

{SENDRECEIVE}

[SymbolLengths]
ID=000h
DLC=8
Var="1Bit" unsigned 0,1
Var="3Bits" unsigned 1,3
Var="4Bits" unsigned 4,4
Var="21Bits" unsigned 8,21
Var="6Bits" unsigned 29,6
Var="29Bits" unsigned 35,29

[SymbolTypes]
ID=001h
DLC=8
Var=Bit bit 0,1
Var=Char char 1,8
Var=String string 16,16
Var=Signed signed 32,4
Var=Unsigned unsigned 36,4
''' # Var=Enum EnumAnimals 40,4
'''
Var=Raw raw 48,16

[SymbolDouble]
ID=002h
DLC=8
Var=Double double 0,64 // Must be 8 Bytes according to PCAN Symbol Editor V5

[SymbolFloat]
ID=003h
DLC=4
Var=Float float 0,32 // Must be 4 Bytes according to PCAN Symbol Editor V5
'''.encode('utf-8'),
)
matrix = canmatrix.formats.sym.load(f)
# Check no errors loading the matrix
assert matrix.load_errors == []

f_out = io.BytesIO()
canmatrix.formats.sym.dump(matrix, f_out)
f_out_bytes = f_out.getvalue()
f_out_string = f_out_bytes.decode("utf-8")

# Check that types are preserved when saving back to .SYM format
assert "Var=Bit bit" in f_out_string
assert "Var=Char char" in f_out_string
assert "Var=String string" in f_out_string
assert "Var=Signed signed" in f_out_string
assert 'Var="21Bits" unsigned' in f_out_string
assert 'Var=Float float' in f_out_string
assert 'Var=Double double' in f_out_string

# Read matrix back in to check all symbols/frames preserved
f_in = io.BytesIO(f_out_bytes)
new_matrix = canmatrix.formats.sym.load(f_in)

# Check no errors loading the matrix
assert new_matrix.load_errors == []

# Check that both matrices have the same Frames
frames = [f.name for f in matrix.frames]
new_frames = [f.name for f in new_matrix.frames]
assert sorted(frames) == sorted(new_frames)

# Check that both matrices have the same signals, and that all the expected signals are present
signals = chain(*[[s.name for s in frame.signals] for frame in matrix.frames])
new_signals = chain(*[[s.name for s in frame.signals] for frame in new_matrix.frames])
assert sorted(signals) == sorted(new_signals) == sorted([
"1Bit",
"3Bits",
"4Bits",
"21Bits",
"6Bits",
"29Bits",
"Bit",
"Char",
"String",
"Signed",
"Unsigned",
"Raw",
"Double",
"Float", ])


0