Add a QML plugin to expose AMB's ClimateControl objects.

To expose the AMB ClimateControl objects to the application layer, add a
QML plugin so the application developers can natively configure the
vehicle's climate controls based on user input.

Because the potential compatibility issue between AMB and Qt being
discussed on the AGL mailing list has not yet been resolved, this commit
also adds a helper program that the climate control plugin will use as a
workaround to access AMB that may be removed in the future.

To include support for this plugin, it is necessary for users to add
"climatecontrolplugin" to their conf/local.conf when building the image.

Change-Id: I6117f0a13e4195e460e3b552befb6e326cdf0f6a
Signed-off-by: Matthew Vick <mvick@jaguarlandrover.com>

12 files changed, 1358 insertions, 0 deletions

diff --git a/recipes-automotive/ambdbusaccess/ambdbusaccess_0.1.bb b/recipes-automotive/ambdbusaccess/ambdbusaccess_0.1.bb
new file mode 100644
index 000000000..c54e28cc5
--- /dev/null
+++ b/recipes-automotive/ambdbusaccess/ambdbusaccess_0.1.bb
@@ -0,0 +1,26 @@
+SUMMARY = "ambdbusaccess"
+
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=815ca599c9df247a0c7f619bab123dad \
+                    file://ambdbusaccess.cpp;startline=1;endline=5;md5=0ba6897a99e9332dae1891b4ccf78de3 \
+                   "
+
+SRC_URI = "file://* \
+          "
+S = "${WORKDIR}"
+
+DEPENDS = "qtdeclarative qtbase"
+RDEPENDS_${PN} = "automotive-message-broker"
+
+RPROVIDES_${PN} = "ambdbusaccess"
+
+inherit qmake5
+
+do_install () {
+        mkdir -p ${D}/usr/lib/qt5/qml/Automotive/
+        cp ambdbusaccess ${D}/usr/lib/qt5/qml/Automotive/
+}
+
+FILES_${PN} += "${libdir}/qt5/qml/Automotive/ambdbusaccess"
+FILES_${PN}-dbg += "${libdir}/qt5/qml/Automotive/.debug"
+
diff --git a/recipes-automotive/ambdbusaccess/files/LICENSE.txt b/recipes-automotive/ambdbusaccess/files/LICENSE.txt
new file mode 100644
index 000000000..14e2f777f
--- /dev/null
+++ b/recipes-automotive/ambdbusaccess/files/LICENSE.txt
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in 
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
diff --git a/recipes-automotive/ambdbusaccess/files/ambdbusaccess.cpp b/recipes-automotive/ambdbusaccess/files/ambdbusaccess.cpp
new file mode 100644
index 000000000..6f2a7b817
--- /dev/null
+++ b/recipes-automotive/ambdbusaccess/files/ambdbusaccess.cpp
@@ -0,0 +1,120 @@
+/* Copyright (C) 2015, Jaguar Land Rover. All Rights Reserved.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <QCoreApplication>
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusObjectPath>
+#include <QDBusReply>
+#include <QDebug>
+#include <string.h>
+
+int main(int argc, char *argv[])
+{
+    // TODO: Clean this up, update API, etc.
+    if (argc < 5 || argc > 6)
+    {
+        qWarning() << "Error detected! Insufficient number of arguments.";
+        qWarning() << "";
+        qWarning() << "Usage: ambdbusaccess <R/W> <Object> <Property> <Zone> [Value]";
+        qWarning() << "- <R/W>";
+        qWarning() << "  Used for specifying [R]ead or [W]rite.";
+        qWarning() << "- <Object>";
+        qWarning() << "  The AMB object to access.";
+        qWarning() << "- <Property>";
+        qWarning() << "  The property within the object to access.";
+        qWarning() << "- <Zone>";
+        qWarning() << "  The AMB zone to access.";
+        qWarning() << "- [Value]";
+        qWarning() << "  The value to write, if writing.";
+        qWarning() << "Example: ambdbusaccess Write ClimateControl FanSpeedLevel 0 7";
+        qWarning() << "";
+        qWarning() << "This program returns an int under the following conditions:";
+        qWarning() << "Successful Read: <Value Read>";
+        qWarning() << "Unsuccessful Read: -1";
+        qWarning() << "Successful Write: <Value Written>";
+        qWarning() << "Unsuccessful Write: -1";
+
+        return -1;
+    }
+
+    // TODO: Error check input.
+    bool read = !strncmp(argv[1], "R", 1);
+    QString object = argv[2];
+    QString property = argv[3];
+    qint32 zone = atoi(argv[4]);
+    qint32 value = 0;
+
+    if (argc == 6)
+    {
+        value = atoi(argv[5]);
+    }
+
+    // Necessary to suppress Qt messages about touching the D-Bus before the application was created.
+    QCoreApplication a(argc, argv);
+
+    // Sanity check that the system bus is actually present.
+    if (!QDBusConnection::systemBus().isConnected())
+    {
+        qCritical() << "Could not access system D-Bus!";
+        return -1;
+    }
+
+    // Get ahold of the manager object.
+    QDBusInterface *manager = new QDBusInterface("org.automotive.message.broker", "/", "org.automotive.Manager",
+                                                 QDBusConnection::systemBus());
+
+    // Go fetch the path for the AMB object we are concerned with.
+    qDebug().nospace() << "Looking for property " << property.toStdString().c_str() << " of object " <<
+                          object.toStdString().c_str() << " in zone " << zone << ".";
+    QDBusReply<QDBusObjectPath> propertyPath = manager->call("FindObjectForZone", object.toStdString().c_str(), zone);
+    if (!propertyPath.isValid())
+    {
+        qDebug() << "Invalid reply!" << propertyPath.error() << "Got the path:" << propertyPath.value().path();
+    }
+
+    // Now that we have the path, open an interface to the object.
+    QDBusInterface *propertyInterface = new QDBusInterface("org.automotive.message.broker", propertyPath.value().path(),
+                                                           "org.automotive.ClimateControl", QDBusConnection::systemBus());
+
+    // Perform our read or write operation.
+    if (read)
+    {
+        QVariant reply = propertyInterface->property(property.toStdString().c_str());
+        if (!reply.isValid())
+        {
+            qDebug() << "Invalid reply when reading the property!" << propertyInterface->lastError() << "Property:" <<
+                        reply.toString();
+            value = -1;
+        }
+        else
+        {
+            qDebug().nospace() << "Got a valid reply for the property of " << reply.toString().toStdString().c_str() << ".";
+            value = reply.toInt();
+        }
+    }
+    else
+    {
+        QVariant reply = propertyInterface->setProperty(property.toStdString().c_str(), value);
+        if (reply.toBool())
+        {
+            qDebug() << "Successfully wrote the property.";
+        }
+        else
+        {
+            qDebug() << "Failed to write the property.";
+            value = -1;
+        }
+    }
+
+    // Clean up.
+    delete propertyInterface;
+    delete manager;
+
+    // Either provide the read value or some feedback to the calling application.
+    return value;
+}
+
diff --git a/recipes-automotive/ambdbusaccess/files/ambdbusaccess.pro b/recipes-automotive/ambdbusaccess/files/ambdbusaccess.pro
new file mode 100644
index 000000000..bfd82ee87
--- /dev/null
+++ b/recipes-automotive/ambdbusaccess/files/ambdbusaccess.pro
@@ -0,0 +1,12 @@
+QT += core dbus
+QT -= gui
+
+TARGET = ambdbusaccess
+CONFIG += console
+CONFIG -= app_bundle
+CONFIG(release):DEFINES += QT_NO_DEBUG_OUTPUT
+
+TEMPLATE = app
+
+SOURCES += \
+    ambdbusaccess.cpp
diff --git a/recipes-automotive/climatecontrolplugin/climatecontrolplugin_0.1.bb b/recipes-automotive/climatecontrolplugin/climatecontrolplugin_0.1.bb
new file mode 100644
index 000000000..8058bdbf7
--- /dev/null
+++ b/recipes-automotive/climatecontrolplugin/climatecontrolplugin_0.1.bb
@@ -0,0 +1,30 @@
+SUMMARY = "climatecontrolplugin"
+
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=815ca599c9df247a0c7f619bab123dad \
+                    file://climatecontrol.cpp;startline=1;endline=5;md5=0ba6897a99e9332dae1891b4ccf78de3 \
+                    file://climatecontrol.h;startline=1;endline=5;md5=0ba6897a99e9332dae1891b4ccf78de3 \
+                    file://climatecontrol_plugin.cpp;startline=1;endline=5;md5=0ba6897a99e9332dae1891b4ccf78de3 \
+                    file://climatecontrol_plugin.h;startline=1;endline=5;md5=0ba6897a99e9332dae1891b4ccf78de3 \
+                   "
+
+SRC_URI = "file://* \
+          "
+S = "${WORKDIR}"
+
+DEPENDS = "qtdeclarative qtbase"
+RDEPENDS_${PN} = "automotive-message-broker ambdbusaccess"
+
+inherit qmake5
+
+do_install () {
+        mkdir -p ${D}/usr/lib/qt5/qml/Automotive/ClimateControl/
+        cp libClimateControl.so ${D}/usr/lib/qt5/qml/Automotive/ClimateControl/
+        cp qmldir ${D}/usr/lib/qt5/qml/Automotive/ClimateControl/
+}
+
+FILES_${PN} += "${libdir}/qt5/qml/Automotive/ClimateControl/libClimateControl.so \
+                ${libdir}/qt5/qml/Automotive/ClimateControl/qmldir \
+               "
+FILES_${PN}-dbg += "${libdir}/qt5/qml/Automotive/ClimateControl/.debug"
+
diff --git a/recipes-automotive/climatecontrolplugin/files/LICENSE.txt b/recipes-automotive/climatecontrolplugin/files/LICENSE.txt
new file mode 100644
index 000000000..14e2f777f
--- /dev/null
+++ b/recipes-automotive/climatecontrolplugin/files/LICENSE.txt
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in 
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
diff --git a/recipes-automotive/climatecontrolplugin/files/climatecontrol.cpp b/recipes-automotive/climatecontrolplugin/files/climatecontrol.cpp
new file mode 100644
index 000000000..dc2a54b42
--- /dev/null
+++ b/recipes-automotive/climatecontrolplugin/files/climatecontrol.cpp
@@ -0,0 +1,262 @@
+/* Copyright (C) 2015, Jaguar Land Rover. All Rights Reserved.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <QDBusConnection>
+#include <QDBusObjectPath>
+#include <QDBusReply>
+#include <QDebug>
+
+#include "climatecontrol.h"
+
+ClimateControl::ClimateControl(QQuickItem *parent):
+    QQuickItem(parent)
+{
+    qDebug() << "ClimateControl plugin loaded!";
+
+    //
+    // Verify that we can access the system bus, where AMB resides. This is largely informational, since the ambdbusaccess
+    // application is responsible for actually accessing AMB.
+    //
+    if (!QDBusConnection::systemBus().isConnected())
+    {
+        qDebug() << "Unable to connect to system bus.";
+    }
+}
+
+ClimateControl::~ClimateControl()
+{
+    qDebug() << "ClimateControl plugin unloaded.";
+}
+
+// Accessor methods.
+qint32 ClimateControl::getZone()
+{
+    return this->zone;
+}
+
+void ClimateControl::setZone(qint32 newZone)
+{
+    if (this->zone != newZone)
+    {
+        this->zone = newZone;
+
+        qDebug().nospace() << "Updated zone to " << this->zone << ".";
+
+        emit zoneChanged();
+
+        // Now that the zone has been updated, fetch the settings for this new zone.
+        this->getSettings();
+    }
+}
+
+quint16 ClimateControl::getFanSpeedLevel()
+{
+    return this->fanSpeedLevel;
+}
+
+void ClimateControl::setFanSpeedLevel(quint16 newFanSpeedLevel)
+{
+    if (this->fanSpeedLevel != newFanSpeedLevel)
+    {
+        this->dbusWrite("FanSpeedLevel", newFanSpeedLevel);
+        this->fanSpeedLevel = newFanSpeedLevel;
+
+        qDebug().nospace() << "Updated fan speed level to " << this->fanSpeedLevel << ".";
+
+        emit fanSpeedLevelChanged();
+    }
+}
+
+qint32 ClimateControl::getTargetTemperature()
+{
+    return this->targetTemperature;
+}
+
+void ClimateControl::setTargetTemperature(qint32 newTargetTemperature)
+{
+    if (this->targetTemperature != newTargetTemperature)
+    {
+        this->dbusWrite("TargetTemperature", newTargetTemperature);
+        this->targetTemperature = newTargetTemperature;
+
+        qDebug().nospace() << "Updated target temperature to " << this->targetTemperature << ".";
+
+        emit targetTemperatureChanged();
+    }
+}
+
+bool ClimateControl::getAirConditioning()
+{
+    return this->airConditioning;
+}
+
+void ClimateControl::setAirConditioning(bool newAirConditioning)
+{
+    if (this->airConditioning != newAirConditioning)
+    {
+        // NOTE: This property is not enabled in the current version of AMB, so no D-Bus access is performed.
+        this->airConditioning = newAirConditioning;
+
+        qDebug().nospace() << "Updated air conditioning to " << this->airConditioning << ".";
+
+        emit airConditioningChanged();
+    }
+}
+
+bool ClimateControl::getHeater()
+{
+    return this->heater;
+}
+
+void ClimateControl::setHeater(bool newHeater)
+{
+    if (this->heater != newHeater)
+    {
+        // NOTE: This property is not enabled in the current version of AMB, so no D-Bus access is performed.
+        this->heater = newHeater;
+
+        qDebug().nospace() << "Updated heater to " << this->heater << ".";
+
+        emit heaterChanged();
+    }
+}
+
+quint8 ClimateControl::getSeatHeater()
+{
+    return this->seatHeater;
+}
+
+void ClimateControl::setSeatHeater(quint8 newSeatHeater)
+{
+    if (this->seatHeater != newSeatHeater)
+    {
+        // NOTE: This property is not enabled in the current version of AMB, so no D-Bus access is performed.
+        this->seatHeater = newSeatHeater;
+
+        qDebug().nospace() << "Updated seat heater to " << this->seatHeater << ".";
+
+        emit seatHeaterChanged();
+    }
+}
+
+quint8 ClimateControl::getSeatCooler()
+{
+    return this->seatCooler;
+}
+
+void ClimateControl::setSeatCooler(quint8 newSeatCooler)
+{
+    if (this->seatCooler != newSeatCooler)
+    {
+        // NOTE: This property is not enabled in the current version of AMB, so no D-Bus access is performed.
+        this->seatCooler = newSeatCooler;
+
+        qDebug().nospace() << "Updated seat cooler to " << this->seatCooler << ".";
+
+        emit seatCoolerChanged();
+    }
+}
+
+bool ClimateControl::getAirCirculation()
+{
+    return this->airCirculation;
+}
+
+void ClimateControl::setAirCirculation(bool newAirCirculation)
+{
+    if (this->airCirculation != newAirCirculation)
+    {
+        // NOTE: This property is not enabled in the current version of AMB, so no D-Bus access is performed.
+        this->airCirculation = newAirCirculation;
+
+        qDebug().nospace() << "Updated air circulation to " << this->airCirculation << ".";
+
+        emit airCirculationChanged();
+    }
+}
+
+quint8 ClimateControl::getSteeringWheelHeater()
+{
+    return this->steeringWheelHeater;
+}
+
+void ClimateControl::setSteeringWheelHeater(quint8 newSteeringWheelHeater)
+{
+    if (this->steeringWheelHeater != newSteeringWheelHeater)
+    {
+        // NOTE: This property is not enabled in the current version of AMB, so no D-Bus access is performed.
+        this->steeringWheelHeater = newSteeringWheelHeater;
+
+        qDebug().nospace() << "Updated steering wheel heater to " << this->steeringWheelHeater << ".";
+
+        emit steeringWheelHeaterChanged();
+    }
+}
+
+// D-Bus connection methods.
+QVariant ClimateControl::dbusRead(const char *property)
+{
+    QString arguments = "R ClimateControl " + QString::fromUtf8(property);
+    QString zoneString;
+
+    // The zone has not been set yet, so do not bother reading from AMB with the exception of FanSpeedLevel at zone 0.
+    if (!this->zone && strcmp(property, "FanSpeedLevel"))
+    {
+        // Return something resembling an uninitialized variable.
+        return 0;
+    }
+
+    // The FanSpeedLevel property is the only property at zone 0 for now.
+    zoneString = QString::number(!strcmp(property, "FanSpeedLevel") ? 0 : this->zone);
+
+    // Add in the zone information.
+    arguments += " " + zoneString;
+
+    qDebug() << "Calling ambdbusaccess with the following arguments:" << arguments;
+
+    // system() returns the result in the upper 8 bits, so shift the result to the right by 8.
+    return system(QString("/usr/lib/qt5/qml/Automotive/ambdbusaccess " + arguments).toStdString().c_str()) >> 8;
+}
+
+void ClimateControl::dbusWrite(const char *property, QVariant value)
+{
+    QString arguments = "W ClimateControl " + QString::fromUtf8(property);
+    QString zoneString;
+
+    // The zone has not been set yet, so do not bother writing to AMB with the exception of FanSpeedLevel at zone 0.
+    if (!this->zone && strcmp(property, "FanSpeedLevel"))
+    {
+        return;
+    }
+
+    // The FanSpeedLevel property is the only property at zone 0 for now.
+    zoneString = QString::number(!strcmp(property, "FanSpeedLevel") ? 0 : this->zone);
+
+    // Add in the zone information and value to write.
+    arguments += " " + zoneString + " " + value.toString();
+
+    qDebug() << "Calling ambdbusaccess with the following arguments:" << arguments;
+
+    system(QString("/usr/lib/qt5/qml/Automotive/ambdbusaccess " + arguments).toStdString().c_str());
+}
+
+void ClimateControl::getSettings()
+{
+    quint8 ambFanSpeedLevel;
+    qint32 ambTargetTemperature;
+
+    //
+    // Go fetch the settings for this zone.
+    //
+    // NOTE: Other properties are not enabled in the current version of AMB, so no D-Bus access is performed for them.
+    //
+    ambFanSpeedLevel = this->dbusRead("FanSpeedLevel").toInt();
+    ambTargetTemperature = this->dbusRead("TargetTemperature").toInt();
+
+    // Call the set methods to generate Qt signals, if any are necessary.
+    this->setFanSpeedLevel(ambFanSpeedLevel);
+    this->setTargetTemperature(ambTargetTemperature);
+}
diff --git a/recipes-automotive/climatecontrolplugin/files/climatecontrol.h b/recipes-automotive/climatecontrolplugin/files/climatecontrol.h
new file mode 100644
index 000000000..819bb5942
--- /dev/null
+++ b/recipes-automotive/climatecontrolplugin/files/climatecontrol.h
@@ -0,0 +1,84 @@
+/* Copyright (C) 2015, Jaguar Land Rover. All Rights Reserved.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef CLIMATECONTROL_H
+#define CLIMATECONTROL_H
+
+#include <QQuickItem>
+
+class ClimateControl : public QQuickItem
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(ClimateControl)
+    Q_PROPERTY(int zone READ getZone WRITE setZone)
+    Q_PROPERTY(int fanSpeedLevel READ getFanSpeedLevel WRITE setFanSpeedLevel)
+    Q_PROPERTY(int targetTemperature READ getTargetTemperature WRITE setTargetTemperature)
+    Q_PROPERTY(bool airConditioning READ getAirConditioning WRITE setAirConditioning)
+    Q_PROPERTY(bool heater READ getHeater WRITE setHeater)
+    Q_PROPERTY(int seatHeater READ getSeatHeater WRITE setSeatHeater)
+    Q_PROPERTY(int seatCooler READ getSeatCooler WRITE setSeatCooler)
+    Q_PROPERTY(bool airCirculation READ getAirCirculation WRITE setAirCirculation)
+    Q_PROPERTY(int steeringWheelHeater READ getSteeringWheelHeater WRITE setSteeringWheelHeater)
+
+public:
+    ClimateControl(QQuickItem *parent = 0);
+    ~ClimateControl();
+
+    // Accessor functions.
+    qint32 getZone();
+    void setZone(qint32 newZone);
+    quint16 getFanSpeedLevel();
+    void setFanSpeedLevel(quint16 newFanSpeedLevel);
+    qint32 getTargetTemperature();
+    void setTargetTemperature(qint32 newTargetTemperature);
+    bool getAirConditioning();
+    void setAirConditioning(bool newAirConditioning);
+    bool getHeater();
+    void setHeater(bool newHeater);
+    quint8 getSeatHeater();
+    void setSeatHeater(quint8 newSeatHeater);
+    quint8 getSeatCooler();
+    void setSeatCooler(quint8 newSeatCooler);
+    bool getAirCirculation();
+    void setAirCirculation(bool newAirCirculation);
+    quint8 getSteeringWheelHeater();
+    void setSteeringWheelHeater(quint8 newSteeringWheelHeater);
+
+signals:
+    // Standard notifiers for property updates.
+    void zoneChanged();
+    void fanSpeedLevelChanged();
+    void targetTemperatureChanged();
+    void airConditioningChanged();
+    void heaterChanged();
+    void seatHeaterChanged();
+    void seatCoolerChanged();
+    void airCirculationChanged();
+    void steeringWheelHeaterChanged();
+
+private:
+    // Representations of the AMB properties.
+    qint32 zone;
+    quint16 fanSpeedLevel;
+    qint32 targetTemperature;
+    bool airConditioning;
+    bool heater;
+    quint8 seatHeater;
+    quint8 seatCooler;
+    bool airCirculation;
+    quint8 steeringWheelHeater;
+
+    //
+    // D-Bus functionality member variables.
+    //
+    // TODO: Make some of this a generic class for use by other plugins.
+    //
+    QVariant dbusRead(const char *property);
+    void dbusWrite(const char *property, QVariant value);
+    void getSettings();
+};
+
+#endif // CLIMATECONTROL_H
diff --git a/recipes-automotive/climatecontrolplugin/files/climatecontrol.pro b/recipes-automotive/climatecontrolplugin/files/climatecontrol.pro
new file mode 100644
index 000000000..d3817c196
--- /dev/null
+++ b/recipes-automotive/climatecontrolplugin/files/climatecontrol.pro
@@ -0,0 +1,36 @@
+TEMPLATE = lib
+TARGET = ClimateControl
+QT += qml quick dbus
+CONFIG += qt plugin c++11
+CONFIG(release):DEFINES += QT_NO_DEBUG_OUTPUT
+
+TARGET = $$qtLibraryTarget($$TARGET)
+uri = Automotive.ClimateControl
+
+# Input
+SOURCES += \
+    climatecontrol_plugin.cpp \
+    climatecontrol.cpp
+
+HEADERS += \
+    climatecontrol_plugin.h \
+    climatecontrol.h
+
+DISTFILES = qmldir \
+    climatecontroltest.qml
+
+!equals(_PRO_FILE_PWD_, $$OUT_PWD) {
+    copy_qmldir.target = $$OUT_PWD/qmldir
+    copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir
+    copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\"
+    QMAKE_EXTRA_TARGETS += copy_qmldir
+    PRE_TARGETDEPS += $$copy_qmldir.target
+}
+
+qmldir.files = qmldir
+unix {
+    installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
+    qmldir.path = $$installPath
+    target.path = $$installPath
+    INSTALLS += target qmldir
+}
diff --git a/recipes-automotive/climatecontrolplugin/files/climatecontrol_plugin.cpp b/recipes-automotive/climatecontrolplugin/files/climatecontrol_plugin.cpp
new file mode 100644
index 000000000..cd53da0da
--- /dev/null
+++ b/recipes-automotive/climatecontrolplugin/files/climatecontrol_plugin.cpp
@@ -0,0 +1,18 @@
+/* Copyright (C) 2015, Jaguar Land Rover. All Rights Reserved.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "climatecontrol_plugin.h"
+#include "climatecontrol.h"
+
+#include <qqml.h>
+
+void ClimateControlPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Automotive.ClimateControl"));
+
+    // @uri Automotive.ClimateControl
+    qmlRegisterType<ClimateControl>(uri, 1, 0, "ClimateControlItem");
+}
diff --git a/recipes-automotive/climatecontrolplugin/files/climatecontrol_plugin.h b/recipes-automotive/climatecontrolplugin/files/climatecontrol_plugin.h
new file mode 100644
index 000000000..315552e89
--- /dev/null
+++ b/recipes-automotive/climatecontrolplugin/files/climatecontrol_plugin.h
@@ -0,0 +1,21 @@
+/* Copyright (C) 2015, Jaguar Land Rover. All Rights Reserved.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef CLIMATECONTROL_PLUGIN_H
+#define CLIMATECONTROL_PLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+class ClimateControlPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif // CLIMATECONTROL_PLUGIN_H
diff --git a/recipes-automotive/climatecontrolplugin/files/qmldir b/recipes-automotive/climatecontrolplugin/files/qmldir
new file mode 100644
index 000000000..67289761e
--- /dev/null
+++ b/recipes-automotive/climatecontrolplugin/files/qmldir
@@ -0,0 +1,3 @@
+module Automotive.ClimateControl
+plugin ClimateControl
+