diff options
| author |   Fulup Ar Foll <fulup@iot.bzh> | 2017-08-23 22:30:20 +0200 |
|---|---|---|
| committer | Fulup Ar Foll <fulup@iot.bzh> | 2017-08-23 22:30:20 +0200 |
| commit | 3cf0bf466296cc244738c14e96c398bc9310ffc9 (patch) | |
| tree | 390d98a97f4bb05a95d07a43bc44e883ea72bd96 | |
| parent | 24ccd6215938767192e0cbd8442ad0e87b87bbdd (diff) | |
Update with monitoring
| -rw-r--r-- | conf.d/cmake/config.cmake | 7 | ||||
| -rw-r--r-- | htdocs/alsa-core.html | 2 | ||||
| -rw-r--r-- | htdocs/alsa-hal.html | 2 | ||||
| -rw-r--r-- | htdocs/audio-control.html | 2 | ||||
| -rw-r--r-- | htdocs/audio-logic.html | 9 | ||||
| -rw-r--r-- | nbproject/project.xml | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 1f07e15..7edac5d 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -95,8 +95,11 @@ set(COMPILE_OPTIONS # Print a helper message when every thing is finished # ---------------------------------------------------- -set(CLOSING_MESSAGE "Debug in ./buid: afb-daemon --port=1234 --ldpaths=. --workdir=. --roothttp=../htdocs --tracereq=common --token='' --verbose") -#set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt") +if(IS_DIRECTORY $ENV{HOME}/opt/afb-monitoring) +set(MONITORING_ALIAS "--alias=/monitoring:$ENV{HOME}/opt/afb-monitoring") +endif() +set(CLOSING_MESSAGE "Debug from afb-daemon --port=1234 ${MONITORING_ALIAS} --ldpaths=. --workdir=. --roothttp=../htdocs --tracereq=common --token= --verbose ") +set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt") # Optional location for config.xml.in # ----------------------------------- diff --git a/htdocs/alsa-core.html b/htdocs/alsa-core.html index d8a02d6..39a4990 100644 --- a/htdocs/alsa-core.html +++ b/htdocs/alsa-core.html @@ -10,6 +10,8 @@ <body onload="init('alsa_registry','alsacore', 'getinfo')"> <button id="connected" onclick="init('alsa_registry','alsacore', 'getinfo');">Binder WS Fail</button> + <button id="mnitoring" onclick="window.open('/monitoring/monitor.html','_monitor_aaaa')">Debug/Monitoring</a></button> + <br><br> <b>Selected SndCard </b> <select id='alsa_registry'></select> diff --git a/htdocs/alsa-hal.html b/htdocs/alsa-hal.html index c05605d..5909c2b 100644 --- a/htdocs/alsa-hal.html +++ b/htdocs/alsa-hal.html @@ -11,6 +11,8 @@ <h1>Simple AlsaHAL tests</h1> <button id="connected" onclick="init('hal_registry','alsacore', 'hallist')">Binder WS Fail</button> + <button id="mnitoring" onclick="window.open('/monitoring/monitor.html','_monitor_aaaa')">Debug/Monitoring</a></button> + <br><br> <b>Selected HAL </b> <select id='hal_registry'></select> diff --git a/htdocs/audio-control.html b/htdocs/audio-control.html index 46352c1..964dc62 100644 --- a/htdocs/audio-control.html +++ b/htdocs/audio-control.html @@ -10,6 +10,8 @@ <h1>Simple Audio Control Test</h1> <button id="connected" onclick="init('hal_registry','alsacore', 'hallist')">Binder WS Fail</button> + <button id="mnitoring" onclick="window.open('/monitoring/monitor.html','_monitor_aaaa')">Debug/Monitoring</a></button> + <br><br> <b>Selected HAL </b> <select id='hal_registry'></select> diff --git a/htdocs/audio-logic.html b/htdocs/audio-logic.html deleted file mode 100644 index 6eb97e3..0000000 --- a/htdocs/audio-logic.html +++ /dev/null @@ -1,9 +0,0 @@ -<html> -<head> - <title>High Level API Simple Test Page</title> - - <script type="text/javascript" src="AFB-websock.js"></script> - <script type="text/javascript" src="AudioBinding.js"></script> -</head> - -ToBeDone
\ No newline at end of file diff --git a/nbproject/project.xml b/nbproject/project.xml index b229af2..497e99e 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -3,7 +3,7 @@ <type>org.netbeans.modules.cnd.makeproject</type> <configuration> <data xmlns="http://www.netbeans.org/ns/make-project/1"> - <name>Audio-Bindings</name> + <name>AFB-aaaa</name> <c-extensions>c</c-extensions> <cpp-extensions>cpp,cxx</cpp-extensions> <header-extensions>h</header-extensions> |