Option to specify the cycle time of an XCP event

vectorgrp · Nov 27, 2024 · 6c54706 · 6c54706
1 parent 62818f1
commit 6c54706
Show file tree

Hide file tree

Showing 18 changed files with 694 additions and 685 deletions.
diff --git a/CANape/CANape.ini b/CANape/CANape.ini
@@ -6,7 +6,7 @@
 ;-------------------------------------------------------------------------------
 
 [!!!!!_CONSISTENCY_CHECK_START_SECTION_!!!!!]
-GUID={D121255C-2680-48E2-AC9D-6C6445E940D3}
+GUID={E0EF4B52-D7DC-4DA0-9A72-F2B0522AAF9B}
 
 [FILE_INFO]
 Identification=CANape-Project-File
@@ -22,7 +22,7 @@ CreationTime=22:29
 CreationDate=09/06/2020 ; Month/Day/Year
 Protected=0
 CurrentWindowsACP=1252
-ModificationTime=19:06
+ModificationTime=19:32
 ModificationDate=11/26/2024 ; Month/Day/Year
 
 [CANAPE]
@@ -3141,7 +3141,7 @@ PSEUDO_CAN_ID_START=2415919104
 DSP_MODE=0
 DAQ_LIST_AUTODETECT=0
 DAQ_COUNT=0
-DAQ_CONFIG_ID=18158
+DAQ_CONFIG_ID=14062
 DAQ_START_STOP_ALL_DISABLED=0
 INIT_CAL_PAGE_SEGMENTWISE=0
 CALRAM_CHECK_INITIAL_PAGE=1
@@ -5020,10 +5020,10 @@ COUNT=5
 [DlgCommentWrapper]
 
 ScreenDPIinSection=96
-WindowLeft=621
-WindowLeft_dpi96=621
-WindowTop=283
-WindowTop_dpi96=283
+WindowLeft=558
+WindowLeft_dpi96=558
+WindowTop=292
+WindowTop_dpi96=292
 WindowWidth=678
 WindowWidth_dpi96=678
 WindowHeight=467
@@ -5144,10 +5144,10 @@ HEIGHT=1
 
 [DlgMdfComment]
 ScreenDPIinSection=96
-WindowLeft=629
-WindowLeft_dpi96=629
-WindowTop=314
-WindowTop_dpi96=314
+WindowLeft=566
+WindowLeft_dpi96=566
+WindowTop=323
+WindowTop_dpi96=323
 WindowWidth=662
 WindowWidth_dpi96=662
 WindowHeight=393
@@ -5895,5 +5895,5 @@ POSTPROC_MODE=0
 Count=0
 
 [~~~~~_CONSISTENCY_CHECK_END_SECTION_~~~~~]
-GUID={D121255C-2680-48E2-AC9D-6C6445E940D3}
+GUID={E0EF4B52-D7DC-4DA0-9A72-F2B0522AAF9B}
 
diff --git a/CANape/xcp_lite_autodetect.a2l b/CANape/xcp_lite_autodetect.a2l
@@ -201,8 +201,8 @@
 /begin MEASUREMENT counter_u8 "wrapping counter: u8" UBYTE NO_COMPU_METHOD 0 0 0 255 PHYS_UNIT "" ECU_ADDRESS 0x4000B ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 4 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin MEASUREMENT counter_usize "wrapping counter: u64" A_UINT64 NO_COMPU_METHOD 0 0 0 1E15 PHYS_UNIT "" ECU_ADDRESS 0x4FF64 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 4 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin MEASUREMENT mainloop_counter1 "" A_UINT64 NO_COMPU_METHOD 0 0 0 1E15 PHYS_UNIT "" ECU_ADDRESS 0x4 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 MEASUREMENT mainloop_local_var1 "" A_UINT64 NO_COMPU_METHOD 0 0 0 1E15 PHYS_UNIT "" ECU_ADDRESS 0x1FEDC ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
-/begin MEASUREMENT mainloop_local_var2 "" A_UINT64 NO_COMPU_METHOD 0 0 0 1E15 PHYS_UNIT "" ECU_ADDRESS 0x1FED4 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT mainloop_local_var1 "" A_UINT64 NO_COMPU_METHOD 0 0 0 1E15 PHYS_UNIT "" ECU_ADDRESS 0x1FEE4 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
+/begin MEASUREMENT mainloop_local_var2 "" A_UINT64 NO_COMPU_METHOD 0 0 0 1E15 PHYS_UNIT "" ECU_ADDRESS 0x1FEDC ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 1 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 /begin MEASUREMENT mainloop_map "2D map on heap" A_UINT64 NO_COMPU_METHOD 0 0 0 1E15 PHYS_UNIT "" ECU_ADDRESS 0x20000 ECU_ADDRESS_EXTENSION 2 MATRIX_DIM 16 16 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT
 
 /begin GROUP mainloop_local "" ROOT /begin REF_MEASUREMENT mainloop_local_var1 mainloop_local_var2 /end REF_MEASUREMENT /end GROUP
