Fix ticket #14. Added/updated/moved *_SW_*_VERSION for build-time cfg version testing

diff --git a/include/Adc.h b/include/Adc.h
index 2e33837673cc69f469624295e0dc4cd30d4817d3..4f175b9e6f64c0ed32a4e9d66b8033bdb3ed9160 100644 (file)
--- a/include/Adc.h
+++ b/include/Adc.h
@@ -23,8 +23,9 @@
 #define ADC_AR_MAJOR_VERSION           3
 #define ADC_AR_MINOR_VERSION           0
 #define ADC_AR_PATCH_VERSION           3
-#define ADC_SW_MAJOR_VERSION           0
-#define ADC_SW_MINOR_VERSION           1
+
+#define ADC_SW_MAJOR_VERSION           1
+#define ADC_SW_MINOR_VERSION           0
 #define ADC_SW_PATCH_VERSION           0
 \r
 /* Std-type */\r

diff --git a/include/Can.h b/include/Can.h
index 1f8173b1d8d530c87a52b6ca749fbc6052b02579..62e374a1985227f1d1966c22ef70c3bdd1d9a0fa 100644 (file)
--- a/include/Can.h
+++ b/include/Can.h
@@ -27,9 +27,10 @@
 #define CAN_MODULE_ID                      MODULE_ID_CAN\r
 #define CAN_AR_MAJOR_VERSION  2\r
 #define CAN_AR_MINOR_VERSION   2\r
-#define CAN_AR_PATCH_VERSION   2\r
-#define CAN_SW_MAJOR_VERSION  0\r
-#define CAN_SW_MINOR_VERSION   1\r
+#define CAN_AR_PATCH_VERSION   2
+\r
+#define CAN_SW_MAJOR_VERSION   1\r
+#define CAN_SW_MINOR_VERSION   0\r
 #define CAN_SW_PATCH_VERSION   0\r
 \r
 #define CAN_E_PARAM_POINTER     0x01\r

diff --git a/include/CanIf.h b/include/CanIf.h
index 54cc6827ef44608d4b4ed697b9bb1157e6730bce..900ad52902ab2030520e233c9899f4b8fa68bc50 100644 (file)
--- a/include/CanIf.h
+++ b/include/CanIf.h
@@ -27,20 +27,21 @@
 #include "PduR.h"
 #include "Com.h"
 
-
-#include "Det.h"
-#include "CanIf_Types.h"
-#include "CanIf_Cfg.h"
-
 #define CANIF_VENDOR_ID          1
 #define CANIF_MODULE_ID          MODULE_ID_CANIF
 #define CANIF_AR_MAJOR_VERSION   3
 #define CANIF_AR_MINOR_VERSION   0
 #define CANIF_AR_PATCH_VERSION   2
-#define CANIF_SW_MAJOR_VERSION   0
-#define CANIF_SW_MINOR_VERSION   1
+
+#define CANIF_SW_MAJOR_VERSION   1
+#define CANIF_SW_MINOR_VERSION   0
 #define CANIF_SW_PATCH_VERSION   0
 
+#include "Det.h"
+#include "CanIf_Types.h"
+#include "CanIf_Cfg.h"
+
+
 // Service IDs
 #define CANIF_INIT_ID                0x01
 #define CANIF_INIT_CONTROLLER_ID     0x02

diff --git a/include/Com.h b/include/Com.h
index 95ecf4b43719f3152ac9454bce5883901c413a04..f8707a4edc3f52823252f9405f0d54bb1df6ec6e 100644 (file)
--- a/include/Com.h
+++ b/include/Com.h
@@ -31,6 +31,10 @@
 #ifdef COM_DEV_ERROR_DETECT\r
 #include "Det.h"\r
 #endif\r
+
+#define COM_SW_MAJOR_VERSION   1
+#define COM_SW_MINOR_VERSION   0
+#define COM_SW_PATCH_VERSION   0
 \r
 #include "Com_Cfg.h"\r
 #include "Com_PbCfg.h"\r

