Removed git markings (#52)

vectorgrp · May 27, 2024 · 88b748b · 88b748b
1 parent 65158d1
commit 88b748b
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 110 deletions.
diff --git a/CPP_Demo/CANape/CANape.ini b/CPP_Demo/CANape/CANape.ini
@@ -20,18 +20,14 @@ PrgDate=14.12.2023
 Description=
 CreationTime=22:29
 CreationDate=09/06/2020 ; Month/Day/Year
-<<<<<<< HEAD
-<<<<<<< HEAD
 ModificationTime=18:22
 ModificationDate=02/07/2024 ; Month/Day/Year
 
 ModificationTime=14:23
 ModificationDate=07/19/2023 ; Month/Day/Year
->>>>>>> 0ded51f (V6 synch with internal version)
 
 ModificationTime=15:55
 ModificationDate=12/15/2021 ; Month/Day/Year
->>>>>>> Vector/master
 Protected=0
 CurrentWindowsACP=1252
 
@@ -1103,16 +1099,16 @@ RIGHTPANE2HEIGHT=-1
 TREEX=265
 TREEY=679
 ACTIVEPANE=1
-SELECTED_TREENODE=Geräte/XCPsim_Device/Protokoll/Transportschicht
-FIRSTVISIBLE_TREENODE=Geräte
+SELECTED_TREENODE=Ger�te/XCPsim_Device/Protokoll/Transportschicht
+FIRSTVISIBLE_TREENODE=Ger�te
 TREEEXPAND_COUNT=8
-TREEEXPAND_0=Geräte
-TREEEXPAND_1=Geräte/XCPsim_Device
-TREEEXPAND_2=Geräte/XCPsim_Device/Datenbasis
+TREEEXPAND_0=Ger�te
+TREEEXPAND_1=Ger�te/XCPsim_Device
+TREEEXPAND_2=Ger�te/XCPsim_Device/Datenbasis
 LAST_FOCUSED_LISTCOLUMN=1
 LAST_FOCUSED_LISTINDEX=0
 LAST_TOP_LISTINDEX=0
-TREEEXPAND_3=Geräte/XCPsim_Device/Protokoll
+TREEEXPAND_3=Ger�te/XCPsim_Device/Protokoll
 TREEEXPAND_4=Netzwerke
 TREEEXPAND_5=Netzwerke/ETH_LocalPC_Network
 TREEEXPAND_6=Netzwerke/ETH_LocalPC_Network/XCPsim_Device
@@ -1149,7 +1145,6 @@ Height_dpi96=793
 ColWidthName=216
 ColWidthDisplay=192
 ShowMore=0
-<<<<<<< HEAD
 MoreHeight=294
 ScreenDPIinSection=96
 WindowLeft=1390
@@ -1169,7 +1164,6 @@ WindowHeight=195
 MoreHeight_dpi96=294
 WindowLeft_dpi96=1513
 WindowTop_dpi96=587
->>>>>>> Vector/master
 WindowWidth_dpi96=624
 WindowHeight_dpi96=130
 
@@ -2265,7 +2259,6 @@ WindowWidth_dpi96=677
 WindowHeight_dpi96=466
 
 [DlgMdfComment]
-<<<<<<< HEAD
 WindowLeft=1371
 WindowTop=506
 WindowWidth=662
@@ -2281,7 +2274,6 @@ WindowHeight=593
 ScreenDPIinSection=144
 WindowLeft_dpi96=1449
 WindowTop_dpi96=546
->>>>>>> Vector/master
 WindowWidth_dpi96=662
 WindowHeight_dpi96=395
 
@@ -3113,11 +3105,9 @@ PSEUDO_CAN_ID_START=2415919104
 DSP_MODE=0
 DAQ_LIST_AUTODETECT=0
 DAQ_COUNT=0
-<<<<<<< HEAD
 DAQ_CONFIG_ID=39152
 
 DAQ_CONFIG_ID=0
->>>>>>> Vector/master
 DAQ_START_STOP_ALL_DISABLED=0
 INIT_CAL_PAGE_SEGMENTWISE=0
 CALRAM_CHECK_INITIAL_PAGE=1
@@ -3222,11 +3212,9 @@ MEMORY_SEGMENT_COUNT=0
 MEMORY_SEGMENT_NAME_1=CALRAM
 MEMORY_SEGMENT_TYPE_1=FLASH,DATA,INTERN
 MEMORY_SEGMENT_SIZE_1=0x00000100
-<<<<<<< HEAD
 MEMORY_SEGMENT_ADDR_1=0x046C9940
 
 MEMORY_SEGMENT_ADDR_1=0x005AEC80
->>>>>>> Vector/master
 MEMORY_SEGMENT_ADDR_EXT_1=0x00
 MEMORY_SEGMENT_ATTRIBUTE_1=0x00000000
 MEMORY_SEGMENT_FLASH_OFFSET_1=0x00000000
@@ -3235,11 +3223,9 @@ MEMORY_SEGMENT_ADDRESS_MAPPING_1=
 CALRAM_SECTOR_NAME_1=CALRAM
 CALRAM_SECTOR_TYPE_1=FLASH,DATA,INTERN
 CALRAM_SECTOR_SIZE_1=0x00000100
-<<<<<<< HEAD
 CALRAM_SECTOR_ADDR_1=0x005AEC80
 
 CALRAM_SECTOR_ADDR_1=0x00030180
->>>>>>> Vector/master
 CALRAM_SECTOR_ADDR_EXT_1=0x00
 CALRAM_SECTOR_ATTRIBUTE_1=0x00000000
 CALRAM_SECTOR_FLASH_OFFSET_1=0x00000000
@@ -3256,11 +3242,9 @@ PACKET_CTR=1
 
 
 
-<<<<<<< HEAD
 HOST=127.0.0.1
 
 HOST=127.0.0.1
->>>>>>> 0ded51f (V6 synch with internal version)
 PORT=5555
 LOCAL_PORT=0
 TRANSPORT_LAYER_PROTOCOL=1
@@ -3406,11 +3390,9 @@ XCP_OPTIONAL_CMD_AVAILABLE_61=2
 XCP_OPTIONAL_CMD_AVAILABLE_62=2
 XCP_OPTIONAL_CMD_AVAILABLE_63=2
 XCP_OPTIONAL_CMD_AUTO_LEARNING=1
-<<<<<<< HEAD
 XCP_OPTIONAL_SUB_CMD_AVAILABLE_0=2
 
 XCP_OPTIONAL_SUB_CMD_AVAILABLE_0=2
->>>>>>> 0ded51f (V6 synch with internal version)
 XCP_OPTIONAL_SUB_CMD_AVAILABLE_1=2
 XCP_OPTIONAL_SUB_CMD_AVAILABLE_2=2
 TRANSPORT_LAYER_VERSION=260
@@ -4503,11 +4485,11 @@ TREEEXPAND_COUNT=4
 TREEEXPAND_0=Netzwerke
 TREEEXPAND_1=Netzwerke/ETH_LocalPC_Network
 TREEEXPAND_2=Netzwerke/ETH_LocalPC_Network/XCPsim_Device
-TREEEXPAND_3=Kanäle
+TREEEXPAND_3=Kan�le
 LAST_FOCUSED_LISTCOLUMN=0
 LAST_FOCUSED_LISTINDEX=0
 LAST_TOP_LISTINDEX=0
-TREEEXPAND_4=Kanäle
+TREEEXPAND_4=Kan�le
 
 [DLG_DISPLAY_PAGE]
 LAST_PAGE=Anzeigeseite
@@ -4998,7 +4980,6 @@ COUNT=5
 5=}
 
 [DlgCommentWrapper]
