1.1.0 release

.travis.yml

@@ -12,3 +12,10 @@ script: python setup.py test
 after_success:
   - coverage run --source=openxc setup.py test
   - coveralls
+deploy:
+  provider: pypi
+  server: https://pypi.org/legacy/
+  user: "__token__"
+  password: $PYPI_PASSWORD
+  on:
+    branch: master

CHANGELOG.rst

@@ -1,6 +1,13 @@
 OpenXC Python Library Changelog
 ===============================
 
+v1.1.0
+----------
+* Feature: Generate firmware now checks for duplicate entries in json and for improperly used keys and unrecognised attributes.
+* Feature: openxc-dashboad has been updated from a command line tool to a web server and webpage.
+* Fix: Requiring windows curses on non windows system
+* Fix: Various Python 3 bugs
+
 v1.0.0
 ----------
 * Remove python 2.7 support

MANIFEST.in

@@ -3,3 +3,4 @@ include CONTRIBUTING.rst
 include LICENSE
 include openxc/generator/signals.cpp.footer
 include openxc/generator/signals.cpp.header
+include openxc/tools/templates/dashboard.html

README.rst

@@ -2,9 +2,9 @@
 OpenXC for Python
 ===============================================
 
-.. image:: /docs/_static/logo.png
+.. image:: https://github.com/openxc/openxc-python/raw/master/docs/_static/logo.png
 
-:Version: 1.0.0
+:Version: 1.1.0
 :Web: http://openxcplatform.com
 :Download: http://pypi.python.org/pypi/openxc/
 :Documentation: http://python.openxcplatform.com
@@ -31,15 +31,16 @@ number of command-line tools for connecting to the CAN translator and
 manipulating previously recorded vehicle data.
 
 To package run "setup.py sdist bdist_wheel"
-to push to pypi run "python -m twine upload dist/*"
+to push to pypi run "python -m twine upload dist/\*"
 Version files:
-	CHANGELOG.rst
-	README.rst
-	openxc/version.py
-	docs/index.rst
+
+- CHANGELOG.rst
+- README.rst
+- openxc/version.py
+- docs/index.rst
 
 License
-=======
+========
 
 Copyright (c) 2012-2017 Ford Motor Company
 

docs/index.rst

@@ -2,9 +2,9 @@
 OpenXC for Python
 ===================
 
-.. image:: /_static/logo.png
+.. image:: https://github.com/openxc/openxc-python/raw/master/docs/_static/logo.png
 
-:Version: 1.0.0
+:Version: 1.1.0
 :Web: http://openxcplatform.com
 :Download: http://pypi.python.org/pypi/openxc/
 :Documentation: http://python.openxcplatform.com

openxc/generator/structures.py

@@ -1,6 +1,7 @@
 import operator
 import math
 from collections import defaultdict
+from openxc.utils import fatal_error
 
 import logging
 
@@ -102,6 +103,14 @@ def id(self, value):
     def merge_message(self, data):
         self.bus_name = self.bus_name or data.get('bus', None)
 
+        message_attributes = dir(self)
+        message_attributes = [a.replace('bus_name', 'bus') for a in message_attributes]
+        data_attributes = list(data.keys())
+        extra_attributes = set(data_attributes) - set(message_attributes)
+
+        if extra_attributes:
+            fatal_error('ERROR: Message %s has unrecognized attributes: %s' % (data.get('id'), ', '.join(extra_attributes)))
+
         if getattr(self, 'message_set'):
             self.bus = self.message_set.lookup_bus(name=self.bus_name)
             if not self.bus.valid():
@@ -353,6 +362,14 @@ def merge_signal(self, data):
                     "%s is deprecated and has no effect " % self.generic_name +
                     " - see the replacement, max_frequency")
 
+        signal_attributes = dir(self)
+        data_attributes = list(data.keys())
+        extra_attributes = set(data_attributes) - set(signal_attributes)
+
+        if extra_attributes:
+           fatal_error('ERROR: Signal %s in %s has unrecognized attributes: %s' % (self.name, self.message.name, ', '.join(extra_attributes)))
+
+
     @property
     def decoder(self):
         decoder = getattr(self, '_decoder', None)

openxc/tools/dashboard.py

