Revert "config: Change default configuration file names"

This reverts commit 49ea87d92a3578c4c1547b094deaaca371816585.

Change-Id: I76186166cf2bd6dff0696f26ff30747288fc5478
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 25ed463..16e6ca9 100644 (file)
--- 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 (file)
index 0b10d33..0000000
--- 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 (file)
index 0b10d33..0000000
--- 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"
-               }
-       ]
-}