From 49fe0eec8f17698fc5f86d0abe01777af1fb2b23 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Fri, 14 Apr 2017 13:24:07 +0200 Subject: [PATCH] Change directory architecture to use 2 separated projects. Each projects, binder and generator, has to be compiled separatly. CAN-binder will host high and low level binding CAN-config-generator only the generator used for low level binding. build.sh script just launch both build in their respective dir. Change-Id: Ic77932660fcca507b23a631d4e4e790f608880ae Signed-off-by: Romain Forlot --- .gitmodules | 10 +- CMakeLists.txt => CAN-binder/CMakeLists.txt | 0 CAN-binder/Makefile | 37 +++ .../can_samples}/citroen/citroen_c5_highway_1 | 0 .../can_samples}/citroen/citroen_c5_highway_2 | 0 .../can_samples}/ford/focus/accel | 0 .../can_samples}/ford/focus/alldoors_lock | 0 .../can_samples}/ford/focus/alldoors_open | 0 .../can_samples}/ford/focus/brake | 0 .../can_samples}/ford/focus/handbrake | 0 .../can_samples}/ford/focus/ignition | 0 .../can_samples}/ford/focus/lights | 0 .../can_samples}/ford/focus/turnleft | 0 .../can_samples}/ford/focus/turnright | 0 .../can_samples}/init_can.sh | 0 .../can_samples}/init_vcan.sh | 0 .../can_samples}/toyota/auris/accel | 0 .../can_samples}/toyota/auris/alldoors_lock | 0 .../can_samples}/toyota/auris/alldoors_unlock | 0 .../can_samples}/toyota/auris/brake | 0 .../can_samples}/toyota/auris/engineoff | 0 .../can_samples}/toyota/auris/handbrake | 0 .../can_samples}/toyota/auris/ignition | 0 .../can_samples}/toyota/auris/keydisengage | 0 .../can_samples}/toyota/auris/keyengage | 0 .../can_samples}/toyota/auris/keyin | 0 .../can_samples}/toyota/auris/keyout | 0 .../can_samples}/toyota/auris/lights | 0 .../trip_test_with_obd2_vehicle_speed_requests | 0 .../can_samples}/toyota/auris/turnleft | 0 .../can_samples}/toyota/auris/turnright | 0 {etc => CAN-binder/etc}/config.cmake | 0 {etc => CAN-binder/etc}/export.map | 0 .../examples}/basic/generate_example.cpp | 0 .../examples/basic}/handlers.cpp | 0 .../examples}/basic/signals.json | 0 .../examples}/toyota/configuration-generated.cpp | 0 .../examples}/toyota/signals.json | 0 {libs => CAN-binder/libs}/CMakeLists.txt | 0 {libs => CAN-binder/libs}/bitfield-c | 0 {libs => CAN-binder/libs}/isotp-c | 0 {libs => CAN-binder/libs}/nanopb | 0 {libs => CAN-binder/libs}/openxc-message-format | 0 {libs => CAN-binder/libs}/uds-c | 0 .../low-can-binding}/CMakeLists.txt | 0 .../low-can-binding}/can/can-bus-dev.cpp | 0 .../low-can-binding}/can/can-bus-dev.hpp | 0 .../low-can-binding}/can/can-bus.cpp | 0 .../low-can-binding}/can/can-bus.hpp | 0 .../low-can-binding}/can/can-command.hpp | 0 .../low-can-binding}/can/can-decoder.cpp | 0 .../low-can-binding}/can/can-decoder.hpp | 0 .../can/can-message-definition.cpp | 0 .../can/can-message-definition.hpp | 0 .../low-can-binding}/can/can-message-set.cpp | 0 .../low-can-binding}/can/can-message-set.hpp | 0 .../low-can-binding}/can/can-message.cpp | 0 .../low-can-binding}/can/can-message.hpp | 0 .../low-can-binding}/can/can-signals.cpp | 0 .../low-can-binding}/can/can-signals.hpp | 0 .../low-can-binding}/configuration-generated.cpp | 0 .../low-can-binding}/configuration.cpp | 0 .../low-can-binding}/configuration.hpp | 0 .../diagnostic/active-diagnostic-request.cpp | 0 .../diagnostic/active-diagnostic-request.hpp | 0 .../diagnostic/diagnostic-manager.cpp | 0 .../diagnostic/diagnostic-manager.hpp | 0 .../diagnostic/diagnostic-message.cpp | 0 .../diagnostic/diagnostic-message.hpp | 0 .../low-can-binding}/low-can-binding.cpp | 0 .../low-can-binding}/low-can-binding.hpp | 0 .../low-can-binding}/packaging/wgt/config.xml | 0 .../packaging/wgt/etc/can_buses.json | 0 .../low-can-binding}/packaging/wgt/icon.png | Bin .../low-can-binding}/utils/config-parser.cpp | 0 .../low-can-binding}/utils/config-parser.hpp | 0 .../low-can-binding}/utils/openxc-utils.cpp | 0 .../low-can-binding}/utils/openxc-utils.hpp | 0 .../low-can-binding}/utils/signals.cpp | 0 .../low-can-binding}/utils/signals.hpp | 0 .../low-can-binding}/utils/socket.cpp | 0 .../low-can-binding}/utils/socket.hpp | 0 .../low-can-binding}/utils/timer.cpp | 0 .../low-can-binding}/utils/timer.hpp | 0 .../.gitignore | 0 .../3rdparty/json/json.hpp | 0 CAN-config-generator/CMakeLists.txt | 283 +++++++++++++++++++++ .../LICENSE | 0 CAN-config-generator/Makefile | 37 +++ .../README.md | 0 .../build.sh | 0 .../can-config-generator.sln | 0 .../can-config-generator.vcxproj | 0 CAN-config-generator/etc/config.cmake | 79 ++++++ CAN-config-generator/etc/export.map | 1 + .../src}/CMakeLists.txt | 18 +- .../src/main.cpp | 0 .../src/main.hpp | 0 .../src/openxc/can_bus.cpp | 0 .../src/openxc/can_bus.hpp | 0 .../src/openxc/can_message.cpp | 0 .../src/openxc/can_message.hpp | 0 .../src/openxc/command.cpp | 0 .../src/openxc/command.hpp | 0 .../src/openxc/diagnostic_message.cpp | 0 .../src/openxc/diagnostic_message.hpp | 0 .../src/openxc/mapping.cpp | 0 .../src/openxc/mapping.hpp | 0 .../src/openxc/message_set.cpp | 0 .../src/openxc/message_set.hpp | 0 .../src/openxc/signal.cpp | 0 .../src/openxc/signal.hpp | 0 .../tests/basic.json | 0 .../tests/generated.cpp | 0 .../tests}/handlers.cpp | 0 .../tests/signals.json | 0 README.md | 18 +- build.sh | 82 +----- 118 files changed, 469 insertions(+), 96 deletions(-) rename CMakeLists.txt => CAN-binder/CMakeLists.txt (100%) create mode 100644 CAN-binder/Makefile rename {can_samples => CAN-binder/can_samples}/citroen/citroen_c5_highway_1 (100%) rename {can_samples => CAN-binder/can_samples}/citroen/citroen_c5_highway_2 (100%) rename {can_samples => CAN-binder/can_samples}/ford/focus/accel (100%) rename {can_samples => CAN-binder/can_samples}/ford/focus/alldoors_lock (100%) rename {can_samples => CAN-binder/can_samples}/ford/focus/alldoors_open (100%) rename {can_samples => CAN-binder/can_samples}/ford/focus/brake (100%) rename {can_samples => CAN-binder/can_samples}/ford/focus/handbrake (100%) rename {can_samples => CAN-binder/can_samples}/ford/focus/ignition (100%) rename {can_samples => CAN-binder/can_samples}/ford/focus/lights (100%) rename {can_samples => CAN-binder/can_samples}/ford/focus/turnleft (100%) rename {can_samples => CAN-binder/can_samples}/ford/focus/turnright (100%) rename {can_samples => CAN-binder/can_samples}/init_can.sh (100%) rename {can_samples => CAN-binder/can_samples}/init_vcan.sh (100%) rename {can_samples => CAN-binder/can_samples}/toyota/auris/accel (100%) rename {can_samples => CAN-binder/can_samples}/toyota/auris/alldoors_lock (100%) rename {can_samples => CAN-binder/can_samples}/toyota/auris/alldoors_unlock (100%) rename {can_samples => CAN-binder/can_samples}/toyota/auris/brake (100%) rename {can_samples => CAN-binder/can_samples}/toyota/auris/engineoff (100%) rename {can_samples => CAN-binder/can_samples}/toyota/auris/handbrake (100%) rename {can_samples => CAN-binder/can_samples}/toyota/auris/ignition (100%) rename {can_samples => CAN-binder/can_samples}/toyota/auris/keydisengage (100%) rename {can_samples => CAN-binder/can_samples}/toyota/auris/keyengage (100%) rename {can_samples => CAN-binder/can_samples}/toyota/auris/keyin (100%) rename {can_samples => CAN-binder/can_samples}/toyota/auris/keyout (100%) rename {can_samples => CAN-binder/can_samples}/toyota/auris/lights (100%) rename {can_samples => CAN-binder/can_samples}/toyota/auris/trip_test_with_obd2_vehicle_speed_requests (100%) rename {can_samples => CAN-binder/can_samples}/toyota/auris/turnleft (100%) rename {can_samples => CAN-binder/can_samples}/toyota/auris/turnright (100%) rename {etc => CAN-binder/etc}/config.cmake (100%) rename {etc => CAN-binder/etc}/export.map (100%) rename {examples => CAN-binder/examples}/basic/generate_example.cpp (100%) rename {can-config-generator/tests => CAN-binder/examples/basic}/handlers.cpp (100%) rename {examples => CAN-binder/examples}/basic/signals.json (100%) rename {examples => CAN-binder/examples}/toyota/configuration-generated.cpp (100%) rename {examples => CAN-binder/examples}/toyota/signals.json (100%) rename {libs => CAN-binder/libs}/CMakeLists.txt (100%) rename {libs => CAN-binder/libs}/bitfield-c (100%) rename {libs => CAN-binder/libs}/isotp-c (100%) rename {libs => CAN-binder/libs}/nanopb (100%) rename {libs => CAN-binder/libs}/openxc-message-format (100%) rename {libs => CAN-binder/libs}/uds-c (100%) rename {low-can-binding => CAN-binder/low-can-binding}/CMakeLists.txt (100%) rename {low-can-binding => CAN-binder/low-can-binding}/can/can-bus-dev.cpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/can/can-bus-dev.hpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/can/can-bus.cpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/can/can-bus.hpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/can/can-command.hpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/can/can-decoder.cpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/can/can-decoder.hpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/can/can-message-definition.cpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/can/can-message-definition.hpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/can/can-message-set.cpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/can/can-message-set.hpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/can/can-message.cpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/can/can-message.hpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/can/can-signals.cpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/can/can-signals.hpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/configuration-generated.cpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/configuration.cpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/configuration.hpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/diagnostic/active-diagnostic-request.cpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/diagnostic/active-diagnostic-request.hpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/diagnostic/diagnostic-manager.cpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/diagnostic/diagnostic-manager.hpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/diagnostic/diagnostic-message.cpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/diagnostic/diagnostic-message.hpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/low-can-binding.cpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/low-can-binding.hpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/packaging/wgt/config.xml (100%) rename {low-can-binding => CAN-binder/low-can-binding}/packaging/wgt/etc/can_buses.json (100%) rename {low-can-binding => CAN-binder/low-can-binding}/packaging/wgt/icon.png (100%) rename {low-can-binding => CAN-binder/low-can-binding}/utils/config-parser.cpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/utils/config-parser.hpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/utils/openxc-utils.cpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/utils/openxc-utils.hpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/utils/signals.cpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/utils/signals.hpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/utils/socket.cpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/utils/socket.hpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/utils/timer.cpp (100%) rename {low-can-binding => CAN-binder/low-can-binding}/utils/timer.hpp (100%) rename {can-config-generator => CAN-config-generator}/.gitignore (100%) rename {can-config-generator => CAN-config-generator}/3rdparty/json/json.hpp (100%) create mode 100644 CAN-config-generator/CMakeLists.txt rename {can-config-generator => CAN-config-generator}/LICENSE (100%) create mode 100644 CAN-config-generator/Makefile rename {can-config-generator => CAN-config-generator}/README.md (100%) rename {can-config-generator => CAN-config-generator}/build.sh (100%) rename {can-config-generator => CAN-config-generator}/can-config-generator.sln (100%) rename {can-config-generator => CAN-config-generator}/can-config-generator.vcxproj (100%) create mode 100644 CAN-config-generator/etc/config.cmake create mode 100644 CAN-config-generator/etc/export.map rename {can-config-generator => CAN-config-generator/src}/CMakeLists.txt (81%) rename {can-config-generator => CAN-config-generator}/src/main.cpp (100%) rename {can-config-generator => CAN-config-generator}/src/main.hpp (100%) rename {can-config-generator => CAN-config-generator}/src/openxc/can_bus.cpp (100%) rename {can-config-generator => CAN-config-generator}/src/openxc/can_bus.hpp (100%) rename {can-config-generator => CAN-config-generator}/src/openxc/can_message.cpp (100%) rename {can-config-generator => CAN-config-generator}/src/openxc/can_message.hpp (100%) rename {can-config-generator => CAN-config-generator}/src/openxc/command.cpp (100%) rename {can-config-generator => CAN-config-generator}/src/openxc/command.hpp (100%) rename {can-config-generator => CAN-config-generator}/src/openxc/diagnostic_message.cpp (100%) rename {can-config-generator => CAN-config-generator}/src/openxc/diagnostic_message.hpp (100%) rename {can-config-generator => CAN-config-generator}/src/openxc/mapping.cpp (100%) rename {can-config-generator => CAN-config-generator}/src/openxc/mapping.hpp (100%) rename {can-config-generator => CAN-config-generator}/src/openxc/message_set.cpp (100%) rename {can-config-generator => CAN-config-generator}/src/openxc/message_set.hpp (100%) rename {can-config-generator => CAN-config-generator}/src/openxc/signal.cpp (100%) rename {can-config-generator => CAN-config-generator}/src/openxc/signal.hpp (100%) rename {can-config-generator => CAN-config-generator}/tests/basic.json (100%) rename {can-config-generator => CAN-config-generator}/tests/generated.cpp (100%) rename {examples/basic => CAN-config-generator/tests}/handlers.cpp (100%) rename {can-config-generator => CAN-config-generator}/tests/signals.json (100%) diff --git a/.gitmodules b/.gitmodules index db4dd12..8441eea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,15 @@ [submodule "low-can-binding/libs/openxc-message-format"] - path = libs/openxc-message-format + path = CAN-binder/libs/openxc-message-format url = https://github.com/openxc/openxc-message-format [submodule "low-can-binding/libs/nanopb"] - path = libs/nanopb + path = CAN-binder/libs/nanopb url = https://github.com/nanopb/nanopb.git [submodule "low-can-binding/libs/uds-c"] - path = libs/uds-c + path = CAN-binder/libs/uds-c url = https://github.com/openxc/uds-c.git [submodule "low-can-binding/libs/bitfield-c"] - path = libs/bitfield-c + path = CAN-binder/libs/bitfield-c url = https://github.com/openxc/bitfield-c.git [submodule "low-can-binding/libs/isotp-c"] - path = libs/isotp-c + path = CAN-binder/libs/isotp-c url = https://github.com/openxc/isotp-c diff --git a/CMakeLists.txt b/CAN-binder/CMakeLists.txt similarity index 100% rename from CMakeLists.txt rename to CAN-binder/CMakeLists.txt diff --git a/CAN-binder/Makefile b/CAN-binder/Makefile new file mode 100644 index 0000000..658ef32 --- /dev/null +++ b/CAN-binder/Makefile @@ -0,0 +1,37 @@ +# Copyright (C) 2015, 2016 "IoT.bzh" +# Author "Romain Forlot" +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +BUILD_DIR := build + +.PHONY: all clean mrproper ${BUILD_DIR}/Makefile + +all: build package + +clean: + @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean + +mrproper: + rm -rf ${BUILD_DIR} + +build: ${BUILD_DIR}/Makefile + cmake --build ${BUILD_DIR} --clean-first + + +package: + cmake --build ${BUILD_DIR} --target widget + +${BUILD_DIR}/Makefile: + @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR} + @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CMAKE_OPTS} ..) diff --git a/can_samples/citroen/citroen_c5_highway_1 b/CAN-binder/can_samples/citroen/citroen_c5_highway_1 similarity index 100% rename from can_samples/citroen/citroen_c5_highway_1 rename to CAN-binder/can_samples/citroen/citroen_c5_highway_1 diff --git a/can_samples/citroen/citroen_c5_highway_2 b/CAN-binder/can_samples/citroen/citroen_c5_highway_2 similarity index 100% rename from can_samples/citroen/citroen_c5_highway_2 rename to CAN-binder/can_samples/citroen/citroen_c5_highway_2 diff --git a/can_samples/ford/focus/accel b/CAN-binder/can_samples/ford/focus/accel similarity index 100% rename from can_samples/ford/focus/accel rename to CAN-binder/can_samples/ford/focus/accel diff --git a/can_samples/ford/focus/alldoors_lock b/CAN-binder/can_samples/ford/focus/alldoors_lock similarity index 100% rename from can_samples/ford/focus/alldoors_lock rename to CAN-binder/can_samples/ford/focus/alldoors_lock diff --git a/can_samples/ford/focus/alldoors_open b/CAN-binder/can_samples/ford/focus/alldoors_open similarity index 100% rename from can_samples/ford/focus/alldoors_open rename to CAN-binder/can_samples/ford/focus/alldoors_open diff --git a/can_samples/ford/focus/brake b/CAN-binder/can_samples/ford/focus/brake similarity index 100% rename from can_samples/ford/focus/brake rename to CAN-binder/can_samples/ford/focus/brake diff --git a/can_samples/ford/focus/handbrake b/CAN-binder/can_samples/ford/focus/handbrake similarity index 100% rename from can_samples/ford/focus/handbrake rename to CAN-binder/can_samples/ford/focus/handbrake diff --git a/can_samples/ford/focus/ignition b/CAN-binder/can_samples/ford/focus/ignition similarity index 100% rename from can_samples/ford/focus/ignition rename to CAN-binder/can_samples/ford/focus/ignition diff --git a/can_samples/ford/focus/lights b/CAN-binder/can_samples/ford/focus/lights similarity index 100% rename from can_samples/ford/focus/lights rename to CAN-binder/can_samples/ford/focus/lights diff --git a/can_samples/ford/focus/turnleft b/CAN-binder/can_samples/ford/focus/turnleft similarity index 100% rename from can_samples/ford/focus/turnleft rename to CAN-binder/can_samples/ford/focus/turnleft diff --git a/can_samples/ford/focus/turnright b/CAN-binder/can_samples/ford/focus/turnright similarity index 100% rename from can_samples/ford/focus/turnright rename to CAN-binder/can_samples/ford/focus/turnright diff --git a/can_samples/init_can.sh b/CAN-binder/can_samples/init_can.sh similarity index 100% rename from can_samples/init_can.sh rename to CAN-binder/can_samples/init_can.sh diff --git a/can_samples/init_vcan.sh b/CAN-binder/can_samples/init_vcan.sh similarity index 100% rename from can_samples/init_vcan.sh rename to CAN-binder/can_samples/init_vcan.sh diff --git a/can_samples/toyota/auris/accel b/CAN-binder/can_samples/toyota/auris/accel similarity index 100% rename from can_samples/toyota/auris/accel rename to CAN-binder/can_samples/toyota/auris/accel diff --git a/can_samples/toyota/auris/alldoors_lock b/CAN-binder/can_samples/toyota/auris/alldoors_lock similarity index 100% rename from can_samples/toyota/auris/alldoors_lock rename to CAN-binder/can_samples/toyota/auris/alldoors_lock diff --git a/can_samples/toyota/auris/alldoors_unlock b/CAN-binder/can_samples/toyota/auris/alldoors_unlock similarity index 100% rename from can_samples/toyota/auris/alldoors_unlock rename to CAN-binder/can_samples/toyota/auris/alldoors_unlock diff --git a/can_samples/toyota/auris/brake b/CAN-binder/can_samples/toyota/auris/brake similarity index 100% rename from can_samples/toyota/auris/brake rename to CAN-binder/can_samples/toyota/auris/brake diff --git a/can_samples/toyota/auris/engineoff b/CAN-binder/can_samples/toyota/auris/engineoff similarity index 100% rename from can_samples/toyota/auris/engineoff rename to CAN-binder/can_samples/toyota/auris/engineoff diff --git a/can_samples/toyota/auris/handbrake b/CAN-binder/can_samples/toyota/auris/handbrake similarity index 100% rename from can_samples/toyota/auris/handbrake rename to CAN-binder/can_samples/toyota/auris/handbrake diff --git a/can_samples/toyota/auris/ignition b/CAN-binder/can_samples/toyota/auris/ignition similarity index 100% rename from can_samples/toyota/auris/ignition rename to CAN-binder/can_samples/toyota/auris/ignition diff --git a/can_samples/toyota/auris/keydisengage b/CAN-binder/can_samples/toyota/auris/keydisengage similarity index 100% rename from can_samples/toyota/auris/keydisengage rename to CAN-binder/can_samples/toyota/auris/keydisengage diff --git a/can_samples/toyota/auris/keyengage b/CAN-binder/can_samples/toyota/auris/keyengage similarity index 100% rename from can_samples/toyota/auris/keyengage rename to CAN-binder/can_samples/toyota/auris/keyengage diff --git a/can_samples/toyota/auris/keyin b/CAN-binder/can_samples/toyota/auris/keyin similarity index 100% rename from can_samples/toyota/auris/keyin rename to CAN-binder/can_samples/toyota/auris/keyin diff --git a/can_samples/toyota/auris/keyout b/CAN-binder/can_samples/toyota/auris/keyout similarity index 100% rename from can_samples/toyota/auris/keyout rename to CAN-binder/can_samples/toyota/auris/keyout diff --git a/can_samples/toyota/auris/lights b/CAN-binder/can_samples/toyota/auris/lights similarity index 100% rename from can_samples/toyota/auris/lights rename to CAN-binder/can_samples/toyota/auris/lights diff --git a/can_samples/toyota/auris/trip_test_with_obd2_vehicle_speed_requests b/CAN-binder/can_samples/toyota/auris/trip_test_with_obd2_vehicle_speed_requests similarity index 100% rename from can_samples/toyota/auris/trip_test_with_obd2_vehicle_speed_requests rename to CAN-binder/can_samples/toyota/auris/trip_test_with_obd2_vehicle_speed_requests diff --git a/can_samples/toyota/auris/turnleft b/CAN-binder/can_samples/toyota/auris/turnleft similarity index 100% rename from can_samples/toyota/auris/turnleft rename to CAN-binder/can_samples/toyota/auris/turnleft diff --git a/can_samples/toyota/auris/turnright b/CAN-binder/can_samples/toyota/auris/turnright similarity index 100% rename from can_samples/toyota/auris/turnright rename to CAN-binder/can_samples/toyota/auris/turnright diff --git a/etc/config.cmake b/CAN-binder/etc/config.cmake similarity index 100% rename from etc/config.cmake rename to CAN-binder/etc/config.cmake diff --git a/etc/export.map b/CAN-binder/etc/export.map similarity index 100% rename from etc/export.map rename to CAN-binder/etc/export.map diff --git a/examples/basic/generate_example.cpp b/CAN-binder/examples/basic/generate_example.cpp similarity index 100% rename from examples/basic/generate_example.cpp rename to CAN-binder/examples/basic/generate_example.cpp diff --git a/can-config-generator/tests/handlers.cpp b/CAN-binder/examples/basic/handlers.cpp similarity index 100% rename from can-config-generator/tests/handlers.cpp rename to CAN-binder/examples/basic/handlers.cpp diff --git a/examples/basic/signals.json b/CAN-binder/examples/basic/signals.json similarity index 100% rename from examples/basic/signals.json rename to CAN-binder/examples/basic/signals.json diff --git a/examples/toyota/configuration-generated.cpp b/CAN-binder/examples/toyota/configuration-generated.cpp similarity index 100% rename from examples/toyota/configuration-generated.cpp rename to CAN-binder/examples/toyota/configuration-generated.cpp diff --git a/examples/toyota/signals.json b/CAN-binder/examples/toyota/signals.json similarity index 100% rename from examples/toyota/signals.json rename to CAN-binder/examples/toyota/signals.json diff --git a/libs/CMakeLists.txt b/CAN-binder/libs/CMakeLists.txt similarity index 100% rename from libs/CMakeLists.txt rename to CAN-binder/libs/CMakeLists.txt diff --git a/libs/bitfield-c b/CAN-binder/libs/bitfield-c similarity index 100% rename from libs/bitfield-c rename to CAN-binder/libs/bitfield-c diff --git a/libs/isotp-c b/CAN-binder/libs/isotp-c similarity index 100% rename from libs/isotp-c rename to CAN-binder/libs/isotp-c diff --git a/libs/nanopb b/CAN-binder/libs/nanopb similarity index 100% rename from libs/nanopb rename to CAN-binder/libs/nanopb diff --git a/libs/openxc-message-format b/CAN-binder/libs/openxc-message-format similarity index 100% rename from libs/openxc-message-format rename to CAN-binder/libs/openxc-message-format diff --git a/libs/uds-c b/CAN-binder/libs/uds-c similarity index 100% rename from libs/uds-c rename to CAN-binder/libs/uds-c diff --git a/low-can-binding/CMakeLists.txt b/CAN-binder/low-can-binding/CMakeLists.txt similarity index 100% rename from low-can-binding/CMakeLists.txt rename to CAN-binder/low-can-binding/CMakeLists.txt diff --git a/low-can-binding/can/can-bus-dev.cpp b/CAN-binder/low-can-binding/can/can-bus-dev.cpp similarity index 100% rename from low-can-binding/can/can-bus-dev.cpp rename to CAN-binder/low-can-binding/can/can-bus-dev.cpp diff --git a/low-can-binding/can/can-bus-dev.hpp b/CAN-binder/low-can-binding/can/can-bus-dev.hpp similarity index 100% rename from low-can-binding/can/can-bus-dev.hpp rename to CAN-binder/low-can-binding/can/can-bus-dev.hpp diff --git a/low-can-binding/can/can-bus.cpp b/CAN-binder/low-can-binding/can/can-bus.cpp similarity index 100% rename from low-can-binding/can/can-bus.cpp rename to CAN-binder/low-can-binding/can/can-bus.cpp diff --git a/low-can-binding/can/can-bus.hpp b/CAN-binder/low-can-binding/can/can-bus.hpp similarity index 100% rename from low-can-binding/can/can-bus.hpp rename to CAN-binder/low-can-binding/can/can-bus.hpp diff --git a/low-can-binding/can/can-command.hpp b/CAN-binder/low-can-binding/can/can-command.hpp similarity index 100% rename from low-can-binding/can/can-command.hpp rename to CAN-binder/low-can-binding/can/can-command.hpp diff --git a/low-can-binding/can/can-decoder.cpp b/CAN-binder/low-can-binding/can/can-decoder.cpp similarity index 100% rename from low-can-binding/can/can-decoder.cpp rename to CAN-binder/low-can-binding/can/can-decoder.cpp diff --git a/low-can-binding/can/can-decoder.hpp b/CAN-binder/low-can-binding/can/can-decoder.hpp similarity index 100% rename from low-can-binding/can/can-decoder.hpp rename to CAN-binder/low-can-binding/can/can-decoder.hpp diff --git a/low-can-binding/can/can-message-definition.cpp b/CAN-binder/low-can-binding/can/can-message-definition.cpp similarity index 100% rename from low-can-binding/can/can-message-definition.cpp rename to CAN-binder/low-can-binding/can/can-message-definition.cpp diff --git a/low-can-binding/can/can-message-definition.hpp b/CAN-binder/low-can-binding/can/can-message-definition.hpp similarity index 100% rename from low-can-binding/can/can-message-definition.hpp rename to CAN-binder/low-can-binding/can/can-message-definition.hpp diff --git a/low-can-binding/can/can-message-set.cpp b/CAN-binder/low-can-binding/can/can-message-set.cpp similarity index 100% rename from low-can-binding/can/can-message-set.cpp rename to CAN-binder/low-can-binding/can/can-message-set.cpp diff --git a/low-can-binding/can/can-message-set.hpp b/CAN-binder/low-can-binding/can/can-message-set.hpp similarity index 100% rename from low-can-binding/can/can-message-set.hpp rename to CAN-binder/low-can-binding/can/can-message-set.hpp diff --git a/low-can-binding/can/can-message.cpp b/CAN-binder/low-can-binding/can/can-message.cpp similarity index 100% rename from low-can-binding/can/can-message.cpp rename to CAN-binder/low-can-binding/can/can-message.cpp diff --git a/low-can-binding/can/can-message.hpp b/CAN-binder/low-can-binding/can/can-message.hpp similarity index 100% rename from low-can-binding/can/can-message.hpp rename to CAN-binder/low-can-binding/can/can-message.hpp diff --git a/low-can-binding/can/can-signals.cpp b/CAN-binder/low-can-binding/can/can-signals.cpp similarity index 100% rename from low-can-binding/can/can-signals.cpp rename to CAN-binder/low-can-binding/can/can-signals.cpp diff --git a/low-can-binding/can/can-signals.hpp b/CAN-binder/low-can-binding/can/can-signals.hpp similarity index 100% rename from low-can-binding/can/can-signals.hpp rename to CAN-binder/low-can-binding/can/can-signals.hpp diff --git a/low-can-binding/configuration-generated.cpp b/CAN-binder/low-can-binding/configuration-generated.cpp similarity index 100% rename from low-can-binding/configuration-generated.cpp rename to CAN-binder/low-can-binding/configuration-generated.cpp diff --git a/low-can-binding/configuration.cpp b/CAN-binder/low-can-binding/configuration.cpp similarity index 100% rename from low-can-binding/configuration.cpp rename to CAN-binder/low-can-binding/configuration.cpp diff --git a/low-can-binding/configuration.hpp b/CAN-binder/low-can-binding/configuration.hpp similarity index 100% rename from low-can-binding/configuration.hpp rename to CAN-binder/low-can-binding/configuration.hpp diff --git a/low-can-binding/diagnostic/active-diagnostic-request.cpp b/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp similarity index 100% rename from low-can-binding/diagnostic/active-diagnostic-request.cpp rename to CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp diff --git a/low-can-binding/diagnostic/active-diagnostic-request.hpp b/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.hpp similarity index 100% rename from low-can-binding/diagnostic/active-diagnostic-request.hpp rename to CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.hpp diff --git a/low-can-binding/diagnostic/diagnostic-manager.cpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp similarity index 100% rename from low-can-binding/diagnostic/diagnostic-manager.cpp rename to CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp diff --git a/low-can-binding/diagnostic/diagnostic-manager.hpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp similarity index 100% rename from low-can-binding/diagnostic/diagnostic-manager.hpp rename to CAN-binder/low-can-binding/diagnostic/diagnostic-manager.hpp diff --git a/low-can-binding/diagnostic/diagnostic-message.cpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp similarity index 100% rename from low-can-binding/diagnostic/diagnostic-message.cpp rename to CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp diff --git a/low-can-binding/diagnostic/diagnostic-message.hpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp similarity index 100% rename from low-can-binding/diagnostic/diagnostic-message.hpp rename to CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp diff --git a/low-can-binding/low-can-binding.cpp b/CAN-binder/low-can-binding/low-can-binding.cpp similarity index 100% rename from low-can-binding/low-can-binding.cpp rename to CAN-binder/low-can-binding/low-can-binding.cpp diff --git a/low-can-binding/low-can-binding.hpp b/CAN-binder/low-can-binding/low-can-binding.hpp similarity index 100% rename from low-can-binding/low-can-binding.hpp rename to CAN-binder/low-can-binding/low-can-binding.hpp diff --git a/low-can-binding/packaging/wgt/config.xml b/CAN-binder/low-can-binding/packaging/wgt/config.xml similarity index 100% rename from low-can-binding/packaging/wgt/config.xml rename to CAN-binder/low-can-binding/packaging/wgt/config.xml diff --git a/low-can-binding/packaging/wgt/etc/can_buses.json b/CAN-binder/low-can-binding/packaging/wgt/etc/can_buses.json similarity index 100% rename from low-can-binding/packaging/wgt/etc/can_buses.json rename to CAN-binder/low-can-binding/packaging/wgt/etc/can_buses.json diff --git a/low-can-binding/packaging/wgt/icon.png b/CAN-binder/low-can-binding/packaging/wgt/icon.png similarity index 100% rename from low-can-binding/packaging/wgt/icon.png rename to CAN-binder/low-can-binding/packaging/wgt/icon.png diff --git a/low-can-binding/utils/config-parser.cpp b/CAN-binder/low-can-binding/utils/config-parser.cpp similarity index 100% rename from low-can-binding/utils/config-parser.cpp rename to CAN-binder/low-can-binding/utils/config-parser.cpp diff --git a/low-can-binding/utils/config-parser.hpp b/CAN-binder/low-can-binding/utils/config-parser.hpp similarity index 100% rename from low-can-binding/utils/config-parser.hpp rename to CAN-binder/low-can-binding/utils/config-parser.hpp diff --git a/low-can-binding/utils/openxc-utils.cpp b/CAN-binder/low-can-binding/utils/openxc-utils.cpp similarity index 100% rename from low-can-binding/utils/openxc-utils.cpp rename to CAN-binder/low-can-binding/utils/openxc-utils.cpp diff --git a/low-can-binding/utils/openxc-utils.hpp b/CAN-binder/low-can-binding/utils/openxc-utils.hpp similarity index 100% rename from low-can-binding/utils/openxc-utils.hpp rename to CAN-binder/low-can-binding/utils/openxc-utils.hpp diff --git a/low-can-binding/utils/signals.cpp b/CAN-binder/low-can-binding/utils/signals.cpp similarity index 100% rename from low-can-binding/utils/signals.cpp rename to CAN-binder/low-can-binding/utils/signals.cpp diff --git a/low-can-binding/utils/signals.hpp b/CAN-binder/low-can-binding/utils/signals.hpp similarity index 100% rename from low-can-binding/utils/signals.hpp rename to CAN-binder/low-can-binding/utils/signals.hpp diff --git a/low-can-binding/utils/socket.cpp b/CAN-binder/low-can-binding/utils/socket.cpp similarity index 100% rename from low-can-binding/utils/socket.cpp rename to CAN-binder/low-can-binding/utils/socket.cpp diff --git a/low-can-binding/utils/socket.hpp b/CAN-binder/low-can-binding/utils/socket.hpp similarity index 100% rename from low-can-binding/utils/socket.hpp rename to CAN-binder/low-can-binding/utils/socket.hpp diff --git a/low-can-binding/utils/timer.cpp b/CAN-binder/low-can-binding/utils/timer.cpp similarity index 100% rename from low-can-binding/utils/timer.cpp rename to CAN-binder/low-can-binding/utils/timer.cpp diff --git a/low-can-binding/utils/timer.hpp b/CAN-binder/low-can-binding/utils/timer.hpp similarity index 100% rename from low-can-binding/utils/timer.hpp rename to CAN-binder/low-can-binding/utils/timer.hpp diff --git a/can-config-generator/.gitignore b/CAN-config-generator/.gitignore similarity index 100% rename from can-config-generator/.gitignore rename to CAN-config-generator/.gitignore diff --git a/can-config-generator/3rdparty/json/json.hpp b/CAN-config-generator/3rdparty/json/json.hpp similarity index 100% rename from can-config-generator/3rdparty/json/json.hpp rename to CAN-config-generator/3rdparty/json/json.hpp diff --git a/CAN-config-generator/CMakeLists.txt b/CAN-config-generator/CMakeLists.txt new file mode 100644 index 0000000..ec91089 --- /dev/null +++ b/CAN-config-generator/CMakeLists.txt @@ -0,0 +1,283 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: Fulup Ar Foll +# contrib: Romain Forlot +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + + +#-------------------------------------------------------------------------- +# WARNING: +# Do not change this cmake template +# Customise your preferences in "./etc/config.cmake" +#-------------------------------------------------------------------------- + + +# Generic useful macro +# ----------------------- +macro(PROJECT_TARGET_ADD TARGET_NAME) + set(PROJECT_TARGETS ${PROJECT_TARGETS} ${TARGET_NAME} CACHE INTERNAL PROJECT_TARGETS) + set(TARGET_NAME ${TARGET_NAME}) +endmacro(PROJECT_TARGET_ADD) + +macro(defstr name value) + add_definitions(-D${name}=${value}) +endmacro(defstr) + +macro(setc name value) + if(NOT DEFINED ${name}) + set(${name} ${value}) + endif(NOT DEFINED ${name}) +endmacro(setc) + +# Dumb macro to add each directory under a path. Make sure we grab all header files! +macro(fill_include_dir path) + file(GLOB_RECURSE dirlist LIST_DIRECTORIES true "${path}/*") + foreach(filename ${dirlist}) + if(IS_DIRECTORY ${filename}) + include_directories(${filename}) + endif(IS_DIRECTORY ${filename}) + endforeach() +endmacro(fill_include_dir) + +# Helper function to retrieve source files from a library repo. +function(find_source_files path) + file(GLOB_RECURSE filelist "${path}/*.[cpx]") + foreach(filename ${filelist}) + if(NOT ${filename} MATCHES ".*(test|example|sample).*") + string(APPEND sources "${filename};") + endif(NOT ${filename} MATCHES ".*(test|example|sample).*") + endforeach() + set(sources_files ${sources} PARENT_SCOPE) +endfunction(find_source_files) + +# WGT packaging function. TYPE can be HTML5, NATIVE, HTML5-HYBRID or BINDING +macro(build_widget type) + message(STATUS "Creation of ${TARGET_NAME}.wgt package for AppFW") + + configure_file(${PROJECT_WGT_DIR}/config.xml config.xml) + + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_WGT_DIR}/etc") + file(GLOB conf_files "${PROJECT_WGT_DIR}/etc/*") + foreach(filename ${conf_files}) + STRING(REGEX REPLACE "^.*/(.*)$" "\\1" shortname ${filename}) + message(STATUS "Copying config file ${shortname}") + configure_file(${filename} ${shortname}) + endforeach() + endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_WGT_DIR}/etc") + + # Include HTML5 files to be packaged + if(${type} STREQUAL "HTML5") + file(GLOB_RECURSE HTML5FILES app/*) + + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/gulpfile.js") + set(HTML5FILES ${HTML5FILES} "${CMAKE_CURRENT_SOURCE_DIR}/gulpfile.js") + endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/gulpfile.js") + + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/bower.json") + set(HTML5FILES ${HTML5FILES} "${CMAKE_CURRENT_SOURCE_DIR}/bower.json") + endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/bower.json") + + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/package.json") + set(HTML5FILES ${HTML5FILES} "${CMAKE_CURRENT_SOURCE_DIR}/package.json") + endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/package.json") + endif(${type} STREQUAL "HTML5") + + if(${type} STREQUAL "HTML5") + add_custom_command( + OUTPUT ${TARGET_NAME}.wgt + DEPENDS ${HTML5FILES} ${PROJECT_WGT_DIR}/config.xml + COMMAND rm -rf package + COMMAND mkdir -p package/lib package/htdocs package/etc package/bin + COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && gulp widget-config-prod + COMMAND cp -a dist.prod/* ${CMAKE_CURRENT_BINARY_DIR}/package/htdocs + ) + endif(${type} STREQUAL "HTML5") + + if(${type} STREQUAL "HTML5-HYBRID") + add_custom_command( + OUTPUT ${TARGET_NAME}.wgt + DEPENDS ${HTML5FILES} ${PROJECT_WGT_DIR}/config.xml + COMMAND rm -rf package + COMMAND mkdir -p package/lib package/htdocs package/etc package/bin + COMMAND cp ${TARGET_NAME}.so package/lib + ) + endif(${type} STREQUAL "HTML5-HYBRID") + + if(${type} STREQUAL "BINDING") + add_custom_command( + OUTPUT ${TARGET_NAME}.wgt + DEPENDS ${PROJECT_WGT_DIR}/config.xml + COMMAND rm -rf package + COMMAND mkdir -p package/lib package/htdocs package/etc package/bin + COMMAND cp ${TARGET_NAME}.so package/lib + ) + endif(${type} STREQUAL "BINDING") + + if(${type} STREQUAL "NATIVE") + add_custom_command( + OUTPUT ${TARGET_NAME}.wgt + DEPENDS ${PROJECT_WGT_DIR}/config.xml + COMMAND rm -rf package + COMMAND mkdir -p package/lib package/htdocs package/etc package/bin + COMMAND cp ${TARGET_NAME} package/bin + ) + endif(${type} STREQUAL "NATIVE") + + add_custom_command( + OUTPUT ${TARGET_NAME}.wgt + COMMAND cp config.xml package/ + COMMAND cp ${conf_files} package/etc + COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/packaging/wgt/${PROJECT_ICON} package/icon.png + COMMAND wgtpkg-pack -f -o ${TARGET_NAME}.wgt package + APPEND + ) + add_custom_target(widget ALL DEPENDS ${TARGET_NAME}.wgt) +endmacro() + +CMAKE_MINIMUM_REQUIRED(VERSION 3.3) +setc(CMAKE_BUILD_TYPE Debug) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) +set(CMP0048 1) + +# Compiler selection should append before project definition +# ----------------------------------------------------------- +foreach (GCC_VERSION "6" "5") + execute_process(COMMAND gcc-${GCC_VERSION} -dumpversion RESULT_VARIABLE GCCRC OUTPUT_QUIET ERROR_QUIET) + if(GCCRC EQUAL 0) + set(CMAKE_C_COMPILER "gcc-${GCC_VERSION}") + set(CMAKE_CXX_COMPILER "g++-${GCC_VERSION}") + set(CMAKE_C_VERSION ${GCC_VERSION}) + break() + endif(GCCRC EQUAL 0) +endforeach(GCC_VERSION) + +# Include project configuration +# ------------------------------ +include(${CMAKE_CURRENT_SOURCE_DIR}/etc/config.cmake) +project(${NAME} VERSION ${VERSION}) +setc(PROJECT_PRETTY_NAME "${PRETTY_NAME}") +setc(PROJECT_DESCRIPTION "${DESCRIPTION}") +setc(PROJECT_WGT_DIR "packaging/wgt") +setc(PROJECT_LIBDIR "libs") +setc(PROJECT_RESOURCES "data") + +message(STATUS "") +message(STATUS "Project=${PROJECT_NAME}/${VERSION}[${PRETTY_NAME} ${DESCRIPTION}]") +message(STATUS "") +message(STATUS "gcc/g++ version-${CMAKE_C_VERSION}.x selected") + +INCLUDE(FindPkgConfig) +INCLUDE(CheckIncludeFiles) +INCLUDE(CheckLibraryExists) +INCLUDE(GNUInstallDirs) + +# Default compilation options +############################################################################ +link_libraries(-Wl,--as-needed -Wl,--gc-sections) +add_compile_options(-Wall -Wextra -Wconversion) +add_compile_options(-Wno-unused-parameter) # frankly not using a parameter does it care? +add_compile_options(-Wno-sign-compare -Wno-sign-conversion) +add_compile_options(-Werror=maybe-uninitialized) +add_compile_options(-Werror=implicit-function-declaration) +add_compile_options(-ffunction-sections -fdata-sections) +add_compile_options(-fPIC) +add_compile_options(-g) + +setc(CMAKE_C_FLAGS_PROFILING "-g -O2 -pg -Wp,-U_FORTIFY_SOURCE") +setc(CMAKE_C_FLAGS_DEBUG "-g -O2 -ggdb -Wp,-U_FORTIFY_SOURCE") +setc(CMAKE_C_FLAGS_RELEASE "-O2") +setc(CMAKE_C_FLAGS_CCOV "-g -O2 --coverage") + +set(CMAKE_CXX_FLAGS_PROFILING "-g -O0 -std=c++11 -pg -Wp,-U_FORTIFY_SOURCE") +set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -std=c++11 -ggdb -Wp,-U_FORTIFY_SOURCE") +set(CMAKE_CXX_FLAGS_RELEASE "-g -O2 -std=c++11") +set(CMAKE_CXX_FLAGS_CCOV "-g -O2 -std=c++11 --coverage") + +setc(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/Install") + +# (BUG!!!) as PKG_CONFIG_PATH does not work [should be en env variable] +setc(PKG_CONFIG_USE_CMAKE_PREFIX_PATH 1) + +# Loop on required package and add options +foreach (PKG_CONFIG ${PKG_REQUIRED_LIST}) + PKG_CHECK_MODULES(${PKG_CONFIG} REQUIRED ${PKG_CONFIG}) + + INCLUDE_DIRECTORIES(${${PKG_CONFIG}_INCLUDE_DIRS}) + list (APPEND link_libraries ${${PKG_CONFIG}_LIBRARIES}) + add_compile_options (${${PKG_CONFIG}_CFLAGS}) +endforeach(PKG_CONFIG) + +# Optional LibEfence Malloc debug library +IF(CMAKE_BUILD_TYPE MATCHES DEBUG) +CHECK_LIBRARY_EXISTS(efence malloc "" HAVE_LIBEFENCE) +IF(HAVE_LIBEFENCE) + MESSAGE(STATUS "Linking with ElectricFence for debugging purposes...") + SET(libefence_LIBRARIES "-lefence") + list (APPEND link_libraries libefence_LIBRARIES}) +ENDIF(HAVE_LIBEFENCE) +ENDIF(CMAKE_BUILD_TYPE MATCHES DEBUG) + +# set default include directories +#INCLUDE_DIRECTORIES(${EXTRA_INCLUDE_DIRS}) +# Brutal but efficace: +fill_include_dir(${CMAKE_CURRENT_SOURCE_DIR}) + +# If no install dir try to guest some smart default +if(BINDINGS_INSTALL_PREFIX) + set(BINDINGS_INSTALL_DIR ${BINDINGS_INSTALL_PREFIX}/${PROJECT_NAME}) +else() + set(BINDINGS_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}) +endif() + +# Default Linkflag +if(NOT BINDINGS_LINK_FLAG) + set(BINDINGS_LINK_FLAG "-Wl,--version-script=${CMAKE_SOURCE_DIR}/etc/export.map") +endif() + +# Bindings to compile +# -------------------- +file(GLOB filelist "*") +foreach(filename ${filelist}) +if(EXISTS "${filename}/CMakeLists.txt") + add_subdirectory(${filename}) +endif(EXISTS "${filename}/CMakeLists.txt") +endforeach() + +# Add a dummy target to enable global dependency order +# ----------------------------------------------------- +if(EXTRA_DEPENDENCIES_ORDER) + set(DEPENDENCIES_TARGET ${PROJECT_NAME}_extra_dependencies) + add_custom_target(${DEPENDENCIES_TARGET} ALL + DEPENDS ${EXTRA_DEPENDENCY_ORDER} + ) +endif() + +# Cmake does not maintain targets list before 3.7 +# ------------------------------------------------- +if(${CMAKE_VERSION} VERSION_LESS 3.7) + set(GLOBAL_TARGET_LIST ${PROJECT_TARGETS}) +else() + get_property(GLOBAL_TARGET_LIST GLOBAL PROPERTY GlobalTargetList) +endif() + +# Print developer helper message when everything is done +# ------------------------------------------------------- +if(CLOSING_MESSAGE AND GLOBAL_TARGET_LIST) + add_custom_target(${PROJECT_NAME}_done ALL + DEPENDS ${DEPENDENCIES_TARGET} ${GLOBAL_TARGET_LIST} + COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${CLOSING_MESSAGE}" + ) +endif() diff --git a/can-config-generator/LICENSE b/CAN-config-generator/LICENSE similarity index 100% rename from can-config-generator/LICENSE rename to CAN-config-generator/LICENSE diff --git a/CAN-config-generator/Makefile b/CAN-config-generator/Makefile new file mode 100644 index 0000000..658ef32 --- /dev/null +++ b/CAN-config-generator/Makefile @@ -0,0 +1,37 @@ +# Copyright (C) 2015, 2016 "IoT.bzh" +# Author "Romain Forlot" +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +BUILD_DIR := build + +.PHONY: all clean mrproper ${BUILD_DIR}/Makefile + +all: build package + +clean: + @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean + +mrproper: + rm -rf ${BUILD_DIR} + +build: ${BUILD_DIR}/Makefile + cmake --build ${BUILD_DIR} --clean-first + + +package: + cmake --build ${BUILD_DIR} --target widget + +${BUILD_DIR}/Makefile: + @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR} + @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CMAKE_OPTS} ..) diff --git a/can-config-generator/README.md b/CAN-config-generator/README.md similarity index 100% rename from can-config-generator/README.md rename to CAN-config-generator/README.md diff --git a/can-config-generator/build.sh b/CAN-config-generator/build.sh similarity index 100% rename from can-config-generator/build.sh rename to CAN-config-generator/build.sh diff --git a/can-config-generator/can-config-generator.sln b/CAN-config-generator/can-config-generator.sln similarity index 100% rename from can-config-generator/can-config-generator.sln rename to CAN-config-generator/can-config-generator.sln diff --git a/can-config-generator/can-config-generator.vcxproj b/CAN-config-generator/can-config-generator.vcxproj similarity index 100% rename from can-config-generator/can-config-generator.vcxproj rename to CAN-config-generator/can-config-generator.vcxproj diff --git a/CAN-config-generator/etc/config.cmake b/CAN-config-generator/etc/config.cmake new file mode 100644 index 0000000..1819daa --- /dev/null +++ b/CAN-config-generator/etc/config.cmake @@ -0,0 +1,79 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: Fulup Ar Foll +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + +# Project Info +# ------------------ +set(NAME can-config-generator) +set(VERSION "1.0") +set(PRETTY_NAME "CAN configuration generator") +set(DESCRIPTION "Generator that convert JSON file following OpenXC spec to configuration-generated.cpp file for the low level CAN binding.") +set(URL "https://github.com/iotbzh/CAN_signaling") +set(PROJECT_ICON "icon.png") + +# Compilation Mode (DEBUG, RELEASE) +# ---------------------------------- +setc(CMAKE_BUILD_TYPE "DEBUG") + +# PKG_CONFIG required packages +# ----------------------------- +set (PKG_REQUIRED_LIST + json-c + libsystemd + afb-daemon +) + +# Static constante definition +# ----------------------------- +add_compile_options(-D_REENTRANT) +add_compile_options(-DPB_FIELD_16BIT) + +# LANG Specific compile flags set for all build types +set(CMAKE_C_FLAGS "") +set(CMAKE_CXX_FLAGS "-std=c++11") + +# Print a helper message when every thing is finished +setc(CLOSING_MESSAGE "Test with: ./can-config-generator -m ../tests/basic.json -o configuration-generated.cpp") +# ---------------------------------------------------- + +# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable] +# --------------------------------------------------------------------- +setc(CMAKE_INSTALL_PREFIX ${HOME}/opt) +setc(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) +setc(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib) + +# Optional dependencies order +# --------------------------- +set(EXTRA_DEPENDENCIES_ORDER can-config-generator low-can-binding) + +# Optional Extra global include path +# ----------------------------------- +#set(EXTRA_INCLUDE_DIRS inc_dir1 inc_dir2 ...) + +# Optional extra libraries +# ------------------------- +#set(EXTRA_LINK_LIBRARIES) + +# Optional force binding installation +# ------------------------------------ +# set(BINDINGS_INSTALL_PREFIX DestinationPath ) + +# Optional force binding Linking flag +# ------------------------------------ +# set(BINDINGS_LINK_FLAG LinkOptions ) + + diff --git a/CAN-config-generator/etc/export.map b/CAN-config-generator/etc/export.map new file mode 100644 index 0000000..52c1b4a --- /dev/null +++ b/CAN-config-generator/etc/export.map @@ -0,0 +1 @@ +{ global: afbBindingV1*; local: *; }; diff --git a/can-config-generator/CMakeLists.txt b/CAN-config-generator/src/CMakeLists.txt similarity index 81% rename from can-config-generator/CMakeLists.txt rename to CAN-config-generator/src/CMakeLists.txt index 0892d2a..39ceba1 100644 --- a/can-config-generator/CMakeLists.txt +++ b/CAN-config-generator/src/CMakeLists.txt @@ -22,14 +22,14 @@ PROJECT_TARGET_ADD(can-config-generator) # Define project Targets add_executable(can-config-generator - src/main.cpp - src/openxc/message_set.cpp - src/openxc/can_bus.cpp - src/openxc/can_message.cpp - src/openxc/command.cpp - src/openxc/diagnostic_message.cpp - src/openxc/mapping.cpp - src/openxc/signal.cpp) + main.cpp + openxc/message_set.cpp + openxc/can_bus.cpp + openxc/can_message.cpp + openxc/command.cpp + openxc/diagnostic_message.cpp + openxc/mapping.cpp + openxc/signal.cpp) # Library dependencies (include updates automatically) TARGET_LINK_LIBRARIES(can-config-generator @@ -38,4 +38,4 @@ PROJECT_TARGET_ADD(can-config-generator) # installation directory INSTALL(TARGETS can-config-generator - RUNTIME DESTINATION ${BINDINGS_INSTALL_DIR}) \ No newline at end of file +RUNTIME DESTINATION ${BINDINGS_INSTALL_DIR}) diff --git a/can-config-generator/src/main.cpp b/CAN-config-generator/src/main.cpp similarity index 100% rename from can-config-generator/src/main.cpp rename to CAN-config-generator/src/main.cpp diff --git a/can-config-generator/src/main.hpp b/CAN-config-generator/src/main.hpp similarity index 100% rename from can-config-generator/src/main.hpp rename to CAN-config-generator/src/main.hpp diff --git a/can-config-generator/src/openxc/can_bus.cpp b/CAN-config-generator/src/openxc/can_bus.cpp similarity index 100% rename from can-config-generator/src/openxc/can_bus.cpp rename to CAN-config-generator/src/openxc/can_bus.cpp diff --git a/can-config-generator/src/openxc/can_bus.hpp b/CAN-config-generator/src/openxc/can_bus.hpp similarity index 100% rename from can-config-generator/src/openxc/can_bus.hpp rename to CAN-config-generator/src/openxc/can_bus.hpp diff --git a/can-config-generator/src/openxc/can_message.cpp b/CAN-config-generator/src/openxc/can_message.cpp similarity index 100% rename from can-config-generator/src/openxc/can_message.cpp rename to CAN-config-generator/src/openxc/can_message.cpp diff --git a/can-config-generator/src/openxc/can_message.hpp b/CAN-config-generator/src/openxc/can_message.hpp similarity index 100% rename from can-config-generator/src/openxc/can_message.hpp rename to CAN-config-generator/src/openxc/can_message.hpp diff --git a/can-config-generator/src/openxc/command.cpp b/CAN-config-generator/src/openxc/command.cpp similarity index 100% rename from can-config-generator/src/openxc/command.cpp rename to CAN-config-generator/src/openxc/command.cpp diff --git a/can-config-generator/src/openxc/command.hpp b/CAN-config-generator/src/openxc/command.hpp similarity index 100% rename from can-config-generator/src/openxc/command.hpp rename to CAN-config-generator/src/openxc/command.hpp diff --git a/can-config-generator/src/openxc/diagnostic_message.cpp b/CAN-config-generator/src/openxc/diagnostic_message.cpp similarity index 100% rename from can-config-generator/src/openxc/diagnostic_message.cpp rename to CAN-config-generator/src/openxc/diagnostic_message.cpp diff --git a/can-config-generator/src/openxc/diagnostic_message.hpp b/CAN-config-generator/src/openxc/diagnostic_message.hpp similarity index 100% rename from can-config-generator/src/openxc/diagnostic_message.hpp rename to CAN-config-generator/src/openxc/diagnostic_message.hpp diff --git a/can-config-generator/src/openxc/mapping.cpp b/CAN-config-generator/src/openxc/mapping.cpp similarity index 100% rename from can-config-generator/src/openxc/mapping.cpp rename to CAN-config-generator/src/openxc/mapping.cpp diff --git a/can-config-generator/src/openxc/mapping.hpp b/CAN-config-generator/src/openxc/mapping.hpp similarity index 100% rename from can-config-generator/src/openxc/mapping.hpp rename to CAN-config-generator/src/openxc/mapping.hpp diff --git a/can-config-generator/src/openxc/message_set.cpp b/CAN-config-generator/src/openxc/message_set.cpp similarity index 100% rename from can-config-generator/src/openxc/message_set.cpp rename to CAN-config-generator/src/openxc/message_set.cpp diff --git a/can-config-generator/src/openxc/message_set.hpp b/CAN-config-generator/src/openxc/message_set.hpp similarity index 100% rename from can-config-generator/src/openxc/message_set.hpp rename to CAN-config-generator/src/openxc/message_set.hpp diff --git a/can-config-generator/src/openxc/signal.cpp b/CAN-config-generator/src/openxc/signal.cpp similarity index 100% rename from can-config-generator/src/openxc/signal.cpp rename to CAN-config-generator/src/openxc/signal.cpp diff --git a/can-config-generator/src/openxc/signal.hpp b/CAN-config-generator/src/openxc/signal.hpp similarity index 100% rename from can-config-generator/src/openxc/signal.hpp rename to CAN-config-generator/src/openxc/signal.hpp diff --git a/can-config-generator/tests/basic.json b/CAN-config-generator/tests/basic.json similarity index 100% rename from can-config-generator/tests/basic.json rename to CAN-config-generator/tests/basic.json diff --git a/can-config-generator/tests/generated.cpp b/CAN-config-generator/tests/generated.cpp similarity index 100% rename from can-config-generator/tests/generated.cpp rename to CAN-config-generator/tests/generated.cpp diff --git a/examples/basic/handlers.cpp b/CAN-config-generator/tests/handlers.cpp similarity index 100% rename from examples/basic/handlers.cpp rename to CAN-config-generator/tests/handlers.cpp diff --git a/can-config-generator/tests/signals.json b/CAN-config-generator/tests/signals.json similarity index 100% rename from can-config-generator/tests/signals.json rename to CAN-config-generator/tests/signals.json diff --git a/README.md b/README.md index cbe951b..a608363 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,23 @@ -# Low level CAN signaling binder +# CAN signaling binder -Low level CAN bus binder, based upon OpenXC vi-firmware project. +CAN bus binder, based upon OpenXC vi-firmware project. + +There are 2 separated projects here, one with the CAN-binder that is installed +on an AGL target and the CAN config generator used to generate a source file for +the low level binding. Full document can be found under `docs` directory. +# Fast build procedure + +Just use build.sh script: + +```bash +./build.sh +``` + +This will build both projects under build directory for each of them. + # Generate documentation ## Prerequisites diff --git a/build.sh b/build.sh index 9496f00..64bd7f5 100755 --- a/build.sh +++ b/build.sh @@ -1,82 +1,4 @@ #!/bin/bash -function build { - echo "ACTION: build" - source ~/agl/sdk/porter/environment* - if [ ! -d "$1/$2" ]; then - echo "INFO: build dir ($1/$2) doesn't exist, created it!" - mkdir -p "$1/$2" - fi - pushd "$1/$2" - #cd "$1/$2" - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=$3 $1 - make - popd -} - -function clean { - echo "ACTION: clean" - if [ -d "$1/$2" ]; then - rm -vrf "$1/$2" - fi -} - -function rebuild { - clean $1 $2 - build $1 $2 $3 -} - -function printhelp { - echo "Usage: build.sh [config]" - echo " action: can be one of the following" - echo " build: build this project." - echo " rebuild: rebuild this project." - echo " clean: clean the previous build." - echo " install: install the build result." - echo " subdir: the subdir into which the build is done." - echo " config: can be Debug or Release. Ignored if the action is 'clean'." -} - -function checkparams { - if [ "$#" -ne "$(($1+1))" ]; then - echo "ERROR: Wrong number of parameters, expected $1 but got $(($#-1))" - printhelp - exit 1 - fi -} - -function main { - CURRENT_DIR=$( dirname "$(readlink -f "$0")" ) - echo "Current script: $CURRENT_DIR" - - if [ "$#" -lt "1" ]; then - echo "ERROR: At least must be specified!" - exit 1 - fi - - case "$1" in - "build") - checkparams 3 $* - build $CURRENT_DIR $2 $3 - ;; - "rebuild") - checkparams 3 $* - rebuild $CURRENT_DIR $2 $3 - ;; - "clean") - checkparams 2 $* - clean $CURRENT_DIR $2 - ;; - "install") - checkparams 3 $* - echo "ERROR: Not implemented yet!" - ;; - *) - echo "ERROR: Unknown action '$3'!" - exit 1 - ;; - esac -} - -main $* - +cd CAN-config-generator && make build && cd - +cd CAN-binder && make build && cd - -- 2.16.6