From fe85cc90e080a24e0ab2d646a6c99f9b74b6bbf8 Mon Sep 17 00:00:00 2001 From: Andrii Kalinich Date: Wed, 21 Mar 2018 22:47:31 -0400 Subject: Update SDL preloaded PT with PROJECTION HMI type There was added PROJECTION HMI type to the notifications_per_minute_by_priority structure. Also this structure was updated in the policy types to make everything work correctly. --- src/appMain/sdl_preloaded_pt.json | 1 + .../policy/policy_external/include/policy/policy_table/types.h | 2 +- .../policy_external/include/policy/policy_table_interface_ext.xml | 2 +- .../policy/policy_regular/include/policy/policy_table/types.h | 2 +- src/components/policy/policy_regular/policy_table_interface_ext.xml | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/appMain/sdl_preloaded_pt.json b/src/appMain/sdl_preloaded_pt.json index 12ebafcb89..7ec2a5889c 100644 --- a/src/appMain/sdl_preloaded_pt.json +++ b/src/appMain/sdl_preloaded_pt.json @@ -28,6 +28,7 @@ "notifications_per_minute_by_priority": { "EMERGENCY": 60, "NAVIGATION": 15, + "PROJECTION": 15, "VOICECOM": 20, "COMMUNICATION": 6, "NORMAL": 4, diff --git a/src/components/policy/policy_external/include/policy/policy_table/types.h b/src/components/policy/policy_external/include/policy/policy_table/types.h index 53f5a35b99..3002d20b93 100644 --- a/src/components/policy/policy_external/include/policy/policy_table/types.h +++ b/src/components/policy/policy_external/include/policy/policy_table/types.h @@ -78,7 +78,7 @@ typedef Map URLList; typedef Map ServiceEndpoints; typedef uint8_t NumberOfNotificationsType; -typedef Map, 0, 6> +typedef Map, 0, 7> NumberOfNotificationsPerMinute; typedef Array, 0, 5> SecondsBetweenRetries; diff --git a/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml b/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml index 91518f8f6e..6683d41c7f 100644 --- a/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml +++ b/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml @@ -128,7 +128,7 @@ minsize="1" maxsize="255" /> + map="true" maxsize="7" minvalue="0" maxvalue="255" /> diff --git a/src/components/policy/policy_regular/include/policy/policy_table/types.h b/src/components/policy/policy_regular/include/policy/policy_table/types.h index 61585776f2..992ec3c752 100644 --- a/src/components/policy/policy_regular/include/policy/policy_table/types.h +++ b/src/components/policy/policy_regular/include/policy/policy_table/types.h @@ -76,7 +76,7 @@ typedef Map URLList; typedef Map ServiceEndpoints; typedef uint8_t NumberOfNotificationsType; -typedef Map, 0, 6> +typedef Map, 0, 7> NumberOfNotificationsPerMinute; typedef Array, 0, 5> SecondsBetweenRetries; diff --git a/src/components/policy/policy_regular/policy_table_interface_ext.xml b/src/components/policy/policy_regular/policy_table_interface_ext.xml index 468eec2b0b..e82b3ad777 100644 --- a/src/components/policy/policy_regular/policy_table_interface_ext.xml +++ b/src/components/policy/policy_regular/policy_table_interface_ext.xml @@ -123,7 +123,7 @@ minsize="1" maxsize="255" /> + map="true" maxsize="7" minvalue="0" maxvalue="255" /> -- cgit v1.2.1 From a6dde5ae05bf4de37ea3d76891b543dd213925e7 Mon Sep 17 00:00:00 2001 From: Andrii Kalinich Date: Wed, 21 Mar 2018 22:52:04 -0400 Subject: Fix affected unit tests --- src/components/application_manager/test/sdl_preloaded_pt.json | 1 + src/components/application_manager/test/sdl_pt_update.json | 1 + src/components/policy/policy_external/test/json/sdl_preloaded_pt.json | 1 + src/components/policy/policy_regular/test/sdl_preloaded_pt.json | 1 + 4 files changed, 4 insertions(+) diff --git a/src/components/application_manager/test/sdl_preloaded_pt.json b/src/components/application_manager/test/sdl_preloaded_pt.json index d6f34c12fc..80dd494405 100644 --- a/src/components/application_manager/test/sdl_preloaded_pt.json +++ b/src/components/application_manager/test/sdl_preloaded_pt.json @@ -20,6 +20,7 @@ "notifications_per_minute_by_priority": { "EMERGENCY": 60, "NAVIGATION": 15, + "PROJECTION": 15, "COMMUNICATION": 6, "NORMAL": 4, "NONE": 0 diff --git a/src/components/application_manager/test/sdl_pt_update.json b/src/components/application_manager/test/sdl_pt_update.json index a332f92382..08f734b1c7 100644 --- a/src/components/application_manager/test/sdl_pt_update.json +++ b/src/components/application_manager/test/sdl_pt_update.json @@ -1708,6 +1708,7 @@ "COMMUNICATION" : 6, "EMERGENCY" : 60, "NAVIGATION" : 15, + "PROJECTION": 15, "NONE" : 0, "NORMAL" : 4, "VOICECOMM" : 10 diff --git a/src/components/policy/policy_external/test/json/sdl_preloaded_pt.json b/src/components/policy/policy_external/test/json/sdl_preloaded_pt.json index d6f34c12fc..80dd494405 100644 --- a/src/components/policy/policy_external/test/json/sdl_preloaded_pt.json +++ b/src/components/policy/policy_external/test/json/sdl_preloaded_pt.json @@ -20,6 +20,7 @@ "notifications_per_minute_by_priority": { "EMERGENCY": 60, "NAVIGATION": 15, + "PROJECTION": 15, "COMMUNICATION": 6, "NORMAL": 4, "NONE": 0 diff --git a/src/components/policy/policy_regular/test/sdl_preloaded_pt.json b/src/components/policy/policy_regular/test/sdl_preloaded_pt.json index d6f34c12fc..80dd494405 100644 --- a/src/components/policy/policy_regular/test/sdl_preloaded_pt.json +++ b/src/components/policy/policy_regular/test/sdl_preloaded_pt.json @@ -20,6 +20,7 @@ "notifications_per_minute_by_priority": { "EMERGENCY": 60, "NAVIGATION": 15, + "PROJECTION": 15, "COMMUNICATION": 6, "NORMAL": 4, "NONE": 0 -- cgit v1.2.1