Skip to content

Feature/Remote Control - Allow Multiple Modules per Module Type #2984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 36 commits into from
Aug 30, 2019
Merged

Feature/Remote Control - Allow Multiple Modules per Module Type #2984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
de15d53
Add new functionality to the interfaces
May 7, 2019
756be55
Add moduleId processing to the resource allocation manager
May 10, 2019
96c0b49
Add GetAcquiredModuleTypes and ReleaseModuleType functions for policy…
May 10, 2019
fb01cc9
Remove redundant SetResourceState call and fix UTs
May 10, 2019
e42d505
Add moduleInfo to default capabilities
May 10, 2019
79127f9
Add ModuleId method to RCCommandRequest
IGapchuk May 11, 2019
5381209
Add ReleaseInteriorVehicleDataModule RPC
IGapchuk May 11, 2019
597e666
Add GetInteriorVehicleDataConsentRequest RPC
IGapchuk May 11, 2019
f02a7e3
Refactor RC capabilities checking
May 20, 2019
ff8b12e
Use range based loop for smart objects with array type
May 20, 2019
a234d0c
Add ModuleId() function implementation
May 22, 2019
d947b64
Add moduleId validation by capabilities and button_name for ButtonPress
May 22, 2019
6007631
Add moduleId validation by capabilities for GetIVD and SetIVD
May 22, 2019
d688878
Add const to the capabilities check functions
May 22, 2019
ed41c5a
Add function to get list of all available resources from hmi capabili…
May 22, 2019
64cd07c
Fix UTs after updating the capabilities check
May 22, 2019
bdec7bc
Add new HMI RPC SetGlobalProperties and save user_location of applica…
IGapchuk May 28, 2019
3bf6d70
Add new parameter to ini file
IGapchuk May 28, 2019
7d817cc
Add separate file for RCRpcTypes
IGapchuk May 31, 2019
c78ab86
Update interior vehicle data caching with moduleId processing
May 30, 2019
01f55a0
Add RCConsentManager
IGapchuk May 31, 2019
4f87d4a
Define Grid, add functions for getting moduleServiceArea and allowMul…
Jun 4, 2019
45eaf07
Update SEAT module type processing
Jun 6, 2019
6a8851f
Add SetGlobalProperties Unit tests
IGapchuk Jun 8, 2019
2efd85b
Add ReleaseInteriorVehicleDataModuleRequest Unit tests
IGapchuk Jun 10, 2019
804157b
Add Grid Unit tests
IGapchuk Jun 16, 2019
4d5b1d0
Add ResourceAllocationManager Unit tests
IGapchuk Jul 8, 2019
b4807aa
Set resource to free if SIVD request is invalid
Jun 11, 2019
cae3f77
Allocate resource after receiving successful response from HMI
IGapchuk Aug 2, 2019
0169eb9
Rename function to indicate that it returns a list of module types
Aug 27, 2019
4899fef
Rename typedef to indicate that it defines a pair moduleType and capa…
Aug 27, 2019
af9b0a6
Fix functions descriptions
Aug 27, 2019
3962a36
Rename function to indicate that it returns data related to the modu…
Aug 27, 2019
f01f662
Fix CheckIfModuleExistsInCapabilities function name
Aug 27, 2019
fb803aa
Update cached consents logic for GIVDC
AKalinich-Luxoft Aug 29, 2019
fa38e50
Update logic for allowMultipleAccess=false
Aug 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 111 additions & 0 deletions src/appMain/hmi_capabilities.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,119 +325,210 @@
"pixelPerInch": 117,
"scale": 1
},
"seatLocationCapability": {
"rows": 2,
"columns": 3,
"levels": 1,
"seats": [
{
"row": 0,
"col": 0,
"level": 0,
"rowspan": 1,
"levelspan": 1,
"colspan": 1
}
]
},
"remoteControlCapability": {
"buttonCapabilities": [
{
"longPressAvailable": true,
"name": "AC_MAX",
"moduleInfo": {
"moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
"allowMultipleAccess": false
},
"shortPressAvailable": true,
"upDownAvailable": false
},
{
"longPressAvailable": true,
"name": "AC",
"moduleInfo": {
"moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
"allowMultipleAccess": false
},
"shortPressAvailable": true,
"upDownAvailable": false
},
{
"longPressAvailable": true,
"name": "RECIRCULATE",
"moduleInfo": {
"moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
"allowMultipleAccess": false
},
"shortPressAvailable": true,
"upDownAvailable": false
},
{
"longPressAvailable": true,
"name": "FAN_UP",
"moduleInfo": {
"moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
"allowMultipleAccess": false
},
"shortPressAvailable": true,
"upDownAvailable": false
},
{
"longPressAvailable": true,
"name": "FAN_DOWN",
"moduleInfo": {
"moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
"allowMultipleAccess": false
},
"shortPressAvailable": true,
"upDownAvailable": false
},
{
"longPressAvailable": true,
"name": "TEMP_UP",
"moduleInfo": {
"moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
"allowMultipleAccess": false
},
"shortPressAvailable": true,
"upDownAvailable": false
},
{
"longPressAvailable": true,
"name": "TEMP_DOWN",
"moduleInfo": {
"moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
"allowMultipleAccess": false
},
"shortPressAvailable": true,
"upDownAvailable": false
},
{
"longPressAvailable": true,
"name": "DEFROST_MAX",
"moduleInfo": {
"moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
"allowMultipleAccess": false
},
"shortPressAvailable": true,
"upDownAvailable": false
},
{
"longPressAvailable": true,
"name": "DEFROST",
"moduleInfo": {
"moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
"allowMultipleAccess": false
},
"shortPressAvailable": true,
"upDownAvailable": false
},
{
"longPressAvailable": true,
"name": "DEFROST_REAR",
"moduleInfo": {
"moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
"allowMultipleAccess": false
},
"shortPressAvailable": true,
"upDownAvailable": false
},
{
"longPressAvailable": true,
"name": "UPPER_VENT",
"moduleInfo": {
"moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
"allowMultipleAccess": false
},
"shortPressAvailable": true,
"upDownAvailable": false
},
{
"longPressAvailable": true,
"name": "LOWER_VENT",
"moduleInfo": {
"moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
"allowMultipleAccess": false
},
"shortPressAvailable": true,
"upDownAvailable": false
},
{
"longPressAvailable": true,
"name": "VOLUME_UP",
"moduleInfo": {
"moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
"allowMultipleAccess": false
},
"shortPressAvailable": true,
"upDownAvailable": false
},
{
"longPressAvailable": true,
"name": "VOLUME_DOWN",
"moduleInfo": {
"moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
"allowMultipleAccess": false
},
"shortPressAvailable": true,
"upDownAvailable": false
},
{
"longPressAvailable": true,
"name": "EJECT",
"moduleInfo": {
"moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
"allowMultipleAccess": false
},
"shortPressAvailable": true,
"upDownAvailable": false
},
{
"longPressAvailable": true,
"name": "SOURCE",
"moduleInfo": {
"moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
"allowMultipleAccess": false
},
"shortPressAvailable": true,
"upDownAvailable": false
},
{
"longPressAvailable": true,
"name": "SHUFFLE",
"moduleInfo": {
"moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
"allowMultipleAccess": false
},
"shortPressAvailable": true,
"upDownAvailable": false
},
{
"longPressAvailable": true,
"name": "REPEAT",
"moduleInfo": {
"moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
"allowMultipleAccess": false
},
"shortPressAvailable": true,
"upDownAvailable": false
}
],
"climateControlCapabilities": [
{
"moduleInfo": {
"moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
"allowMultipleAccess": false
},
"acEnableAvailable": true,
"acMaxEnableAvailable": true,
"autoModeEnableAvailable": true,
Expand Down Expand Up @@ -470,6 +561,10 @@
],
"radioControlCapabilities": [
{
"moduleInfo": {
"moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
"allowMultipleAccess": true
},
"availableHdChannelsAvailable": true,
"hdChannelAvailable": true,
"moduleName": "radio",
Expand All @@ -488,6 +583,10 @@
"audioControlCapabilities": [
{
"moduleName": "audio",
"moduleInfo": {
"moduleId": "a279fe12-4587-4d12-8514-50f4ea9e9537",
"allowMultipleAccess": true
},
"sourceAvailable": true,
"volumeAvailable": true,
"equalizerAvailable": true,
Expand All @@ -498,6 +597,10 @@
"seatControlCapabilities": [
{
"moduleName": "driver_seat",
"moduleInfo": {
"moduleId": "06cdec22-920e-4865-bf2e-9518463edc68",
"allowMultipleAccess": false
},
"heatingEnabledAvailable" : true,
"coolingEnabledAvailable": true,
"heatingLevelAvailable": true,
Expand All @@ -517,6 +620,10 @@
],
"lightControlCapabilities": {
"moduleName": "light",
"moduleInfo": {
"moduleId": "8d73e369-6a1f-4459-ab5a-6e432631881d",
"allowMultipleAccess": false
},
"supportedLights":[
{
"statusAvailable":true,
Expand Down Expand Up @@ -810,6 +917,10 @@
},
"hmiSettingsControlCapabilities": {
"moduleName": "hmiSettings",
"moduleInfo": {
"moduleId": "c8cace3c-d482-4be1-8862-624a21e34563",
"allowMultipleAccess": true
},
"distanceUnitAvailable": true,
"temperatureUnitAvailable": true,
"displayModeUnitAvailable": true
Expand Down
16 changes: 16 additions & 0 deletions src/appMain/sdl_preloaded_pt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,6 +913,22 @@
"LIMITED",
"NONE"
]
},
"ReleaseInteriorVehicleDataModule": {
"hmi_levels": [
"BACKGROUND",
"FULL",
"LIMITED",
"NONE"
]
},
"GetInteriorVehicleDataConsent": {
"hmi_levels": [
"BACKGROUND",
"FULL",
"LIMITED",
"NONE"
]
}
}
},
Expand Down
6 changes: 5 additions & 1 deletion src/appMain/smartDeviceLink.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,4 +390,8 @@ HMIOriginID = "HMI_ID"
EmbeddedServices = MEDIA, WEATHER, NAVIGATION

; Additional time added to RPC timeout when passing through to App service
RpcPassThroughTimeout = 10000
RpcPassThroughTimeout = 10000

[RCModuleConsent]
; The period (in days) after which consent for module_id should be removed.
PeriodForConsentExpiration = 30
13 changes: 13 additions & 0 deletions src/components/application_manager/include/application_manager/application.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1202,6 +1202,19 @@ class Application : public virtual InitialApplicationData,
*/
virtual void set_cloud_app_certificate(const std::string& certificate) = 0;

/**
* @brief Set user location
* @param smart object of user location
*/
virtual void set_user_location(
const smart_objects::SmartObject& user_location) = 0;

/**
* @brief Get user location
* @return smart object of user location
*/
virtual const smart_objects::SmartObject& get_user_location() const = 0;

protected:
mutable sync_primitives::Lock hmi_states_lock_;

Expand Down
6 changes: 6 additions & 0 deletions src/components/application_manager/include/application_manager/application_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,11 @@ class ApplicationImpl : public virtual Application,
*/
void set_cloud_app_certificate(const std::string& certificate) OVERRIDE;

void set_user_location(
const smart_objects::SmartObject& user_location) OVERRIDE;

const smart_objects::SmartObject& get_user_location() const OVERRIDE;

protected:
/**
* @brief Clean up application folder. Persistent files will stay
Expand Down Expand Up @@ -611,6 +616,7 @@ class ApplicationImpl : public virtual Application,
std::string cloud_transport_type_;
mobile_apis::HybridAppPreference::eType hybrid_app_preference_;
std::string certificate_;
smart_objects::SmartObject user_location_;

/**
* @brief Defines number per time in seconds limits
Expand Down
10 changes: 10 additions & 0 deletions ...omponents/application_manager/include/application_manager/commands/command_request_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,16 @@ class CommandRequestImpl : public CommandImpl,
bool IsResultCodeUnsupported(const ResponseInfo& first,
const ResponseInfo& second) const;

/**
* @brief CheckResult checks whether the overall result
* of the responses is successful
* @param first response
* @param second response
* @return true if the overall result is successful
* otherwise - false
*/
bool CheckResult(const ResponseInfo& first, const ResponseInfo& second) const;

protected:
/**
* @brief Returns policy parameters permissions
Expand Down
6 changes: 6 additions & 0 deletions src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,11 @@ class HMICapabilitiesImpl : public HMICapabilities {

const smart_objects::SmartObject* rc_capability() const OVERRIDE;

void set_seat_location_capability(
const smart_objects::SmartObject& seat_location_capability) OVERRIDE;

const smart_objects::SmartObject* seat_location_capability() const OVERRIDE;

void Init(resumption::LastState* last_state) OVERRIDE;

/*
Expand Down Expand Up @@ -617,6 +622,7 @@ class HMICapabilitiesImpl : public HMICapabilities {
smart_objects::SmartObject* phone_capability_;
smart_objects::SmartObject* video_streaming_capability_;
smart_objects::SmartObject* rc_capability_;
smart_objects::SmartObject* seat_location_capability_;

ApplicationManager& app_mngr_;
HMILanguageHandler hmi_language_handler_;
Expand Down
Loading