Merge remote-tracking branch 'origin/devel'

README.md

@@ -5,7 +5,7 @@ Open Source Car Control (OSCC) is an assemblage of software and hardware designs
 
 OSCC enables developers to send control commands to the vehicle, read control messages from the vehicle’s OBD-II CAN network, and forward reports for current vehicle control state. Such as steering angle & wheel speeds. Control commands are issued to the vehicle component ECUs via the steering wheel torque sensor, throttle position sensor, and brake position sensor. (Because the gas-powered Kia Soul isn’t brake by-wire capable, an auxiliary actuator is added to enable braking.) This low-level interface means that OSCC offers full-range control of the vehicle without altering the factory safety-case, spoofing CAN messages, or hacking ADAS features.
 
-Although we currently support only the 2014 or later Kia Soul (w/ Kia Soul EV & Kia Niro support coming in Q3/Q4 2017, respectively), the API and firmware have been designed to make it easy to add new vehicle support. Additionally, the separation between API and firmware means it is easier to modify and test parts of your program without having to update the flashed OSCC modules.
+Although OSCC currently supports only the 2014 or later Kia Soul (petrol and EV), the API and firmware have been designed to make it easy to add new vehicle support. Additionally, the separation between API and firmware means it is easier to modify and test parts of your program without having to update the flashed OSCC modules.
 
 Our [Wiki](https://github.com/PolySync/OSCC/wiki) is in the process of being updated to reflect the new changes, but contains a bunch of valuable information to help you get started in understanding the details of the system.
 
@@ -89,6 +89,7 @@ appropriate build flag:
 | --------------- | ---------------- |
 | Kia Soul Petrol | -DKIA_SOUL=ON    |
 | Kia Soul EV     | -DKIA_SOUL_EV=ON |
+| Kia Niro        | -DKIA_NIRO=ON    |
 
 
 For example, if you want to build firmware for the petrol Kia Soul:

api/OsccConfig.cmake

@@ -2,6 +2,8 @@ if(KIA_SOUL)
     add_definitions(-DKIA_SOUL)
 elseif(KIA_SOUL_EV)
     add_definitions(-DKIA_SOUL_EV)
+elseif(KIA_NIRO)
+        add_definitions(-DKIA_NIRO)
 else()
     message(FATAL_ERROR "No platform selected")
 endif()

api/include/vehicles.h

@@ -13,6 +13,8 @@
 #include "vehicles/kia_soul_petrol.h"
 #elif defined(KIA_SOUL_EV)
 #include "vehicles/kia_soul_ev.h"
+#elif defined(KIA_NIRO)
+#include "vehicles/kia_niro.h"
 #endif
 
 #define CONSTRAIN(amt, low, high) ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)))