diff --git a/include/Det.h b/include/Det.h
index 98d11dbea0b6e7a2c461d13f2b4e5a3155fccd26..7807f14bdbd712c94486cdb746c0e7522c292781 100644 (file)
--- a/include/Det.h
+++ b/include/Det.h
@@ -28,20 +28,23 @@
  */\r
 \r
 #ifndef _DET_H_\r
-#define _DET_H_\r
+#define _DET_H_
+
+#define DET_MODULE_ID            MODULE_ID_DET
+#define DET_VENDOR_ID            1
+
+#define DET_SW_MAJOR_VERSION     1
+#define DET_SW_MINOR_VERSION     0
+#define DET_SW_PATCH_VERSION     0
+
+#define DET_AR_MAJOR_VERSION     2
+#define DET_AR_MINOR_VERSION     2
+#define DET_AR_PATCH_VERSION     2
+\r
 #include "Std_Types.h"\r
 #include "Det_Cfg.h"\r
 #include "Modules.h"\r
 \r
-#define DET_MODULE_ID            MODULE_ID_DET\r
-#define DET_VENDOR_ID            1\r
-#define DET_SW_MAJOR_VERSION     1\r
-#define DET_SW_MINOR_VERSION     0\r
-#define DET_SW_PATCH_VERSION     0\r
-#define DET_AR_MAJOR_VERSION     2\r
-#define DET_AR_MINOR_VERSION     2\r
-#define DET_AR_PATCH_VERSION     2\r
-\r
 // Error codes\r
 #define DET_E_CBK_REGISTRATION_FAILED 0x01\r
 #define DET_E_INDEX_OUT_OF_RANGE      0x02\r

diff --git a/include/Dio.h b/include/Dio.h
index 2bb22b20f3aa9afb2634c12468df5cc6d9abd1ed..03109066700fe0d6da9e35855cead3c9e2f08c42 100644 (file)
--- a/include/Dio.h
+++ b/include/Dio.h
@@ -58,17 +58,19 @@ typedef enum
 typedef uint32 Dio_LevelType;\r
 \r
 typedef uint16 Dio_PortLevelType;\r
+
+#define DIO_SW_MAJOR_VERSION   1
+#define DIO_SW_MINOR_VERSION   0
+#define DIO_SW_PATCH_VERSION   0
+
+#define DIO_AR_MAJOR_VERSION     2
+#define DIO_AR_MINOR_VERSION     2 
+#define DIO_AR_PATCH_VERSION     1 
 \r
 #include "Dio_Cfg.h"\r
 \r
+
 #if ( DIO_VERSION_INFO_API == STD_ON)\r
-#define DIO_SW_MAJOR_VERSION           1 \r
-#define DIO_SW_MINOR_VERSION           0 \r
-#define DIO_SW_PATCH_VERSION           0 \r
-#define DIO_AR_MAJOR_VERSION     2\r
-#define DIO_AR_MINOR_VERSION     2 \r
-#define DIO_AR_PATCH_VERSION     1 \r
-\r
 void Dio_GetVersionInfo( Std_VersionInfoType *versionInfo );\r
 #endif\r
 \r

diff --git a/include/EcuM.h b/include/EcuM.h
index c9937d95745bcf480ca81ceae07c5c2b2b8b13e5..faa58ec3045e41d75d90374bb6da49e11aa57805 100644 (file)
--- a/include/EcuM.h
+++ b/include/EcuM.h
@@ -126,17 +126,19 @@ typedef enum
        ECUM_BOOT_TARGET_APP = 0, // The Ecu will boot into the application\r
        ECUM_BOOT_TARGET_BOOTLOADER = 1, // The Ecu will boot into the bootloader\r
 } EcuM_BootTargetType;\r
