diff options
author | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-07-05 16:43:46 -0400 |
---|---|---|
committer | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-07-05 17:04:55 -0400 |
commit | b8d3227c3421f9408fbba3c7d392d4ae68790bfa (patch) | |
tree | f60eb58045351d9fb32ab33af8eb91ecdea3a4b2 /src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc | |
parent | 92d03d64236864a191c5e8ab9fa3c1c35111a486 (diff) | |
parent | 3ca6e219ad6325e4ae5486df0f1071c90430a259 (diff) | |
download | sdl_core-b8d3227c3421f9408fbba3c7d392d4ae68790bfa.tar.gz |
Merge remote-tracking branch 'origin/feature/remove_qt_hmi_api_dbus' into develop
# Conflicts:
# src/components/application_manager/CMakeLists.txt
# src/components/application_manager/include/application_manager/commands/mobile/get_vehicle_data_request.h
# src/components/application_manager/include/application_manager/commands/mobile/subscribe_vehicle_data_request.h
# src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_vehicle_data_request.h
# src/components/application_manager/src/commands/mobile/get_vehicle_data_request.cc
# src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc
# src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_request.cc
# src/components/application_manager/src/hmi_command_factory.cc
# src/components/application_manager/src/message_helper/message_helper.cc
# src/components/application_manager/test/commands/hmi/dummy_hmi_commands_test.cc
# src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc
# src/components/application_manager/test/commands/mobile/get_vehicle_data_request_test.cc
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc')
-rw-r--r-- | src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc | 44 |
1 files changed, 1 insertions, 43 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc index 2374609774..b8b84f13c9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc @@ -223,27 +223,6 @@ #include "hmi/on_tts_reset_timeout_notification.h" #include "hmi/dial_number_request.h" #include "hmi/dial_number_response.h" -#include "hmi/on_vi_gps_data_notification.h" -#include "hmi/on_vi_speed_notification.h" -#include "hmi/on_vi_rpm_notification.h" -#include "hmi/on_vi_fuel_level_notification.h" -#include "hmi/on_vi_fuel_level_state_notification.h" -#include "hmi/on_vi_instant_fuel_consumption_notification.h" -#include "hmi/on_vi_external_temperature_notification.h" -#include "hmi/on_vi_vin_notification.h" -#include "hmi/on_vi_prndl_notification.h" -#include "hmi/on_vi_tire_pressure_notification.h" -#include "hmi/on_vi_odometer_notification.h" -#include "hmi/on_vi_belt_status_notification.h" -#include "hmi/on_vi_body_information_notification.h" -#include "hmi/on_vi_device_status_notification.h" -#include "hmi/on_vi_driver_braking_notification.h" -#include "hmi/on_vi_wiper_status_notification.h" -#include "hmi/on_vi_head_lamp_status_notification.h" -#include "hmi/on_vi_engine_torque_notification.h" -#include "hmi/on_vi_acc_pedal_position_notification.h" -#include "hmi/on_vi_steering_wheel_angle_notification.h" -#include "hmi/on_vi_my_key_notification.h" #include "hmi/ui_set_icon_request.h" #include "application_manager/commands/commands_test.h" @@ -515,28 +494,7 @@ typedef Types<commands::hmi::OnButtonEventNotification, commands::OnVRLanguageChangeNotification, commands::OnTTSLanguageChangeNotification> HMICommandsListFourth; -typedef Types<commands::OnVIGpsDataNotification, - commands::OnVISpeedNotification, - commands::OnVIRpmNotification, - commands::OnVIFuelLevelNotification, - commands::OnVIFuelLevelStateNotification, - commands::OnVIInstantFuelConsumptionNotification, - commands::OnVIExternalTemperatureNotification, - commands::OnVIVinNotification, - commands::OnVIPrndlNotification, - commands::OnVITirePressureNotification, - commands::OnVIOdometerNotification, - commands::OnVIBeltStatusNotification, - commands::OnVIBodyInformationNotification, - commands::OnVIDeviceStatusNotification, - commands::OnVIDriverBrakingNotification, - commands::OnVIWiperStatusNotification, - commands::OnVIHeadLampStatusNotification, - commands::OnVIEngineTorqueNotification, - commands::OnVIAccPedalPositionNotification, - commands::OnVISteeringWheelAngleNotification, - commands::OnVIMyKeyNotification, - commands::AllowAllAppsRequest, +typedef Types<commands::AllowAllAppsRequest, commands::AllowAllAppsResponse, commands::AllowAppRequest, commands::AllowAppResponse> HMICommandsListFifth; |