-<<<<<<< HEAD
 ScreenDPIinSection=96
 WindowLeft=1363
 WindowLeft_dpi96=1363
@@ -5018,7 +4999,6 @@ WindowWidth=1015
 WindowWidth_dpi96=677
 WindowHeight=699
 WindowHeight_dpi96=466
->>>>>>> Vector/master
 
 [FUNCTION_5]
 NAME=DelayJitter
@@ -5047,7 +5027,6 @@ COUNT=5
 4= return ;
 5=}
 
-<<<<<<< HEAD
 
 [Dialog_MdiCfgDlg_Typ1099511627776]
 LastOpenedDlgType=8

diff --git a/CPP_Demo/CANape/CPP_Demo.cna b/CPP_Demo/CANape/CPP_Demo.cna
@@ -10,13 +10,11 @@ PrgDate=14.12.2023
 Description=
 CreationTime=18:30
 CreationDate=01/27/2022 ; Month/Day/Year
-<<<<<<< HEAD
 ModificationTime=18:22
 ModificationDate=02/07/2024 ; Month/Day/Year
 
 ModificationTime=14:23
 ModificationDate=07/19/2023 ; Month/Day/Year
->>>>>>> 0ded51f (V6 synch with internal version)
 Protected=0
 CurrentWindowsACP=1252
 
@@ -905,7 +903,7 @@ FilterNodeID=Alle\Messliste
 TreeExpand_0=@Alle
 TreeExpand_1=Alle\Messliste
 TreeExpand_2=Alle\Messliste\Alle Signale
-TreeExpand_3=$Alle\Ger�te
+TreeExpand_3=$Alle\Ger�te
 TreeExpand_4=#Alle\Messliste\Alle Signale\gChannel1
 TreeExpand_5=@Alle\Messliste
 TreeExpand_6=$Alle\Messliste\Alle Signale

