-
Notifications
You must be signed in to change notification settings - Fork 3
Client simulator #5
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -139,6 +139,9 @@ Go to omap-tutorial folder. | |
| export LD_LIBRARY_PATH=/usr/local/lib | ||
|
|
||
| test-platform ./PandaBoardES.xml | ||
| # Disable criteria check at XML load time in order to enable test without criteria. | ||
| remote-process localhost 5001 setFailureOnFailedSettingsLoad false | ||
|
|
||
| remote-process localhost 5001 start | ||
| remote-process localhost 5000 listParameters /Audio | ||
| remote-process localhost 5000 help | ||
|
|
@@ -192,7 +195,7 @@ InclusiveCriterion ClosingPlaybackRoutes : Media Modem Voice Tone | |
| InclusiveCriterion OpenedCaptureRoutes : Media Modem Voice MultiChannel | ||
| InclusiveCriterion OpenedPlaybackRoutes : Media Modem Voice Tones DeepMedia | ||
| InclusiveCriterion SelectedInputDevice : SubMic Headset MainMic Dmic1 Dmic2 Dmic1 | ||
| InclusiveCriterion SelectedOutputDevice : Earpiece Headset Ihf | ||
| InclusiveCriterion SelectedOutputDevices : Earpiece Headset Ihf | ||
| InclusiveCriterion AudioSource : Default Mic None VoiceCall VoiceCommunication VoiceDownlink VoiceUplink | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think here I will clean up the AudioCriteria.txt inside the client simulator related to PandaBoardES features as the board does not have all the capability of the SoC enabled. Idea here was more to list all the SoC features for criteria overview. |
||
| ExclusiveCriterion BandType : NB SuperWB Unknown WB | ||
| ExclusiveCriterion ScreenState : Off On | ||
|
|
||
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| ExclusiveCriterion Mode : InCsvCall InVoipCall Normal | ||
| InclusiveCriterion RoutageState : Configure Flow Path | ||
| InclusiveCriterion ClosingCaptureRoutes : Media Modem Voice MultiChannel | ||
| InclusiveCriterion ClosingPlaybackRoutes : Media Modem Voice Tones DeepMedia | ||
| InclusiveCriterion OpenedCaptureRoutes : Media Modem Voice MultiChannel | ||
| InclusiveCriterion OpenedPlaybackRoutes : Media Modem Voice Tones DeepMedia | ||
| InclusiveCriterion SelectedInputDevices : SubMic Headset MainMic DMIC | ||
| InclusiveCriterion SelectedOutputDevices : Earpiece Headset Headphones IHF | ||
| InclusiveCriterion AudioSource : Default Mic None VoiceCall VoiceCommunication VoiceDownlink VoiceUplink | ||
| ExclusiveCriterion BandType : NB SuperWB Unknown WB | ||
| ExclusiveCriterion ScreenState : Off On |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
|
|
||
| # clientSimulator for PandaBoard | ||
|
|
||
| ## Before starting | ||
| 1) Variables setting and packages | ||
| ``` | ||
| sudo apt-get install python3 m4 | ||
| export LD_LIBRARY_PATH=/usr/local/lib | ||
| ``` | ||
| 2) Delta inside PFW core for scripts under UBUNTU | ||
| ``` | ||
| diff --git a/tools/xmlGenerator/lightRoutingUpdate.sh b/tools/xmlGenerator/lightRoutingUpdate.sh | ||
| index 4bde78f..e084d50 100755 | ||
| --- a/tools/xmlGenerator/lightRoutingUpdate.sh | ||
| +++ b/tools/xmlGenerator/lightRoutingUpdate.sh | ||
| @@ -35,12 +35,12 @@ | ||
|
|
||
| set -eu -o pipefail | ||
|
|
||
| -adbShell="adb shell" | ||
| +adbShell=" " | ||
| parameter="$adbShell $parameterCommandAccess" | ||
|
|
||
| -tmpfile="/tmp/pfw_commands" | ||
| -target_tmpfile="/data/pfw_commands" | ||
| +tmpfile="/home/lab/external/panda/tmp/pfw_commands" | ||
| +target_tmpfile="/home/lab/external/panda/data/pfw_commands" | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These paths are only relevant on your machine. |
||
|
|
||
|
|
||
| adbShellForward () { | ||
| @@ -48,7 +48,7 @@ adbShellForward () { | ||
| echo 'echo $?; exit' >> "$1" | ||
|
|
||
| # Send commands | ||
| - adb push "$1" "$target_tmpfile" | ||
| + cp "$1" "$target_tmpfile" | ||
| $adbShell chmod 700 "$target_tmpfile" | ||
|
|
||
| $adbShell "$target_tmpfile" | | ||
| ``` | ||
|
|
||
| ## Running MiddleWare simulator and update XML setting from .pfw files | ||
| 1) Run Parameter Framework client simulator Go to tools omap-tutorial folder : | ||
| ``` | ||
| <PATH to Paremeter Framework>/tools/clientSimulator/pfClientSimulator.py ./clientSimulator/scripts/panda | ||
| ``` | ||
| Update `scripts/panda/conf.json` to reflect the path | ||
|
|
||
| => Script will run `test-platform` application. | ||
|
|
||
| 2) Check status | ||
| ``` | ||
| /usr/local/bin/remote-process localhost 5000 status | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Call "remote-process" instead of "/usr/local/bin/remote-process" (here and other places) |
||
| ``` | ||
|
|
||
| 3) Generate Routing from audio_hal folder | ||
| ``` | ||
| /usr/local/bin/remote-process localhost 5000 setTuningMode on | ||
| /usr/local/bin/remote-process localhost 5000 deleteAllDomains | ||
| ~/intel/parameter-framework/tools/xmlGenerator/lightRoutingUpdate.sh routing_twl6040.pfw routing_omapabe.pfw | ||
| ``` | ||
|
|
||
| 4) Save XML for the next Setting | ||
| ``` | ||
| /usr/local/bin/remote-process localhost 5000 exportDomainsWithSettingsXML /home/ubuntu/test.xml | ||
| cp /home/ubuntu/test.xml ~/intel/parameter-framework-samples/omap-tutorial/Settings/Audio/AudioConfigurableDomains.xml | ||
| ``` | ||
|
|
||
| 5) Restart MiddleWare simulator and check UCs. | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
|
|
||
| supDomain: Audio.omapabe | ||
| supDomain: Volume | ||
|
|
||
| supDomain: Playback | ||
| supDomain: External | ||
| domain: Headset | ||
| conf: Normal | ||
| SelectedOutputDevices Includes Headset | ||
| /Audio/omapabe/abe/output/headset/sdt_dl_volume/volume = 120 | ||
| conf: Default | ||
| /Audio/omapabe/abe/output/headset/sdt_dl_volume/volume = 0 | ||
| supDomain: MediaPlayback | ||
| supDomain: External | ||
| domain: Headset | ||
| conf: Normal | ||
| ALL | ||
| SelectedOutputDevices Includes Headset | ||
| ANY | ||
| OpenedPlaybackRoutes Includes Media | ||
| OpenedPlaybackRoutes Includes DeepMedia | ||
| /Audio/omapabe/abe/output/headset/dl1/media_playback = 120 | ||
| conf: Default | ||
| /Audio/omapabe/abe/output/headset/dl1/media_playback = 0 | ||
| supDomain: VoicePlayback | ||
| supDomain: External | ||
| domain: Headset | ||
| conf: Normal | ||
| ALL | ||
| SelectedOutputDevices Includes Headset | ||
| OpenedPlaybackRoutes Includes Voice | ||
| /Audio/omapabe/abe/output/headset/dl1/voice_playback = 120 | ||
| conf: Default | ||
| /Audio/omapabe/abe/output/headset/dl1/voice_playback = 0 | ||
| supDomain: TonesPlayback | ||
| supDomain: External | ||
| domain: Headset | ||
| conf: Normal | ||
| ALL | ||
| SelectedOutputDevices Includes Headset | ||
| OpenedPlaybackRoutes Includes Tones | ||
| /Audio/omapabe/abe/output/headset/dl1/tones_playback = 120 | ||
| conf: Default | ||
| /Audio/omapabe/abe/output/headset/dl1/tones_playback = 0 | ||
| supDomain: Capture | ||
| supDomain: External | ||
| domain: Headset | ||
| conf: Default | ||
| SelectedInputDevices Includes Headset | ||
| /Audio/omapabe/abe/input/amic/volume = 120 120 | ||
| conf: Mute | ||
| /Audio/omapabe/abe/input/amic/volume = 0 0 | ||
|
|
||
| supDomain: Routing | ||
| supDomain: Enable | ||
| RoutageState Includes Path | ||
|
|
||
| supDomain: omapabe | ||
| supDomain: Playback | ||
| supDomain: External | ||
| domain: Headset | ||
| conf: Enable | ||
| SelectedOutputDevices Includes Headset | ||
| /Audio/omapabe/abe/output/headset/sdt_dl = 1 | ||
|
|
||
| conf: Disable | ||
| /Audio/omapabe/abe/output/headset/sdt_dl = 0 | ||
| supDomain: MediaPlayback | ||
| supDomain: External | ||
| domain: Headset | ||
| conf: Enable | ||
| ALL | ||
| SelectedOutputDevices Includes Headset | ||
| ANY | ||
| OpenedPlaybackRoutes Includes Media | ||
| OpenedPlaybackRoutes Includes DeepMedia | ||
| /Audio/omapabe/abe/output/headset/dl1/mixer_media = 1 | ||
|
|
||
| conf: Disable | ||
| /Audio/omapabe/abe/output/headset/dl1/mixer_media = 0 | ||
| supDomain: VoicePlayback | ||
| supDomain: External | ||
| domain: Headset | ||
| conf: Enable | ||
| ALL | ||
| SelectedOutputDevices Includes Headset | ||
| OpenedPlaybackRoutes Includes Voice | ||
| /Audio/omapabe/abe/output/headset/dl1/mixer_voice = 1 | ||
|
|
||
| conf: Disable | ||
| /Audio/omapabe/abe/output/headset/dl1/mixer_voice = 0 | ||
| supDomain: TonesPlayback | ||
| supDomain: External | ||
| domain: Headset | ||
| conf: Enable | ||
| ALL | ||
| SelectedOutputDevices Includes Headset | ||
| OpenedPlaybackRoutes Includes Tones | ||
| /Audio/omapabe/abe/output/headset/dl1/mixer_tones = 1 | ||
|
|
||
| conf: Disable | ||
| /Audio/omapabe/abe/output/headset/dl1/mixer_tones = 0 | ||
|
|
||
| supDomain: MediaCapture | ||
| supDomain: External | ||
| domain: Headset | ||
| conf: Enable | ||
| ALL | ||
| SelectedInputDevices Includes Headset | ||
| OpenedCaptureRoutes Includes Media | ||
| /Audio/omapabe/abe/input/ul2_left/route = amic_left | ||
| /Audio/omapabe/abe/input/ul2_right/route = amic_right | ||
|
|
||
| conf: Disable | ||
| /Audio/omapabe/abe/input/ul2_left/route = none | ||
| /Audio/omapabe/abe/input/ul2_right/route = none | ||
|
|
||
|
|
||
| supDomain: Configure | ||
| RoutageState Includes Configure | ||
|
|
||
| supDomain: omapabe | ||
| domain: Calibration.HWCodec | ||
| conf: All | ||
| /Audio/omapabe/abe/output/pdm = 1 | ||
|
|
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
|
|
||
| supDomain: Audio.twl6040 | ||
| supDomain: Volume | ||
| domain: Headset | ||
| conf: Normal | ||
| ANY | ||
| SelectedOutputDevices Includes Headset | ||
| SelectedOutputDevices Includes Headphones | ||
| /Audio/omapabe/twl6040/output/headset/volume = 12 12 | ||
|
|
||
| conf: Default | ||
| /Audio/omapabe/twl6040/output/headset/volume = 0 0 | ||
|
|
||
| supDomain: Routing | ||
| supDomain: Enable | ||
| RoutageState Includes Path | ||
|
|
||
| supDomain: twl6040 | ||
| supDomain: Playback | ||
| supDomain: External | ||
| domain: Headset | ||
| conf: Enable | ||
| ANY | ||
| SelectedOutputDevices Includes Headset | ||
| SelectedOutputDevices Includes Headphones | ||
| /Audio/omapabe/twl6040/output/headset/enable/right = hs_dac | ||
| /Audio/omapabe/twl6040/output/headset/enable/left = hs_dac | ||
|
|
||
| conf: Disable | ||
| /Audio/omapabe/twl6040/output/headset/enable/right = off | ||
| /Audio/omapabe/twl6040/output/headset/enable/left = off | ||
|
|
||
| supDomain: Capture | ||
| supDomain: External | ||
| domain: Headset | ||
| conf: Enable | ||
| ANY | ||
| SelectedInputDevices Includes Headset | ||
| /Audio/omapabe/twl6040/input/right/mux = headset_mic | ||
| /Audio/omapabe/twl6040/input/left/mux = headset_mic | ||
|
|
||
| conf: Disable | ||
| /Audio/omapabe/twl6040/input/right/mux = off | ||
| /Audio/omapabe/twl6040/input/left/mux = off | ||
|
|
||
|
|
||
| supDomain: Configure | ||
| RoutageState Includes Configure | ||
|
|
||
| supDomain: twl6040 | ||
| domain: Calibration.HWCodec | ||
| conf: Default | ||
| /Audio/omapabe/twl6040/output/hs_power_mode/value = high-performance | ||
| /Audio/omapabe/twl6040/power_mode/value = high-performance |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this not be disabled by default ? The criteria file is provided in this file, there is no reason the settings load should fail, isn't it ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is more for people who wants to start test platform without criteria. At list here you manage to lunch it with the new setting file.