From 9e86564a58a0f9c83edc5bb76fd8ab4c7e7a63ee Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Thu, 4 May 2017 14:28:09 +0200 Subject: Update with last app-templates modifications https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/app-templates Change-Id: I42eff75b790b70047e1b91b963edf458084881c9 Signed-off-by: Romain Forlot --- CAN-binder/etc/export.map | 2 +- CAN-binder/etc/macros.cmake | 7 +- .../binding/configuration-generated.cpp | 348 +++++++++++++++++++++ .../low-can-binding/binding/configuration.cpp | 106 +++++++ .../low-can-binding/binding/configuration.hpp | 112 +++++++ .../low-can-binding/binding/low-can-binding.cpp | 296 ++++++++++++++++++ .../low-can-binding/binding/low-can-binding.hpp | 33 ++ .../low-can-binding/configuration-generated.cpp | 348 --------------------- CAN-binder/low-can-binding/configuration.cpp | 106 ------- CAN-binder/low-can-binding/configuration.hpp | 112 ------- CAN-binder/low-can-binding/low-can-binding.cpp | 296 ------------------ CAN-binder/low-can-binding/low-can-binding.hpp | 33 -- .../low-can-binding/packaging/wgt/config.xml | 11 - .../packaging/wgt/etc/can_buses.json | 3 - CAN-binder/low-can-binding/packaging/wgt/icon.png | Bin 4035 -> 0 bytes 15 files changed, 899 insertions(+), 914 deletions(-) create mode 100644 CAN-binder/low-can-binding/binding/configuration-generated.cpp create mode 100644 CAN-binder/low-can-binding/binding/configuration.cpp create mode 100644 CAN-binder/low-can-binding/binding/configuration.hpp create mode 100644 CAN-binder/low-can-binding/binding/low-can-binding.cpp create mode 100644 CAN-binder/low-can-binding/binding/low-can-binding.hpp delete mode 100644 CAN-binder/low-can-binding/configuration-generated.cpp delete mode 100644 CAN-binder/low-can-binding/configuration.cpp delete mode 100644 CAN-binder/low-can-binding/configuration.hpp delete mode 100644 CAN-binder/low-can-binding/low-can-binding.cpp delete mode 100644 CAN-binder/low-can-binding/low-can-binding.hpp delete mode 100644 CAN-binder/low-can-binding/packaging/wgt/config.xml delete mode 100644 CAN-binder/low-can-binding/packaging/wgt/etc/can_buses.json delete mode 100644 CAN-binder/low-can-binding/packaging/wgt/icon.png (limited to 'CAN-binder') diff --git a/CAN-binder/etc/export.map b/CAN-binder/etc/export.map index 52c1b4aa..ee2f4133 100644 --- a/CAN-binder/etc/export.map +++ b/CAN-binder/etc/export.map @@ -1 +1 @@ -{ global: afbBindingV1*; local: *; }; +{ global: afbBindingV*; local: *; }; diff --git a/CAN-binder/etc/macros.cmake b/CAN-binder/etc/macros.cmake index afad28a6..5e00b9d0 100644 --- a/CAN-binder/etc/macros.cmake +++ b/CAN-binder/etc/macros.cmake @@ -75,29 +75,28 @@ macro(populate_widget) set(POPULE_WIDGET_TARGET "populate_${TARGET_NAME}") get_target_property(T ${TARGET_NAME} LABELS) + get_target_property(OUT ${TARGET_NAME} OUTPUT_NAME) if(${T} STREQUAL "BINDING") add_custom_command(OUTPUT ${WIDGET_LIBDIR}/${TARGET_NAME}.so DEPENDS ${TARGET_NAME} COMMAND mkdir -p ${WIDGET_LIBDIR} - COMMAND cp ${TARGET_NAME}.so ${WIDGET_LIBDIR} + COMMAND cp ${OUT}.so ${WIDGET_LIBDIR} ) add_custom_target(${POPULE_WIDGET_TARGET} ALL DEPENDS ${WIDGET_LIBDIR}/${TARGET_NAME}.so) elseif(${T} STREQUAL "EXECUTABLE") add_custom_command(OUTPUT ${WIDGET_BINDIR}/${TARGET_NAME} DEPENDS ${TARGET_NAME} COMMAND mkdir -p ${WIDGET_BINDIR} - COMMAND cp ${TARGET_NAME} ${WIDGET_BINDIR} + COMMAND cp ${OUT} ${WIDGET_BINDIR} ) add_custom_target(${POPULE_WIDGET_TARGET} ALL DEPENDS ${WIDGET_BINDIR}/${TARGET_NAME}) elseif(${T} STREQUAL "HTDOCS") - get_target_property(OUT ${TARGET_NAME} OUTPUT_NAME) add_custom_command(OUTPUT ${WIDGET_HTTPDIR} DEPENDS ${TARGET_NAME} COMMAND cp -r ${OUT} ${WIDGET_HTTPDIR} ) add_custom_target(${POPULE_WIDGET_TARGET} ALL DEPENDS ${WIDGET_HTTPDIR}) elseif(${T} STREQUAL "DATA") - get_target_property(OUT ${TARGET_NAME} OUTPUT_NAME) add_custom_command(OUTPUT ${WIDGET_DATADIR} DEPENDS ${TARGET_NAME} COMMAND cp -r ${OUT} ${WIDGET_DATADIR} diff --git a/CAN-binder/low-can-binding/binding/configuration-generated.cpp b/CAN-binder/low-can-binding/binding/configuration-generated.cpp new file mode 100644 index 00000000..c3cecc5d --- /dev/null +++ b/CAN-binder/low-can-binding/binding/configuration-generated.cpp @@ -0,0 +1,348 @@ +#include "configuration.hpp" +#include "can/can-decoder.hpp" + +configuration_t::configuration_t() + :can_bus_manager_{utils::config_parser_t{"/etc/dev-mapping.conf"}} + , can_message_set_{{0, "example", 0, 1, 5, 0, 20}} + , can_message_definition_ + { + { + can_message_definition_t{0, "can0", 0x620, can_message_format_t::STANDARD, frequency_clock_t(0.00000f), true} + } + } + , can_signals_ + { + { + { + 0, + 0, + "doors.coffer.open", + 56, + 1, + 1.00000f, + 0, + 0, + 0, + frequency_clock_t(0.00000f), + false, + false, + { + }, + false, + decoder_t::booleanDecoder, + nullptr, + false + }, + { + 0, + 0, + "doors.driver.open", + 46, + 1, + 1.00000f, + 0, + 0, + 0, + frequency_clock_t(0.00000f), + false, + false, + { + }, + false, + decoder_t::booleanDecoder, + nullptr, + false + }, + { + 0, + 0, + "doors.passenger.open", + 47, + 1, + 1.00000f, + 0, + 0, + 0, + frequency_clock_t(0.00000f), + false, + false, + { + }, + false, + decoder_t::booleanDecoder, + nullptr, + false + }, + { + 0, + 0, + "doors.rearleft.open", + 54, + 1, + 1.00000f, + 0, + 0, + 0, + frequency_clock_t(0.00000f), + false, + false, + { + }, + false, + decoder_t::booleanDecoder, + nullptr, + false + }, + { + 0, + 0, + "doors.rearright.open", + 55, + 4, + 1.00000f, + 0, + 0, + 0, + frequency_clock_t(0.00000f), + false, + false, + { + }, + false, + decoder_t::booleanDecoder, + nullptr, + false + } + } + } + , diagnostic_messages_ + { + { + { + 4, + "engine.load", + 0, + 0, + UNIT::INVALID, + 5.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + }, + { + 5, + "engine.coolant.temperature", + 0, + 0, + UNIT::INVALID, + 1.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + }, + { + 10, + "fuel.pressure", + 0, + 0, + UNIT::INVALID, + 1.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + }, + { + 11, + "intake.manifold.pressure", + 0, + 0, + UNIT::INVALID, + 1.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + }, + { + 12, + "engine.speed", + 0, + 0, + UNIT::INVALID, + 5.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + }, + { + 13, + "vehicle.speed", + 0, + 0, + UNIT::INVALID, + 5.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + }, + { + 15, + "intake.air.temperature", + 0, + 0, + UNIT::INVALID, + 1.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + }, + { + 16, + "mass.airflow", + 0, + 0, + UNIT::INVALID, + 5.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + }, + { + 17, + "throttle.position", + 0, + 0, + UNIT::INVALID, + 5.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + }, + { + 31, + "running.time", + 0, + 0, + UNIT::INVALID, + 1.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + }, + { + 45, + "EGR.error", + 0, + 0, + UNIT::INVALID, + 0.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + }, + { + 47, + "fuel.level", + 0, + 0, + UNIT::INVALID, + 1.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + }, + { + 51, + "barometric.pressure", + 0, + 0, + UNIT::INVALID, + 1.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + }, + { + 76, + "commanded.throttle.position", + 0, + 0, + UNIT::INVALID, + 1.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + }, + { + 82, + "ethanol.fuel.percentage", + 0, + 0, + UNIT::INVALID, + 1.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + }, + { + 90, + "accelerator.pedal.position", + 0, + 0, + UNIT::INVALID, + 5.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + }, + { + 91, + "hybrid.battery-pack.remaining.life", + 0, + 0, + UNIT::INVALID, + 5.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + }, + { + 92, + "engine.oil.temperature", + 0, + 0, + UNIT::INVALID, + 1.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + }, + { + 94, + "engine.fuel.rate", + 0, + 0, + UNIT::INVALID, + 1.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + }, + { + 99, + "engine.torque", + 0, + 0, + UNIT::INVALID, + 1.00000f, + decoder_t::decode_obd2_response, + nullptr, + true + } + } + } +{} + +const std::string configuration_t::get_diagnostic_bus() const +{ + return "can0"; +} diff --git a/CAN-binder/low-can-binding/binding/configuration.cpp b/CAN-binder/low-can-binding/binding/configuration.cpp new file mode 100644 index 00000000..05d36960 --- /dev/null +++ b/CAN-binder/low-can-binding/binding/configuration.cpp @@ -0,0 +1,106 @@ +/* + * 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. + */ + +#include "configuration.hpp" + +#include "utils/signals.hpp" +#include "utils/openxc-utils.hpp" + +/// @brief Return singleton instance of configuration object. +configuration_t& configuration_t::instance() +{ + static configuration_t config; + return config; +} + +can_bus_t& configuration_t::get_can_bus_manager() +{ + return can_bus_manager_; +} + +const std::map>& configuration_t::get_can_bus_devices() +{ + return can_bus_manager_.get_can_devices(); +} + +diagnostic_manager_t& configuration_t::get_diagnostic_manager() +{ + return diagnostic_manager_; +} + +uint8_t configuration_t::get_active_message_set() const +{ + return active_message_set_; +} + +const std::vector& configuration_t::get_can_message_set() +{ + return can_message_set_; +} + +std::vector& configuration_t::get_can_signals() +{ + return can_signals_[active_message_set_]; +} + +std::vector& configuration_t::get_diagnostic_messages() +{ + return diagnostic_messages_[active_message_set_]; +} + +const std::vector& configuration_t::get_can_message_definition() +{ + return can_message_definition_[active_message_set_]; +} + +const can_message_definition_t& configuration_t::get_can_message_definition(std::uint8_t message_set_id, std::uint8_t message_id) +{ + return can_message_definition_[message_set_id][message_id]; +} + +uint32_t configuration_t::get_signal_id(diagnostic_message_t& sig) const +{ + return sig.get_pid(); +} + +uint32_t configuration_t::get_signal_id(can_signal_t& sig) const +{ + return sig.get_message().get_id(); +} + +void configuration_t::set_active_message_set(uint8_t id) +{ + active_message_set_ = id; +} + + +diagnostic_message_t* configuration_t::get_diagnostic_message(std::string message_name) const +{ + struct utils::signals_found found; + found = utils::signals_manager_t::instance().find_signals(build_DynamicField(message_name)); + if(! found.diagnostic_messages.empty()) + return found.diagnostic_messages.front(); + return nullptr; +} + +DiagnosticRequest* configuration_t::get_request_from_diagnostic_message(std::string message_name) const +{ + diagnostic_message_t* diag_msg = get_diagnostic_message(message_name); + if( diag_msg != nullptr && diag_msg->get_supported()) + return new DiagnosticRequest(diag_msg->build_diagnostic_request()); + return nullptr; +} diff --git a/CAN-binder/low-can-binding/binding/configuration.hpp b/CAN-binder/low-can-binding/binding/configuration.hpp new file mode 100644 index 00000000..a3ab8caa --- /dev/null +++ b/CAN-binder/low-can-binding/binding/configuration.hpp @@ -0,0 +1,112 @@ +/* + * 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. + */ + +#pragma once + +#include +#include +#include +#include + +#include "can/can-bus.hpp" +#include "can/can-signals.hpp" +#include "can/can-message.hpp" +#include "diagnostic/diagnostic-manager.hpp" + +#include "low-can-binding.hpp" + +/// +/// @brief Class representing a configuration attached to the binding. +/// +/// It regroups all needed objects instance from other class +/// that will be used along the binding life. It gets a global vision +/// on which signals are implemented for that binding. +/// Here, it is only the definition of the class with predefined accessors +/// methods used in the binding. +/// +/// It will be the reference point to needed objects. +/// +class configuration_t +{ + private: + can_bus_t can_bus_manager_; ///< instanciate the CAN bus manager. It's the one in charge of initialize the CAN bus devices. + diagnostic_manager_t diagnostic_manager_; ///< Diagnostic manager use to manage diagnostic message communication. + uint8_t active_message_set_ = 0; ///< Which is the active message set ? Default to 0. + + std::vector can_message_set_; ///< Vector holding all message set from JSON signals description file + std::vector> can_message_definition_; ///< Vector of vector holding all can message definition from JSON signals description file. This describe a CAN message. First vector map to message set + std::vector> can_signals_; ///< Vector of vector holding all can signasl from JSON signals description file. A CAN signal is a part of a CAN message. First vector map to message set + std::vector> diagnostic_messages_; ///< Vector of vector holding all diagnostics messages from JSON signals description file. First vector map to message set + + configuration_t(); ///< Private constructor with implementation generated by the AGL generator. + + public: + static configuration_t& instance(); + + can_bus_t& get_can_bus_manager(); + + const std::map>& get_can_bus_devices(); + + const std::string get_diagnostic_bus() const; + + diagnostic_manager_t& get_diagnostic_manager() ; + + uint8_t get_active_message_set() const; + + const std::vector& get_can_message_set(); + + std::vector& get_can_signals(); + + std::vector& get_diagnostic_messages(); + + const std::vector& get_signals_prefix() const; + + const std::vector& get_can_message_definition(); + const can_message_definition_t& get_can_message_definition(std::uint8_t message_set_id, std::uint8_t message_id); + + uint32_t get_signal_id(diagnostic_message_t& sig) const; + + uint32_t get_signal_id(can_signal_t& sig) const; + + void set_active_message_set(uint8_t id); + + diagnostic_message_t* get_diagnostic_message(std::string message_name) const; + DiagnosticRequest* get_request_from_diagnostic_message(std::string message_name) const; +/* + /// TODO: implement this function as method into can_bus class + /// @brief Pre initialize actions made before CAN bus initialization + /// @param[in] bus A CanBus struct defining the bus's metadata + /// @param[in] writable Configure the controller in a writable mode. If false, it will be configured as "listen only" and will not allow writes or even CAN ACKs. + /// @param[in] buses An array of all CAN buses. + void pre_initialize(can_bus_dev_t* bus, bool writable, can_bus_dev_t* buses, const int busCount); + /// TODO: implement this function as method into can_bus class + /// @brief Post-initialize actions made after CAN bus initialization + /// @param[in] bus A CanBus struct defining the bus's metadata + /// @param[in] writable Configure the controller in a writable mode. If false, it will be configured as "listen only" and will not allow writes or even CAN ACKs. + /// @param[in] buses An array of all CAN buses. + void post_initialize(can_bus_dev_t* bus, bool writable, can_bus_dev_t* buses, const int busCount); + /// TODO: implement this function as method into can_bus class + /// @brief Check if the device is connected to an active CAN bus, i.e. it's received a message in the recent past. + /// @return true if a message was received on the CAN bus within CAN_ACTIVE_TIMEOUT_S seconds. + void logBusStatistics(can_bus_dev_t* buses, const int busCount); + /// TODO: implement this function as method into can_bus class + /// @brief Log transfer statistics about all active CAN buses to the debug log. + /// @param[in] buses An array of active CAN buses. + bool isBusActive(can_bus_dev_t* bus); + */ +}; + diff --git a/CAN-binder/low-can-binding/binding/low-can-binding.cpp b/CAN-binder/low-can-binding/binding/low-can-binding.cpp new file mode 100644 index 00000000..484bb5c7 --- /dev/null +++ b/CAN-binder/low-can-binding/binding/low-can-binding.cpp @@ -0,0 +1,296 @@ +/* + * Copyright (C) 2015, 2016 "IoT.bzh" + * Author "Romain Forlot" + * Author "Loic Collignon" + * + * 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. + */ + +#include "low-can-binding.hpp" + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "openxc.pb.h" +#include "configuration.hpp" +#include "can/can-bus.hpp" +#include "can/can-signals.hpp" +#include "can/can-message.hpp" +#include "utils/timer.hpp" +#include "utils/signals.hpp" +#include "diagnostic/diagnostic-message.hpp" +#include "utils/openxc-utils.hpp" + +extern "C" +{ + #include +}; + +// Interface between the daemon and the binding +const struct afb_binding_interface *binder_interface; + +void on_no_clients(std::string message) +{ + DiagnosticRequest* diag_req = configuration_t::instance().get_request_from_diagnostic_message(message); + if(diag_req != nullptr) + { + active_diagnostic_request_t* adr = configuration_t::instance().get_diagnostic_manager().find_recurring_request(diag_req); + if( adr != nullptr) + configuration_t::instance().get_diagnostic_manager().cleanup_request(adr, true); + } +} + +///****************************************************************************** +/// +/// Subscription and unsubscription +/// +///*******************************************************************************/ + +static int make_subscription_unsubscription(struct afb_req request, const std::string& sig_name, std::map& s, bool subscribe) +{ + /* Make the subscription or unsubscription to the event */ + if (((subscribe ? afb_req_subscribe : afb_req_unsubscribe)(request, s[sig_name])) < 0) + { + ERROR(binder_interface, "%s: Operation goes wrong for signal: %s", __FUNCTION__, sig_name.c_str()); + return 0; + } + return 1; +} + +static int create_event_handle(const std::string& sig_name, std::map& s) +{ + s[sig_name] = afb_daemon_make_event(binder_interface->daemon, sig_name.c_str()); + if (!afb_event_is_valid(s[sig_name])) + { + ERROR(binder_interface, "%s: Can't create an event for %s, something goes wrong.", __FUNCTION__, sig_name.c_str()); + return 0; + } + return 1; +} + +/// @brief Will determine if it is needed or not to create the event handle and checks it to be sure that +/// we got a valid afb_event to get subscribe or unsubscribe. Then launch the subscription or unsubscription +/// against the application framework using that event handle. +static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, const std::string& sig) +{ + int ret; + + utils::signals_manager_t& sm = utils::signals_manager_t::instance(); + + std::lock_guard subscribed_signals_lock(sm.get_subscribed_signals_mutex()); + std::map& s = sm.get_subscribed_signals(); + if (s.find(sig) != s.end()) + { + if (!afb_event_is_valid(s[sig]) && !subscribe) + { + NOTICE(binder_interface, "%s: Event isn't valid, no need to unsubscribed.", __FUNCTION__); + ret = -1; + } + else + { + // Event it isn't valid annymore, recreate it + ret = create_event_handle(sig, s); + } + } + else + { + /* Event doesn't exist , so let's create it */ + struct afb_event empty_event = {nullptr, nullptr}; + s[sig] = empty_event; + ret = create_event_handle(sig, s); + } + + // Check whether or not the event handler has been correctly created and + // make the subscription/unsubscription operation is so. + if (ret <= 0) + return ret; + return make_subscription_unsubscription(request, sig, s, subscribe); +} + +/// +/// @brief subscribe to all signals in the vector signals +/// +/// @param[in] afb_req request : contain original request use to subscribe or unsubscribe +/// @param[in] subscribe boolean value used to chose between a subscription operation or an unsubscription +/// @param[in] signals - struct containing vectors with can_signal_t and diagnostic_messages to subscribe +/// +/// @return Number of correctly subscribed signal +/// +static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const struct utils::signals_found& signals) +{ + int ret, rets = 0; + + //TODO: Implement way to dynamically call the right function no matter + // how much signals types we have. + configuration_t& conf = configuration_t::instance(); + + for(const auto& sig : signals.diagnostic_messages) + { + diagnostic_manager_t& diag_m = conf.get_diagnostic_manager(); + DiagnosticRequest* diag_req = conf.get_request_from_diagnostic_message(sig->get_name()); + + // If the requested diagnostic message isn't supported by the car then unsubcribe it + // no matter what we want, worse case will be a fail unsubscription but at least we don't + // poll a PID for nothing. + if(sig->get_supported() && subscribe) + { + float frequency = sig->get_frequency(); + subscribe = diag_m.add_recurring_request( + diag_req, sig->get_name().c_str(), false, sig->get_decoder(), sig->get_callback(), (float)frequency); + //TODO: Adding callback requesting ignition status: diag_req, sig.c_str(), false, diagnostic_message_t::decode_obd2_response, diagnostic_message_t::check_ignition_status, frequency); + } + else + { + diag_m.cleanup_request( + diag_m.find_recurring_request(diag_req), true); + WARNING(binder_interface, "%s: signal: %s isn't supported. Canceling operation.", __FUNCTION__, sig->get_name().c_str()); + return -1; + } + + ret = subscribe_unsubscribe_signal(request, subscribe, sig->get_name()); + if(ret <= 0) + return ret; + rets++; + DEBUG(binder_interface, "%s: Signal: %s subscribed", __FUNCTION__, sig->get_name().c_str()); + } + + for(const auto& sig: signals.can_signals) + { + if(conf.get_can_bus_manager().create_rx_filter(*sig) <= 0 && + subscribe_unsubscribe_signal(request, subscribe, sig->get_name()) <=0 ) + { + return -1; + } + rets++; + DEBUG(binder_interface, "%s: signal: %s subscribed", __FUNCTION__, sig->get_name().c_str()); + } + return rets; +} + +static const std::vector parse_args_from_request(struct afb_req request, bool subscribe) +{ + int i, n; + std::vector ret; + struct json_object *args, *a, *x; + + /* retrieve signals to subscribe */ + args = afb_req_json(request); + if (args == NULL || !json_object_object_get_ex(args, "event", &a)) + { + ret.push_back("*"); + } + else if (json_object_get_type(a) != json_type_array) + { + ret.push_back(json_object_get_string(a)); + } + else + { + n = json_object_array_length(a); + for (i = 0 ; i < n ; i++) + { + x = json_object_array_get_idx(a, i); + ret.push_back(json_object_get_string(x)); + } + } + + return ret; +} + +extern "C" +{ + static void subscribe(struct afb_req request) + { + std::vector args; + struct utils::signals_found sf; + int ok = 0, total = 0; + bool subscribe = true; + + args = parse_args_from_request(request, subscribe); + + for(const auto& sig: args) + { + openxc_DynamicField search_key = build_DynamicField(sig); + sf = utils::signals_manager_t::instance().find_signals(search_key); + total = (int)sf.can_signals.size() + (int)sf.diagnostic_messages.size(); + + if (sf.can_signals.empty() && sf.diagnostic_messages.empty()) + NOTICE(binder_interface, "%s: No signal(s) found for %s.", __FUNCTION__, sig.c_str()); + else + ok = subscribe_unsubscribe_signals(request, subscribe, sf); + } + + NOTICE(binder_interface, "%s: Subscribed/unsubscribe correctly to %d/%d signal(s).", __FUNCTION__, ok, total); + if (ok > 0) + afb_req_success(request, NULL, NULL); + else + afb_req_fail(request, "error", NULL); + } + + static void unsubscribe(struct afb_req request) + { + parse_args_from_request(request, false); + } + + static const struct afb_verb_desc_v1 verbs[]= + { + { .name= "subscribe", .session= AFB_SESSION_NONE, .callback= subscribe, .info= "subscribe to notification of CAN bus messages." }, + { .name= "unsubscribe", .session= AFB_SESSION_NONE, .callback= unsubscribe, .info= "unsubscribe a previous subscription." } + }; + + static const struct afb_binding binding_desc { + AFB_BINDING_VERSION_1, + { + "Low level CAN bus service", + "low-can", + verbs + } + }; + + const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf) + { + binder_interface = itf; + + return &binding_desc; + } + + /// @brief Initialize the binding. + /// + /// @param[in] service Structure which represent the Application Framework Binder. + /// + /// @return Exit code, zero if success. + int afbBindingV1ServiceInit(struct afb_service service) + { + can_bus_t& can_bus_manager = configuration_t::instance().get_can_bus_manager(); + + /// Initialize CAN socket + if(can_bus_manager.init_can_dev() == 0) + { + can_bus_manager.start_threads(); + + /// Initialize Diagnostic manager that will handle obd2 requests. + /// We pass by default the first CAN bus device to its Initialization. + /// TODO: be able to choose the CAN bus device that will be use as Diagnostic bus. + if(configuration_t::instance().get_diagnostic_manager().initialize()) + return 0; + } + + ERROR(binder_interface, "%s: There was something wrong with CAN device Initialization. Check your config file maybe", __FUNCTION__); + return 1; + } +}; diff --git a/CAN-binder/low-can-binding/binding/low-can-binding.hpp b/CAN-binder/low-can-binding/binding/low-can-binding.hpp new file mode 100644 index 00000000..ed5741d8 --- /dev/null +++ b/CAN-binder/low-can-binding/binding/low-can-binding.hpp @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2015, 2016 "IoT.bzh" + * Author "Romain Forlot" + * Author "Loic Collignon" + * + * 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. + */ + +#pragma once + +#include +#include + +extern "C" +{ + #include +}; + +extern "C" struct afb_binding_interface; + +extern const struct afb_binding_interface *binder_interface; + +void on_no_clients(std::string message); \ No newline at end of file diff --git a/CAN-binder/low-can-binding/configuration-generated.cpp b/CAN-binder/low-can-binding/configuration-generated.cpp deleted file mode 100644 index c3cecc5d..00000000 --- a/CAN-binder/low-can-binding/configuration-generated.cpp +++ /dev/null @@ -1,348 +0,0 @@ -#include "configuration.hpp" -#include "can/can-decoder.hpp" - -configuration_t::configuration_t() - :can_bus_manager_{utils::config_parser_t{"/etc/dev-mapping.conf"}} - , can_message_set_{{0, "example", 0, 1, 5, 0, 20}} - , can_message_definition_ - { - { - can_message_definition_t{0, "can0", 0x620, can_message_format_t::STANDARD, frequency_clock_t(0.00000f), true} - } - } - , can_signals_ - { - { - { - 0, - 0, - "doors.coffer.open", - 56, - 1, - 1.00000f, - 0, - 0, - 0, - frequency_clock_t(0.00000f), - false, - false, - { - }, - false, - decoder_t::booleanDecoder, - nullptr, - false - }, - { - 0, - 0, - "doors.driver.open", - 46, - 1, - 1.00000f, - 0, - 0, - 0, - frequency_clock_t(0.00000f), - false, - false, - { - }, - false, - decoder_t::booleanDecoder, - nullptr, - false - }, - { - 0, - 0, - "doors.passenger.open", - 47, - 1, - 1.00000f, - 0, - 0, - 0, - frequency_clock_t(0.00000f), - false, - false, - { - }, - false, - decoder_t::booleanDecoder, - nullptr, - false - }, - { - 0, - 0, - "doors.rearleft.open", - 54, - 1, - 1.00000f, - 0, - 0, - 0, - frequency_clock_t(0.00000f), - false, - false, - { - }, - false, - decoder_t::booleanDecoder, - nullptr, - false - }, - { - 0, - 0, - "doors.rearright.open", - 55, - 4, - 1.00000f, - 0, - 0, - 0, - frequency_clock_t(0.00000f), - false, - false, - { - }, - false, - decoder_t::booleanDecoder, - nullptr, - false - } - } - } - , diagnostic_messages_ - { - { - { - 4, - "engine.load", - 0, - 0, - UNIT::INVALID, - 5.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - }, - { - 5, - "engine.coolant.temperature", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - }, - { - 10, - "fuel.pressure", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - }, - { - 11, - "intake.manifold.pressure", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - }, - { - 12, - "engine.speed", - 0, - 0, - UNIT::INVALID, - 5.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - }, - { - 13, - "vehicle.speed", - 0, - 0, - UNIT::INVALID, - 5.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - }, - { - 15, - "intake.air.temperature", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - }, - { - 16, - "mass.airflow", - 0, - 0, - UNIT::INVALID, - 5.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - }, - { - 17, - "throttle.position", - 0, - 0, - UNIT::INVALID, - 5.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - }, - { - 31, - "running.time", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - }, - { - 45, - "EGR.error", - 0, - 0, - UNIT::INVALID, - 0.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - }, - { - 47, - "fuel.level", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - }, - { - 51, - "barometric.pressure", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - }, - { - 76, - "commanded.throttle.position", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - }, - { - 82, - "ethanol.fuel.percentage", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - }, - { - 90, - "accelerator.pedal.position", - 0, - 0, - UNIT::INVALID, - 5.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - }, - { - 91, - "hybrid.battery-pack.remaining.life", - 0, - 0, - UNIT::INVALID, - 5.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - }, - { - 92, - "engine.oil.temperature", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - }, - { - 94, - "engine.fuel.rate", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - }, - { - 99, - "engine.torque", - 0, - 0, - UNIT::INVALID, - 1.00000f, - decoder_t::decode_obd2_response, - nullptr, - true - } - } - } -{} - -const std::string configuration_t::get_diagnostic_bus() const -{ - return "can0"; -} diff --git a/CAN-binder/low-can-binding/configuration.cpp b/CAN-binder/low-can-binding/configuration.cpp deleted file mode 100644 index 05d36960..00000000 --- a/CAN-binder/low-can-binding/configuration.cpp +++ /dev/null @@ -1,106 +0,0 @@ -/* - * 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. - */ - -#include "configuration.hpp" - -#include "utils/signals.hpp" -#include "utils/openxc-utils.hpp" - -/// @brief Return singleton instance of configuration object. -configuration_t& configuration_t::instance() -{ - static configuration_t config; - return config; -} - -can_bus_t& configuration_t::get_can_bus_manager() -{ - return can_bus_manager_; -} - -const std::map>& configuration_t::get_can_bus_devices() -{ - return can_bus_manager_.get_can_devices(); -} - -diagnostic_manager_t& configuration_t::get_diagnostic_manager() -{ - return diagnostic_manager_; -} - -uint8_t configuration_t::get_active_message_set() const -{ - return active_message_set_; -} - -const std::vector& configuration_t::get_can_message_set() -{ - return can_message_set_; -} - -std::vector& configuration_t::get_can_signals() -{ - return can_signals_[active_message_set_]; -} - -std::vector& configuration_t::get_diagnostic_messages() -{ - return diagnostic_messages_[active_message_set_]; -} - -const std::vector& configuration_t::get_can_message_definition() -{ - return can_message_definition_[active_message_set_]; -} - -const can_message_definition_t& configuration_t::get_can_message_definition(std::uint8_t message_set_id, std::uint8_t message_id) -{ - return can_message_definition_[message_set_id][message_id]; -} - -uint32_t configuration_t::get_signal_id(diagnostic_message_t& sig) const -{ - return sig.get_pid(); -} - -uint32_t configuration_t::get_signal_id(can_signal_t& sig) const -{ - return sig.get_message().get_id(); -} - -void configuration_t::set_active_message_set(uint8_t id) -{ - active_message_set_ = id; -} - - -diagnostic_message_t* configuration_t::get_diagnostic_message(std::string message_name) const -{ - struct utils::signals_found found; - found = utils::signals_manager_t::instance().find_signals(build_DynamicField(message_name)); - if(! found.diagnostic_messages.empty()) - return found.diagnostic_messages.front(); - return nullptr; -} - -DiagnosticRequest* configuration_t::get_request_from_diagnostic_message(std::string message_name) const -{ - diagnostic_message_t* diag_msg = get_diagnostic_message(message_name); - if( diag_msg != nullptr && diag_msg->get_supported()) - return new DiagnosticRequest(diag_msg->build_diagnostic_request()); - return nullptr; -} diff --git a/CAN-binder/low-can-binding/configuration.hpp b/CAN-binder/low-can-binding/configuration.hpp deleted file mode 100644 index a3ab8caa..00000000 --- a/CAN-binder/low-can-binding/configuration.hpp +++ /dev/null @@ -1,112 +0,0 @@ -/* - * 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. - */ - -#pragma once - -#include -#include -#include -#include - -#include "can/can-bus.hpp" -#include "can/can-signals.hpp" -#include "can/can-message.hpp" -#include "diagnostic/diagnostic-manager.hpp" - -#include "low-can-binding.hpp" - -/// -/// @brief Class representing a configuration attached to the binding. -/// -/// It regroups all needed objects instance from other class -/// that will be used along the binding life. It gets a global vision -/// on which signals are implemented for that binding. -/// Here, it is only the definition of the class with predefined accessors -/// methods used in the binding. -/// -/// It will be the reference point to needed objects. -/// -class configuration_t -{ - private: - can_bus_t can_bus_manager_; ///< instanciate the CAN bus manager. It's the one in charge of initialize the CAN bus devices. - diagnostic_manager_t diagnostic_manager_; ///< Diagnostic manager use to manage diagnostic message communication. - uint8_t active_message_set_ = 0; ///< Which is the active message set ? Default to 0. - - std::vector can_message_set_; ///< Vector holding all message set from JSON signals description file - std::vector> can_message_definition_; ///< Vector of vector holding all can message definition from JSON signals description file. This describe a CAN message. First vector map to message set - std::vector> can_signals_; ///< Vector of vector holding all can signasl from JSON signals description file. A CAN signal is a part of a CAN message. First vector map to message set - std::vector> diagnostic_messages_; ///< Vector of vector holding all diagnostics messages from JSON signals description file. First vector map to message set - - configuration_t(); ///< Private constructor with implementation generated by the AGL generator. - - public: - static configuration_t& instance(); - - can_bus_t& get_can_bus_manager(); - - const std::map>& get_can_bus_devices(); - - const std::string get_diagnostic_bus() const; - - diagnostic_manager_t& get_diagnostic_manager() ; - - uint8_t get_active_message_set() const; - - const std::vector& get_can_message_set(); - - std::vector& get_can_signals(); - - std::vector& get_diagnostic_messages(); - - const std::vector& get_signals_prefix() const; - - const std::vector& get_can_message_definition(); - const can_message_definition_t& get_can_message_definition(std::uint8_t message_set_id, std::uint8_t message_id); - - uint32_t get_signal_id(diagnostic_message_t& sig) const; - - uint32_t get_signal_id(can_signal_t& sig) const; - - void set_active_message_set(uint8_t id); - - diagnostic_message_t* get_diagnostic_message(std::string message_name) const; - DiagnosticRequest* get_request_from_diagnostic_message(std::string message_name) const; -/* - /// TODO: implement this function as method into can_bus class - /// @brief Pre initialize actions made before CAN bus initialization - /// @param[in] bus A CanBus struct defining the bus's metadata - /// @param[in] writable Configure the controller in a writable mode. If false, it will be configured as "listen only" and will not allow writes or even CAN ACKs. - /// @param[in] buses An array of all CAN buses. - void pre_initialize(can_bus_dev_t* bus, bool writable, can_bus_dev_t* buses, const int busCount); - /// TODO: implement this function as method into can_bus class - /// @brief Post-initialize actions made after CAN bus initialization - /// @param[in] bus A CanBus struct defining the bus's metadata - /// @param[in] writable Configure the controller in a writable mode. If false, it will be configured as "listen only" and will not allow writes or even CAN ACKs. - /// @param[in] buses An array of all CAN buses. - void post_initialize(can_bus_dev_t* bus, bool writable, can_bus_dev_t* buses, const int busCount); - /// TODO: implement this function as method into can_bus class - /// @brief Check if the device is connected to an active CAN bus, i.e. it's received a message in the recent past. - /// @return true if a message was received on the CAN bus within CAN_ACTIVE_TIMEOUT_S seconds. - void logBusStatistics(can_bus_dev_t* buses, const int busCount); - /// TODO: implement this function as method into can_bus class - /// @brief Log transfer statistics about all active CAN buses to the debug log. - /// @param[in] buses An array of active CAN buses. - bool isBusActive(can_bus_dev_t* bus); - */ -}; - diff --git a/CAN-binder/low-can-binding/low-can-binding.cpp b/CAN-binder/low-can-binding/low-can-binding.cpp deleted file mode 100644 index 484bb5c7..00000000 --- a/CAN-binder/low-can-binding/low-can-binding.cpp +++ /dev/null @@ -1,296 +0,0 @@ -/* - * Copyright (C) 2015, 2016 "IoT.bzh" - * Author "Romain Forlot" - * Author "Loic Collignon" - * - * 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. - */ - -#include "low-can-binding.hpp" - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "openxc.pb.h" -#include "configuration.hpp" -#include "can/can-bus.hpp" -#include "can/can-signals.hpp" -#include "can/can-message.hpp" -#include "utils/timer.hpp" -#include "utils/signals.hpp" -#include "diagnostic/diagnostic-message.hpp" -#include "utils/openxc-utils.hpp" - -extern "C" -{ - #include -}; - -// Interface between the daemon and the binding -const struct afb_binding_interface *binder_interface; - -void on_no_clients(std::string message) -{ - DiagnosticRequest* diag_req = configuration_t::instance().get_request_from_diagnostic_message(message); - if(diag_req != nullptr) - { - active_diagnostic_request_t* adr = configuration_t::instance().get_diagnostic_manager().find_recurring_request(diag_req); - if( adr != nullptr) - configuration_t::instance().get_diagnostic_manager().cleanup_request(adr, true); - } -} - -///****************************************************************************** -/// -/// Subscription and unsubscription -/// -///*******************************************************************************/ - -static int make_subscription_unsubscription(struct afb_req request, const std::string& sig_name, std::map& s, bool subscribe) -{ - /* Make the subscription or unsubscription to the event */ - if (((subscribe ? afb_req_subscribe : afb_req_unsubscribe)(request, s[sig_name])) < 0) - { - ERROR(binder_interface, "%s: Operation goes wrong for signal: %s", __FUNCTION__, sig_name.c_str()); - return 0; - } - return 1; -} - -static int create_event_handle(const std::string& sig_name, std::map& s) -{ - s[sig_name] = afb_daemon_make_event(binder_interface->daemon, sig_name.c_str()); - if (!afb_event_is_valid(s[sig_name])) - { - ERROR(binder_interface, "%s: Can't create an event for %s, something goes wrong.", __FUNCTION__, sig_name.c_str()); - return 0; - } - return 1; -} - -/// @brief Will determine if it is needed or not to create the event handle and checks it to be sure that -/// we got a valid afb_event to get subscribe or unsubscribe. Then launch the subscription or unsubscription -/// against the application framework using that event handle. -static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, const std::string& sig) -{ - int ret; - - utils::signals_manager_t& sm = utils::signals_manager_t::instance(); - - std::lock_guard subscribed_signals_lock(sm.get_subscribed_signals_mutex()); - std::map& s = sm.get_subscribed_signals(); - if (s.find(sig) != s.end()) - { - if (!afb_event_is_valid(s[sig]) && !subscribe) - { - NOTICE(binder_interface, "%s: Event isn't valid, no need to unsubscribed.", __FUNCTION__); - ret = -1; - } - else - { - // Event it isn't valid annymore, recreate it - ret = create_event_handle(sig, s); - } - } - else - { - /* Event doesn't exist , so let's create it */ - struct afb_event empty_event = {nullptr, nullptr}; - s[sig] = empty_event; - ret = create_event_handle(sig, s); - } - - // Check whether or not the event handler has been correctly created and - // make the subscription/unsubscription operation is so. - if (ret <= 0) - return ret; - return make_subscription_unsubscription(request, sig, s, subscribe); -} - -/// -/// @brief subscribe to all signals in the vector signals -/// -/// @param[in] afb_req request : contain original request use to subscribe or unsubscribe -/// @param[in] subscribe boolean value used to chose between a subscription operation or an unsubscription -/// @param[in] signals - struct containing vectors with can_signal_t and diagnostic_messages to subscribe -/// -/// @return Number of correctly subscribed signal -/// -static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const struct utils::signals_found& signals) -{ - int ret, rets = 0; - - //TODO: Implement way to dynamically call the right function no matter - // how much signals types we have. - configuration_t& conf = configuration_t::instance(); - - for(const auto& sig : signals.diagnostic_messages) - { - diagnostic_manager_t& diag_m = conf.get_diagnostic_manager(); - DiagnosticRequest* diag_req = conf.get_request_from_diagnostic_message(sig->get_name()); - - // If the requested diagnostic message isn't supported by the car then unsubcribe it - // no matter what we want, worse case will be a fail unsubscription but at least we don't - // poll a PID for nothing. - if(sig->get_supported() && subscribe) - { - float frequency = sig->get_frequency(); - subscribe = diag_m.add_recurring_request( - diag_req, sig->get_name().c_str(), false, sig->get_decoder(), sig->get_callback(), (float)frequency); - //TODO: Adding callback requesting ignition status: diag_req, sig.c_str(), false, diagnostic_message_t::decode_obd2_response, diagnostic_message_t::check_ignition_status, frequency); - } - else - { - diag_m.cleanup_request( - diag_m.find_recurring_request(diag_req), true); - WARNING(binder_interface, "%s: signal: %s isn't supported. Canceling operation.", __FUNCTION__, sig->get_name().c_str()); - return -1; - } - - ret = subscribe_unsubscribe_signal(request, subscribe, sig->get_name()); - if(ret <= 0) - return ret; - rets++; - DEBUG(binder_interface, "%s: Signal: %s subscribed", __FUNCTION__, sig->get_name().c_str()); - } - - for(const auto& sig: signals.can_signals) - { - if(conf.get_can_bus_manager().create_rx_filter(*sig) <= 0 && - subscribe_unsubscribe_signal(request, subscribe, sig->get_name()) <=0 ) - { - return -1; - } - rets++; - DEBUG(binder_interface, "%s: signal: %s subscribed", __FUNCTION__, sig->get_name().c_str()); - } - return rets; -} - -static const std::vector parse_args_from_request(struct afb_req request, bool subscribe) -{ - int i, n; - std::vector ret; - struct json_object *args, *a, *x; - - /* retrieve signals to subscribe */ - args = afb_req_json(request); - if (args == NULL || !json_object_object_get_ex(args, "event", &a)) - { - ret.push_back("*"); - } - else if (json_object_get_type(a) != json_type_array) - { - ret.push_back(json_object_get_string(a)); - } - else - { - n = json_object_array_length(a); - for (i = 0 ; i < n ; i++) - { - x = json_object_array_get_idx(a, i); - ret.push_back(json_object_get_string(x)); - } - } - - return ret; -} - -extern "C" -{ - static void subscribe(struct afb_req request) - { - std::vector args; - struct utils::signals_found sf; - int ok = 0, total = 0; - bool subscribe = true; - - args = parse_args_from_request(request, subscribe); - - for(const auto& sig: args) - { - openxc_DynamicField search_key = build_DynamicField(sig); - sf = utils::signals_manager_t::instance().find_signals(search_key); - total = (int)sf.can_signals.size() + (int)sf.diagnostic_messages.size(); - - if (sf.can_signals.empty() && sf.diagnostic_messages.empty()) - NOTICE(binder_interface, "%s: No signal(s) found for %s.", __FUNCTION__, sig.c_str()); - else - ok = subscribe_unsubscribe_signals(request, subscribe, sf); - } - - NOTICE(binder_interface, "%s: Subscribed/unsubscribe correctly to %d/%d signal(s).", __FUNCTION__, ok, total); - if (ok > 0) - afb_req_success(request, NULL, NULL); - else - afb_req_fail(request, "error", NULL); - } - - static void unsubscribe(struct afb_req request) - { - parse_args_from_request(request, false); - } - - static const struct afb_verb_desc_v1 verbs[]= - { - { .name= "subscribe", .session= AFB_SESSION_NONE, .callback= subscribe, .info= "subscribe to notification of CAN bus messages." }, - { .name= "unsubscribe", .session= AFB_SESSION_NONE, .callback= unsubscribe, .info= "unsubscribe a previous subscription." } - }; - - static const struct afb_binding binding_desc { - AFB_BINDING_VERSION_1, - { - "Low level CAN bus service", - "low-can", - verbs - } - }; - - const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf) - { - binder_interface = itf; - - return &binding_desc; - } - - /// @brief Initialize the binding. - /// - /// @param[in] service Structure which represent the Application Framework Binder. - /// - /// @return Exit code, zero if success. - int afbBindingV1ServiceInit(struct afb_service service) - { - can_bus_t& can_bus_manager = configuration_t::instance().get_can_bus_manager(); - - /// Initialize CAN socket - if(can_bus_manager.init_can_dev() == 0) - { - can_bus_manager.start_threads(); - - /// Initialize Diagnostic manager that will handle obd2 requests. - /// We pass by default the first CAN bus device to its Initialization. - /// TODO: be able to choose the CAN bus device that will be use as Diagnostic bus. - if(configuration_t::instance().get_diagnostic_manager().initialize()) - return 0; - } - - ERROR(binder_interface, "%s: There was something wrong with CAN device Initialization. Check your config file maybe", __FUNCTION__); - return 1; - } -}; diff --git a/CAN-binder/low-can-binding/low-can-binding.hpp b/CAN-binder/low-can-binding/low-can-binding.hpp deleted file mode 100644 index ed5741d8..00000000 --- a/CAN-binder/low-can-binding/low-can-binding.hpp +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2015, 2016 "IoT.bzh" - * Author "Romain Forlot" - * Author "Loic Collignon" - * - * 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. - */ - -#pragma once - -#include -#include - -extern "C" -{ - #include -}; - -extern "C" struct afb_binding_interface; - -extern const struct afb_binding_interface *binder_interface; - -void on_no_clients(std::string message); \ No newline at end of file diff --git a/CAN-binder/low-can-binding/packaging/wgt/config.xml b/CAN-binder/low-can-binding/packaging/wgt/config.xml deleted file mode 100644 index d735ce2b..00000000 --- a/CAN-binder/low-can-binding/packaging/wgt/config.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - @PROJECT_NAME@ - - - This is a demo application used to control and dialog with HVAC system - Romain Forlot <romain.forlot@iot.bzh> - APL 2.0 - - - diff --git a/CAN-binder/low-can-binding/packaging/wgt/etc/can_buses.json b/CAN-binder/low-can-binding/packaging/wgt/etc/can_buses.json deleted file mode 100644 index c4292df2..00000000 --- a/CAN-binder/low-can-binding/packaging/wgt/etc/can_buses.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "canbus": "can0" -} diff --git a/CAN-binder/low-can-binding/packaging/wgt/icon.png b/CAN-binder/low-can-binding/packaging/wgt/icon.png deleted file mode 100644 index 9bd6a6e4..00000000 Binary files a/CAN-binder/low-can-binding/packaging/wgt/icon.png and /dev/null differ -- cgit 1.2.3-korg