Ubuntu build breaks

Author: RainerZ

src/main.rs

@@ -120,7 +120,7 @@ struct CalPage {
     run: bool,          // Stop all tasks
     run1: bool,         // Stop demo task1
     run2: bool,         // Stop demo task2
-    cycle_time_ms: u16, // Cycle time of main loop task in milliseconds
+    cycle_time_ms: u32, // Cycle time of main loop task in milliseconds
 }
 
 const CAL_PAGE: CalPage = CalPage {

xcp_lite.a2l

@@ -66,7 +66,7 @@
         /end MEMORY_SEGMENT
 
         /begin MEMORY_SEGMENT
-            CalPage "" DATA FLASH INTERN 0x80010000 6 -1 -1 -1 -1 -1
+            CalPage "" DATA FLASH INTERN 0x80010000 8 -1 -1 -1 -1 -1
             /begin IF_DATA XCP
                 /begin SEGMENT /* index: */ 1 /* pages: */ 2 /* ext: */ 0 0 0
                 /begin CHECKSUM XCP_ADD_44 MAX_BLOCK_SIZE 0xFFFF EXTERNAL_FUNCTION "" /end CHECKSUM
@@ -162,10 +162,10 @@
 /begin CHARACTERISTIC static_vars.test_u32 "Test static u32" VALUE 0x148278 U32 0 NO_COMPU_METHOD 0 4294967295 ECU_ADDRESS_EXTENSION 1 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 2 /end DAQ_EVENT /end IF_DATA /end CHARACTERISTIC
 /begin GROUP Cal "" /begin REF_CHARACTERISTIC calpage00.task1_cycle_time_us calpage00.task2_cycle_time_us static_vars.test_f64 static_vars.test_u32 /end REF_CHARACTERISTIC /end GROUP
 
-/begin CHARACTERISTIC CalPage.cycle_time_ms "main task cycle time" VALUE 0x80010000 U16 0 NO_COMPU_METHOD 0 65535 PHYS_UNIT "ms" /end CHARACTERISTIC
-/begin CHARACTERISTIC CalPage.run "" VALUE 0x80010002 U8 0 NO_COMPU_METHOD 0 1 PHYS_UNIT "bool" /end CHARACTERISTIC
-/begin CHARACTERISTIC CalPage.run1 "" VALUE 0x80010003 U8 0 NO_COMPU_METHOD 0 1 PHYS_UNIT "bool" /end CHARACTERISTIC
-/begin CHARACTERISTIC CalPage.run2 "" VALUE 0x80010004 U8 0 NO_COMPU_METHOD 0 1 PHYS_UNIT "bool" /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
+/begin CHARACTERISTIC CalPage.run2 "" VALUE 0x80010006 U8 0 NO_COMPU_METHOD 0 1 PHYS_UNIT "bool" /end CHARACTERISTIC
 /begin GROUP CalPage "" /begin REF_CHARACTERISTIC CalPage.cycle_time_ms CalPage.run CalPage.run1 CalPage.run2 /end REF_CHARACTERISTIC /end GROUP
 
 /begin CHARACTERISTIC CalPage1.TestInts.test_bool "" VALUE 0x8002002A U8 0 NO_COMPU_METHOD 0 255 /end CHARACTERISTIC

xcplib/xcpAppl.c

@@ -489,7 +489,7 @@ uint32_t ApplXcpGetId(uint8_t id, uint8_t* buf, uint32_t bufLen) {
         if (gXcpA2lName==NULL) return 0; 
         len = (uint32_t)strlen(gXcpA2lName);
         if (buf) {
-            if (len >= bufLen) return 0; // Insufficient buffer space
+            if (len >= bufLen-1) return 0; // Insufficient buffer space
             strncpy((char*)buf, gXcpA2lName, len);
         }
         break;
@@ -498,7 +498,7 @@ uint32_t ApplXcpGetId(uint8_t id, uint8_t* buf, uint32_t bufLen) {
     if (gXcpA2lName==NULL) return 0; 
       len = (uint32_t)strlen(gXcpA2lName)+4;
       if (buf) {
-        if (len > bufLen) return 0; // Insufficient buffer space
+        if (len > bufLen-1) return 0; // Insufficient buffer space
         SNPRINTF((char*)buf, bufLen, "%s.a2l", gXcpA2lName);
       }
       break;
@@ -510,8 +510,8 @@ uint32_t ApplXcpGetId(uint8_t id, uint8_t* buf, uint32_t bufLen) {
 #ifdef XCP_ENABLE_IDT_A2L_UPLOAD
     case IDT_ASAM_UPLOAD:
         {
-            char filename[512];
-            SNPRINTF((char*)filename, 256, "%s.a2l", gXcpA2lName);
+            char filename[256];
+            SNPRINTF((char*)filename, 255, "%s.a2l", gXcpA2lName);
             if (NULL==(gXcpFile=loadFile(filename,&gXcpFileLength))) return 0;
             len = gXcpFileLength;
         }
@@ -524,7 +524,7 @@ uint32_t ApplXcpGetId(uint8_t id, uint8_t* buf, uint32_t bufLen) {
         if (buf) {
             uint8_t addr[4];
             if (socketGetLocalAddr(NULL, addr)) {
-                SNPRINTF((char*)buf, bufLen, "http://%u.%u.%u.%u:%u/file/%s.a2l", addr[0], addr[1], addr[2], addr[3], gOptionHTTPPort, gXcpA2lName);
+                SNPRINTF((char*)buf, bufLen-1, "http://%u.%u.%u.%u:%u/file/%s.a2l", addr[0], addr[1], addr[2], addr[3], gOptionHTTPPort, gXcpA2lName);
                 len = (uint32_t)strlen((char*)buf);
             }
         }