From ab6a4a5eb285a1ca88b3ad87ee035b9956e253ed Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Thu, 20 Jul 2017 16:40:35 +0200
Subject: Examples reorganization

Separated by protocols and created signals from reversed
engineered signals.
Meld all used signals into an "agl-vcar" folder to be used as
default.

Change-Id: I27f7bc227a6fcea3db6672819e6a4d7bbf09863b
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
 low-can-binding/binding/application-generated.cpp | 78 ++++++++++++++++++++++-
 low-can-binding/can/can-bus-device.hpp            | 65 +++++++++++++++++++
 2 files changed, 142 insertions(+), 1 deletion(-)
 create mode 100644 low-can-binding/can/can-bus-device.hpp

(limited to 'low-can-binding')

diff --git a/low-can-binding/binding/application-generated.cpp b/low-can-binding/binding/application-generated.cpp
index fff40fb..876b95b 100644
--- a/low-can-binding/binding/application-generated.cpp
+++ b/low-can-binding/binding/application-generated.cpp
@@ -6,7 +6,83 @@ application_t::application_t()
 	, can_message_set_{
 		{std::make_shared<can_message_set_t>(can_message_set_t{0,"example",
 			{ // beginning can_message_definition_ vector
-				{std::make_shared<can_message_definition_t>(can_message_definition_t{"hs",0x3D9,can_message_format_t::STANDARD,frequency_clock_t(5.00000f),true,
+				{std::make_shared<can_message_definition_t>(can_message_definition_t{"ls",0x30,can_message_format_t::STANDARD,frequency_clock_t(5.00000f),true,
+					{ // beginning can_signals vector
+						{std::make_shared<can_signal_t> (can_signal_t{
+							"hvac.fan.speed",
+							32,
+							8,
+							23.5294f,
+							0.00000,
+							0,
+							0,
+							frequency_clock_t(0.00000f),
+							true,
+							false,
+							{
+							},
+							false,
+							nullptr,
+							nullptr,
+							false
+						})},
+						{std::make_shared<can_signal_t> (can_signal_t{
+							"hvac.temperature.left",
+							0,
+							8,
+							1.00000f,
+							0.00000,
+							0,
+							0,
+							frequency_clock_t(0.00000f),
+							true,
+							false,
+							{
+							},
+							false,
+							nullptr,
+							nullptr,
+							false
+						})},
+						{std::make_shared<can_signal_t> (can_signal_t{
+							"hvac.temperature.right",
+							8,
+							8,
+							1.00000f,
+							0.00000,
+							0,
+							0,
+							frequency_clock_t(0.00000f),
+							true,
+							false,
+							{
+							},
+							false,
+							nullptr,
+							nullptr,
+							false
+						})},
+						{std::make_shared<can_signal_t> (can_signal_t{
+							"hvac.temperature.average",
+							16,
+							8,
+							1.00000f,
+							0.00000,
+							0,
+							0,
+							frequency_clock_t(0.00000f),
+							true,
+							false,
+							{
+							},
+							false,
+							nullptr,
+							nullptr,
+							false
+						})}
+					} // end can_signals vector
+				})} // end can_message_definition entry
+,				{std::make_shared<can_message_definition_t>(can_message_definition_t{"hs",0x3D9,can_message_format_t::STANDARD,frequency_clock_t(5.00000f),true,
 					{ // beginning can_signals vector
 						{std::make_shared<can_signal_t> (can_signal_t{
 							"engine.speed",
diff --git a/low-can-binding/can/can-bus-device.hpp b/low-can-binding/can/can-bus-device.hpp
new file mode 100644
index 0000000..0b979b1
--- /dev/null
+++ b/low-can-binding/can/can-bus-device.hpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2015, 2016, 2017 "IoT.bzh"
+ * Author "Romain Forlot" <romain.forlot@iot.bzh>
+ * Author "Loïc Collignon" <loic.collignon@iot.bzh>
+ *
+ * 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 <utility>
+#include <mutex>
+#include <queue>
+#include <thread>
+#include <linux/can.h>
+#include <condition_variable>
+
+#include "openxc.pb.h"
+#include "can-message.hpp"
+#include "../utils/config-parser.hpp"
+#include "../binding/low-can-hat.hpp"
+#include "../binding/low-can-subscription.hpp"
+
+/// @brief A container for a CAN module paried with a certain bus.
+///
+/// There are three things that control the operating mode of the CAN controller:
+///
+/// - Should arbitrary CAN message writes be allowed? See rawWritable.
+/// - Should translated, simple vehicle message writes be allowed? See the
+///   'writable' field in signals defined for this bus.
+///
+class can_bus_t
+{
+private:
+	int index;
+	std::string name;
+	std::string device_name;
+	float max_message_frequency;	//<! maxMessageFrequency - the default maximum frequency for all CAN messages when
+									/// using the raw passthrough mode. To put no limit on the frequency, set
+									/// this to 0.
+	bool raw_writable;  //<! rawWritable - True if this CAN bus connection should allow raw CAN messages
+						/// writes. This is independent from the CanSignal 'writable' option, which
+						/// can be set to still allow translated writes back to this bus.
+	bool passthrough_can_messages; //<! passthroughCanMessages - True if low-level CAN messages should be send to the
+								   /// output interface, not just signals as simple vehicle messages.
+
+public:
+	int get_index() const;
+	const std::string get_bus_name() const;
+	const std::string get_bus_device_name() const;
+	const float max_message_frequency() const;
+	bool get_raw_writable() const;
+	bool get_passthrough_can_messages() const;
+
+};
-- 
cgit 1.2.3-korg