@@ -1,211 +1,48 @@
-""" This module contains the methods for the ``openxc-dashboard`` command line
-program.
-
-`main` is executed when ``openxc-dashboard`` is run, and all other callables in
-this module are internal only.
-"""
-
-
-
-import argparse
-import curses
-import math
-from datetime import datetime
-from threading import Lock
-
-from .common import device_options, configure_logging, select_device
-from openxc.vehicle import Vehicle
-from openxc.measurements import EventedMeasurement, Measurement
-
-try:
-    str
-except NameError:
-    # Python 3
-    str = str = str
-
-
-# timedelta.total_seconds() is only in 2.7, so we backport it here for 2.6
-def total_seconds(delta):
-    return (delta.microseconds + (delta.seconds
-        + delta.days * 24 * 3600) * 10**6) / 10**6
-
-
-# Thanks, SO: http://stackoverflow.com/questions/1094841/reusable-library-to-get-human-readable-version-of-file-size
-def sizeof_fmt(num):
-    for unit in ['bytes', 'KB', 'MB', 'GB', 'TB']:
-        if num < 1024.0:
-            return "%3.1f%s" % (num, unit)
-        num /= 1024.0
-
-
-class DataPoint(object):
-    AVERAGE_FREQUENCY_ALPHA = 0.1
-
-    def __init__(self, measurement_type):
-        self.event = ''
-        self.current_data = None
-        self.events = {}
-        self.messages_received = 0
-        self.measurement_type = measurement_type
-        self.min = None
-        self.max = None
-        self.last_update_time = None
-        self.average_time_since_update = None
-
-    def update(self, measurement):
-        self.messages_received += 1
-        self.current_data = measurement
-
-        if self.last_update_time is not None:
-            time_since_update = total_seconds(datetime.now() - self.last_update_time)
-            if self.average_time_since_update is None:
-                self.average_time_since_update = time_since_update
-            else:
-                self.average_time_since_update = ((self.AVERAGE_FREQUENCY_ALPHA *
-                        time_since_update) + (1 - self.AVERAGE_FREQUENCY_ALPHA) *
-                        self.average_time_since_update)
-        self.last_update_time = datetime.now()
-
-        if getattr(self.current_data.value, 'unit', None) == self.current_data.unit:
-            if self.min is None or self.current_data.value < self.min:
-                self.min = self.current_data.value
-            elif self.max is None or self.current_data.value > self.max:
-                self.max = self.current_data.value
-
-        if isinstance(measurement, EventedMeasurement):
-            if measurement.valid_state():
-                self.events[measurement.value] = measurement.event
-
-    def percentage(self):
-        # TODO man, this is getting really ugly to handle all of the different
-        # types
-        percent = None
-        if hasattr(self.measurement_type, 'valid_range'):
-            percent = self.current_data.percentage_within_range()
-        elif (getattr(self, 'min', None) is not None and
-                getattr(self, 'max', None) is not None) and self.min != self.max:
-            percent = (((self.current_data.value - self.min) / float(self.max -
-                    self.min)) * 100).num
-        return percent
-
-    def print_to_window(self, window, row, started_time):
-        width = window.getmaxyx()[1]
-        if self.current_data is not None:
-            if len(self.events) == 0:
-                value = str(self.current_data)
-            else:
-                result = ""
-                for item, value in enumerate(self.measurement_type.states):
-                    # TODO missing keys here?
-                    result += "%s: %s " % (value, self.events.get(value, "?"))
-                value = result
-
-            value_color = curses.color_pair(2)
-            window.addstr(row, 0, "{:>22} %s".format(value), value_color)
-        window.addstr(row, 23, self.current_data.name)
-
-        if width > 60:
-            message_count_color = curses.color_pair(3)
-            window.addstr(row, 50, "Msgs: " + str(self.messages_received),
-                    message_count_color)
-
-        if width > 75 and self.average_time_since_update > 0:
-            window.addstr(row, 61, "Freq. (Hz): %d" %
-                    math.ceil((1 / self.average_time_since_update)))
-
-
-class Dashboard(object):
-    def __init__(self, window, vehicle):
-        self.window = window
-        self.elements = {}
-        self.scroll_position = 0
-        self.screen_lock = Lock()
-        vehicle.listen(Measurement, self.receive)
-
-        self.started_time = datetime.now()
-        self.messages_received = 0
-
-        curses.use_default_colors()
-        curses.init_pair(1, curses.COLOR_RED, -1)
-        curses.init_pair(2, curses.COLOR_GREEN, -1)
-        curses.init_pair(3, curses.COLOR_YELLOW, -1)
-
-    def receive(self, measurement, **kwargs):
-        if self.messages_received == 0:
-            self.started_time = datetime.now()
-        self.messages_received += 1
-
-        if measurement.name not in self.elements:
-            self.elements[measurement.name] = DataPoint(measurement.__class__)
-        self.elements[measurement.name].update(measurement)
-        self._redraw()
-
-    def _redraw(self):
-        self.screen_lock.acquire()
-        self.window.erase()
-        max_rows = self.window.getmaxyx()[0] - 4
-        for row, element in enumerate(sorted(list(self.elements.values()),
-                key=lambda elt: elt.current_data.name)[self.scroll_position:]):
-            if row > max_rows:
-                break
-            element.print_to_window(self.window, row, self.started_time)
-        self.window.addstr(max_rows + 1, 0,
-                "Message count: %d (%d corrupted)" % (self.messages_received,
-                    self.source.corrupted_messages), curses.A_REVERSE)
-        self.window.addstr(max_rows + 2, 0,
-                "Total received: %s" %
-                sizeof_fmt(self.source.bytes_received),
-                curses.A_REVERSE)
-        self.window.addstr(max_rows + 3, 0, "Data Rate: %s" %
-            sizeof_fmt(self.source.bytes_received /
-                (total_seconds(datetime.now() - self.started_time)
-                    + 0.1)),
-             curses.A_REVERSE)
-        self.window.refresh()
-        self.screen_lock.release()
-
-    def scroll_down(self, lines):
-        self.screen_lock.acquire()
-        self.scroll_position = min(self.window.getmaxyx()[1],
-                self.scroll_position + lines)
-        self.screen_lock.release()
-
-    def scroll_up(self, lines):
-        self.screen_lock.acquire()
-        self.scroll_position = max(0, self.scroll_position - lines)
-        self.screen_lock.release()
-
-
-def run_dashboard(window, source_class, source_kwargs):
-    vehicle = Vehicle()
-    dashboard = Dashboard(window, vehicle)
-    dashboard.source = source_class(**source_kwargs)
-    vehicle.add_source(dashboard.source)
-
-    window.scrollok(True)
-    while True:
-        c = window.getch()
-        if c == curses.KEY_DOWN:
-            dashboard.scroll_down(1)
-        elif c == curses.KEY_UP:
-            dashboard.scroll_up(1)
-        elif c == curses.KEY_NPAGE:
-            dashboard.scroll_down(25)
-        elif c == curses.KEY_PPAGE:
-            dashboard.scroll_up(25)
-
-
-
-def parse_options():
-    parser = argparse.ArgumentParser(
-            description="View a real-time dashboard of all OpenXC measurements",
-            parents=[device_options()])
-    arguments = parser.parse_args()
-    return arguments
-
-
-def main():
-    configure_logging()
-    arguments = parse_options()
-    source_class, source_kwargs = select_device(arguments)
-    curses.wrapper(run_dashboard, source_class, source_kwargs)
+""" This module contains the methods for the ``openxc-dashboard`` command line
+program.
+
+`main` is executed when ``openxc-dashboard`` is run, and all other callables in
+this module are internal only.
+"""
+
+import argparse
+import threading
+import logging
+from flask import Flask
+from flask import render_template
+from flask_socketio import SocketIO
+
+from openxc.interface import UsbVehicleInterface
+
+log = logging.getLogger('werkzeug')
+log.setLevel(logging.ERROR)
+app = Flask(__name__)
+socketio = SocketIO(app)
+
+def vehicle_data_thread():
+    vi = UsbVehicleInterface(callback=send_data)
+    vi.start()
+
+def send_data(data, **kwargs):
+    socketio.emit('vehicle data', data, broadcast=True)
+
+@app.route("/")
+def dashboard_static():
+    try:
+        vehicle_data_thread()
+    except:
+        pass
+    return render_template('dashboard.html')
+
+def parse_options():
+    parser = argparse.ArgumentParser(
+            description="View a real-time dashboard of all OpenXC measurements",
+            parents=[device_options()])
+    arguments = parser.parse_args()
+    return arguments
+
+
+def main():
+    socketio.start_background_task(vehicle_data_thread)
+    print("View the dashboard at http://127.0.0.1:5000")
+    app.run()

openxc/tools/static/css/dashboard.css

@@ -0,0 +1,12 @@
+caption {
+	font-size: 1.5em;
+}
+
+table, th, td {
+  text-align: left;
+  border-spacing: 8px 1px;
+}
+
+.metric {
+	text-align: right;
+}