From 692376f019562e48ddef074b427f2397cae25087 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Fri, 5 May 2017 18:31:41 +0200 Subject: Separation between hat and callback binding parts As well as handling reading signals BCM socket using systemd event loop. Change-Id: I1e121635ec5db489b2bcb88a3101e716bf8883d5 Signed-off-by: Romain Forlot --- .../low-can-binding/binding/configuration.hpp | 2 +- .../low-can-binding/binding/low-can-binding.cpp | 296 --------------------- .../low-can-binding/binding/low-can-binding.hpp | 33 --- CAN-binder/low-can-binding/binding/low-can-cb.cpp | 252 ++++++++++++++++++ CAN-binder/low-can-binding/binding/low-can-hat.cpp | 86 ++++++ CAN-binder/low-can-binding/binding/low-can-hat.hpp | 36 +++ CAN-binder/low-can-binding/can/can-bus-dev.cpp | 4 +- CAN-binder/low-can-binding/can/can-bus.hpp | 2 +- CAN-binder/low-can-binding/can/can-decoder.cpp | 2 +- CAN-binder/low-can-binding/can/can-message.cpp | 2 +- CAN-binder/low-can-binding/utils/config-parser.cpp | 2 +- CAN-binder/low-can-binding/utils/signals.hpp | 2 +- CAN-binder/low-can-binding/utils/socketcan.hpp | 2 +- 13 files changed, 382 insertions(+), 339 deletions(-) delete mode 100644 CAN-binder/low-can-binding/binding/low-can-binding.cpp delete mode 100644 CAN-binder/low-can-binding/binding/low-can-binding.hpp create mode 100644 CAN-binder/low-can-binding/binding/low-can-cb.cpp create mode 100644 CAN-binder/low-can-binding/binding/low-can-hat.cpp create mode 100644 CAN-binder/low-can-binding/binding/low-can-hat.hpp diff --git a/CAN-binder/low-can-binding/binding/configuration.hpp b/CAN-binder/low-can-binding/binding/configuration.hpp index ab799e81..10bdf4b4 100644 --- a/CAN-binder/low-can-binding/binding/configuration.hpp +++ b/CAN-binder/low-can-binding/binding/configuration.hpp @@ -27,7 +27,7 @@ #include "../can/can-message.hpp" #include "../diagnostic/diagnostic-manager.hpp" -#include "low-can-binding.hpp" +#include "low-can-hat.hpp" /// /// @brief Class representing a configuration attached to the binding. diff --git a/CAN-binder/low-can-binding/binding/low-can-binding.cpp b/CAN-binder/low-can-binding/binding/low-can-binding.cpp deleted file mode 100644 index 99d14718..00000000 --- a/CAN-binder/low-can-binding/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/binding/low-can-binding.hpp b/CAN-binder/low-can-binding/binding/low-can-binding.hpp deleted file mode 100644 index ed5741d8..00000000 --- a/CAN-binder/low-can-binding/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/binding/low-can-cb.cpp b/CAN-binder/low-can-binding/binding/low-can-cb.cpp new file mode 100644 index 00000000..414fa910 --- /dev/null +++ b/CAN-binder/low-can-binding/binding/low-can-cb.cpp @@ -0,0 +1,252 @@ +/* + * 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-hat.hpp" + +#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 +}; + +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); + } +} + +int read(sd_event_source *s, int fd, uint32_t revents, void *userdata) +{ + can_signal_t* sig= (can_signal_t*)userdata; + if(sig->read_socket() != can_message_format_t::ERROR) + return 0; + return -1; +} + +///****************************************************************************** +/// +/// 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(sig->create_rx_filter() <= 0 && + subscribe_unsubscribe_signal(request, subscribe, sig->get_name()) <=0) + { + return -1; + } + struct sd_event_source* e_source; + sd_event_add_io(afb_daemon_get_event_loop(binder_interface->daemon), &e_source, sig->get_socket().socket(), EPOLLIN, read, sig); + 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; +} + +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); +} + + void unsubscribe(struct afb_req request) +{ + parse_args_from_request(request, false); +} \ No newline at end of file diff --git a/CAN-binder/low-can-binding/binding/low-can-hat.cpp b/CAN-binder/low-can-binding/binding/low-can-hat.cpp new file mode 100644 index 00000000..b115a964 --- /dev/null +++ b/CAN-binder/low-can-binding/binding/low-can-hat.cpp @@ -0,0 +1,86 @@ +/* + * 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-hat.hpp" + +#include +#include +#include +#include +#include + +#include "configuration.hpp" +#include "../can/can-bus.hpp" + +extern "C" +{ + #include +}; + +// Interface between the daemon and the binding +const struct afb_binding_interface *binder_interface; + +extern "C" +{ + 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-hat.hpp b/CAN-binder/low-can-binding/binding/low-can-hat.hpp new file mode 100644 index 00000000..7df4663c --- /dev/null +++ b/CAN-binder/low-can-binding/binding/low-can-hat.hpp @@ -0,0 +1,36 @@ +/* + * 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); + +void subscribe(struct afb_req request); +void unsubscribe(struct afb_req request); \ No newline at end of file diff --git a/CAN-binder/low-can-binding/can/can-bus-dev.cpp b/CAN-binder/low-can-binding/can/can-bus-dev.cpp index 7155a72d..bc6f8583 100644 --- a/CAN-binder/low-can-binding/can/can-bus-dev.cpp +++ b/CAN-binder/low-can-binding/can/can-bus-dev.cpp @@ -24,9 +24,7 @@ #include "can-bus.hpp" #include "can-message.hpp" -#include "../binding/low-can-binding.hpp" -#include "canutil/write.h" -#include "bitfield/bitfield.h" +#include "../binding/low-can-hat.hpp" /// @brief Class constructor /// diff --git a/CAN-binder/low-can-binding/can/can-bus.hpp b/CAN-binder/low-can-binding/can/can-bus.hpp index 3fcc29fc..f6a3745e 100644 --- a/CAN-binder/low-can-binding/can/can-bus.hpp +++ b/CAN-binder/low-can-binding/can/can-bus.hpp @@ -30,7 +30,7 @@ #include "can-signals.hpp" #include "../utils/config-parser.hpp" #include "../diagnostic/diagnostic-manager.hpp" -#include "../binding/low-can-binding.hpp" +#include "../binding/low-can-hat.hpp" // TODO actual max is 32 but dropped to 24 for memory considerations #define MAX_ACCEPTANCE_FILTERS 24 diff --git a/CAN-binder/low-can-binding/can/can-decoder.cpp b/CAN-binder/low-can-binding/can/can-decoder.cpp index 9a381113..f36c4b94 100644 --- a/CAN-binder/low-can-binding/can/can-decoder.cpp +++ b/CAN-binder/low-can-binding/can/can-decoder.cpp @@ -20,7 +20,7 @@ #include "canutil/read.h" #include "../utils/openxc-utils.hpp" -#include "../binding/low-can-binding.hpp" +#include "../binding/low-can-hat.hpp" /// @brief Parse the signal's bitfield from the given data and return the raw /// value. diff --git a/CAN-binder/low-can-binding/can/can-message.cpp b/CAN-binder/low-can-binding/can/can-message.cpp index b6e4458b..ac2610e5 100644 --- a/CAN-binder/low-can-binding/can/can-message.cpp +++ b/CAN-binder/low-can-binding/can/can-message.cpp @@ -19,7 +19,7 @@ #include -#include "../binding/low-can-binding.hpp" +#include "../binding/low-can-hat.hpp" /// /// @brief Class constructor diff --git a/CAN-binder/low-can-binding/utils/config-parser.cpp b/CAN-binder/low-can-binding/utils/config-parser.cpp index 60ea1187..9c81afb0 100644 --- a/CAN-binder/low-can-binding/utils/config-parser.cpp +++ b/CAN-binder/low-can-binding/utils/config-parser.cpp @@ -17,7 +17,7 @@ #include "config-parser.hpp" -#include "../binding/low-can-binding.hpp" +#include "../binding/low-can-hat.hpp" namespace utils { diff --git a/CAN-binder/low-can-binding/utils/signals.hpp b/CAN-binder/low-can-binding/utils/signals.hpp index 88b98756..053433ae 100644 --- a/CAN-binder/low-can-binding/utils/signals.hpp +++ b/CAN-binder/low-can-binding/utils/signals.hpp @@ -26,7 +26,7 @@ #include "../can/can-signals.hpp" #include "../diagnostic/diagnostic-message.hpp" -#include "../binding/low-can-binding.hpp" +#include "../binding/low-can-hat.hpp" namespace utils { diff --git a/CAN-binder/low-can-binding/utils/socketcan.hpp b/CAN-binder/low-can-binding/utils/socketcan.hpp index 3dcc277d..e9116643 100644 --- a/CAN-binder/low-can-binding/utils/socketcan.hpp +++ b/CAN-binder/low-can-binding/utils/socketcan.hpp @@ -24,7 +24,7 @@ #include #include "../can/can-message.hpp" -#include "../binding/low-can-binding.hpp" +#include "../binding/low-can-hat.hpp" #define INVALID_SOCKET -1 -- cgit 1.2.3-korg