diff --git a/CPP_Demo/CANape_static/CANape.ini b/CPP_Demo/CANape_static/CANape.ini
@@ -20,18 +20,14 @@ PrgDate=14.12.2023
 Description=
 CreationTime=22:29
 CreationDate=09/06/2020 ; Month/Day/Year
-<<<<<<< HEAD
-<<<<<<< HEAD
 ModificationTime=20:06
 ModificationDate=02/06/2024 ; Month/Day/Year
 
 ModificationTime=14:23
 ModificationDate=07/19/2023 ; Month/Day/Year
->>>>>>> 0ded51f (V6 synch with internal version)
 
 ModificationTime=15:55
 ModificationDate=12/15/2021 ; Month/Day/Year
->>>>>>> Vector/master
 Protected=0
 CurrentWindowsACP=1252
 
@@ -1103,12 +1099,12 @@ RIGHTPANE2HEIGHT=-1
 TREEX=331
 TREEY=853
 ACTIVEPANE=0
-SELECTED_TREENODE=Geräte/XCPsim_Device/Datenbasis
-FIRSTVISIBLE_TREENODE=Geräte
+SELECTED_TREENODE=Ger�te/XCPsim_Device/Datenbasis
+FIRSTVISIBLE_TREENODE=Ger�te
 TREEEXPAND_COUNT=3
-TREEEXPAND_0=Geräte
-TREEEXPAND_1=Geräte/XCPsim_Device
-TREEEXPAND_2=Geräte/XCPsim_Device/Protokoll
+TREEEXPAND_0=Ger�te
+TREEEXPAND_1=Ger�te/XCPsim_Device
+TREEEXPAND_2=Ger�te/XCPsim_Device/Protokoll
 LAST_FOCUSED_LISTCOLUMN=1
 LAST_FOCUSED_LISTINDEX=0
 LAST_TOP_LISTINDEX=0
@@ -1149,7 +1145,6 @@ Height_dpi96=793
 ColWidthName=270
 ColWidthDisplay=240
 ShowMore=0
-<<<<<<< HEAD
 MoreHeight=368
 ScreenDPIinSection=120
 WindowLeft=1667
@@ -1169,7 +1164,6 @@ WindowHeight=195
 MoreHeight_dpi96=294
 WindowLeft_dpi96=1513
 WindowTop_dpi96=587
->>>>>>> Vector/master
 WindowWidth_dpi96=624
 WindowHeight_dpi96=130
 
@@ -2265,7 +2259,6 @@ WindowWidth_dpi96=677
 WindowHeight_dpi96=466
 
 [DlgMdfComment]
-<<<<<<< HEAD
 WindowLeft=1643
 WindowTop=446
 WindowWidth=828
@@ -2281,7 +2274,6 @@ WindowHeight=593
 ScreenDPIinSection=144
 WindowLeft_dpi96=1449
 WindowTop_dpi96=546
->>>>>>> Vector/master
 WindowWidth_dpi96=662
 WindowHeight_dpi96=395
 
@@ -3113,11 +3105,9 @@ PSEUDO_CAN_ID_START=2415919104
 DSP_MODE=0
 DAQ_LIST_AUTODETECT=0
 DAQ_COUNT=0
-<<<<<<< HEAD
 DAQ_CONFIG_ID=39120
 
 DAQ_CONFIG_ID=0
->>>>>>> Vector/master
 DAQ_START_STOP_ALL_DISABLED=0
 INIT_CAL_PAGE_SEGMENTWISE=0
 CALRAM_CHECK_INITIAL_PAGE=1
@@ -3222,11 +3212,9 @@ MEMORY_SEGMENT_COUNT=0
 MEMORY_SEGMENT_NAME_1=CALRAM
 MEMORY_SEGMENT_TYPE_1=FLASH,DATA,INTERN
 MEMORY_SEGMENT_SIZE_1=0x00000100
-<<<<<<< HEAD
 MEMORY_SEGMENT_ADDR_1=0x046C9940
 
 MEMORY_SEGMENT_ADDR_1=0x005AEC80
->>>>>>> Vector/master
 MEMORY_SEGMENT_ADDR_EXT_1=0x00
 MEMORY_SEGMENT_ATTRIBUTE_1=0x00000000
 MEMORY_SEGMENT_FLASH_OFFSET_1=0x00000000
@@ -3235,11 +3223,9 @@ MEMORY_SEGMENT_ADDRESS_MAPPING_1=
 CALRAM_SECTOR_NAME_1=CALRAM
 CALRAM_SECTOR_TYPE_1=FLASH,DATA,INTERN
 CALRAM_SECTOR_SIZE_1=0x00000100
-<<<<<<< HEAD
 CALRAM_SECTOR_ADDR_1=0x005AEC80
 
 CALRAM_SECTOR_ADDR_1=0x00030180
