Debug prints refactored, memory check hook, bugfixes

benxh · Mar 2, 2022 · 876aca1 · 876aca1
1 parent 2729500
commit 876aca1
Show file tree

Hide file tree

Showing 27 changed files with 1,121 additions and 1,071 deletions.
diff --git a/CPP_Demo/CANape/CANape.ini b/CPP_Demo/CANape/CANape.ini
diff --git a/CPP_Demo/CANape/CPP_Demo.cna b/CPP_Demo/CANape/CPP_Demo.cna
diff --git a/CPP_Demo/CANape/CanapeCmd.ini b/CPP_Demo/CANape/CanapeCmd.ini
@@ -3,8 +3,8 @@ COMMAND_COUNT=0
 COMMAND_HISTORY=0
 COMMAND_DESCRIPTION=0
 MENU_ICON=0
-MENU_ICON_WIDTH=24
-MENU_ICON_HEIGHT=24
+MENU_ICON_WIDTH=16
+MENU_ICON_HEIGHT=16
 COUNT=1306
 MENU_ICON_WIDTH_dpi96=16
 MENU_ICON_HEIGHT_dpi96=16

diff --git a/CPP_Demo/CMakeLists.txt b/CPP_Demo/CMakeLists.txt
@@ -12,6 +12,7 @@ set(CPP_Demo_SOURCES
 
 set(OPTION_DEBUG_LEVEL 1 CACHE STRING "Debug output level")
 option(OPTION_ENABLE_TCP "Enable TCP" 1)
+option(OPTION_USE_TCP "Use TCP by default" 0)
 set(OPTION_SERVER_PORT 5555 CACHE STRING "XCP default port")
 set(OPTION_SERVER_ADDR {0,0,0,0} CACHE STRING "XCP IP address to bind, ANY=0.0.0.0")
 option(OPTION_ENABLE_A2L_GEN "Enable A2L file generator" 1)

diff --git a/CPP_Demo/main_cfg.h b/CPP_Demo/main_cfg.h
@@ -6,6 +6,8 @@
 /* Copyright(c) Vector Informatik GmbH.All rights reserved.
    Licensed under the MIT license.See LICENSE file in the project root for details. */
 
+#define APP_CPP_DEMO
+
 #define APP_NAME "CPP_Demo"
 #define APP_VERSION_MAJOR 5
 #define APP_VERSION_MINOR 0
@@ -26,6 +28,7 @@
 
 // Default ip addr and port
 #define OPTION_ENABLE_TCP ON // Enable TCP support and commandline option -tcp
+#define OPTION_USE_TCP OFF // Enable TCP by default and commandline option -udp
 #define OPTION_SERVER_PORT 5555 // Default UDP port
 #define OPTION_SERVER_ADDR {0,0,0,0} // Default IP addr, 0.0.0.0 = ANY, 255.255.255.255 = first adapter found, overwritten by commandline option -bind x.x.x.x
 

diff --git a/CPP_Demo/main_cfg.h.in b/CPP_Demo/main_cfg.h.in
@@ -6,6 +6,7 @@
 /* Copyright(c) Vector Informatik GmbH.All rights reserved.
    Licensed under the MIT license.See LICENSE file in the project root for details. */
 
+#define APP_CPP_DEMO
 #define APP_NAME "CPP_Demo"
 #define APP_VERSION_MAJOR @CPP_Demo_VERSION_MAJOR@
 #define APP_VERSION_MINOR @CPP_Demo_VERSION_MINOR@
@@ -26,6 +27,7 @@
 
 // Default ip addr and port
 #define OPTION_ENABLE_TCP @OPTION_ENABLE_TCP@ // Enable TCP support and commandline option -tcp
+#define OPTION_USE_TCP @OPTION_USE_TCP@ // Enable TCP by default and commandline option -udp
 #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, 0.0.0.0 = ANY, 255.255.255.255 = first adapter found, overwritten by commandline option -bind x.x.x.x