diff --git a/.gitignore b/.gitignore index 32fcc4d..de053b1 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ tmp.a2l /a2lfile.txt *.bin /tokio_demo.a2l +/point_cloud.a2l diff --git a/point_cloud.a2l b/point_cloud.a2l deleted file mode 100644 index a5cb66d..0000000 --- a/point_cloud.a2l +++ /dev/null @@ -1,165 +0,0 @@ - - ASAP2_VERSION 1 71 - /begin PROJECT point_cloud "" - /begin HEADER "" VERSION "1.0" /end HEADER - /begin MODULE point_cloud "" - - /include "XCP_104.aml" - - /begin MOD_COMMON "" - BYTE_ORDER MSB_LAST - ALIGNMENT_BYTE 1 - ALIGNMENT_WORD 1 - ALIGNMENT_LONG 1 - ALIGNMENT_FLOAT16_IEEE 1 - ALIGNMENT_FLOAT32_IEEE 1 - ALIGNMENT_FLOAT64_IEEE 1 - ALIGNMENT_INT64 1 - /end MOD_COMMON - - /begin RECORD_LAYOUT F64 FNC_VALUES 1 FLOAT64_IEEE ROW_DIR DIRECT /end RECORD_LAYOUT - /begin TYPEDEF_MEASUREMENT M_F64 "" FLOAT64_IEEE NO_COMPU_METHOD 0 0 -1e12 1e12 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_F64 "" VALUE F64 0 NO_COMPU_METHOD -1e12 1e12 /end TYPEDEF_CHARACTERISTIC - - /begin RECORD_LAYOUT F32 FNC_VALUES 1 FLOAT32_IEEE ROW_DIR DIRECT /end RECORD_LAYOUT - /begin TYPEDEF_MEASUREMENT M_F32 "" FLOAT32_IEEE NO_COMPU_METHOD 0 0 -1e12 1e12 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_F32 "" VALUE F32 0 NO_COMPU_METHOD -1e12 1e12 /end TYPEDEF_CHARACTERISTIC - - /begin RECORD_LAYOUT S64 FNC_VALUES 1 A_UINT64 ROW_DIR DIRECT /end RECORD_LAYOUT - /begin TYPEDEF_MEASUREMENT M_I64 "" A_UINT64 NO_COMPU_METHOD 0 0 -1e12 1e12 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_I64 "" VALUE S64 0 NO_COMPU_METHOD -1e12 1e12 /end TYPEDEF_CHARACTERISTIC - - /begin RECORD_LAYOUT S32 FNC_VALUES 1 SLONG ROW_DIR DIRECT /end RECORD_LAYOUT - /begin TYPEDEF_MEASUREMENT M_I32 "" SLONG NO_COMPU_METHOD 0 0 -2147483648 2147483647 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_I32 "" VALUE S32 0 NO_COMPU_METHOD -2147483648 2147483647 /end TYPEDEF_CHARACTERISTIC - - /begin RECORD_LAYOUT S16 FNC_VALUES 1 SWORD ROW_DIR DIRECT /end RECORD_LAYOUT - /begin TYPEDEF_MEASUREMENT M_I16 "" SWORD NO_COMPU_METHOD 0 0 -32768 32767 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_I16 "" VALUE S16 0 NO_COMPU_METHOD -32768 32767 /end TYPEDEF_CHARACTERISTIC - - /begin RECORD_LAYOUT S8 FNC_VALUES 1 SBYTE ROW_DIR DIRECT /end RECORD_LAYOUT - /begin TYPEDEF_MEASUREMENT M_I8 "" SBYTE NO_COMPU_METHOD 0 0 -128 127 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_I8 "" VALUE S8 0 NO_COMPU_METHOD -128 127 /end TYPEDEF_CHARACTERISTIC - - /begin RECORD_LAYOUT U8 FNC_VALUES 1 UBYTE ROW_DIR DIRECT /end RECORD_LAYOUT - /begin TYPEDEF_MEASUREMENT M_U8 "" UBYTE NO_COMPU_METHOD 0 0 0 255 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_U8 "" VALUE U8 0 NO_COMPU_METHOD 0 255 /end TYPEDEF_CHARACTERISTIC - - /begin RECORD_LAYOUT U16 FNC_VALUES 1 UWORD ROW_DIR DIRECT /end RECORD_LAYOUT - /begin TYPEDEF_MEASUREMENT M_U16 "" UWORD NO_COMPU_METHOD 0 0 0 65535 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_U16 "" VALUE U16 0 NO_COMPU_METHOD 0 65535 /end TYPEDEF_CHARACTERISTIC - - /begin RECORD_LAYOUT U32 FNC_VALUES 1 ULONG ROW_DIR DIRECT /end RECORD_LAYOUT - /begin TYPEDEF_MEASUREMENT M_U32 "" ULONG NO_COMPU_METHOD 0 0 0 4294967295 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_U32 "" VALUE U32 0 NO_COMPU_METHOD 0 4294967295 /end TYPEDEF_CHARACTERISTIC - - /begin RECORD_LAYOUT U64 FNC_VALUES 1 A_UINT64 ROW_DIR DIRECT /end RECORD_LAYOUT - /begin TYPEDEF_MEASUREMENT M_U64 "" A_UINT64 NO_COMPU_METHOD 0 0 0 1e12 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_U64 "" VALUE U64 0 NO_COMPU_METHOD 0 1e12 /end TYPEDEF_CHARACTERISTIC - - /begin MOD_PAR "" - - EPK "EPK" - ADDR_EPK 0x80000000 - /begin MEMORY_SEGMENT - epk "" DATA FLASH INTERN 0x80000000 3 -1 -1 -1 -1 -1 - /end MEMORY_SEGMENT - - /begin MEMORY_SEGMENT - Params "" DATA FLASH INTERN 0x80010000 48 -1 -1 -1 -1 -1 - /begin IF_DATA XCP - /begin SEGMENT /* index: */ 1 /* pages: */ 2 /* ext: */ 0 0 0 - /begin CHECKSUM XCP_ADD_44 MAX_BLOCK_SIZE 0xFFFF EXTERNAL_FUNCTION "" /end CHECKSUM - /begin PAGE 0x0 ECU_ACCESS_DONT_CARE XCP_READ_ACCESS_DONT_CARE XCP_WRITE_ACCESS_DONT_CARE /end PAGE - /begin PAGE 0x1 ECU_ACCESS_DONT_CARE XCP_READ_ACCESS_DONT_CARE XCP_WRITE_ACCESS_NOT_ALLOWED /end PAGE - /end SEGMENT - /end IF_DATA - /end MEMORY_SEGMENT - /end MOD_PAR - - /begin IF_DATA XCP - /begin PROTOCOL_LAYER - 0x104 1000 2000 0 0 0 0 0 252 1468 BYTE_ORDER_MSB_LAST ADDRESS_GRANULARITY_BYTE - OPTIONAL_CMD GET_COMM_MODE_INFO - OPTIONAL_CMD GET_ID - OPTIONAL_CMD SET_MTA - OPTIONAL_CMD UPLOAD - OPTIONAL_CMD SHORT_UPLOAD - OPTIONAL_CMD DOWNLOAD - OPTIONAL_CMD SHORT_DOWNLOAD - OPTIONAL_CMD GET_CAL_PAGE - OPTIONAL_CMD SET_CAL_PAGE - OPTIONAL_CMD COPY_CAL_PAGE - OPTIONAL_CMD BUILD_CHECKSUM - OPTIONAL_CMD GET_DAQ_RESOLUTION_INFO - OPTIONAL_CMD GET_DAQ_PROCESSOR_INFO - OPTIONAL_CMD FREE_DAQ - OPTIONAL_CMD ALLOC_DAQ - OPTIONAL_CMD ALLOC_ODT - OPTIONAL_CMD ALLOC_ODT_ENTRY - OPTIONAL_CMD SET_DAQ_PTR - OPTIONAL_CMD WRITE_DAQ - OPTIONAL_CMD GET_DAQ_LIST_MODE - OPTIONAL_CMD SET_DAQ_LIST_MODE - OPTIONAL_CMD START_STOP_SYNCH - OPTIONAL_CMD START_STOP_DAQ_LIST - OPTIONAL_CMD GET_DAQ_CLOCK - OPTIONAL_CMD WRITE_DAQ_MULTIPLE - OPTIONAL_CMD TIME_CORRELATION_PROPERTIES - OPTIONAL_CMD USER_CMD - OPTIONAL_LEVEL1_CMD GET_VERSION - /end PROTOCOL_LAYER - /begin DAQ - DYNAMIC 0 1 0 OPTIMISATION_TYPE_DEFAULT ADDRESS_EXTENSION_FREE IDENTIFICATION_FIELD_TYPE_RELATIVE_BYTE GRANULARITY_ODT_ENTRY_SIZE_DAQ_BYTE 0xF8 OVERLOAD_INDICATION_PID - /begin TIMESTAMP_SUPPORTED - 0x1 SIZE_DWORD UNIT_1US TIMESTAMP_FIXED - /end TIMESTAMP_SUPPORTED - -/begin EVENT "point_cloud" "point_cl" 0 DAQ 0xFF 0 0 0 CONSISTENCY DAQ /end EVENT - - /end DAQ - -/begin XCP_ON_UDP_IP 0x104 5555 ADDRESS "127.0.0.1" /end XCP_ON_UDP_IP - - /end IF_DATA - -/begin GROUP Cal "" /begin REF_CHARACTERISTIC /end REF_CHARACTERISTIC /end GROUP - -/begin CHARACTERISTIC Params.ampl_x "" VALUE 0x80010008 F64 0 NO_COMPU_METHOD 0.001 100 PHYS_UNIT "m" /end CHARACTERISTIC -/begin CHARACTERISTIC Params.ampl_y "" VALUE 0x80010020 F64 0 NO_COMPU_METHOD 0.001 100 PHYS_UNIT "m" /end CHARACTERISTIC -/begin CHARACTERISTIC Params.period_x "" VALUE 0x80010000 F64 0 NO_COMPU_METHOD 0.001 10 PHYS_UNIT "s" /end CHARACTERISTIC -/begin CHARACTERISTIC Params.period_y "" VALUE 0x80010018 F64 0 NO_COMPU_METHOD 0.001 10 PHYS_UNIT "s" /end CHARACTERISTIC -/begin CHARACTERISTIC Params.phi_x "" VALUE 0x80010010 F64 0 NO_COMPU_METHOD 0 1 PHYS_UNIT "PI" /end CHARACTERISTIC -/begin CHARACTERISTIC Params.phi_y "" VALUE 0x80010028 F64 0 NO_COMPU_METHOD 0 2 PHYS_UNIT "PI" /end CHARACTERISTIC -/begin GROUP Params "" /begin REF_CHARACTERISTIC Params.ampl_x Params.ampl_y Params.period_x Params.period_y Params.phi_x Params.phi_y /end REF_CHARACTERISTIC /end GROUP - - -/begin MEASUREMENT mainloop_counter1 "" A_UINT64 NO_COMPU_METHOD 0 0 0 1000000000000 PHYS_UNIT "" ECU_ADDRESS 0xD0 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 0 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT -/begin CHARACTERISTIC point_cloud "point cloud demo" ASCII 0x0 U8 0 NO_COMPU_METHOD 0 255 READ_ONLY NUMBER 200 ECU_ADDRESS_EXTENSION 2 - /begin ANNOTATION ANNOTATION_LABEL "ObjectDescription" ANNOTATION_ORIGIN "application/dds" - /begin ANNOTATION_TEXT - " " - "Vector::PointCloud" - "" - "module Vector {" -"struct Point {" - "float x;" -"float y;" -"float z;" - "};" - " struct PointCloud {" - "sequence points;" - " };" - "};" - /end ANNOTATION_TEXT - /end ANNOTATION - -/begin ANNOTATION ANNOTATION_LABEL "IsVlsd" ANNOTATION_ORIGIN "" /begin ANNOTATION_TEXT "true" /end ANNOTATION_TEXT /end ANNOTATION -/begin ANNOTATION ANNOTATION_LABEL "MaxBufferNeeded" ANNOTATION_ORIGIN "" /begin ANNOTATION_TEXT "200" /end ANNOTATION_TEXT /end ANNOTATION - /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 0 /end DAQ_EVENT /end IF_DATA /end CHARACTERISTIC - -/begin GROUP point_cloud "" /begin REF_MEASUREMENT mainloop_counter1 point_cloud /end REF_MEASUREMENT /end GROUP - - /end MODULE - /end PROJECT - \ No newline at end of file diff --git a/tests/tokio_multi_thread.rs b/tests/tokio_multi_thread.rs index 7297082..7c57f18 100644 --- a/tests/tokio_multi_thread.rs +++ b/tests/tokio_multi_thread.rs @@ -150,6 +150,7 @@ fn task(cal_seg: CalSeg) { //----------------------------------------------------------------------------- // Integration test multi thread measurememt and calibration +#[ignore] #[tokio::test] async fn test_tokio_multi_thread() { env_logger::Builder::new().filter_level(OPTION_LOG_LEVEL.to_log_level_filter()).init(); diff --git a/tests/tokio_single_thread.rs b/tests/tokio_single_thread.rs index a4ef30b..54735a6 100644 --- a/tests/tokio_single_thread.rs +++ b/tests/tokio_single_thread.rs @@ -147,6 +147,7 @@ fn task(cal_seg: CalSeg) { //----------------------------------------------------------------------------- // Integration test single thread measurement and calibration +#[ignore] #[tokio::test] async fn test_tokio_single_thread() { env_logger::Builder::new().filter_level(OPTION_LOG_LEVEL.to_log_level_filter()).try_init().ok();