From b0602743f986e7750c062fe12363b1c88f5181f8 Mon Sep 17 00:00:00 2001 From: ian Date: Tue, 29 Jul 2025 16:58:40 +0900 Subject: [PATCH] sync source --- test data/ASAP2Example.a2l | 107 +++------------------------------ test data/example-a2l-file.a2l | 2 +- 2 files changed, 11 insertions(+), 98 deletions(-) diff --git a/test data/ASAP2Example.a2l b/test data/ASAP2Example.a2l index 5ab1c7b..84aa003 100644 --- a/test data/ASAP2Example.a2l +++ b/test data/ASAP2Example.a2l @@ -15,7 +15,7 @@ ASAP2_VERSION 1 71 /end HEADER /begin MODULE Module - "Module \"description\" with escaped quotes" + "Module description with escaped quotes" /begin A2ML struct Protocol_Layer { @@ -1718,50 +1718,7 @@ ASAP2_VERSION 1 71 /end ANNOTATION_TEXT /end ANNOTATION /end CHARACTERISTIC - -/* - /begin CHARACTERISTIC DEMO_CUBOID - "CUBOID description" - CUBOID - 0x3000 - MAP_LAYOUT - 0 - IDENTITY - 0 100 - EXTENDED_LIMITS 0 255 - /begin AXIS_DESCR - FIX_AXIS - revolution - NO_COMPU_METHOD - 11 - 0 20000 - FORMAT "%4.0" - PHYS_UNIT "rpm" - FIX_AXIS_PAR_DIST 0 2000 11 - /end AXIS_DESCR - /begin AXIS_DESCR - FIX_AXIS - speed - NO_COMPU_METHOD - 11 - 0 360 - FORMAT "%8.2" - PHYS_UNIT "mph" - FIX_AXIS_PAR_DIST 0 36 11 - /end AXIS_DESCR - /begin AXIS_DESCR - FIX_AXIS - speed - NO_COMPU_METHOD - 11 - 0 360 - FORMAT "%8.2" - PHYS_UNIT "mph" - FIX_AXIS_PAR_DIST 0 36 11 - /end AXIS_DESCR - /end CHARACTERISTIC -*/ - + /begin MEASUREMENT bit1_2_3 "bit1&2&3 description" UBYTE @@ -1895,14 +1852,7 @@ MATRIX_DIM = 8 4 1" DEMO_MAP /end DEF_CHARACTERISTIC /end FUNCTION -/* - /begin FUNCTION FUNC_CUBOIDSs - "CUBOIDs description" - /begin DEF_CHARACTERISTIC - DEMO_CUBOID - /end DEF_CHARACTERISTIC - /end FUNCTION -*/ + /begin FUNCTION FUNC_MEASUREMENTs "MEASUREMENTs description" /begin OUT_MEASUREMENT @@ -2111,20 +2061,20 @@ must be defined, too." VAR_SEPARATOR "." /* PUMKF.1 */ VAR_NAMING NUMERIC - /* variant criterion "Car body" with three variants */ + /* variant criterion "Car body" with three variants * / /begin VAR_CRITERION Car "Car body" - Limousine Kombi Cabrio + Limousine Kombi_Cabrio VAR_MEASUREMENT bit1_2_3 /end VAR_CRITERION - - /* variant criterion "Type of gear box" with two variants */ +*/ + /* variant criterion "Type of gear box" with two variants * / /begin VAR_CRITERION Gear "Type of gear box" Manual Automatic VAR_SELECTION_CHARACTERISTIC EPKID /end VAR_CRITERION - + */ /begin VAR_FORBIDDEN_COMB /* forbidden: Limousine-Manual*/ Car Limousine Gear Manual @@ -2181,7 +2131,7 @@ must be defined, too." NO_COMPU_METHOD -100 655 /end TYPEDEF_CHARACTERISTIC - +/* /begin TYPEDEF_STRUCTURE TD_STRUCTURE "binary structure" 0x400 @@ -2195,7 +2145,7 @@ must be defined, too." MATRIX_DIM 10 /end STRUCTURE_COMPONENT /end TYPEDEF_STRUCTURE - +*/ /begin TYPEDEF_MEASUREMENT TD_MEASUREMENT "register content" SWORD @@ -2267,43 +2217,6 @@ must be defined, too." /end TRANSFORMER_OUT_OBJECTS /end TRANSFORMER -/* - /begin MEASUREMENT r1 - "" - SLONG - IDENTITY - 0 0 - -800 -200 - PHYS_UNIT "%1" - ECU_ADDRESS 0xC01004 - /end MEASUREMENT - - /begin MEASUREMENT r2 - "" - SLONG - IDENTITY - 0 0 - -200 200 - PHYS_UNIT "%2" - ECU_ADDRESS 0xC01008 - /end MEASUREMENT - - /begin MEASUREMENT r3 - "" - FLOAT64_IEEE - IDENTITY - 0 0 - -200 200 - PHYS_UNIT "%3" - ECU_ADDRESS 0xC0100C - /end MEASUREMENT - /begin FUNCTION ArrayTest - "" - /begin LOC_MEASUREMENT - r1 r2 r3 - /end LOC_MEASUREMENT - /end FUNCTION -*/ /end MODULE /end PROJECT diff --git a/test data/example-a2l-file.a2l b/test data/example-a2l-file.a2l index 112b21f..a644455 100644 --- a/test data/example-a2l-file.a2l +++ b/test data/example-a2l-file.a2l @@ -59,7 +59,7 @@ ASAP2_VERSION 1 61 /begin IF_DATA XCP /begin PROTOCOL_LAYER - 0x0100 + 0x0100 2000 2000 2000