diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2019-11-28 16:42:42 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2019-12-03 19:46:26 +0100 |
| commit | 7cbb31315af943af42fe0805c99f719c9d7cfc67 (patch) | |
| tree | e04615b74cfbc055e5d249d95dc2baf4034754ee | |
| parent | c80973fdf88118911a5d23ea15be931d23ba97c7 (diff) | |
config: Change default configuration file names
Default file name doesn't fit when using on a target board because
the binder and app-framework choose another processus name than the
one chosen manually so binding doesn't find the JSON configuration file.
Change-Id: I287b0c2ffe571a49626663aa8abe69d928e2bbf6
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | conf.d/cmake/config.cmake | 10 | ||||
| -rw-r--r-- | conf.d/project/etc/control-agl-service-can-low-level.json (renamed from conf.d/project/etc/control-low-can.json) | 0 | ||||
| -rw-r--r-- | conf.d/project/etc/control-low-can-j1939.json | 24 |
3 files changed, 29 insertions, 5 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 7031c7ef..25ed4631 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -61,10 +61,10 @@ endif() # Activate ISO TP # Need module in kernel # -------------- - -execute_process(COMMAND ls /usr/include/linux/can/isotp.h RESULT_VARIABLE result2 OUTPUT_QUIET ERROR_QUIET) - -if(result2) +invalid +invalid_VARIABLE result2 OUTPUT_QUIET ERROR_QUIET) +invalid +invalid message("Feature ISO TP disabled") set(WITH_FEATURE_ISOTP OFF) else() @@ -214,7 +214,7 @@ set(AFB_REMPORT "1234" CACHE STRING "Default binder listening port") # Print a helper message when every thing is finished # ---------------------------------------------------- -set(CLOSING_MESSAGE "Typical binding launch: afb-daemon --port=${AFB_REMPORT} --workdir=${CMAKE_BINARY_DIR}/package --ldpaths=lib --roothttp=htdocs --token=\"${AFB_TOKEN}\" --tracereq=common --verbose") +set(CLOSING_MESSAGE "Typical binding launch: afb-daemon --name=afbd-${PROJECT_NAME} --port=${AFB_REMPORT} --workdir=${CMAKE_BINARY_DIR}/package --ldpaths=lib --roothttp=htdocs --token=\"${AFB_TOKEN}\" --tracereq=common --verbose") set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt") diff --git a/conf.d/project/etc/control-low-can.json b/conf.d/project/etc/control-agl-service-can-low-level.json index 0b10d33d..0b10d33d 100644 --- a/conf.d/project/etc/control-low-can.json +++ b/conf.d/project/etc/control-agl-service-can-low-level.json diff --git a/conf.d/project/etc/control-low-can-j1939.json b/conf.d/project/etc/control-low-can-j1939.json new file mode 100644 index 00000000..0b10d33d --- /dev/null +++ b/conf.d/project/etc/control-low-can-j1939.json @@ -0,0 +1,24 @@ +{ + "$schema": "", + "metadata": { + "uid": "Low Can", + "version": "1.0", + "api": "low-can", + "info": "Low can Configuration" + }, + "config": { + "active_message_set": 0, + "dev-mapping": { + "hs": "can0", + "ls": "can0" + }, + "diagnostic_bus": "hs" + }, + "plugins": [ + { + "uid": "agl-vcar-signals", + "info": "agl-vcar signals", + "libs": "agl-vcar-signals.ctlso" + } + ] +} |