X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=JSON.mkd;h=069f74b4fc1203318bb6cf34d0a3c327f4ae74b6;hb=75bc6db24e48f4b577f68a4e27cace82ff8e442c;hp=71546bc92b7696dc09699db052d728265a523d7b;hpb=e47f58b38d86e6aefd1b8f2fba2fc9dba3eae702;p=apps%2Fagl-service-can-low-level.git

diff --git a/JSON.mkd b/JSON.mkd
index 71546bc9..069f74b4 100644
--- a/JSON.mkd
+++ b/JSON.mkd
@@ -65,9 +65,9 @@ A diagnostic request is added or cancelled with a JSON object like this example:
 
     { "command": "diagnostic_request",
       "action": "add",
-      "request": {
+      "diagnostic_request": {
           "bus": 1,
-          "id": 1234,
+          "message_id": 1234,
           "mode": 1,
           "pid": 5,
           "payload": "0x1234",
@@ -92,9 +92,9 @@ simple one-time diagnostic request:
 
     { "command": "diagnostic_request",
       "action": "add",
-      "request": {
+      "diagnostic_request": {
           "bus": 1,
-          "id": 1234,
+          "message_id": 1234,
           "mode": 1,
           "pid": 5
         }
@@ -111,9 +111,9 @@ previous example as a recurring request at 1Hz:
 
     { "command": "diagnostic_request",
       "action": "add",
-      "request": {
+      "diagnostic_request": {
           "bus": 1,
-          "id": 1234,
+          "message_id": 1234,
           "mode": 1,
           "pid": 5,
           "frequency": 1
@@ -125,9 +125,9 @@ To cancel a recurring request, send a `cancel` action with the same key, e.g.:
 
     { "command": "diagnostic_request",
       "action": "cancel",
-      "request": {
+      "diagnostic_request": {
           "bus": 1,
-          "id": 1234,
+          "message_id": 1234,
           "mode": 1,
           "pid": 5
         }
@@ -141,7 +141,7 @@ exist in parallel with a recurring request for the same key.
 **bus** - the numerical identifier of the CAN bus where this request should be
     sent, most likely 1 or 2 (for a vehicle interface with 2 CAN controllers).
 
-**id** - the CAN arbitration ID for the request.
+**message_id** - the CAN message ID for the request.
 
 **mode** - the OBD-II mode of the request - 0x1 through 0xff (1 through 9 are the
     standardized modes and 0x22 is a common proprietary mode).
@@ -162,7 +162,7 @@ exist in parallel with a recurring request for the same key.
 
 **multiple_responses** - (optional, false by default) if true, request will stay
   active for a full 100ms, even after receiving a diagnostic response message.
-  This is useful for requests to the functional broadcast arbitration ID
+  This is useful for requests to the functional broadcast message ID
   (`0x7df`) when you need to get responses from multiple modules. It's possible
   to set this to `true` for non-broadcast requests, but in practice you won't
   see any additional responses after the first and it will just take up memory
@@ -191,7 +191,7 @@ When a node on the network response to the request and the result is published
 by the VI, the result looks like:
 
     {"bus": 1,
-      "id": 1234,
+      "message_id": 1234,
       "mode": 1,
       "pid": 5,
       "success": true,
@@ -202,7 +202,7 @@ and to an unsuccessful request, with the `negative_response_code` and no `pid`
 echo:
 
     {"bus": 1,
-      "id": 1234,
+      "message_id": 1234,
       "mode": 1,
       "success": false,
       "negative_response_code": 17}
@@ -210,7 +210,7 @@ echo:
 **bus** - the numerical identifier of the CAN bus where this response was
     received.
 
-**id** - the CAN arbitration ID for this response.
+**message_id** - the CAN message ID for this response.
 
 **mode** - the OBD-II mode of the original diagnostic request.
 
@@ -235,7 +235,7 @@ Finally, the `payload` and `value` fields are mutually exclusive:
 
 The response to a simple PID request would look like this:
 
-    {"success": true, "bus": 1, "id": 1234, "mode": 1, "pid": 5, "payload": "0x2"}
+    {"success": true, "bus": 1, "message_id": 1234, "mode": 1, "pid": 5, "payload": "0x2"}
 
 ## Commands
 
@@ -271,6 +271,8 @@ response into the outgoing data stream.
 The `device_id` command triggers the VI to inject a unique device ID (e.g. the
 MAC address of an included Bluetooth module) into into the outgoing data stream.
 
+If no device ID is available, the response message will be "Unknown".
+
 **Request**
 
     { "command": "device_id"}