From 34e7c10b5763cd6d8f63a4c24b317268d45c449f Mon Sep 17 00:00:00 2001
From: Bradley <brad@enkrona.net>
Date: Wed, 14 Sep 2016 18:40:55 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

dropping support for python 3.2

python 3.2 has an ugly problem where Unicode strings (the default in python 3) couldn't be used in binascii functions. This broke a lot of calls to unhexlify.
---
 .idea/misc.xml         | 14 ++++++++++++++
 .idea/modules.xml      |  8 ++++++++
 .idea/python-OBD.iml   |  8 ++++++++
 .idea/workspace.xml    | 42 ++++++++++++++++++++++++++++++++++++++++++
 .travis.yml            |  1 -
 obd/UnitsAndScaling.py |  5 ++---
 6 files changed, 74 insertions(+), 4 deletions(-)
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/python-OBD.iml
 create mode 100644 .idea/workspace.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..d93c344a
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7.10 (/usr/bin/python)" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..177c801e
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/python-OBD.iml" filepath="$PROJECT_DIR$/.idea/python-OBD.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/python-OBD.iml b/.idea/python-OBD.iml
new file mode 100644
index 00000000..d0876a78
--- /dev/null
+++ b/.idea/python-OBD.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 00000000..cbbc05a9
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="CreatePatchCommitExecutor">
+    <option name="PATCH_PATH" value="" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false">
+    <option name="remove_strategy" value="false" />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <created>1475848658461</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1475848658461</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager />
+    <watches-manager />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index ad22f32f..3bbfeffd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ language: python
 
 python:
   - 2.7
-  - 3.2
   - 3.3
   - 3.4
   - 3.5
diff --git a/obd/UnitsAndScaling.py b/obd/UnitsAndScaling.py
index 0d58de39..6aa21d4c 100644
--- a/obd/UnitsAndScaling.py
+++ b/obd/UnitsAndScaling.py
@@ -43,7 +43,6 @@
 Unit.define("ppm = count / 1000000 = PPM = parts_per_million")
 
 
-
 class UAS():
     """
     Class for representing a Unit and Scale conversion
@@ -77,8 +76,8 @@ def __call__(self, _bytes):
     0x05 : UAS(False, 0.0000305,  Unit.count),
     0x06 : UAS(False, 0.000305,   Unit.count),
     0x07 : UAS(False, 0.25,       Unit.rpm),
-    0x08 : UAS(False, 0.01,       Unit.kph),
-    0x09 : UAS(False, 1,          Unit.kph),
+    0x08 : UAS(False, 0.01,       Unit.mph),
+    0x09 : UAS(False, 1,          Unit.mph),
     0x0A : UAS(False, 0.122,      Unit.millivolt),
     0x0B : UAS(False, 0.001,      Unit.volt),
     0x0C : UAS(False, 0.01,       Unit.volt),