Merge pull request #398 from openxc/next

C5 fixes
Platform command
vagrant environment update

.travis.yml

@@ -1,12 +1,15 @@
+#keep Ubuntu 12.04 on Travis to match Vagrant
+dist: precise
 language: c
+dist: precise
 compiler:
 - clang
 script: PLATFORM=TESTING make test
 install:
 - gem install coveralls-lcov
 before_install:
 - sudo apt-get update -qq
-- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq -y libgd2-xpm ia32-libs
+- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq -y libgd2-xpm ia32-libs libsubunit-dev
   ia32-libs-multiarch; fi
 - travis_wait script/bootstrap.sh
 - cd src

CHANGELOG.mkd

@@ -1,6 +1,6 @@
 # OpenXC Vehicle Interface Firmware Changelog
 
-## v7.2.1-dev
+## v7.3.0
 
 * BREAKING: Removed fine_odometer_since_restart from emulator.
 * Feature: Added sending evented messages from emulator.
@@ -13,7 +13,15 @@
   and the command line. The response will mimic the request's bus, message ID, mode, and PID (if sent).
   The response will also include a randomly generated value between 0 and 100.
   Recurring diagnostic messages when running emulator firmware are currently not supported.
-* Updated fabric, ecsda versions and force pyparsing=2.2.0 for PIP versions. (https://github.com/openxc/vi-firmware/issues/382).
+* Update: Moved Vagrant VM to xenial64. Several updated packages.
+* Fix: Fixed a few bugs with C5 support from initial release:
+	- BLE Broadcast name and MAC
+	- CAN2 access
+	- UART debug access
+	- Updated flash instructions
+* Feature: Add PLATFORM command
+
+
 
 ## v7.2.0
 

README.rst

@@ -4,7 +4,7 @@ OpenXC Vehicle Interface Firmware
 
 .. image:: /docs/_static/logo.png
 
-:Version: 7.2.1-dev
+:Version: 7.3.0
 :Web: http://openxcplatform.com
 :Documentation: http://vi-firmware.openxcplatform.com
 :Source: http://github.com/openxc/vi-firmware
@@ -82,7 +82,7 @@ Releasing
 License
 =======
 
-Copyright (c) 2012-2017 Ford Motor Company
+Copyright (c) 2012-2018 Ford Motor Company
 
 Licensed under the BSD license.
 

Vagrantfile

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
@@ -9,10 +10,31 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # vagrantup.com.
 
   # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "ubuntu/precise64"
+  config.vm.box = "ubuntu/xenial64"
+
+  # Check for proxy enviroment variable and set it
+  if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
+    if Vagrant.has_plugin?("vagrant-proxyconf")
+      if ENV['HTTP_PROXY']
+        config.proxy.http = ENV['HTTP_PROXY']
+        config.apt_proxy.http = ENV['HTTP_PROXY']
+      end
+      if ENV['HTTPS_PROXY']
+        config.proxy.https = ENV['HTTPS_PROXY']
+        config.apt_proxy.https = ENV['HTTP_PROXY']
+      end
+      if ENV['NO_PROXY'] 
+        config.proxy.no_proxy = ENV['NO_PROXY']
+      end
+    else
+      abort("ERROR, vagrant-proxyconf not installed run ‘vagrant plugin install vagrant-proxyconf’ to install it") 
+    end
+  end
 
+
   config.vm.provision "shell", privileged: false, keep_color: true do |s|
     s.inline = "ln -fs /vagrant vi-firmware;"
     s.inline += "VAGRANT=1 vi-firmware/script/bootstrap.sh"
+
   end
 end

docs/advanced/rtc.rst

@@ -14,4 +14,4 @@ Example JSON command
 
 To set the RTC to the correct unix time on Windows Git Bash, Mac, or Linux shell, use the following command:
 
-``% TIME=$(date+%s); openxc-control-set --time $TIME``
+``% TIME=$(date +%s); openxc-control set --time $TIME``

docs/conf.py

@@ -42,16 +42,16 @@
 
 # General information about the project.
 project = 'OpenXC Vehicle Interface Firmware'
-copyright = '2017, Ford Motor Company'
+copyright = '2018, Ford Motor Company'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '7.2.1-dev'
+version = '7.3.0'
 # The full version, including alpha/beta/rc tags.
-release = '7.2.1-dev'
+release = '7.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/config/bit-numbering.rst

@@ -7,7 +7,7 @@ Bit Numbering and Byte Order
 When dealing with binary data like CAN messages, there are two important details
 - byte order and bit numbering.
 
-Byte order, or _`endianness <http://en.wikipedia.org/wiki/Endianness>`, determines
+Byte order, or `endianness <http://en.wikipedia.org/wiki/Endianness>`_, determines
 the convention used to interpret a sequence of bytes as a number. Given 4 bytes
 of data, e.g. ``0x01 02 03 04``, the endianness determines which byte is the
 "zero-th" byte and which is the last. There are only two options: big endian

docs/index.rst

@@ -4,7 +4,7 @@ OpenXC Vehicle Interface Firmware
 
 .. image:: /_static/logo.png
 
-:Version: 7.2.1-dev
+:Version: 7.3.0
 :Web: http://openxcplatform.com
 :Documentation: http://vi-firmware.openxcplatform.com
 :Source: http://github.com/openxc/vi-firmware

script/bootstrap/common.sh

@@ -150,25 +150,13 @@ supported - see the docs for the recommended approach"
 
     if [ $OS == "cygwin" ]; then
     # TODO need a warning colored promp
-        echo "It looks like you're developing in Cygwin. Cygwin is no \
-longer the recommended build environment for \
-Windows developers. It is unofficially supported by the bootstrap \
-scripts, but the recommended method is to use Vagrant - see the docs for \
-more information."
-        echo -n "Press Enter to continue anyway, or Control-C to cancel"
-        read
-        echo "Continuing with bootstrap..."
+        die "Compiling the VI firmware from a Cigwin prompt is not \
+supported - see the docs for the recommended approach"
     fi
 
     if [ $OS == "mac" ]; then
-        echo "It looks like you're developing in Mac OS X. We recommend \
-using Vagrant to compile the VI firmware. OS X is unofficially supported by \
-the bootstrap scripts and you should be able to compile just fine, but you \
-can save yourself some trouble by using the pre-configured Vagrant \
-environment. See the docs for more information."
-        echo -n "Press Enter to continue anyway, or Control-C to cancel"
-        read
-        echo "Continuing with bootstrap..."
+        die "Compiling the VI firmware from a MacOS prompt is not \
+supported - see the docs for the recommended approach"
     fi
 
     if [ $OS == "linux" ] && [ -z $VAGRANT ] && [ -z $CI ]; then
@@ -182,22 +170,13 @@ pre-configured Vagrant environment. See the docs for more information."
         echo "Continuing with bootstrap..."
     fi
 
-    if [ $OS == "mac" ] && ! command -v brew >/dev/null 2>&1; then
-        echo "Installing Homebrew..."
-        ruby -e "$(curl -fsSkL raw.github.com/mxcl/homebrew/go)"
-    fi
+
 
     if ! command -v make >/dev/null 2>&1; then
-        if [ $OS == "cygwin" ]; then
-            _cygwin_error "make"
-        elif [ $OS == "mac" ]; then
-                die "Missing 'make' - install the Xcode CLI tools"
-        else
-            if [ $DISTRO == "arch" ]; then
-                _install "base-devel"
-            elif [ $DISTRO == "Ubuntu" ]; then
-                _install "build-essential"
-            fi
+        if [ $DISTRO == "arch" ]; then
+            _install "base-devel"
+        elif [ $DISTRO == "Ubuntu" ]; then
+            _install "build-essential"
         fi
     fi
 
@@ -213,11 +192,7 @@ pre-configured Vagrant environment. See the docs for more information."
 
 
     if ! command -v git >/dev/null 2>&1; then
-        if [ $OS == "cygwin" ]; then
-            die "You need to install Git for Windows from http://git-scm.com/ and select the option to \"Run Git from the Windows Command Prompt\" during the installation."
-        elif [ $OS == "mac" ] || [ $OS == "linux" ]; then
-            _install git
-        fi
+        _install git
     fi
 
     echo "Updating Git submodules..."
@@ -228,10 +203,6 @@ pre-configured Vagrant environment. See the docs for more information."
     if ! git submodule update --init --recursive --quiet; then
         echo "Unable to update git submodules - try running \"git submodule update --init --recursive\" to see the full error"
         echo "If git complains that it \"Needed a single revision\", run \"rm -rf src/libs\" and then try the bootstrap script again"
-        if [ $OS == "cygwin" ]; then
-            echo "In Cygwin this may be true (ignore if you know ca-certifications is installed:"
-            _cygwin_error "ca-certificates"
-        fi
         die
     fi
     set -e
@@ -249,22 +220,9 @@ pre-configured Vagrant environment. See the docs for more information."
         _install "python"
     fi
 
-    if [ $OS != "cygwin" ]; then
-        echo "Installing Python development headers..."
-        _install "python-dev"
-    fi
-
     if ! command -v pip >/dev/null 2>&1; then
-        echo "Installing Pip..."
-        if ! command -v easy_install >/dev/null 2>&1; then
-            _install "python-setuptools"
-        fi
-
-        if ! command -v easy_install >/dev/null 2>&1; then
-            die "easy_install not available, can't install pip"
-        fi
-
-        $SUDO_CMD easy_install pip
+		curl -Ss https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py
+        $SUDO_CMD python /tmp/get-pip.py
     fi
 
     PIP_SUDO_CMD=
@@ -277,6 +235,10 @@ pre-configured Vagrant environment. See the docs for more information."
     if [ -z $CI ]; then
         $PIP_SUDO_CMD pip install --src dependencies --pre -r $BOOTSTRAP_DIR/pip-requirements.txt
     fi
+
+    if ! command -v clang >/dev/null 2>&1; then
+        $SUDO_CMD sudo apt-get install clang -y
+    fi
 
     COMMON_SOURCED=1
 fi

src/config.cpp

@@ -118,7 +118,7 @@ openxc::telitHE910::TelitDevice telitDevice = {
 openxc::config::Configuration* openxc::config::getConfiguration() {
     static openxc::config::Configuration CONFIG = {
         messageSetIndex: 0,
-        version: "7.2.1-dev",
+        version: "7.3.0",
         platform: PLATFORM,
         environmentMode: ENVIRONMENT_MODE,
         payloadFormat: PayloadFormat::DEFAULT_OUTPUT_FORMAT,

src/pipeline.cpp

@@ -241,11 +241,9 @@ void openxc::pipeline::process(Pipeline* pipeline) {
         fs::processSendQueue(pipeline->fs);
     }
     #endif
-    #ifndef UART_LOGGING_DISABLE
     if(uart::connected(pipeline->uart)) {
         uart::processSendQueue(pipeline->uart);
     }
-    #endif
     if(pipeline->network != NULL) {
        network::processSendQueue(pipeline->network);
     }

src/platform/pic32/ble.cpp

@@ -594,7 +594,7 @@ bool openxc::interface::ble::initialize(BleDevice* device)
     //debug("Mac address %x:%x:%x:%x:%x:%x", device->blesettings.bdaddr[0], device->blesettings.bdaddr[1], device->blesettings.bdaddr[2],
     //                device->blesettings.bdaddr[3], device->blesettings.bdaddr[4], device->blesettings.bdaddr[5]);
 
-	sprintf(device_adv_name,"OPENXC-VI-%02X%02X",device->blesettings.bdaddr[1],device->blesettings.bdaddr[0]);
+	sprintf(device_adv_name,"OpenXC-VI-%02X%02X",device->blesettings.bdaddr[1],device->blesettings.bdaddr[0]);
 
 
 	device->blesettings.advname = (const char*)device_adv_name;

src/platform/pic32/c5_common_platforms.h

@@ -129,8 +129,4 @@
 
 #endif
 
-#ifdef CROSSCHASM_C5_BLE
-    #define UART_LOGGING_DISABLE
 #endif
-
-#endif