Corrects json controller configurations

Corrects json controller configurations to look more like a
definitive hal configuration.

Change-Id: I2281df854d408dcf8064a77d1941f4fca8c8b28e
Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>

2 files changed, 51 insertions, 99 deletions

diff --git a/4a-hal-references-boards-cfg/4a-hal-sample1.json b/4a-hal-references-boards-cfg/4a-hal-sample1.json
index 7d51035..a93a4be 100644
--- a/4a-hal-references-boards-cfg/4a-hal-sample1.json
+++ b/4a-hal-references-boards-cfg/4a-hal-sample1.json
@@ -15,53 +15,29 @@
             "action": "api://4a-hal-manager#ping"
         }
     ],
-    "controls":
-            [
-                {
-                    "uid": "Multimedia-Role",
-                    "info": "Request a multimedia stream",
-                    "privileges": "audio:multimedia",
-                    "action": "api://4a-hal-manager#ping",
-                    "args": {
-                        "ctl": "Multimedia_Playback_Volume",
-                        "val": 80
-                    }
-                },
-                {
-                    "uid": "Navigation-Role",
-                    "privileges": "audio:navigation",
-                    "action": "api://4a-hal-manager#ping",
-                    "args": {
-                        "ctl": "Multimedia_Playback_Volume",
-                        "val": 40
-                    }
-                },
-                {
-                    "uid": "Telephony-Role",
-                    "privileges": "audio:telephony",
-                    "action": "api://4a-hal-manager#ping",
-                    "args": {
-                        "ctl": "Navigation_Playback_Volume",
-                        "val": 0
-                    }
-                },
-                {
-                    "uid": "Release-Role",
-                    "privileges": "audio",
-                    "action": "api://4a-hal-manager#ping"
-                },
-                {
-                    "uid": "Signal-Timeout",
-                    "info": "Arm a timer and send event after timeout",
-                    "privileges": "audio:signal",
-                    "action": "api://4a-hal-manager#ping"
-                }
-            ],
-    "events":
-            [
-                {
-                    "uid": "api/status_changed",
-                    "action": "api://4a-hal-manager#ping"
-                }
-            ]
+    "controls": [
+        {
+            "uid": "Master-Volume-Set",
+            "info": "Set Master Volume",
+            "privileges": "audio",
+            "action": "api://4a-hal-manager#ping"
+        },
+        {
+            "uid": "Master-Volume-Ramp",
+            "info": "Ramp master Volume",
+            "privileges": "audio",
+            "action": "api://4a-hal-manager#ping"
+        },
+        {
+            "uid": "ping2",
+            "info": "Ping hal",
+            "action": "api://4a-hal-manager#ping"
+        }
+    ],
+    "events": [
+        {
+            "uid": "api/status_changed",
+            "action": "api://4a-hal-manager#ping"
+        }
+    ]
 }
\ No newline at end of file
diff --git a/4a-hal-references-boards-cfg/4a-hal-sample2.json b/4a-hal-references-boards-cfg/4a-hal-sample2.json
index 6bd30b8..8448b4f 100644
--- a/4a-hal-references-boards-cfg/4a-hal-sample2.json
+++ b/4a-hal-references-boards-cfg/4a-hal-sample2.json
@@ -15,53 +15,29 @@
             "action": "api://4a-hal-manager#ping"
         }
     ],
-    "controls":
-            [
-                {
-                    "uid": "Multimedia-Role",
-                    "info": "Request a multimedia stream",
-                    "privileges": "audio:multimedia",
-                    "action": "api://4a-hal-manager#ping",
-                    "args": {
-                        "ctl": "Multimedia_Playback_Volume",
-                        "val": 80
-                    }
-                },
-                {
-                    "uid": "Navigation-Role",
-                    "privileges": "audio:navigation",
-                    "action": "api://4a-hal-manager#ping",
-                    "args": {
-                        "ctl": "Multimedia_Playback_Volume",
-                        "val": 40
-                    }
-                },
-                {
-                    "uid": "Telephony-Role",
-                    "privileges": "audio:telephony",
-                    "action": "api://4a-hal-manager#ping",
-                    "args": {
-                        "ctl": "Navigation_Playback_Volume",
-                        "val": 0
-                    }
-                },
-                {
-                    "uid": "Release-Role",
-                    "privileges": "audio",
-                    "action": "api://4a-hal-manager#ping"
-                },
-                {
-                    "uid": "Signal-Timeout",
-                    "info": "Arm a timer and send event after timeout",
-                    "privileges": "audio:signal",
-                    "action": "api://4a-hal-manager#ping"
-                }
-            ],
-    "events":
-            [
-                {
-                    "uid": "api/status_changed",
-                    "action": "api://4a-hal-manager#ping"
-                }
-            ]
-}
+    "controls": [
+        {
+            "uid": "Master-Volume-Set",
+            "info": "Set Master Volume",
+            "privileges": "audio",
+            "action": "api://4a-hal-manager#ping"
+        },
+        {
+            "uid": "Master-Volume-Ramp",
+            "info": "Ramp master Volume",
+            "privileges": "audio",
+            "action": "api://4a-hal-manager#ping"
+        },
+        {
+            "uid": "ping2",
+            "info": "Ping hal",
+            "action": "api://4a-hal-manager#ping"
+        }
+    ],
+    "events": [
+        {
+            "uid": "api/status_changed",
+            "action": "api://4a-hal-manager#ping"
+        }
+    ]
+}
\ No newline at end of file