From c265243158028a834e84b9ecbfad20f73a64b14a Mon Sep 17 00:00:00 2001 From: JackLivio Date: Thu, 21 Feb 2019 15:50:35 -0500 Subject: Config for embeddedServices and CoresOriginID --- src/appMain/smartDeviceLink.ini | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/appMain') diff --git a/src/appMain/smartDeviceLink.ini b/src/appMain/smartDeviceLink.ini index ccb377d1e6..54a86113a3 100644 --- a/src/appMain/smartDeviceLink.ini +++ b/src/appMain/smartDeviceLink.ini @@ -369,3 +369,10 @@ EnableAppLaunchIOS = true ; Note: this configuration is applied even if multiple-transports feature is not enabled. ;AudioServiceTransports = TCP_WIFI, IAP_CARPLAY, IAP_USB_HOST_MODE, IAP_USB_DEVICE_MODE, IAP_USB, AOA_USB ;VideoServiceTransports = TCP_WIFI, IAP_CARPLAY, IAP_USB_HOST_MODE, IAP_USB_DEVICE_MODE, IAP_USB, AOA_USB + +[AppServices] +; The ID to pass to app service publishers when sending a PerformAppServiceInteraction request +CoresOriginId = "sdl_core" + +; Services that exist on the module. Values are of AppServiceType in RPC Spec. These services will be used as default and app services will only become primary service publisher with direct user interaction. These services will also be a fallback if no app service publisher is registered with the system of that type. +EmbeddedServices = MEDIA, WEATHER, NAVIGATION, VOICE_ASSISTANT -- cgit v1.2.1 From 1155779394444363ff18eb7771aa295f18261566 Mon Sep 17 00:00:00 2001 From: JackLivio Date: Thu, 21 Feb 2019 16:11:51 -0500 Subject: Update to HMIOriginID --- src/appMain/smartDeviceLink.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/appMain') diff --git a/src/appMain/smartDeviceLink.ini b/src/appMain/smartDeviceLink.ini index 54a86113a3..954381afeb 100644 --- a/src/appMain/smartDeviceLink.ini +++ b/src/appMain/smartDeviceLink.ini @@ -372,7 +372,7 @@ EnableAppLaunchIOS = true [AppServices] ; The ID to pass to app service publishers when sending a PerformAppServiceInteraction request -CoresOriginId = "sdl_core" +HMIOriginID = "HMI_ID" ; Services that exist on the module. Values are of AppServiceType in RPC Spec. These services will be used as default and app services will only become primary service publisher with direct user interaction. These services will also be a fallback if no app service publisher is registered with the system of that type. EmbeddedServices = MEDIA, WEATHER, NAVIGATION, VOICE_ASSISTANT -- cgit v1.2.1 From a4011490d9aa4606d6d835690bc8703c4375526b Mon Sep 17 00:00:00 2001 From: Shobhit Adlakha Date: Thu, 21 Feb 2019 17:53:08 -0500 Subject: SystemCapability Subscription (#2800) * Added subscribe paramater and SystemCapability App Extension * Added SystemCapability app extension in sdl_rpc_plugin * Added enabling/disabling subscription in * Added and implemented OnSystemCapabilityUpdated notification * Add binary data to OEM_SPECIFIC request type * Add check for missing presetBankCapabilities in Buttons.GetCapabilities * Revert "Add missing resource close in LoadPlugin" This reverts commit 35defc42777c57412cbf8b793489ab0dac502f4e. * Genericize vehicle info in hmi_capabilities.json * Added subscribe paramater and SystemCapability App Extension * Added SystemCapability app extension in sdl_rpc_plugin * Added enabling/disabling subscription in * Added and implemented OnSystemCapabilityUpdated notification * Added AppServices structs to MOBILE API * Add binary data to OEM_SPECIFIC request type * Add check for missing presetBankCapabilities in Buttons.GetCapabilities * Revert "Add missing resource close in LoadPlugin" This reverts commit 35defc42777c57412cbf8b793489ab0dac502f4e. * Genericize vehicle info in hmi_capabilities.json * Added subscribe paramater and SystemCapability App Extension * Added SystemCapability app extension in sdl_rpc_plugin * Added enabling/disabling subscription in * Added and implemented OnSystemCapabilityUpdated notification * Added and implemented OnSystemCapabilityUpdated notification * Added AppServices structs to MOBILE API * Add binary data to OEM_SPECIFIC request type * Add check for missing presetBankCapabilities in Buttons.GetCapabilities * Revert "Add missing resource close in LoadPlugin" This reverts commit 35defc42777c57412cbf8b793489ab0dac502f4e. * Genericize vehicle info in hmi_capabilities.json * Added subscribe paramater and SystemCapability App Extension * Added SystemCapability app extension in sdl_rpc_plugin * Added enabling/disabling subscription in * Added and implemented OnSystemCapabilityUpdated notification * Added AppServices structs to MOBILE API * Implemented AppServiceCapabilities response * Renamed SystemCapability App Extension filename and ExtractExtension function * Fix style * Add OnSystemCapabilityUpdated(APP_SERVICES) handling * Fix missing include and unused variables * Made fix in App service manager and added notifcation RPC to policy table * Implemented automatic app system capability subscription of App Service Provider * Add binary data to OEM_SPECIFIC request type * Add check for missing presetBankCapabilities in Buttons.GetCapabilities * Revert "Add missing resource close in LoadPlugin" This reverts commit 35defc42777c57412cbf8b793489ab0dac502f4e. * Genericize vehicle info in hmi_capabilities.json * Added subscribe paramater and SystemCapability App Extension * Added SystemCapability app extension in sdl_rpc_plugin * Added enabling/disabling subscription in * Added and implemented OnSystemCapabilityUpdated notification * Added AppServices structs to MOBILE API * Implemented AppServiceCapabilities response * Renamed SystemCapability App Extension filename and ExtractExtension function * Fix style * Add OnSystemCapabilityUpdated(APP_SERVICES) handling * Fix missing include and unused variables * Made fix in App service manager and added notifcation RPC to policy table * Implemented automatic app system capability subscription of App Service Provider * Rebase and style fix * Added all published app services in OnSystemCapabilityUpdate notification * Add binary data to OEM_SPECIFIC request type * Add check for missing presetBankCapabilities in Buttons.GetCapabilities * Revert "Add missing resource close in LoadPlugin" This reverts commit 35defc42777c57412cbf8b793489ab0dac502f4e. * Genericize vehicle info in hmi_capabilities.json * Added subscribe paramater and SystemCapability App Extension * Added SystemCapability app extension in sdl_rpc_plugin * Added enabling/disabling subscription in * Added and implemented OnSystemCapabilityUpdated notification * Added AppServices structs to MOBILE API * Implemented AppServiceCapabilities response * Renamed SystemCapability App Extension filename and ExtractExtension function * Fix style * Add OnSystemCapabilityUpdated(APP_SERVICES) handling * Fix missing include and unused variables * Made fix in App service manager and added notifcation RPC to policy table * Implemented automatic app system capability subscription of App Service Provider * Added subscribe paramater and SystemCapability App Extension * Added SystemCapability app extension in sdl_rpc_plugin * Added and implemented OnSystemCapabilityUpdated notification * Renamed SystemCapability App Extension filename and ExtractExtension function * Fix style * Add OnSystemCapabilityUpdated(APP_SERVICES) handling * Made fix in App service manager and added notifcation RPC to policy table * Rebase and style fix * Added all published app services in OnSystemCapabilityUpdate notification * Applied parameter updateReason only to published app service which triggers OnSystemCapabilityUpdated notification * Implemented OnSystemCapabilityUpdated notification to HMI * Addressed review comments * Implemented UnPublishAppService in ASM * Implemented ASP removal notification * Moved ASP removal notification to ApplicationManagerImpl::UnregisterApplication * Moved HMI OSCU notification from app services plugin to sdl rpc plugin * Initialize AppServiceManager in Application manager tests * Moved create notification functions to message helper class * Fix style * Removed setServiceActive function * Update SystemCapability structs with new revisions * Fixed error from previous commit and addressed style comments * Addressed review comments * Addressed review comments and removed extra debug statements --- src/appMain/sdl_preloaded_pt.json | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/appMain') diff --git a/src/appMain/sdl_preloaded_pt.json b/src/appMain/sdl_preloaded_pt.json index 06ab56bc39..57f7587542 100644 --- a/src/appMain/sdl_preloaded_pt.json +++ b/src/appMain/sdl_preloaded_pt.json @@ -180,6 +180,12 @@ "LIMITED", "NONE"] }, + "OnSystemCapabilityUpdated": { + "hmi_levels": ["BACKGROUND", + "FULL", + "LIMITED", + "NONE"] + }, "PerformAudioPassThru": { "hmi_levels": ["FULL", "LIMITED"] -- cgit v1.2.1 From 8080ac0ded578a25107fe1d532419056fa9819f7 Mon Sep 17 00:00:00 2001 From: Jacob Keeler Date: Fri, 22 Feb 2019 11:30:08 -0500 Subject: Update src/appMain/smartDeviceLink.ini Co-Authored-By: JackLivio --- src/appMain/smartDeviceLink.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/appMain') diff --git a/src/appMain/smartDeviceLink.ini b/src/appMain/smartDeviceLink.ini index 954381afeb..90c2d94bf3 100644 --- a/src/appMain/smartDeviceLink.ini +++ b/src/appMain/smartDeviceLink.ini @@ -371,7 +371,7 @@ EnableAppLaunchIOS = true ;VideoServiceTransports = TCP_WIFI, IAP_CARPLAY, IAP_USB_HOST_MODE, IAP_USB_DEVICE_MODE, IAP_USB, AOA_USB [AppServices] -; The ID to pass to app service publishers when sending a PerformAppServiceInteraction request +; The ID used to fill the originApp field when the HMI sends a PerformAppServiceInteraction request HMIOriginID = "HMI_ID" ; Services that exist on the module. Values are of AppServiceType in RPC Spec. These services will be used as default and app services will only become primary service publisher with direct user interaction. These services will also be a fallback if no app service publisher is registered with the system of that type. -- cgit v1.2.1 From 45b9c2e8d109ed124c604c4b690b1847bc93c9c6 Mon Sep 17 00:00:00 2001 From: Jacob Keeler Date: Tue, 26 Feb 2019 12:53:56 -0500 Subject: PerformAppServiceInteraction RPC (#2815) * Add PerformAppServiceInteraction RPC * Add handling for `requestServiceActive` parameter * Fix style * Change PerformAppServiceInteraction class naming Clarify direction in class name --- src/appMain/sdl_preloaded_pt.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/appMain') diff --git a/src/appMain/sdl_preloaded_pt.json b/src/appMain/sdl_preloaded_pt.json index 57f7587542..8041a0d4e9 100644 --- a/src/appMain/sdl_preloaded_pt.json +++ b/src/appMain/sdl_preloaded_pt.json @@ -583,10 +583,20 @@ "AppService":{ "rpcs":{ "PublishAppService":{ - "hmi_levels":["BACKGROUND", + "hmi_levels": [ + "BACKGROUND", + "FULL", + "LIMITED", + "NONE" + ] + }, + "PerformAppServiceInteraction": { + "hmi_levels": [ + "BACKGROUND", "FULL", "LIMITED", - "NONE"] + "NONE" + ] } } }, -- cgit v1.2.1