Merge remote-tracking branch 'origin/master' into next

2 files changed, 7 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32f48535..66d73c1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # OpenXC Message Format Changelog
 
+## v0.3.1-dev
+
+* Removed factor and offset from diagnostic requests to minimize the number of
+  fields, and since this is such an uncommon use case and one that can be
+  handled by the client receiving the data. We may add them back in the future.
+
 ## v0.3
 
 * Add diagnostic message request/response format.
diff --git a/README.md b/README.md
index 9c5aeb88..9ff9b2ed 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ discrete pieces of information in the measurement.
 
 The format for a raw CAN message:
 
-    {"bus": 1, "id": 1234, "value": "0x12345678"}
+    {"bus": 1, "id": 1234, "data": "0x12345678"}
 
 **bus** - the numerical identifier of the CAN bus where this message originated,
   most likely 1 or 2 (for a vehicle interface with 2 CAN controllers).
@@ -66,8 +66,6 @@ with this command format:
           "pid": 5,
           "payload": "0x1234",
           "multiple_responses": false,
-          "factor": 1.0,
-          "offset": 0,
           "frequency": 1,
           "name": "my_pid"
         }