diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2019-11-28 17:23:39 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2019-12-03 19:46:26 +0100 |
| commit | 5fda4a653b43f684cc41242fc4ee48aa9d4bc73e (patch) | |
| tree | 476e0621b219dbb18d6d7392ccf8e24121e8a51f | |
| parent | 7cbb31315af943af42fe0805c99f719c9d7cfc67 (diff) | |
Revert "config: Change default configuration file names"
This reverts commit 49ea87d92a3578c4c1547b094deaaca371816585.
Change-Id: I76186166cf2bd6dff0696f26ff30747288fc5478
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | conf.d/cmake/config.cmake | 8 | ||||
| -rw-r--r-- | conf.d/project/etc/control-agl-service-can-low-level.json | 24 | ||||
| -rw-r--r-- | conf.d/project/etc/control-low-can-j1939.json | 24 |
3 files changed, 4 insertions, 52 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 25ed4631..16e6ca9e 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 # -------------- -invalid -invalid_VARIABLE result2 OUTPUT_QUIET ERROR_QUIET) -invalid -invalid + +execute_process(COMMAND ls /usr/include/linux/can/isotp.h RESULT_VARIABLE result2 OUTPUT_QUIET ERROR_QUIET) + +if(result2) message("Feature ISO TP disabled") set(WITH_FEATURE_ISOTP OFF) else() diff --git a/conf.d/project/etc/control-agl-service-can-low-level.json b/conf.d/project/etc/control-agl-service-can-low-level.json deleted file mode 100644 index 0b10d33d..00000000 --- a/conf.d/project/etc/control-agl-service-can-low-level.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "$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" - } - ] -} diff --git a/conf.d/project/etc/control-low-can-j1939.json b/conf.d/project/etc/control-low-can-j1939.json deleted file mode 100644 index 0b10d33d..00000000 --- a/conf.d/project/etc/control-low-can-j1939.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "$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" - } - ] -} |