Change-Id: I5df96540400b833e684001f8fc5fa33ff1892bae
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
15 files changed:
* limitations under the License.
*/
* limitations under the License.
*/
+#include <map>
+#include <mutex>
#include <unistd.h>
#include <string.h>
#include <net/if.h>
#include <sys/ioctl.h>
#include <linux/can/raw.h>
#include <unistd.h>
#include <string.h>
#include <net/if.h>
#include <sys/ioctl.h>
#include <linux/can/raw.h>
#include "can-bus-dev.hpp"
#include "can-bus.hpp"
#include "can-bus-dev.hpp"
#include "can-bus.hpp"
+#include "can-signals.hpp"
#include "can-decoder.hpp"
#include "../configuration.hpp"
#include "../utils/signals.hpp"
#include "can-decoder.hpp"
#include "../configuration.hpp"
#include "../utils/signals.hpp"
#include <condition_variable>
#include "openxc.pb.h"
#include <condition_variable>
#include "openxc.pb.h"
-#include "../utils/timer.hpp"
-#include "can-signals.hpp"
#include "can-message.hpp"
#include "can-bus-dev.hpp"
#include "../diagnostic/active-diagnostic-request.hpp"
#include "can-message.hpp"
#include "can-bus-dev.hpp"
#include "../diagnostic/active-diagnostic-request.hpp"
*/
#include "can-decoder.hpp"
*/
#include "can-decoder.hpp"
#include "canutil/read.h"
#include "../utils/openxc-utils.hpp"
#include "canutil/read.h"
#include "../utils/openxc-utils.hpp"
+#include "can-signals.hpp"
+#include "can-message.hpp"
+#include "openxc.pb.h"
#include "../utils/signals.hpp"
#include "can-decoder.hpp"
#include "../diagnostic/diagnostic-message.hpp"
#include "../utils/signals.hpp"
#include "can-decoder.hpp"
#include "../diagnostic/diagnostic-message.hpp"
-#include "../low-can-binding.hpp"
std::string can_signal_t::prefix_ = "messages";
std::string can_signal_t::prefix_ = "messages";
#include <fcntl.h>
#include "can/can-bus.hpp"
#include <fcntl.h>
#include "can/can-bus.hpp"
* limitations under the License.
*/
* limitations under the License.
*/
#include "active-diagnostic-request.hpp"
#include "active-diagnostic-request.hpp"
#include <vector>
#include "uds/uds.h"
#include "uds/uds_types.h"
#include <vector>
#include "uds/uds.h"
#include "uds/uds_types.h"
+#include "../utils/timer.hpp"
#include "../can/can-bus-dev.hpp"
#include "../can/can-bus-dev.hpp"
-#include "../can/can-message.hpp"
-
-#include "../low-can-binding.hpp"
class active_diagnostic_request_t;
class diagnostic_manager_t;
class active_diagnostic_request_t;
class diagnostic_manager_t;
#include "diagnostic-manager.hpp"
#include "diagnostic-manager.hpp"
#include "../utils/openxc-utils.hpp"
#include "../configuration.hpp"
#include "../utils/openxc-utils.hpp"
#include "../configuration.hpp"
#include "uds/uds.h"
#include "openxc.pb.h"
#include "uds/uds.h"
#include "openxc.pb.h"
-#include "../can/can-bus-dev.hpp"
-#include "../can/can-message.hpp"
+#include "../can/can-bus.hpp"
#include "active-diagnostic-request.hpp"
#include "active-diagnostic-request.hpp"
-#include "../low-can-binding.hpp"
-
/* Each CAN bus needs its own set of shim functions, so this should
* match the maximum CAN controller count.
*/
/* Each CAN bus needs its own set of shim functions, so this should
* match the maximum CAN controller count.
*/
static void shims_timer();
private:
static void shims_timer();
private:
- DiagnosticShims shims_; /*!< shims_ - A map of shim functions for each CAN bus that plug the diagnostics
- * library (uds-c) into the VI's CAN peripheral.*/
+ DiagnosticShims shims_; /*!< shims_ - Shim functions for each CAN bus that plug the diagnostics
+ * library (uds-c) into the VI's CAN peripheral.*/
std::string bus_; /*!< bus_ - A pointer to the CAN bus that should be used for all standard OBD-II requests, if the bus is not
std::string bus_; /*!< bus_ - A pointer to the CAN bus that should be used for all standard OBD-II requests, if the bus is not
- * explicitly spcified in the request. Default to the first bus CAN at initialization.*/
+ * explicitly spcified in the request. Default to the first bus CAN at initialization.*/
std::vector<active_diagnostic_request_t*> recurring_requests_; /*!< recurringRequests - A list of active recurring diagnostic requests.*/
std::vector<active_diagnostic_request_t*> non_recurring_requests_; /*!< nonrecurringRequests - A list of active one-time diagnostic requests. When a
* response is received for a non-recurring request or it times out, it is removed*/
std::vector<active_diagnostic_request_t*> recurring_requests_; /*!< recurringRequests - A list of active recurring diagnostic requests.*/
std::vector<active_diagnostic_request_t*> non_recurring_requests_; /*!< nonrecurringRequests - A list of active one-time diagnostic requests. When a
* response is received for a non-recurring request or it times out, it is removed*/
* See the License for the specific language governing permissions and
* limitations under the License.
*/
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "diagnostic-message.hpp"
#include "diagnostic-message.hpp"
#pragma once
#include <vector>
#pragma once
#include <vector>
-#include "../can/can-bus.hpp"
#include "../can/can-message.hpp"
#include "active-diagnostic-request.hpp"
#include "../can/can-message.hpp"
#include "active-diagnostic-request.hpp"
-#include "../low-can-binding.hpp"
-
enum UNIT {
POURCENT,
DEGREES_CELSIUS,
enum UNIT {
POURCENT,
DEGREES_CELSIUS,
#include "low-can-binding.hpp"
#include "low-can-binding.hpp"
#include <queue>
#include <mutex>
#include <vector>
#include <queue>
#include <mutex>
#include <vector>
#include "../configuration.hpp"
#include "../configuration.hpp"
/**
* @brief Build a specific VehicleMessage containing a DiagnosticResponse.
*
/**
* @brief Build a specific VehicleMessage containing a DiagnosticResponse.
*