+
+
+#define ECUM_SW_MAJOR_VERSION          1
+#define ECUM_SW_MINOR_VERSION          0
+#define ECUM_SW_PATCH_VERSION          0
+
+#define ECUM_AR_MAJOR_VERSION     1
+#define ECUM_AR_MINOR_VERSION     2
+#define ECUM_AR_PATCH_VERSION     2
 \r
 #include "EcuM_Cfg.h"\r
-\r
+
 #if ( ECUM_VERSION_INFO_API == STD_ON)\r
-#define ECUM_SW_MAJOR_VERSION          1\r
-#define ECUM_SW_MINOR_VERSION          0\r
-#define ECUM_SW_PATCH_VERSION          0\r
-#define ECUM_AR_MAJOR_VERSION     1\r
-#define ECUM_AR_MINOR_VERSION     2\r
-#define ECUM_AR_PATCH_VERSION     2\r
-\r
 void EcuM_GetVersionInfo( Std_VersionInfoType *versionInfo );\r
 #endif\r
 \r

diff --git a/include/Gpt.h b/include/Gpt.h
index 3c723312a020adc49863b5a2e14c1601bc587dcb..22405178c3c2e471d7553dd116a23e3279f85671 100644 (file)
--- a/include/Gpt.h
+++ b/include/Gpt.h
@@ -66,19 +66,21 @@ typedef enum
   GPT_MODE_SLEEP
 } Gpt_ModeType;
 
-#include "Gpt_Cfg.h"
-
-#if (GPT_VERSION_INFO_API == STD_ON)
 
 #define GPT_VENDOR_ID             1
 #define GPT_MODULE_ID                   1
-#define GPT_SW_MAJOR_VERSION           1
+
+#define GPT_SW_MAJOR_VERSION   1
 #define GPT_SW_MINOR_VERSION           0
-#define GPT_SW_PATCH_VERSION           0
+#define GPT_SW_PATCH_VERSION   0
+
 #define GPT_AR_MAJOR_VERSION     2
 #define GPT_AR_MINOR_VERSION     2
 #define GPT_AR_PATCH_VERSION     1
 
+#include "Gpt_Cfg.h"
+
+#if (GPT_VERSION_INFO_API == STD_ON)
 #define Gpt_GetVersionInfo(_vi) STD_GET_VERSION_INFO(_vi,GPT)
 #endif
 

diff --git a/include/Lin.h b/include/Lin.h
index a76143808880597d0be6206aea5015e743fb7b0b..812de106391a6747a5895313b992ded374f6425a 100644 (file)
--- a/include/Lin.h
+++ b/include/Lin.h
@@ -22,20 +22,20 @@
 
 #ifndef LIN_H_\r
 #define LIN_H_\r
+
+
+#define LIN_SW_MAJOR_VERSION    1
+#define LIN_SW_MINOR_VERSION           0
+#define LIN_SW_PATCH_VERSION    0
+#define LIN_AR_MAJOR_VERSION    1
+#define LIN_AR_MINOR_VERSION    2
+#define LIN_AR_PATCH_VERSION    1
 \r
 #include "Std_Types.h"\r
 #include "Lin_Cfg.h"\r
 #include "ComStack_Types.h"\r
 \r
 #if (LIN_VERSION_INFO_API == STD_ON)\r
-\r
-#define LIN_SW_MAJOR_VERSION    1\r
-#define LIN_SW_MINOR_VERSION           0\r
-#define LIN_SW_PATCH_VERSION    0\r
-#define LIN_AR_MAJOR_VERSION    1\r
-#define LIN_AR_MINOR_VERSION    2\r
-#define LIN_AR_PATCH_VERSION    1\r
-\r
 void Lin_GetVersionInfo( Std_VersionInfoType *versionInfo );\r
 #define Lin_GetVersionInfo(_vi) STD_GET_VERSION_INFO(_vi,LIN)\r
 #endif\r

