From: Eric Marsman <emarsman@gmail.com>
Date: Mon, 29 Feb 2016 16:34:44 +0000 (+0000)
Subject: Merge branch 'messagepackadditions' of https://github.com/openxc/openxc-message-forma... 
X-Git-Tag: 5.0.2~275^2~2^2~1^2~6
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=7dd8702c223c3509e216b72331fdf7a5375f48b7;hp=8987262fa7e8510030d11e42edb4128868a6e81c;p=apps%2Fagl-service-can-low-level.git

Merge branch 'messagepackadditions' of https://github.com/openxc/openxc-message-format into HEAD
---

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..b25c15b8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*~
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 981eaced..e8244c41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # OpenXC Message Format Changelog
 
-## v0.5.0-dev
+## v0.5.0
+
+* Feature: Support for C5 Cellular device. New uptime message.
 
 ## v0.4
 
diff --git a/JSON.mkd b/JSON.mkd
index 831ac505..cddfc4e7 100644
--- a/JSON.mkd
+++ b/JSON.mkd
@@ -373,11 +373,11 @@ the response will be `true`.
 
     { "command_response": "predefined_obd2", "status": true}
 
-### Celluar C5 Configuration
+### C5 Cellular Configuration
 
 The ModemConfigurationCommand message allows users to change certain aspects of modem operation on-the-fly (at runtime). The modem configuration settings are stored in flash memory and are untouched by the bootloader during a software update (assuming the correct cellular_c5 linker file is used during compilation of vi-firmware). Thus, new modem settings persistent across power cycles.
 
-The ModemConfigurationCommand message provides three sub-messages for particular groups of modem settings. These are NetworkOperatorSettings, NetworkDataSettings, and ServerConnectSettings. These configuration messages are described in great detail within the [cellular_c5_config](https://github.com/openxc/vi-firmware/docs/advanced/cellular_c5_config.mkd) documentation. 
+The ModemConfigurationCommand message provides three sub-messages for particular groups of modem settings. These are NetworkOperatorSettings, NetworkDataSettings, and ServerConnectSettings. These configuration messages are described in great detail within the [c5_cellular_config](https://github.com/openxc/vi-firmware/docs/advanced/c5_cell_config.mkd) documentation. 
 
 Currently, only the ServerConnectSettings sub-message is supported in the vi-firmware's command interpreter. All other settings are currently compile-time only.
 
diff --git a/README.md b/README.md
index 27f40c81..0597fc42 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # OpenXC Message Format Specification
 
-Version: v0.5.0-dev
+Version: v0.5.0
 
 This specification is a part of the [OpenXC platform][OpenXC].