X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=README.md;h=29baa3a3bfbde99f1f472ba921c5c9f2a3abcbea;hb=ab2066f086fa6cec7a29c019f51933023d4d5419;hp=5b43032b1d1eb8736c5b37e8b898a5490cfc50fc;hpb=b55b73d2d2353208dbf6bf982f288c281a017943;p=apps%2Flow-level-can-service.git

diff --git a/README.md b/README.md
index 5b43032..29baa3a 100644
--- a/README.md
+++ b/README.md
@@ -1,51 +1,40 @@
 # OpenXC Message Format Specification
 
+Version: v0.4-dev
+
 This specification is a part of the [OpenXC platform][OpenXC].
 
 An OpenXC vehicle interface sends generic vehicle data over one or more output
-interfaces (e.g. USB or Bluetooth) as JSON objects, separated by newlines.
-
-There are two valid message types - single valued and evented.
-
-There may not be a 1:1 relationship between input and output signals - i.e. raw
-engine timing CAN signals may be summarized in an "engine performance" metric on
-the abstract side of the interface.
-
-## Single Valued
-
-The expected format of a single valued message is:
-
-    {"name": "steering_wheel_angle", "value": 45}
-
-## Evented
+interfaces (e.g. USB or Bluetooth) as JSON or Protocol Buffers (protobuf).
 
-The expected format of an event message is:
+## JSON
 
-    {"name": "button_event", "value": "up", "event": "pressed"}
+The JSON format is the most flexible and easiest to use. The format is fully
+specified in the [JSON.mkd](JSON.mkd) file in this repository.
+a more flexible option than binary, but is less compact and
+therefore takes more bandwidth and processing power.
 
-This format is good for something like a button event, where there are two
-discrete pieces of information in the measurement.
+The JSON format is best for most developers, as it is fairly efficient and very
+flexible.
 
-## Raw CAN Message format
+## Binary (Protocol Buffers)
 
-An OpenXC vehicle interface may also output raw CAN messages. Each CAN message
-is sent as a JSON object, separated by newlines. The format of each object is:
+The binary format is encoded using [Google Protocol
+Buffers](https://code.google.com/p/protobuf/). The format is specified in the
+file [openxc.proto](openxc.proto). The descriptions of the messages can be foud
+in the JSON specs - the binary format mirrors this.
 
-    {"bus": 1, "id": 1234, "value": "0x12345678"}
+The binary messages are published by the VI using the standard length-delimited
+method (any protobuf library should support this).
 
-**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).
-
-**id** - the CAN message ID
-
-**data** - up to 8 bytes of data from the CAN message's payload, represented as
-  a hexidecimal number in a string. Many JSON parser cannot handle 64-bit
-  integers, which is why we are not using a numerical data type.
+The binary format is best if you need to maximize the amount of data that can be
+sent from the VI, trading off flexibility for efficiency.
 
 ## Trace File Format
 
 An OpenXC vehicle trace file is a plaintext file that contains JSON objects,
-separated by newlines.
+separated by newlines (which may be either `\r\n` or `\n`, depending on the
+platform the trace file was recorded).
 
 The first line may be a metadata object, although this is optional:
 
@@ -142,10 +131,31 @@ manufacturers may support custom message names.
     * numerical, -179.0 to 179.0 degrees with standard GPS accuracy
     * 1Hz
 
+## Signals from Diagnostic Messages
+
+This set of signals is often retreived from OBD-II requests. The units can be
+found in the [OBD-II standard](http://en.wikipedia.org/wiki/OBD-II_PIDs#Mode_01).
+
+* engine_load
+* engine_coolant_temperature
+* barometric_pressure
+* commanded_throttle_position
+* throttle_position
+* fuel_level
+* intake_air_temperature
+* intake_manifold_pressure
+* running_time
+* fuel_pressure
+* mass_airflow
+* accelerator_pedal_position
+* ethanol_fuel_percentage
+* engine_oil_temperature
+* engine_torque
+
 License
 =======
 
-Copyright (c) 2012-2013 Ford Motor Company
+Copyright (c) 2012-2014 Ford Motor Company
 
 Licensed under the BSD license.