From 63aecdd1ff60eb55c0784c17bfe4a51b5dd67564 Mon Sep 17 00:00:00 2001 From: Rainer Zaiser Date: Sat, 31 Aug 2024 13:30:05 +0200 Subject: [PATCH] Minor changes --- .gitignore | 2 + CPP_Demo/main.cpp | 6 + C_Demo/ecu.c | 4 + C_Demo/main.h | 92 ----- XCPlib/XCPlib.xcodeproj/project.pbxproj | 346 ------------------ .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../UserInterfaceState.xcuserstate | Bin 14664 -> 0 bytes .../xcschemes/xcschememanagement.plist | 14 - XCPlib/main.h | 88 ----- XCPlite/main.c | 5 + XCPlite/main.h | 13 - src/main.h | 5 - src/xcpAppl.c | 2 +- src/xcpLite.h | 2 +- 15 files changed, 19 insertions(+), 575 deletions(-) delete mode 100644 C_Demo/main.h delete mode 100644 XCPlib/XCPlib.xcodeproj/project.pbxproj delete mode 100644 XCPlib/XCPlib.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 XCPlib/XCPlib.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 XCPlib/XCPlib.xcodeproj/project.xcworkspace/xcuserdata/rainer.xcuserdatad/UserInterfaceState.xcuserstate delete mode 100644 XCPlib/XCPlib.xcodeproj/xcuserdata/rainer.xcuserdatad/xcschemes/xcschememanagement.plist delete mode 100644 XCPlib/main.h diff --git a/.gitignore b/.gitignore index e808787..ab45b47 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,5 @@ Xcode_build/ Environment CustomProperties.json +/.vscode/settings.json +/.vscode/tasks.json diff --git a/CPP_Demo/main.cpp b/CPP_Demo/main.cpp index 7ae7eb7..632880b 100644 --- a/CPP_Demo/main.cpp +++ b/CPP_Demo/main.cpp @@ -21,6 +21,12 @@ #include "A2Lpp.hpp" +#ifdef _WIN +#define M_PI 3.14159265358979323846 +#endif +#define M_2PI (M_PI*2) + + // OPTIONs are defined in main_cfg.h diff --git a/C_Demo/ecu.c b/C_Demo/ecu.c index 336a57d..852b789 100644 --- a/C_Demo/ecu.c +++ b/C_Demo/ecu.c @@ -18,6 +18,10 @@ #endif #include "ecu.h" +#ifdef _WIN +#define M_PI 3.14159265358979323846 +#endif +#define M_2PI (M_PI*2) /**************************************************************************/ /* ECU Measurements */ diff --git a/C_Demo/main.h b/C_Demo/main.h deleted file mode 100644 index 0d22152..0000000 --- a/C_Demo/main.h +++ /dev/null @@ -1,92 +0,0 @@ -#pragma once - - -/* main.h */ -/* -| Code released into public domain, no attribution required -*/ - -// Windows or Linux ? -#if defined(_WIN32) || defined(_WIN64) - #define _WIN - #if defined(_WIN32) && defined(_WIN64) - #undef _WIN32 - #endif - #if defined(_LINUX) || defined(_LINUX64)|| defined(_LINUX32) - #error - #endif -#else - #define _LINUX - #if defined (_ix64_) || defined (__x86_64__) || defined (__aarch64__) - #define _LINUX64 - #else - #define _LINUX32 - #endif - #if defined(_WIN) || defined(_WIN64)|| defined(_WIN32) - #error - #endif -#endif - - -#ifdef _WIN -#define WIN32_LEAN_AND_MEAN -#define _CRT_SECURE_NO_WARNINGS -#else -#define _DEFAULT_SOURCE -#endif - - -#include -#include -#include -#include -#include -#include - -#ifndef _WIN // Linux - -#include -#include -#include -#include -#include -//#include - -#include -#include -//#include -//#include -//#include -//#include -#include -#include - -//#define MAX_PATH 256 - -#else // Windows - -#include -#include -#include - -#endif - - -#ifdef __cplusplus -#include -#include -#include -#include -#endif - -#define BOOL int -#define FALSE 0 -#define TRUE 1 - -#ifdef _WIN -#define M_PI 3.14159265358979323846 -#endif -#define M_2PI (M_PI*2) - -#include "main_cfg.h" - diff --git a/XCPlib/XCPlib.xcodeproj/project.pbxproj b/XCPlib/XCPlib.xcodeproj/project.pbxproj deleted file mode 100644 index 7a03a18..0000000 --- a/XCPlib/XCPlib.xcodeproj/project.pbxproj +++ /dev/null @@ -1,346 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 56; - objects = { - -/* Begin PBXBuildFile section */ - D52705D62B76E30000875CEC /* main.h in Headers */ = {isa = PBXBuildFile; fileRef = D52705D12B76E30000875CEC /* main.h */; }; - D52705D72B76E30000875CEC /* xcp_cfg.h in Headers */ = {isa = PBXBuildFile; fileRef = D52705D22B76E30000875CEC /* xcp_cfg.h */; }; - D52705D82B76E30000875CEC /* main_cfg.h in Headers */ = {isa = PBXBuildFile; fileRef = D52705D32B76E30000875CEC /* main_cfg.h */; }; - D52705D92B76E30000875CEC /* xcpAppl.c in Sources */ = {isa = PBXBuildFile; fileRef = D52705D42B76E30000875CEC /* xcpAppl.c */; }; - D52705DA2B76E30000875CEC /* xcptl_cfg.h in Headers */ = {isa = PBXBuildFile; fileRef = D52705D52B76E30000875CEC /* xcptl_cfg.h */; }; - D52705E82B76E32700875CEC /* xcpLite.c in Sources */ = {isa = PBXBuildFile; fileRef = D52705DB2B76E32700875CEC /* xcpLite.c */; }; - D52705E92B76E32700875CEC /* dbg_print.h in Headers */ = {isa = PBXBuildFile; fileRef = D52705DC2B76E32700875CEC /* dbg_print.h */; }; - D52705EA2B76E32700875CEC /* xcp.h in Headers */ = {isa = PBXBuildFile; fileRef = D52705DD2B76E32700875CEC /* xcp.h */; }; - D52705EB2B76E32700875CEC /* xcpEthServer.c in Sources */ = {isa = PBXBuildFile; fileRef = D52705DE2B76E32700875CEC /* xcpEthServer.c */; }; - D52705EC2B76E32700875CEC /* xcpEthTl.h in Headers */ = {isa = PBXBuildFile; fileRef = D52705DF2B76E32700875CEC /* xcpEthTl.h */; }; - D52705ED2B76E32700875CEC /* A2L.c in Sources */ = {isa = PBXBuildFile; fileRef = D52705E02B76E32700875CEC /* A2L.c */; }; - D52705EE2B76E32700875CEC /* xcpLite.h in Headers */ = {isa = PBXBuildFile; fileRef = D52705E12B76E32700875CEC /* xcpLite.h */; }; - D52705EF2B76E32700875CEC /* platform.c in Sources */ = {isa = PBXBuildFile; fileRef = D52705E22B76E32700875CEC /* platform.c */; }; - D52705F02B76E32700875CEC /* xcpEthServer.h in Headers */ = {isa = PBXBuildFile; fileRef = D52705E32B76E32700875CEC /* xcpEthServer.h */; }; - D52705F12B76E32700875CEC /* xcpEthTl.c in Sources */ = {isa = PBXBuildFile; fileRef = D52705E42B76E32700875CEC /* xcpEthTl.c */; }; - D52705F22B76E32700875CEC /* A2L.h in Headers */ = {isa = PBXBuildFile; fileRef = D52705E52B76E32700875CEC /* A2L.h */; }; - D52705F32B76E32700875CEC /* xcpTl.h in Headers */ = {isa = PBXBuildFile; fileRef = D52705E62B76E32700875CEC /* xcpTl.h */; }; - D52705F42B76E32700875CEC /* platform.h in Headers */ = {isa = PBXBuildFile; fileRef = D52705E72B76E32700875CEC /* platform.h */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - D52705CA2B76E25A00875CEC /* libXCPlib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libXCPlib.a; sourceTree = BUILT_PRODUCTS_DIR; }; - D52705D12B76E30000875CEC /* main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = main.h; sourceTree = ""; }; - D52705D22B76E30000875CEC /* xcp_cfg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xcp_cfg.h; sourceTree = ""; }; - D52705D32B76E30000875CEC /* main_cfg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = main_cfg.h; sourceTree = ""; }; - D52705D42B76E30000875CEC /* xcpAppl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xcpAppl.c; sourceTree = ""; }; - D52705D52B76E30000875CEC /* xcptl_cfg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xcptl_cfg.h; sourceTree = ""; }; - D52705DB2B76E32700875CEC /* xcpLite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xcpLite.c; path = ../src/xcpLite.c; sourceTree = ""; }; - D52705DC2B76E32700875CEC /* dbg_print.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dbg_print.h; path = ../src/dbg_print.h; sourceTree = ""; }; - D52705DD2B76E32700875CEC /* xcp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xcp.h; path = ../src/xcp.h; sourceTree = ""; }; - D52705DE2B76E32700875CEC /* xcpEthServer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xcpEthServer.c; path = ../src/xcpEthServer.c; sourceTree = ""; }; - D52705DF2B76E32700875CEC /* xcpEthTl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xcpEthTl.h; path = ../src/xcpEthTl.h; sourceTree = ""; }; - D52705E02B76E32700875CEC /* A2L.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = A2L.c; path = ../src/A2L.c; sourceTree = ""; }; - D52705E12B76E32700875CEC /* xcpLite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xcpLite.h; path = ../src/xcpLite.h; sourceTree = ""; }; - D52705E22B76E32700875CEC /* platform.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = platform.c; path = ../src/platform.c; sourceTree = ""; }; - D52705E32B76E32700875CEC /* xcpEthServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xcpEthServer.h; path = ../src/xcpEthServer.h; sourceTree = ""; }; - D52705E42B76E32700875CEC /* xcpEthTl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xcpEthTl.c; path = ../src/xcpEthTl.c; sourceTree = ""; }; - D52705E52B76E32700875CEC /* A2L.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = A2L.h; path = ../src/A2L.h; sourceTree = ""; }; - D52705E62B76E32700875CEC /* xcpTl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xcpTl.h; path = ../src/xcpTl.h; sourceTree = ""; }; - D52705E72B76E32700875CEC /* platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform.h; path = ../src/platform.h; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - D52705C82B76E25A00875CEC /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - D52705C12B76E25A00875CEC = { - isa = PBXGroup; - children = ( - D52705E02B76E32700875CEC /* A2L.c */, - D52705E52B76E32700875CEC /* A2L.h */, - D52705DC2B76E32700875CEC /* dbg_print.h */, - D52705E22B76E32700875CEC /* platform.c */, - D52705E72B76E32700875CEC /* platform.h */, - D52705DD2B76E32700875CEC /* xcp.h */, - D52705DE2B76E32700875CEC /* xcpEthServer.c */, - D52705E32B76E32700875CEC /* xcpEthServer.h */, - D52705E42B76E32700875CEC /* xcpEthTl.c */, - D52705DF2B76E32700875CEC /* xcpEthTl.h */, - D52705DB2B76E32700875CEC /* xcpLite.c */, - D52705E12B76E32700875CEC /* xcpLite.h */, - D52705E62B76E32700875CEC /* xcpTl.h */, - D52705D32B76E30000875CEC /* main_cfg.h */, - D52705D12B76E30000875CEC /* main.h */, - D52705D22B76E30000875CEC /* xcp_cfg.h */, - D52705D42B76E30000875CEC /* xcpAppl.c */, - D52705D52B76E30000875CEC /* xcptl_cfg.h */, - D52705CB2B76E25A00875CEC /* Products */, - ); - sourceTree = ""; - }; - D52705CB2B76E25A00875CEC /* Products */ = { - isa = PBXGroup; - children = ( - D52705CA2B76E25A00875CEC /* libXCPlib.a */, - ); - name = Products; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - D52705C62B76E25A00875CEC /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - D52705F22B76E32700875CEC /* A2L.h in Headers */, - D52705EE2B76E32700875CEC /* xcpLite.h in Headers */, - D52705EA2B76E32700875CEC /* xcp.h in Headers */, - D52705F02B76E32700875CEC /* xcpEthServer.h in Headers */, - D52705D62B76E30000875CEC /* main.h in Headers */, - D52705D72B76E30000875CEC /* xcp_cfg.h in Headers */, - D52705D82B76E30000875CEC /* main_cfg.h in Headers */, - D52705F32B76E32700875CEC /* xcpTl.h in Headers */, - D52705EC2B76E32700875CEC /* xcpEthTl.h in Headers */, - D52705F42B76E32700875CEC /* platform.h in Headers */, - D52705DA2B76E30000875CEC /* xcptl_cfg.h in Headers */, - D52705E92B76E32700875CEC /* dbg_print.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - D52705C92B76E25A00875CEC /* XCPlib */ = { - isa = PBXNativeTarget; - buildConfigurationList = D52705CE2B76E25A00875CEC /* Build configuration list for PBXNativeTarget "XCPlib" */; - buildPhases = ( - D52705C62B76E25A00875CEC /* Headers */, - D52705C72B76E25A00875CEC /* Sources */, - D52705C82B76E25A00875CEC /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = XCPlib; - productName = XCPlib; - productReference = D52705CA2B76E25A00875CEC /* libXCPlib.a */; - productType = "com.apple.product-type.library.static"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - D52705C22B76E25A00875CEC /* Project object */ = { - isa = PBXProject; - attributes = { - BuildIndependentTargetsInParallel = 1; - LastUpgradeCheck = 1520; - TargetAttributes = { - D52705C92B76E25A00875CEC = { - CreatedOnToolsVersion = 15.2; - }; - }; - }; - buildConfigurationList = D52705C52B76E25A00875CEC /* Build configuration list for PBXProject "XCPlib" */; - compatibilityVersion = "Xcode 14.0"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = D52705C12B76E25A00875CEC; - productRefGroup = D52705CB2B76E25A00875CEC /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - D52705C92B76E25A00875CEC /* XCPlib */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - D52705C72B76E25A00875CEC /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - D52705D92B76E30000875CEC /* xcpAppl.c in Sources */, - D52705EF2B76E32700875CEC /* platform.c in Sources */, - D52705ED2B76E32700875CEC /* A2L.c in Sources */, - D52705EB2B76E32700875CEC /* xcpEthServer.c in Sources */, - D52705E82B76E32700875CEC /* xcpLite.c in Sources */, - D52705F12B76E32700875CEC /* xcpEthTl.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - D52705CC2B76E25A00875CEC /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 14.2; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - }; - name = Debug; - }; - D52705CD2B76E25A00875CEC /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 14.2; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - SDKROOT = macosx; - }; - name = Release; - }; - D52705CF2B76E25A00875CEC /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - }; - name = Debug; - }; - D52705D02B76E25A00875CEC /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - D52705C52B76E25A00875CEC /* Build configuration list for PBXProject "XCPlib" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - D52705CC2B76E25A00875CEC /* Debug */, - D52705CD2B76E25A00875CEC /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - D52705CE2B76E25A00875CEC /* Build configuration list for PBXNativeTarget "XCPlib" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - D52705CF2B76E25A00875CEC /* Debug */, - D52705D02B76E25A00875CEC /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = D52705C22B76E25A00875CEC /* Project object */; -} diff --git a/XCPlib/XCPlib.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/XCPlib/XCPlib.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a..0000000 --- a/XCPlib/XCPlib.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/XCPlib/XCPlib.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/XCPlib/XCPlib.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/XCPlib/XCPlib.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/XCPlib/XCPlib.xcodeproj/project.xcworkspace/xcuserdata/rainer.xcuserdatad/UserInterfaceState.xcuserstate b/XCPlib/XCPlib.xcodeproj/project.xcworkspace/xcuserdata/rainer.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index d748af828f077cb1c01bb36cdf3570f29f84e200..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14664 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 - - - - SchemeUserState - - XCPlib.xcscheme_^#shared#^_ - - orderHint - 0 - - - - diff --git a/XCPlib/main.h b/XCPlib/main.h deleted file mode 100644 index f8a8e4b..0000000 --- a/XCPlib/main.h +++ /dev/null @@ -1,88 +0,0 @@ -#pragma once - -/* main.h */ -/* -| Code released into public domain, no attribution required -*/ - -// Windows or Linux ? -#if defined(_WIN32) || defined(_WIN64) - #define _WIN - #if defined(_WIN32) && defined(_WIN64) - #undef _WIN32 - #endif - #if defined(_LINUX) || defined(_LINUX64)|| defined(_LINUX32) - #error - #endif -#else - #define _LINUX - #if defined (_ix64_) || defined (__x86_64__) || defined (__aarch64__) - #define _LINUX64 - #else - #define _LINUX32 - #endif - #if defined(_WIN) || defined(_WIN64)|| defined(_WIN32) - #error - #endif -#endif - - -#ifdef _WIN -#define WIN32_LEAN_AND_MEAN -#define _CRT_SECURE_NO_WARNINGS -#else -#define _DEFAULT_SOURCE -#endif - - -#include -#include -#include -#include -#include - -#ifdef _WIN -#define M_PI 3.14159265358979323846 -#endif -#define M_2PI (M_PI*2) - -#include - -#ifndef _WIN // Linux - -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#define MAX_PATH 256 -#define BOOL int -#define FALSE 0 -#define TRUE 1 - -#else // Windows - -#include -#include -#include - -#define BOOL int -#define FALSE 0 -#define TRUE 1 - -#endif - -#include "main_cfg.h" - diff --git a/XCPlite/main.c b/XCPlite/main.c index 521c523..94d5101 100644 --- a/XCPlite/main.c +++ b/XCPlite/main.c @@ -19,6 +19,11 @@ #include "A2L.h" #endif +#ifdef _WIN +#define M_PI 3.14159265358979323846 +#endif +#define M_2PI (M_PI*2) + // OPTIONs defined in main_cfg.h diff --git a/XCPlite/main.h b/XCPlite/main.h index 0d22152..1332275 100644 --- a/XCPlite/main.h +++ b/XCPlite/main.h @@ -50,19 +50,11 @@ #include #include #include -//#include - #include #include -//#include -//#include -//#include -//#include #include #include -//#define MAX_PATH 256 - #else // Windows #include @@ -83,10 +75,5 @@ #define FALSE 0 #define TRUE 1 -#ifdef _WIN -#define M_PI 3.14159265358979323846 -#endif -#define M_2PI (M_PI*2) - #include "main_cfg.h" diff --git a/src/main.h b/src/main.h index f8d6c49..9d75dc5 100644 --- a/src/main.h +++ b/src/main.h @@ -83,10 +83,5 @@ #define FALSE 0 #define TRUE 1 -// #ifdef _WIN -// #define M_PI 3.14159265358979323846 -// #endif -// #define M_2PI (M_PI*2) - #include "main_cfg.h" diff --git a/src/xcpAppl.c b/src/xcpAppl.c index c90d560..4a8504d 100644 --- a/src/xcpAppl.c +++ b/src/xcpAppl.c @@ -236,7 +236,7 @@ uint8_t* ApplXcpGetBaseAddr() return ((uint8_t*)((uint64_t)(&__base_addr_val)&0xffffffff00000000)); } -uint32_t ApplXcpGetAddr(const uint8_t* p) +uint32_t ApplXcpGetAddr(uint8_t* p) { return ((uint32_t)((uint64_t) p)& 0xffffffff); } diff --git a/src/xcpLite.h b/src/xcpLite.h index b421051..7b2bf8a 100644 --- a/src/xcpLite.h +++ b/src/xcpLite.h @@ -142,7 +142,7 @@ extern void ApplXcpStopDaq(); /* Address conversions from A2L address to pointer and vice versa in absolute addressing mode */ #ifdef XCP_ENABLE_ABS_ADDRESSING extern uint8_t* ApplXcpGetPointer(uint8_t xcpAddrExt, uint32_t xcpAddr); /* Create a pointer (uint8_t*) from xcpAddrExt and xcpAddr, returns NULL if no access */ -extern uint32_t ApplXcpGetAddr(const uint8_t* p); // Calculate the xcpAddr address from a pointer +extern uint32_t ApplXcpGetAddr(uint8_t* p); // Calculate the xcpAddr address from a pointer extern uint8_t *ApplXcpGetBaseAddr(); // Get the base address for DAQ data access */ #endif