diff --git a/include/LinIf.h b/include/LinIf.h
index f9c2fe1f3dcbee866461fb14036414504fbee0ab..b8a1671d23ff4fba05ccb141626ae6670b091195 100644 (file)
--- a/include/LinIf.h
+++ b/include/LinIf.h
@@ -22,6 +22,13 @@
 
 #ifndef LINIF_H_\r
 #define LINIF_H_\r
+
+#define LINIF_SW_MAJOR_VERSION    1
+#define LINIF_SW_MINOR_VERSION    0
+#define LINIF_SW_PATCH_VERSION    0
+#define LINIF_AR_MAJOR_VERSION    2
+#define LINIF_AR_MINOR_VERSION    0
+#define LINIF_AR_PATCH_VERSION    1
 \r
 #include "Std_Types.h"\r
 #include "LinIf_Cfg.h"\r
@@ -29,14 +36,8 @@
 #include "ComStack_Types.h"\r
 #include "ComM_Types.h"\r
 \r
-#if (LINIF_VERSION_INFO_API == STD_ON)\r
 \r
-#define LINIF_SW_MAJOR_VERSION    1\r
-#define LINIF_SW_MINOR_VERSION    0\r
-#define LINIF_SW_PATCH_VERSION    0\r
-#define LINIF_AR_MAJOR_VERSION    2\r
-#define LINIF_AR_MINOR_VERSION    0\r
-#define LINIF_AR_PATCH_VERSION    1\r
+\r
 \r
 /* --- Service IDs --- */\r
 #define LINIF_INIT_SERVICE_ID               0x00\r
@@ -57,7 +58,8 @@
 #define LINIF_E_RESPONSE 0x52 //Assigned\r
 #define LINIF_E_NC_NO_RESPONSE 0x53 //Assigned by DEM\r
 #define LINIF_E_CHANNEL_X_SLAVE_Y 0x54 //Assigned by DEM\r
-\r
+
+#if (LINIF_VERSION_INFO_API == STD_ON)\r
 void LinIf_GetVersionInfo( Std_VersionInfoType *versionInfo );\r
 #define LinIf_GetVersionInfo(_vi) STD_GET_VERSION_INFO(_vi,LINIF)\r
 #endif\r

diff --git a/include/LinSM.h b/include/LinSM.h
index 740883f304d1836ad29da7936b72dcecf36b93ad..30dfcb546a0574460b5c2fbfdc72627a856ec045 100644 (file)
--- a/include/LinSM.h
+++ b/include/LinSM.h
@@ -22,6 +22,13 @@
 
 #ifndef LINSM_H_\r
 #define LINSM_H_\r
+
+#define LINSM_SW_MAJOR_VERSION    1
+#define LINSM_SW_MINOR_VERSION    0
+#define LINSM_SW_PATCH_VERSION    0
+#define LINSM_AR_MAJOR_VERSION    1
+#define LINSM_AR_MINOR_VERSION    0
+#define LINSM_AR_PATCH_VERSION    1
 \r
 #include "ComStack_Types.h"\r
 #include "Std_Types.h"\r
@@ -31,15 +38,6 @@
 #include "ComM_Types.h"\r
 #include "LinIf.h"\r
 \r
-#if (LINSM_VERSION_INFO_API == STD_ON)\r
-\r
-#define LINSM_SW_MAJOR_VERSION    1\r
-#define LINSM_SW_MINOR_VERSION    0\r
-#define LINSM_SW_PATCH_VERSION    0\r
-#define LINSM_AR_MAJOR_VERSION    1\r
-#define LINSM_AR_MINOR_VERSION    0\r
-#define LINSM_AR_PATCH_VERSION    1\r
-\r
 #define LINSM_INIT_SERVICE_ID 0x01\r
 #define LINSM_REQUEST_COM_MODE_SERVICE_ID 0x10\r
 #define LINSM_GET_CURRENT_COM_MODE_SERVICE_ID 0x11\r
