Skip to content

Add more types and fix a SD loading issue #133

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

Open
parai wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add more types and fix a SD loading issue #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion examples/generator/data_types/gen_type_defs_array.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
from autosar.model import ImplementationModel
import autosar.generator


def main():
"""
Create workspace and print type header to stdout
Expand Down
1 change: 0 additions & 1 deletion examples/template/demo_system/factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ def create(self,
size=self.bit_size,
encoding=self.encoding,
native_declaration=self.native_declaration)

return elem


Expand Down
9 changes: 9 additions & 0 deletions examples/template/demo_system/platform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@ class ImplementationTypes:

_boolean_constraint = factory.DataConstraintInternalTemplate("boolean_DataConstr", NAMESPACE, 0, 1)
_uint8_constraint = factory.DataConstraintInternalTemplate("uint8_DataConstr", NAMESPACE, 0, 255)
_sint8_constraint = factory.DataConstraintInternalTemplate("sint8_DataConstr", NAMESPACE, -128, 127)
_uint16_constraint = factory.DataConstraintInternalTemplate("uint16_DataConstr", NAMESPACE, 0, 65535)
_sint16_constraint = factory.DataConstraintInternalTemplate("sint16_DataConstr", NAMESPACE, -32768, 32767)
_uint32_constraint = factory.DataConstraintInternalTemplate("uint32_DataConstr", NAMESPACE, 0, 4294967295)
_sint32_constraint = factory.DataConstraintInternalTemplate("sint32_DataConstr", NAMESPACE, -2147483648, 2147483647)
_uint64_constraint = factory.DataConstraintInternalTemplate("uint64_DataConstr", NAMESPACE,
0, 18446744073709551615)
_boolean_compumethod = factory.CompuMethodEnumTemplate("boolean_CompuMethod", NAMESPACE, ["FALSE", "TRUE"])
Expand All @@ -40,9 +43,15 @@ class ImplementationTypes:
_boolean_compumethod, type_emitter="Platform_Type")
uint8 = factory.ImplementationValueTypeTemplate("uint8", NAMESPACE, BaseTypes.uint8, _uint8_constraint,
type_emitter="Platform_Type")
sint8 = factory.ImplementationValueTypeTemplate("sint8", NAMESPACE, BaseTypes.sint8, _sint8_constraint,
type_emitter="Platform_Type")
uint16 = factory.ImplementationValueTypeTemplate("uint16", NAMESPACE, BaseTypes.uint16, _uint16_constraint,
type_emitter="Platform_Type")
sint16 = factory.ImplementationValueTypeTemplate("sint16", NAMESPACE, BaseTypes.sint16, _sint16_constraint,
type_emitter="Platform_Type")
uint32 = factory.ImplementationValueTypeTemplate("uint32", NAMESPACE, BaseTypes.uint32, _uint32_constraint,
type_emitter="Platform_Type")
sint32 = factory.ImplementationValueTypeTemplate("sint32", NAMESPACE, BaseTypes.sint32, _sint32_constraint,
type_emitter="Platform_Type")
uint64 = factory.ImplementationValueTypeTemplate("uint64", NAMESPACE, BaseTypes.uint64, _uint64_constraint,
type_emitter="Platform_Type")
4 changes: 2 additions & 2 deletions src/autosar/generator/type_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def _create_code_sequence(self) -> cfile.core.Sequence:
code.append(C.ifndef(include_guard))
code.append(C.define(include_guard))
code.append(C.blank())
code.append(C.ifndef("__cplusplus"))
code.append(C.ifdef("__cplusplus"))
code.append(C.line(C.extern("C")))
code.append(C.line("{"))
code.append(C.endif())
Expand All @@ -60,7 +60,7 @@ def _create_code_sequence(self) -> cfile.core.Sequence:
code.append(C.blank())
code.extend(self._gen_type_defs(self.gen_data_type_creation_order()))
code.append(C.blank())
code.append(C.ifndef("__cplusplus"))
code.append(C.ifdef("__cplusplus"))
code.append(C.line("}"))
code.append([C.endif(), C.line_comment(" __cplusplus")])
code.append([C.endif(), C.line_comment(" " + include_guard)])
Expand Down
9 changes: 6 additions & 3 deletions src/autosar/xml/reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,9 +572,12 @@ def _read_admin_data_sd(self, xml_element: ElementTree.Element) -> dict[str, str
"""
Reads Complex-type AR:SD
"""
key = xml_element.attrib['GID']
value = xml_element.text
return {key: value}
if 'GID' in xml_element.attrib:
key = xml_element.attrib['GID']
value = xml_element.text
return {key: value}
else:
return xml_element.text

# --- AUTOSAR Document

Expand Down