summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlexander Wenzel <Alexander.AW.Wenzel@bmw.de>2014-05-13 17:06:31 +0200
committerAlexander Wenzel <Alexander.AW.Wenzel@bmw.de>2014-05-16 08:37:40 +0200
commit965e022b9d5375691763864658b3f0cf39ecf875 (patch)
tree987534b67f526f7ff1f2ded53bbf84d9d02eebbb /src
parentb06bb75b62251cab81d41ffa506ce47916448165 (diff)
downloadDLT-daemon-965e022b9d5375691763864658b3f0cf39ecf875.tar.gz
Send ECU Id if enabled and added library API to change.
Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
Diffstat (limited to 'src')
-rwxr-xr-xsrc/examples/dlt-example-user.c5
-rw-r--r--src/lib/dlt_user.c27
-rwxr-xr-xsrc/lib/dlt_user_cfg.h3
3 files changed, 34 insertions, 1 deletions
diff --git a/src/examples/dlt-example-user.c b/src/examples/dlt-example-user.c
index 3dcf245..25d3110 100755
--- a/src/examples/dlt-example-user.c
+++ b/src/examples/dlt-example-user.c
@@ -235,6 +235,11 @@ int main(int argc, char* argv[])
}
}
+ dlt_with_session_id(1);
+ dlt_with_timestamp(1);
+ dlt_with_ecu_id(1);
+ dlt_verbose_mode();
+
DLT_REGISTER_APP("LOG","Test Application for Logging");
DLT_REGISTER_CONTEXT(mycontext,"TEST","Test Context for Logging");
diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
index b7ab992..0b28ff8 100644
--- a/src/lib/dlt_user.c
+++ b/src/lib/dlt_user.c
@@ -408,6 +408,9 @@ int dlt_init_common(void)
/* With timestamp is enabled by default */
dlt_user.with_timestamp= DLT_USER_WITH_TIMESTAMP;
+ /* With timestamp is enabled by default */
+ dlt_user.with_ecu_id= DLT_USER_WITH_ECU_ID;
+
/* Local print is disabled by default */
dlt_user.enable_local_print = 0;
@@ -2761,6 +2764,22 @@ int dlt_with_timestamp(int8_t with_timestamp)
return 0;
}
+int dlt_with_ecu_id(int8_t with_ecu_id)
+{
+ if (dlt_user_initialised==0)
+ {
+ if (dlt_init()<0)
+ {
+ return -1;
+ }
+ }
+
+ /* Set with_timestamp */
+ dlt_user.with_ecu_id = with_ecu_id;
+
+ return 0;
+}
+
int dlt_enable_local_print(void)
{
if (dlt_user_initialised==0)
@@ -2940,7 +2959,13 @@ DltReturnValue dlt_user_log_send_log(DltContextData *log, int mtype)
}
msg.standardheader = (DltStandardHeader*)(msg.headerbuffer + sizeof(DltStorageHeader));
- msg.standardheader->htyp = DLT_HTYP_WEID | DLT_HTYP_PROTOCOL_VERSION1 ;
+ msg.standardheader->htyp = DLT_HTYP_PROTOCOL_VERSION1 ;
+
+ /* send ecu id */
+ if(dlt_user.with_ecu_id)
+ {
+ msg.standardheader->htyp |= DLT_HTYP_WEID;
+ }
/* send timestamp */
if(dlt_user.with_timestamp)
diff --git a/src/lib/dlt_user_cfg.h b/src/lib/dlt_user_cfg.h
index 4c3e201..9559c98 100755
--- a/src/lib/dlt_user_cfg.h
+++ b/src/lib/dlt_user_cfg.h
@@ -114,6 +114,9 @@
/* send always timestamp: 0 - don't use, 1 - use */
#define DLT_USER_WITH_TIMESTAMP 1
+/* send always ecu id: 0 - don't use, 1 - use */
+#define DLT_USER_WITH_ECU_ID 1
+
/* default message id for non-verbose mode, if no message id was provided */
#define DLT_USER_DEFAULT_MSGID 0xffff