@@ -64,8 +62,9 @@ typedef enum {
        LINSM_FULL_COM,\r
        LINSM_RUN_SCHEDULE,\r
        LINSM_GOTO_SLEEP,\r
-}LinSM_StatusType;\r
+}LinSM_StatusType;
 \r
+#if (LINSM_VERSION_INFO_API == STD_ON)\r
 void LinSM_GetVersionInfo( Std_VersionInfoType *versionInfo );\r
 #define LinSM_GetVersionInfo(_vi) STD_GET_VERSION_INFO(_vi,LINSM)\r
 #endif\r

diff --git a/include/Mcu.h b/include/Mcu.h
index 316a8fed6dbbb4d4fc5c2609c4ae952dd309c840..e8d3bd25546be9e129664b6bed1680d0babbe8fd 100644 (file)
--- a/include/Mcu.h
+++ b/include/Mcu.h
@@ -22,6 +22,10 @@
 
 #ifndef MCU_H_\r
 #define MCU_H_\r
+
+#define MCU_SW_MAJOR_VERSION   1
+#define MCU_SW_MINOR_VERSION   0
+#define MCU_SW_PATCH_VERSION   0
 \r
 #include "Cpu.h"\r
 #include "irq.h"\r

diff --git a/include/Os.h b/include/Os.h
index ba12dbb55ade8cb9e1e2a00114185e4605be82a0..9283126a839c143a70075eb9292aa0d426211a2f 100644 (file)
--- a/include/Os.h
+++ b/include/Os.h
@@ -27,7 +27,9 @@
 #ifndef OS_H_\r
 #define OS_H_\r
 \r
-\r
+#define OS_SW_MAJOR_VERSION    1
+#define OS_SW_MINOR_VERSION    0
+#define OS_SW_PATCH_VERSION    0\r
 \r
 #include "Std_Types.h"\r
 #if !defined(CC_KERNEL)\r

diff --git a/include/Port.h b/include/Port.h
index 742fc5de5d6c1d8f67387d98e46891b771680fa3..dcc871724a3797927ae9191563da41fae3f98e9b 100644 (file)
--- a/include/Port.h
+++ b/include/Port.h
@@ -22,17 +22,18 @@
 
 #ifndef PORT_H_\r
 #define PORT_H_\r
+
+#define PORT_SW_MAJOR_VERSION          1 
+#define PORT_SW_MINOR_VERSION          0 
+#define PORT_SW_PATCH_VERSION          0 
+
+#define PORT_AR_MAJOR_VERSION     3
+#define PORT_AR_MINOR_VERSION     0 
+#define PORT_AR_PATCH_VERSION     2 
 \r
-#include "Port_Cfg.h"\r
-#if PORT_VERSION_INFO_API == STD_ON\r
-\r
-#define PORT_SW_MAJOR_VERSION          1 \r
-#define PORT_SW_MINOR_VERSION          0 \r
-#define PORT_SW_PATCH_VERSION          0 \r
-#define PORT_AR_MAJOR_VERSION     3\r
-#define PORT_AR_MINOR_VERSION     0 \r
-#define PORT_AR_PATCH_VERSION     2 \r
+#include "Port_Cfg.h"
 \r
+#if PORT_VERSION_INFO_API == STD_ON\r
 void Port_GetVersionInfo( Std_VersionInfoType *versionInfo );\r
 #endif \r
 \r

diff --git a/include/Pwm.h b/include/Pwm.h
index c54e088b42fb2995c35367f0b0faabf96f66f7b6..bcf86a1c443f2ec5102e505e61b48b02983748a0 100644 (file)
--- a/include/Pwm.h
+++ b/include/Pwm.h
@@ -16,6 +16,10 @@
 #ifndef PWM_H_
 #define PWM_H_
 
+#define PWM_SW_MAJOR_VERSION   1
+#define PWM_SW_MINOR_VERSION   0
+#define PWM_SW_PATCH_VERSION   0
+
 /*
  * PWM094: Std_VersionInfoType shall be imported from Std_Types.h
  */