Merged in from default

diff --cc communication/PduR/PduR.c
Simple merge

diff --cc communication/PduR/PduR_CanIf.h
index 6a4a214248676e1a95e12e28032361931fa19477,3d5d55c29daf90c82aa36da88ae1a38c991c2792..b7753146c7facf329f35a048783a15e96f7ad39f
--- 1/communication/PduR/PduR_CanIf.h
--- 2/communication/PduR/PduR_CanIf.h
+++ b/communication/PduR/PduR_CanIf.h
@@@ -25,36 -25,19 +25,35 @@@
  \r
  #include "PduR.h"\r
  \r
- #ifdef PDUR_CANIF_SUPPORT
- \r
-       #ifndef PDUR_ZERO_COST_OPERATION\r
+ #if PDUR_CANIF_SUPPORT == STD_ON\r
+ #if PDUR_ZERO_COST_OPERATION == STD_OFF\r
 +
 +              void PduR_CanIfRxIndication (PduIdType CanRxPduId, const uint8 *CanSudPtr );\r
 +              void PduR_CanIfTxConfirmation(PduIdType CanTxPduId);\r
 +
 +      #else // Zero cost operation active\r
 +
 +              #if PDUR_SINGLE_IF == CAN_IF && defined(PDUR_COM_SUPPORT)
 +
 +                      #include "Com_Com.h"
 +
 +                      #define PduR_CanIfRxIndication Com_RxIndication\r
 +                      #define PduR_CanIfTxConfirmation Com_TxConfirmation
 +
 +              #else
 +
 +                      #define PduR_CanIfRxIndication (void)
 +                      #define PduR_CanIfTxConfirmation (void)
 +
 +              #endif
 +
 +      #endif // Zero cost operation active
  \r
 -void PduR_CanIfRxIndication (PduIdType CanRxPduId, const uint8 *CanSudPtr );\r
 -void PduR_CanIfTxConfirmation(PduIdType CanTxPduId);\r
 -\r
 -\r
 -#else // Zero cost operation active\r
 -\r
 -#define PduR_CanIfRxIndication Com_RxIndication\r
 -#define PduR_CanIfTxConfirmation Com_TxConfirmation\r
 -\r
 -#endif\r
 -#endif\r
 -\r
 +#else
 +
 +      #define PduR_CanIfRxIndication (void)
 +      #define PduR_CanIfTxConfirmation (void)
 +
 +#endif // CAN_IF not supported\r
 +
  #endif /* PDUR_CANIF_H_ */\r

diff --cc communication/PduR/PduR_If.c
index 1ed1a3f453b54453bd3f1f2163bf2ca543aa3835,aeb1427e5a308de8a04d36db47577498cfda3ba5..4cd0dfdb5ed6a2f47311b268243a3649b5950808
--- 1/communication/PduR/PduR_If.c
--- 2/communication/PduR/PduR_If.c
+++ b/communication/PduR/PduR_If.c
@@@ -22,12 -22,9 +22,12 @@@
  
  #include <string.h>\r
  #include "PduR_If.h"\r
 -#include "debug.h"\r
 +#include "debug.h"
 +#if defined(USE_DEM)
 +#include "Dem.h"
 +#endif\r
  \r
- #ifndef PDUR_ZERO_COST_OPERATION\r
+ #if PDUR_ZERO_COST_OPERATION == STD_OFF\r
  \r
  /**\r
   * Helper function for the PduR_<LO>IfRxIndication functions. This helper performs the actions specified by PDUR255 and PDUR258.

diff --cc include/PduR.h
index d8e2fd5aff24e7c8c48b241d05a51922a3c8f9ca,51361b273a1f7db94a6e8a204b439f73d8afaf82..aaa802f71ec0378d29eee18aafd59cd4ed7f8bd0
--- 1/include/PduR.h
--- 2/include/PduR.h
+++ b/include/PduR.h
@@@ -31,6 -31,20 +31,21 @@@
  #define PDUR_SW_MINOR_VERSION  0
  #define PDUR_SW_PATCH_VERSION  0
  
+ 
++
+ // ERROR CODES
+ #define PDUR_E_CONFIG_PTR_INVALID     0x06
+ #define PDUR_E_INVALID_REQUEST                0x01
+ #define PDUR_E_PDU_ID_INVALID         0x02
+ #define PDUR_E_TP_TX_REQ_REJECTED     0x03
+ #define PDUR_E_DATA_PTR_INVALID               0x05
+ #define PDUR_E_PDU_INSTANCE_LOST      0x10
+ 
+ #define PDUR_INSTANCE_ID      0
+ 
+ #include "modules.h"
+ #include "debug.h"
+ 
  #include "PduR_Cfg.h"
  #include "PduR_Types.h"
  
@@@ -41,9 -55,9 +56,11 @@@
  #include "PduR_Com.h"
  #include "PduR_CanIf.h"
  #include "PduR_LinIf.h"
 +#include "PduR_CanTp.h"
 +#include "PduR_Dcm.h"
  
+ 
+ 
  /* Contain the current state of the PDU router. The router is uninitialized
   * until PduR_Init has been run.
   */