summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2017-06-15 15:43:42 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2017-06-15 15:43:54 +0200
commitd618bb5be37f87cea9a3d32236caa536553455fd (patch)
treee4a4695f8cf1e5ec32a7ca445bf5332aa9302983
parent5d01f968a29f4a55d428a89e35a9b544e3eae34e (diff)
Fix template dir and data file dir to match new templating.
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
-rw-r--r--conf.d/config.cmake4
-rw-r--r--htdocs/unicens.html2
2 files changed, 5 insertions, 1 deletions
diff --git a/conf.d/config.cmake b/conf.d/config.cmake
index 1bca0a3..e9b5cd5 100644
--- a/conf.d/config.cmake
+++ b/conf.d/config.cmake
@@ -29,6 +29,10 @@ set(PROJECT_AUTHOR_MAIL "fulup@iot.bzh")
set(PROJECT_LICENCE "Apache-V2")
set(PROJECT_LANGUAGES,"C")
+# Where are stored default templates files from submodule or subtree app-templates in your project tree
+# relative to the root project directory
+set(PROJECT_APP_TEMPLATES_DIR "conf.d/templates")
+
# Compilation Mode (DEBUG, RELEASE)
# ----------------------------------
set(CMAKE_BUILD_TYPE "DEBUG")
diff --git a/htdocs/unicens.html b/htdocs/unicens.html
index fc56b06..db49baf 100644
--- a/htdocs/unicens.html
+++ b/htdocs/unicens.html
@@ -11,7 +11,7 @@
<button id="connected" onclick="init()">Binder WS Fail</button></li>
<br>
<ol>
- <li><button onclick="callbinder('unicens','initialise', {filename:'data/config.ucsx'})">Parse Config.ucsx</button></li>
+ <li><button onclick="callbinder('unicens','initialise', {filename:'data/ucs2_config/config.ucsx'})">Parse Config.ucsx</button></li>
<li><button onclick="callbinder('unicens','setvol', {channel:'master', volume: 255})">Set Master Volume to 255</button></li>
<li><button onclick="callbinder('unicens','setvol', {channel:'master', volume: 200})">Set Master Volume to 200</button></li>
<li><button onclick="callbinder('unicens','setvol', [[0,200], [1,255]])">Set left=200 right=250</button></li>