diff options
| author | JackLivio <jack@livio.io> | 2018-06-29 09:49:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-29 09:49:24 -0400 |
| commit | ba1da7bc2ff3fd37638620f6bea526384646ab0e (patch) | |
| tree | c75ca40401db8d9092df5c7cdcbde8676eb9bd10 /src/components/application_manager | |
| parent | eb8b2c1be904e3d2a056cd83c9d2226c0ed16796 (diff) | |
| parent | 2efa273c64769c202ff120c787bc2d20bc49b170 (diff) | |
| download | sdl_core-ba1da7bc2ff3fd37638620f6bea526384646ab0e.tar.gz | |
Merge pull request #2293 from smartdevicelink/feature/data_turn_signalfix/remove_commented_codefeature/make_makeshared_support_variadic_templatesfeature/increase_policy_utests_speed
Feature/data turn signal
Diffstat (limited to 'src/components/application_manager')
5 files changed, 12 insertions, 0 deletions
diff --git a/src/components/application_manager/include/application_manager/smart_object_keys.h b/src/components/application_manager/include/application_manager/smart_object_keys.h index 50d70591c9..80e475a680 100644 --- a/src/components/application_manager/include/application_manager/smart_object_keys.h +++ b/src/components/application_manager/include/application_manager/smart_object_keys.h @@ -254,6 +254,7 @@ extern const char* fuel_level_state; extern const char* instant_fuel_consumption; extern const char* fuel_range; extern const char* external_temp; +extern const char* turn_signal; extern const char* vin; extern const char* prndl; extern const char* tire_pressure; diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc index 2e50942369..1f1ff4ddf0 100644 --- a/src/components/application_manager/src/message_helper/message_helper.cc +++ b/src/components/application_manager/src/message_helper/message_helper.cc @@ -180,6 +180,8 @@ std::pair<std::string, mobile_apis::VehicleDataType::VEHICLEDATA_FUELRANGE), std::make_pair(strings::external_temp, mobile_apis::VehicleDataType::VEHICLEDATA_EXTERNTEMP), + std::make_pair(strings::turn_signal, + mobile_apis::VehicleDataType::VEHICLEDATA_TURNSIGNAL), std::make_pair(strings::vin, mobile_apis::VehicleDataType::VEHICLEDATA_VIN), std::make_pair(strings::prndl, mobile_apis::VehicleDataType::VEHICLEDATA_PRNDL), diff --git a/src/components/application_manager/src/smart_object_keys.cc b/src/components/application_manager/src/smart_object_keys.cc index e4e89c6e1f..5514ad688a 100644 --- a/src/components/application_manager/src/smart_object_keys.cc +++ b/src/components/application_manager/src/smart_object_keys.cc @@ -218,6 +218,7 @@ const char* fuel_level_state = "fuelLevel_State"; const char* instant_fuel_consumption = "instantFuelConsumption"; const char* fuel_range = "fuelRange"; const char* external_temp = "externalTemperature"; +const char* turn_signal = "turnSignal"; const char* vin = "vin"; const char* prndl = "prndl"; const char* tire_pressure = "tirePressure"; diff --git a/src/components/application_manager/test/sdl_preloaded_pt.json b/src/components/application_manager/test/sdl_preloaded_pt.json index ced0a9d603..7f5436b5b6 100644 --- a/src/components/application_manager/test/sdl_preloaded_pt.json +++ b/src/components/application_manager/test/sdl_preloaded_pt.json @@ -353,6 +353,7 @@ "engineOilLife", "engineTorque", "externalTemperature", + "turnSignal", "fuelLevel", "fuelLevel_State", "headLampStatus", @@ -372,6 +373,7 @@ "engineOilLife", "engineTorque", "externalTemperature", + "turnSignal", "fuelLevel", "fuelLevel_State", "headLampStatus", @@ -391,6 +393,7 @@ "engineOilLife", "engineTorque", "externalTemperature", + "turnSignal", "fuelLevel", "fuelLevel_State", "headLampStatus", @@ -409,6 +412,7 @@ "engineOilLife", "engineTorque", "externalTemperature", + "turnSignal", "fuelLevel", "fuelLevel_State", "headLampStatus", diff --git a/src/components/application_manager/test/sdl_pt_update.json b/src/components/application_manager/test/sdl_pt_update.json index f87ae40eac..e5fdb33a93 100644 --- a/src/components/application_manager/test/sdl_pt_update.json +++ b/src/components/application_manager/test/sdl_pt_update.json @@ -1590,6 +1590,7 @@ "engineOilLife", "engineTorque", "externalTemperature", + "turnSignal", "fuelLevel", "fuelLevel_State", "headLampStatus", @@ -1607,6 +1608,7 @@ "engineOilLife", "engineTorque", "externalTemperature", + "turnSignal", "fuelLevel", "fuelLevel_State", "headLampStatus", @@ -1624,6 +1626,7 @@ "engineOilLife", "engineTorque", "externalTemperature", + "turnSignal", "fuelLevel", "fuelLevel_State", "headLampStatus", @@ -1640,6 +1643,7 @@ "engineOilLife", "engineTorque", "externalTemperature", + "turnSignal", "fuelLevel", "fuelLevel_State", "headLampStatus", |