Skip to content

Commit

Permalink
Merge pull request #2122 from smartdevicelink/release/5.0.0
Browse files Browse the repository at this point in the history 
Release 5.0.0
  • Loading branch information
@Jack-Byrne
Jack-Byrne authored Oct 19, 2018
2 parents 0a95b66 + a53b742 commit ab2de14
Show file tree
Hide file tree
Showing 1,417 changed files with 78,472 additions and 9,191 deletions.
Binary file added .DS_Store
View file
Binary file not shown.
24 changes: 24 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
ATF Test Scripts to check #[issue number in sdl_core repository]

This PR is **[ready / not ready]** for review.

### Summary
[Summary of PR changes]

### ATF version
[ATF version to use]

### Changelog

##### Enhancements
* [Enhancement info]

##### Bug Fixes
* [Bug Fix Info]

### Dependencies:
- [ ] [Task 1]
- [ ] [Task 2]

### CLA
- [ ] I have signed [the CLA](https://docs.google.com/forms/d/e/1FAIpQLSdsgJY33VByaX482zHzi-xUm49JNnmuJOyAM6uegPQ2LXYVfA/viewform)
31 changes: 0 additions & 31 deletions KnownIssues.md
View file

This file was deleted.

3 changes: 2 additions & 1 deletion files/Base4InPreDataConsent_preloaded_pt.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2251,7 +2251,8 @@
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["Base-4"]
"groups": ["Base-4"],
"RequestType": []
},
"device": {
"keep_context": false,
Expand Down
6 changes: 4 additions & 2 deletions files/DeviceConsentedAndAppPermissionsForConsent_preloaded_pt.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2251,14 +2251,16 @@
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["Base-4"]
"groups": ["Base-4"],
"RequestType": []
},
"0000001": {
"keep_context": false,
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["DrivingCharacteristics-3","Base-4"]
"groups": ["DrivingCharacteristics-3","Base-4"],
"RequestType": []
},
"device": {
"keep_context": false,
Expand Down
5 changes: 3 additions & 2 deletions files/DeviceGroupInPreconsented_preloadedPT.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2251,15 +2251,16 @@
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["Base-4"]
"groups": ["Base-4"],
"RequestType": []
},
"device": {
"keep_context": false,
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["DataConsent-2"],
"preconsented_groups":["DataConsent-2"]
"preconsented_groups":["DataConsent-2"]
},
"pre_DataConsent": {
"keep_context": false,
Expand Down
3 changes: 2 additions & 1 deletion files/FocusContextTrue_preloaded_pt.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2251,7 +2251,8 @@
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["Base-4"]
"groups": ["Base-4"],
"RequestType": []
},
"device": {
"keep_context": false,
Expand Down
6 changes: 4 additions & 2 deletions files/GroupsForApp_preloaded_pt.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2252,7 +2252,8 @@
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["Base-4"]
"groups": ["Base-4"],
"RequestType": []
},
"0000001": {
"keep_context": false,
Expand All @@ -2262,7 +2263,8 @@
"groups": [
"SendLocation",
"DataConsent-2"
]
],
"RequestType": []
},
"device": {
"keep_context": false,
Expand Down
3 changes: 2 additions & 1 deletion files/KeepContextTrue_preloaded_pt.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2251,7 +2251,8 @@
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["Base-4"]
"groups": ["Base-4"],
"RequestType": []
},
"device": {
"keep_context": false,
Expand Down
2 changes: 2 additions & 0 deletions files/OnAppregistered/connecttest.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ function module:InitHMI_onReady()
button_capability("PRESET_8"),
button_capability("PRESET_9"),
button_capability("OK", true, false, true),
button_capability("PLAY_PAUSE"),
button_capability("SEEKLEFT"),
button_capability("SEEKRIGHT"),
button_capability("TUNEUP"),
Expand Down Expand Up @@ -360,6 +361,7 @@ function module:InitHMI_onReady()
displayCapabilities =
{
displayType = "GEN2_8_DMA",
displayName = "GENERIC_DISPLAY",
textFields =
{
text_field("mainField1"),
Expand Down
22 changes: 12 additions & 10 deletions files/PTFromCloud_Nickname_validation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -382,15 +382,17 @@
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["Base-4"]
},
"1234567": {
"keep_context": false,
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["Base-4"],
"nicknames": ["AnotherName"]
"groups": ["Base-4"],
"RequestType": []
},
"1234567": {
"keep_context": false,
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["Base-4"],
"nicknames": ["AnotherName"],
"RequestType": []
},
"device": {
"keep_context": false,
Expand All @@ -408,4 +410,4 @@
}
}
}
}
}
6 changes: 4 additions & 2 deletions files/PTU_AppIDAppHMIType.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2250,15 +2250,17 @@
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["Base-4"]
"groups": ["Base-4"],
"RequestType": []
},
"0000002": {
"keep_context": false,
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["Base-4"],
"AppHMIType": ["MEDIA","INFORMATION"]
"AppHMIType": ["MEDIA","INFORMATION"],
"RequestType": []
},
"device": {
"keep_context": false,
Expand Down
6 changes: 4 additions & 2 deletions files/PTU_AppIDDefaultHMI.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2250,14 +2250,16 @@
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["Base-4"]
"groups": ["Base-4"],
"RequestType": []
},
"0000002": {
"keep_context": false,
"steal_focus": false,
"priority": "NONE",
"default_hmi": "BACKGROUND",
"groups": ["Base-4"]
"groups": ["Base-4"],
"RequestType": []
},
"device": {
"keep_context": false,
Expand Down
6 changes: 4 additions & 2 deletions files/PTU_AppIDGroups.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2250,14 +2250,16 @@
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["Base-4"]
"groups": ["Base-4"],
"RequestType": []
},
"0000002": {
"keep_context": false,
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["Location-1", "Navigation-1"]
"groups": ["Location-1", "Navigation-1"],
"RequestType": []
},
"device": {
"keep_context": false,
Expand Down
3 changes: 2 additions & 1 deletion files/PTU_AppRevokedGroup.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2293,7 +2293,8 @@
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["Base-4"]
"groups": ["Base-4"],
"RequestType": []
},
"0000001":null,
"device": {
Expand Down
3 changes: 2 additions & 1 deletion files/PTU_BackgroundDefaultHMI_InDefault.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2250,7 +2250,8 @@
"steal_focus": false,
"priority": "NONE",
"default_hmi": "BACKGROUND",
"groups": ["Base-4"]
"groups": ["Base-4"],
"RequestType": []
},
"device": {
"keep_context": false,
Expand Down
35 changes: 19 additions & 16 deletions files/PTU_GetUserFriendlyMessage_without_DE_DE.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,60 +41,60 @@
},
"Base-4" : {
"rpcs" : {

"ReadDID": {
"hmi_levels": [
"BACKGROUND",
"FULL",
"LIMITED"
]
}
,
,

"GetDTCs": {
"hmi_levels": [
"BACKGROUND",
"FULL",
"LIMITED"
]
}
,
,

"DiagnosticMessage": {
"hmi_levels": [
"BACKGROUND",
"FULL",
"LIMITED"
]
}
,
,

"SubscribeVehicleData": {
"hmi_levels": [
"BACKGROUND",
"FULL",
"LIMITED"
]
}
,
,

"GetVehicleData": {
"hmi_levels": [
"BACKGROUND",
"FULL",
"LIMITED"
]
}
,
,

"UnsubscribeVehicleData": {
"hmi_levels": [
"BACKGROUND",
"FULL",
"LIMITED"
]
}
,
,
"AddCommand" : {
"hmi_levels" : ["BACKGROUND",
"FULL",
Expand Down Expand Up @@ -1602,7 +1602,7 @@
}
}
},

"group1" : {
"languages" : {
"de-de" : {
Expand Down Expand Up @@ -2375,21 +2375,24 @@
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["Base-4", "groupName_11", "groupName_12"]
"groups": ["Base-4", "groupName_11", "groupName_12"],
"RequestType": []
},
"0000002": {
"keep_context": false,
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["Base-4", "groupName_21", "groupName_22"]
"groups": ["Base-4", "groupName_21", "groupName_22"],
"RequestType": []
},
"default" : {
"keep_context" : false,
"steal_focus" : false,
"priority" : "NONE",
"default_hmi" : "NONE",
"groups": ["Base-4", "Location-1", "DrivingCharacteristics-3", "VehicleInfo-3", "Emergency-1", "PropriataryData-1"]
"groups": ["Base-4", "Location-1", "DrivingCharacteristics-3", "VehicleInfo-3", "Emergency-1", "PropriataryData-1"],
"RequestType": []
},
"device" : {
"keep_context" : false,
Expand Down
3 changes: 2 additions & 1 deletion files/PTU_NewDefaultPermissions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2251,7 +2251,8 @@
"steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
"groups": ["Base-4", "Location-1"]
"groups": ["Base-4", "Location-1"],
"RequestType": []
},
"device": {
"keep_context": false,
Expand Down
Loading

0 comments on commit ab2de14

Please sign in to comment.