X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flow-can-binding.cpp;h=b895adcc99f0d357be634d936bbdaef35a614de7;hb=860d6bd4a829ee5aca50b93122474c9bf68fff9d;hp=af86786dbfd157e8e72cea8d1f8d604010826c5a;hpb=54595b88520c3caea40fac61ed79f2dcb57b7062;p=apps%2Fagl-service-can-low-level.git diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp index af86786d..b895adcc 100644 --- a/src/low-can-binding.cpp +++ b/src/low-can-binding.cpp @@ -40,8 +40,7 @@ #include #include -#include "ll-can-binding.h" -#include "obd2.h" +#include "obd2.hpp" /* * Interface between the daemon and the binding @@ -177,7 +176,10 @@ static int subscribe_unsubscribe_name(struct afb_req request, int subscribe, con if (0 == strcmp(name, "*")) return subscribe_unsubscribe_all(request, subscribe); - find_signals(name, sig); + if(obd2_handler_c.is_obd2_signal(name)) + + else + find_can_signals(name, sig); if (sig == NULL) { return 0; } @@ -246,6 +248,13 @@ const struct afb_binding *afbBindingV1Register (const struct afb_binding_interfa 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) { std::ifstream fd_conf; @@ -267,7 +276,7 @@ int afbBindingV1ServiceInit(struct afb_service service) jo_canbus = json_tokener_parse(&fd_conf_content); /* Open CAN socket */ - CanBus_c CanBus_handler(interface, json_object_get_string(json_object_object_get(jo_canbus, "deviceName")); + can_bus_t CanBus_handler(interface, json_object_get_string(json_object_object_get(jo_canbus, "deviceName")); CanBus_handler.open(); CanBus_handler.start_threads(); }