@@ -211,10 +211,10 @@
 
 /begin GROUP task2_inst "" ROOT /begin REF_MEASUREMENT channel_1 channel_10 channel_2 channel_3 channel_4 channel_5 channel_6 channel_7 channel_8 channel_9 /end REF_MEASUREMENT /end GROUP
 
-/begin CHARACTERISTIC static_cal_page.task1_cycle_time_us "task1 cycle time" VALUE 0x14502C U32 0 NO_COMPU_METHOD 0 4294967295 PHYS_UNIT "us" ECU_ADDRESS_EXTENSION 1 /end CHARACTERISTIC
-/begin CHARACTERISTIC static_cal_page.task2_cycle_time_us "task2 cycle time" VALUE 0x145030 U32 0 NO_COMPU_METHOD 0 4294967295 PHYS_UNIT "us" ECU_ADDRESS_EXTENSION 1 /end CHARACTERISTIC
-/begin CHARACTERISTIC static_vars.test_f64 "Test static f64" VALUE 0x145170 F64 0 NO_COMPU_METHOD -1000000000000 1000000000000 ECU_ADDRESS_EXTENSION 1 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 3 /end DAQ_EVENT /end IF_DATA /end CHARACTERISTIC
-/begin CHARACTERISTIC static_vars.test_u32 "Test static u32" VALUE 0x145178 U32 0 NO_COMPU_METHOD 0 4294967295 ECU_ADDRESS_EXTENSION 1 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 3 /end DAQ_EVENT /end IF_DATA /end CHARACTERISTIC
+/begin CHARACTERISTIC static_cal_page.task1_cycle_time_us "task1 cycle time" VALUE 0x14402C U32 0 NO_COMPU_METHOD 0 4294967295 PHYS_UNIT "us" ECU_ADDRESS_EXTENSION 1 /end CHARACTERISTIC
+/begin CHARACTERISTIC static_cal_page.task2_cycle_time_us "task2 cycle time" VALUE 0x144030 U32 0 NO_COMPU_METHOD 0 4294967295 PHYS_UNIT "us" ECU_ADDRESS_EXTENSION 1 /end CHARACTERISTIC
+/begin CHARACTERISTIC static_vars.test_f64 "Test static f64" VALUE 0x144170 F64 0 NO_COMPU_METHOD -1000000000000 1000000000000 ECU_ADDRESS_EXTENSION 1 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 3 /end DAQ_EVENT /end IF_DATA /end CHARACTERISTIC
+/begin CHARACTERISTIC static_vars.test_u32 "Test static u32" VALUE 0x144178 U32 0 NO_COMPU_METHOD 0 4294967295 ECU_ADDRESS_EXTENSION 1 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 3 /end DAQ_EVENT /end IF_DATA /end CHARACTERISTIC
 /begin CHARACTERISTIC CalPage.cycle_time_ms "main task cycle time" VALUE 0x80010000 U32 0 NO_COMPU_METHOD 0 4294967295 PHYS_UNIT "ms" /end CHARACTERISTIC
 /begin CHARACTERISTIC CalPage.run "" VALUE 0x80010004 U8 0 NO_COMPU_METHOD 0 1 PHYS_UNIT "bool" /end CHARACTERISTIC
 /begin CHARACTERISTIC CalPage.run1 "" VALUE 0x80010005 U8 0 NO_COMPU_METHOD 0 1 PHYS_UNIT "bool" /end CHARACTERISTIC

diff --git a/examples/multi_thread_demo/CANape/CanapeCmd.ini b/examples/multi_thread_demo/CANape/CanapeCmd.ini
@@ -2,9 +2,9 @@
 COMMAND_COUNT=0
 COMMAND_HISTORY=0
 COMMAND_DESCRIPTION=0
-MENU_ICON_WIDTH=16
+MENU_ICON_WIDTH=20
 MENU_ICON_WIDTH_dpi96=16
-MENU_ICON_HEIGHT=16
+MENU_ICON_HEIGHT=20
 MENU_ICON_HEIGHT_dpi96=16
 COUNT=1271