A2l macro improvements (#27)

* ApplXcpSetA2LName works with and without file extension .a2l, parameter is copied
* XcpSetEPK parameter is copied, whitespace removed
* xcpAppl.h removed, content moved to XCPlite.h
* A2L generation optional
* DaqXxxx macros moved to xcpLite.h
* Warnings on Raspberry Pi fixed
* OPTIMISATION_TYPE_DEFAULT
* CANape projects

Author: RainerZ

.vscode/settings.json

@@ -1,5 +1,13 @@
 {
     "files.associations": {
         "stdatomic.h": "c"
-    }
+    },
+    "cSpell.words": [
+        "COMPU",
+        "DONT",
+        "Mainloop",
+        "SBYTE",
+        "SLONG",
+        "UBYTE"
+    ]
 }

build.rs

@@ -38,9 +38,6 @@ fn main() {
         // DAQ
         .allowlist_function("XcpEvent")
         .allowlist_function("XcpEventExt")
-        //.allowlist_function("XcpTriggerDaqEventAt")
-        //.allowlist_function("XcpEventAt")
-        //.allowlist_function("XcpEventExtAt")
         // Misc
         .allowlist_function("XcpSetLogLevel")
         .allowlist_function("XcpPrint")

src/xcp/mod.rs

@@ -605,12 +605,10 @@ impl Xcp {
                     let name = std::ffi::CString::new(reg.get_app_name()).unwrap();
                     // @@@@ UNSAFE - C library call
                     xcplib::ApplXcpSetA2lName(name.as_ptr());
-                    std::mem::forget(name); // This memory is never dropped, it is moved to xcplib singleton
 
                     let epk = std::ffi::CString::new(reg.get_app_version()).unwrap();
                     // @@@@ UNSAFE - C library call
                     xcplib::XcpSetEpk(epk.as_ptr());
-                    std::mem::forget(epk); // This memory is never dropped, it is moved to xcplib singleton
                 }
             }
         }

src/xcp/xcplib.rs

@@ -1,5 +1,20 @@
 /* automatically generated by rust-bindgen 0.71.1 */
 
+unsafe extern "C" {
+    #[doc = " Initialize the XCP on Ethernet server instance.\n @pre User has called XcpInit.\n @param address Address to bind to.\n @param port Port to bind to.\n @param use_tcp Use TCP if true, otherwise UDP.\n @param measurement_queue Optional external memory to place the measurement queue.\n Pass NULL if server should allocate it.\n @param measurement_queue_size Measurement queue size in bytes. Includes the bytes occupied by the queue header.\n @return True on success, otherwise false."]
+    pub fn XcpEthServerInit(address: *const u8, port: u16, use_tcp: bool, measurement_queue_size: u32) -> bool;
+}
+unsafe extern "C" {
+    #[doc = " Shutdown the XCP on Ethernet server instance."]
+    pub fn XcpEthServerShutdown() -> bool;
+}
+unsafe extern "C" {
+    #[doc = " Get the XCP on Ethernet server instance status.\n @return True if the server is running, otherwise false."]
+    pub fn XcpEthServerStatus() -> bool;
+}
+unsafe extern "C" {
+    pub fn XcpEthTlGetInfo(isTCP: *mut bool, mac: *mut u8, addr: *mut u8, port: *mut u16);
+}
 unsafe extern "C" {
     pub fn XcpInit();
 }
@@ -28,21 +43,6 @@ unsafe extern "C" {
 unsafe extern "C" {
     pub fn ApplXcpGetClock64() -> u64;
 }
-unsafe extern "C" {
-    pub fn XcpEthTlGetInfo(isTCP: *mut bool, mac: *mut u8, addr: *mut u8, port: *mut u16);
-}
-unsafe extern "C" {
-    #[doc = " Initialize the XCP on Ethernet server instance.\n @pre User has called XcpInit.\n @param address Address to bind to.\n @param port Port to bind to.\n @param use_tcp Use TCP if true, otherwise UDP.\n @param measurement_queue Optional external memory to place the measurement queue.\n Pass NULL if server should allocate it.\n @param measurement_queue_size Measurement queue size in bytes. Includes the bytes occupied by the queue header.\n @return True on success, otherwise false."]
-    pub fn XcpEthServerInit(address: *const u8, port: u16, use_tcp: bool, measurement_queue_size: u32) -> bool;
-}
-unsafe extern "C" {
-    #[doc = " Shutdown the XCP on Ethernet server instance."]
-    pub fn XcpEthServerShutdown() -> bool;
-}
-unsafe extern "C" {
-    #[doc = " Get the XCP on Ethernet server instance status.\n @return True if the server is running, otherwise false."]
-    pub fn XcpEthServerStatus() -> bool;
-}
 unsafe extern "C" {
     pub fn ApplXcpRegisterCallbacks(
         cb_connect: ::std::option::Option<unsafe extern "C" fn() -> bool>,

tests/xcp_test_executor.rs

@@ -242,7 +242,7 @@ impl XcpDaqDecoder for DaqDecoder {
             if data.len() >= 32 {
                 let mut o = 24;
                 for i in 0..(data.len() - 24) / 8 {
-                    let test = (data[o + 0] as u64)
+                    let test = (data[o] as u64)
                         | ((data[o + 1] as u64) << 8)
                         | ((data[o + 2] as u64) << 16)
                         | ((data[o + 3] as u64) << 24)
@@ -336,7 +336,7 @@ pub async fn test_daq(
     xcp_client.start_measurement().await.unwrap();
 
     // Test for given time
-    // Every 2ms check if measurment  is still ok
+    // Every 2ms check if measurement  is still ok
     // Break on error
     let starttime = Instant::now();
     loop {

xcplib/.gitignore

@@ -1,5 +1,7 @@
 /build
 
+*.a2l.old
+
 /C_Demo.a2l
 /hello_xcp.a2l
 /struct_demo.a2l