->>>>>>> Vector/master
 CALRAM_SECTOR_ADDR_EXT_1=0x00
 CALRAM_SECTOR_ATTRIBUTE_1=0x00000000
 CALRAM_SECTOR_FLASH_OFFSET_1=0x00000000
@@ -3256,11 +3242,9 @@ PACKET_CTR=1
 
 
 
-<<<<<<< HEAD
 HOST=127.0.0.1
 
 HOST=172.31.31.11
->>>>>>> 0ded51f (V6 synch with internal version)
 PORT=5555
 LOCAL_PORT=0
 TRANSPORT_LAYER_PROTOCOL=1
@@ -3406,11 +3390,9 @@ XCP_OPTIONAL_CMD_AVAILABLE_61=2
 XCP_OPTIONAL_CMD_AVAILABLE_62=2
 XCP_OPTIONAL_CMD_AVAILABLE_63=2
 XCP_OPTIONAL_CMD_AUTO_LEARNING=1
-<<<<<<< HEAD
 XCP_OPTIONAL_SUB_CMD_AVAILABLE_0=2
 
 XCP_OPTIONAL_SUB_CMD_AVAILABLE_0=2
->>>>>>> 0ded51f (V6 synch with internal version)
 XCP_OPTIONAL_SUB_CMD_AVAILABLE_1=2
 XCP_OPTIONAL_SUB_CMD_AVAILABLE_2=2
 TRANSPORT_LAYER_VERSION=260
@@ -4507,7 +4489,7 @@ TREEEXPAND_3=Netzwerke/ETH_LocalPC/XCPsim/Protokoll
 LAST_FOCUSED_LISTCOLUMN=0
 LAST_FOCUSED_LISTINDEX=0
 LAST_TOP_LISTINDEX=0
-TREEEXPAND_4=Kanäle
+TREEEXPAND_4=Kan�le
 
 [DLG_DISPLAY_PAGE]
 LAST_PAGE=Anzeigeseite
@@ -4998,7 +4980,6 @@ COUNT=5
 5=}
 
 [DlgCommentWrapper]
-<<<<<<< HEAD
 ScreenDPIinSection=120
 WindowLeft=1634
 WindowLeft_dpi96=1307
@@ -5018,7 +4999,6 @@ WindowWidth=1015
 WindowWidth_dpi96=677
 WindowHeight=699
 WindowHeight_dpi96=466
->>>>>>> Vector/master
 
 [FUNCTION_5]
 NAME=DelayJitter
@@ -5047,7 +5027,6 @@ COUNT=5
 4= return ;
 5=}
 
-<<<<<<< HEAD
 
 [Dialog_MdiCfgDlg_Typ1099511627776]
 LastOpenedDlgType=8

diff --git a/CPP_Demo/main_cfg.h.in b/CPP_Demo/main_cfg.h.in
@@ -22,29 +22,18 @@
 #define OPTION_DEBUG_LEVEL @OPTION_DEBUG_LEVEL@ 
 
 // A2L generation
-<<<<<<< HEAD
-#define OPTION_ENABLE_A2L_GEN ON // Enable A2L generation
-#if OPTION_ENABLE_A2L_GEN
-#define OPTION_ENABLE_A2L_SYMBOL_LINKS ON // Enable generation of symbol links (required for CANape integrated linker map update)
-=======
 #define OPTION_ENABLE_A2L_GEN ON // Enable A2L generation
 #if OPTION_ENABLE_A2L_GEN
 #define OPTION_ENABLE_A2L_SYMBOL_LINKS ON // Enable generation of symbol links (required for CANape integrated linker map update)
->>>>>>> 0ded51f (V6 synch with internal version)
 #define OPTION_A2L_NAME "CPP_Demo" // A2L name 
 #define OPTION_A2L_FILE_NAME "CPP_Demo.a2l" // A2L filename 
 #define OPTION_A2L_PROJECT_NAME "CPP_Demo" // A2L project name
 #endif
 
 // Default communication parameters
 #define OPTION_ENABLE_TCP @OPTION_ENABLE_TCP@ // Enable TCP support
-<<<<<<< HEAD
-#define OPTION_USE_TCP @OPTION_USE_TCP@ 
-#define OPTION_MTU 1500
-=======
 #define OPTION_USE_TCP @OPTION_USE_TCP@ // Default
 #define OPTION_MTU @OPTION_MTU@ // Ethernet MTU
->>>>>>> 0ded51f (V6 synch with internal version)
 #define OPTION_SERVER_PORT @OPTION_SERVER_PORT@ // Default UDP port, overwritten by commandline option -port
 #define OPTION_SERVER_ADDR @OPTION_SERVER_ADDR@ // Default IP addr to bind, 0.0.0.0 = ANY, overwritten by commandline option -bind x.x.x.x