#include <mutex>
#include <vector>
#include <thread>
-#include <fcntl.h>
+#include <time.h>
#include <linux/can.h>
#include <json-c/json.h>
-#include <systemd/sd-event.h>
#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 "obd2/obd2-signals.hpp"
#include "utils/openxc-utils.hpp"
-#include "configuration.hpp"
+
+extern "C"
+{
+ #include <afb/afb-service-itf.h>
+};
// Interface between the daemon and the binding
const struct afb_binding_interface *binder_interface;
static int make_subscription_unsubscription(struct afb_req request, const std::string& sig_name, std::map<std::string, struct afb_event>& s, bool subscribe)
{
/* Make the subscription or unsubscription to the event */
- if (((subscribe ? afb_req_subscribe : afb_req_unsubscribe)(request, s[sig_name.c_str()])) < 0)
+ if (((subscribe ? afb_req_subscribe : afb_req_unsubscribe)(request, s[sig_name])) < 0)
{
- ERROR(binder_interface, "Operation goes wrong for signal: %s", sig_name);
+ ERROR(binder_interface, "Operation goes wrong for signal: %s", sig_name.c_str());
return 0;
}
return 1;
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, "Can't create an event, something goes wrong.");
+ ERROR(binder_interface, "Can't create an event for %s, something goes wrong.", sig_name.c_str());
return 0;
}
return 1;
}
/**
- * @fn static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector<CanSignal>& signals)
+ * @fn static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector<can_signal_t>& signals)
* @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] CanSignal vector with CanSignal to subscribe
+ * @param[in] can_signal_t vector with can_signal_t to subscribe
*
* @return Number of correctly subscribed signal
*/
{
int rets = 0;
- for(auto& sig : signals)
+ //TODO: Implement way to dynamically call the right function no matter
+ // how much signals types we have.
+
+ for(const std::string& sig : signals)
{
- int ret = subscribe_unsubscribe_signal(request, subscribe, sig);
+ int ret;
+ if (active_diagnostic_request_t::is_diagnostic_signal(sig) && subscribe)
+ {
+ std::vector<obd2_signal_t*> found;
+ configuration_t::instance().find_obd2_signals(build_DynamicField(sig), found);
+ int frequency = found.front()->get_frequency();
+ DiagnosticRequest* diag_req = new DiagnosticRequest(found.front()->build_diagnostic_request());
+ configuration_t::instance().get_diagnostic_manager().add_recurring_request(
+ diag_req, sig.c_str(), false, obd2_signal_t::decode_obd2_response, nullptr, (float)frequency);
+ //TODO: Adding callback requesting ignition status: diag_req, sig.c_str(), false, obd2_signal_t::decode_obd2_response, obd2_signal_t::check_ignition_status, frequency);
+ }
+
+ ret = subscribe_unsubscribe_signal(request, subscribe, sig);
if(ret <= 0)
return ret;
+
rets++;
DEBUG(binder_interface, "Signal: %s subscribed", sig.c_str());
}
ret = 0;
ret = subscribe_unsubscribe_signals(request, subscribe, signals);
- NOTICE(binder_interface, "Subscribed correctly to %d/%d signal(s).", ret, (int)signals.size());
+ NOTICE(binder_interface, "Subscribed/unsubscribe correctly to %d/%d signal(s).", ret, (int)signals.size());
return ret;
}
/**
* @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)
{
- configuration_t config;
-
- can_bus_manager = config.get_can_bus_manager();
+ can_bus_t& can_bus_manager = configuration_t::instance().get_can_bus_manager();
- /* Open CAN socket */
+ /// 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(can_bus_manager.get_can_devices().front()))
return 0;
- }
+
ERROR(binder_interface, "There was something wrong with CAN device Initialization. Check your config file maybe");
return 1;
}
Code Review / apps / low-level-can-service.git / blobdiff