summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Linke <christian.linke@bmw.de>2013-01-31 13:43:42 +0100
committerChristian Linke <christian.linke@bmw.de>2013-01-31 13:43:42 +0100
commit67f4b9a5eaef56fb86c056f5c2eefde7a2c3bc87 (patch)
tree42ad296ebb6eecba3b0d29408ac3fc5e7d04a066
parent2999b87998ec7df7ca5a4a897a41611148587fd7 (diff)
downloadaudiomanager-67f4b9a5eaef56fb86c056f5c2eefde7a2c3bc87.tar.gz
* updated documentation to match foton release
Signed-off-by: Christian Linke <christian.linke@bmw.de>
-rw-r--r--AudioManagerDaemon/docx/14_z_nodeStateManagement.dox5
-rwxr-xr-x[-rw-r--r--]AudioManagerDaemon/docx/images/AudioManagement.pngbin21217 -> 34386 bytes
-rwxr-xr-xAudioManagerDaemon/docx/images/ClassDiagramm.pngbin211194 -> 220221 bytes
-rwxr-xr-xAudioManagerDaemon/docx/images/Lifecylerequest.pngbin0 -> 48509 bytes
-rwxr-xr-xAudioManagerDaemon/docx/images/NodeStateManagementRelations.pngbin0 -> 19326 bytes
-rwxr-xr-x[-rw-r--r--]AudioManagerDaemon/docx/images/daemon_insight.pngbin33062 -> 50992 bytes
-rwxr-xr-xAudioManagerDaemon/docx/images/dependencies.pngbin28511 -> 33324 bytes
-rwxr-xr-x[-rw-r--r--]AudioManagerDaemon/docx/images/dependencies_test.pngbin29015 -> 53955 bytes
8 files changed, 4 insertions, 1 deletions
diff --git a/AudioManagerDaemon/docx/14_z_nodeStateManagement.dox b/AudioManagerDaemon/docx/14_z_nodeStateManagement.dox
index 2e9150e..4e7d3e3 100644
--- a/AudioManagerDaemon/docx/14_z_nodeStateManagement.dox
+++ b/AudioManagerDaemon/docx/14_z_nodeStateManagement.dox
@@ -27,6 +27,9 @@ The ControllerPlugin can register by the NSM to be informed when a shutdown will
but only after the Controller registered by the NSM via am::CAmNodeStateCommunicator::nsmRegisterShutdownClient.\n
The controller has to answer this request during the timeout with am::CAmNodeStateCommunicator::nsmSendLifecycleRequestComplete .
For more information, check am::CAmNodeStateCommunicator and http://projects.genivi.org
-
+Here is an overview of the relations between AudioManager and NSM:
+\image html NodeStateManagementRelations.png
+Here is the sequence that is used to do handle the lifecyclerequests:
+\image html Lifecylerequest.png
*/
diff --git a/AudioManagerDaemon/docx/images/AudioManagement.png b/AudioManagerDaemon/docx/images/AudioManagement.png
index 8d74798..f3b4cdd 100644..100755
--- a/AudioManagerDaemon/docx/images/AudioManagement.png
+++ b/AudioManagerDaemon/docx/images/AudioManagement.png
Binary files differ
diff --git a/AudioManagerDaemon/docx/images/ClassDiagramm.png b/AudioManagerDaemon/docx/images/ClassDiagramm.png
index 7e75568..63f048b 100755
--- a/AudioManagerDaemon/docx/images/ClassDiagramm.png
+++ b/AudioManagerDaemon/docx/images/ClassDiagramm.png
Binary files differ
diff --git a/AudioManagerDaemon/docx/images/Lifecylerequest.png b/AudioManagerDaemon/docx/images/Lifecylerequest.png
new file mode 100755
index 0000000..f6a67fc
--- /dev/null
+++ b/AudioManagerDaemon/docx/images/Lifecylerequest.png
Binary files differ
diff --git a/AudioManagerDaemon/docx/images/NodeStateManagementRelations.png b/AudioManagerDaemon/docx/images/NodeStateManagementRelations.png
new file mode 100755
index 0000000..52c25c6
--- /dev/null
+++ b/AudioManagerDaemon/docx/images/NodeStateManagementRelations.png
Binary files differ
diff --git a/AudioManagerDaemon/docx/images/daemon_insight.png b/AudioManagerDaemon/docx/images/daemon_insight.png
index 7f4f160..78c0928 100644..100755
--- a/AudioManagerDaemon/docx/images/daemon_insight.png
+++ b/AudioManagerDaemon/docx/images/daemon_insight.png
Binary files differ
diff --git a/AudioManagerDaemon/docx/images/dependencies.png b/AudioManagerDaemon/docx/images/dependencies.png
index 8c44a77..d2dcddd 100755
--- a/AudioManagerDaemon/docx/images/dependencies.png
+++ b/AudioManagerDaemon/docx/images/dependencies.png
Binary files differ
diff --git a/AudioManagerDaemon/docx/images/dependencies_test.png b/AudioManagerDaemon/docx/images/dependencies_test.png
index b0bc123..eca6a9e 100644..100755
--- a/AudioManagerDaemon/docx/images/dependencies_test.png
+++ b/AudioManagerDaemon/docx/images/dependencies_test.png
Binary files differ