Multifixes: class and methods, typo, comments

[apps/agl-service-can-low-level.git] / src / can-utils.hpp

diff --git a/src/can-utils.hpp b/src/can-utils.hpp
index ee87790..c6b23a2 100644 (file)
--- a/src/can-utils.hpp
+++ b/src/can-utils.hpp
@@ -29,6 +29,7 @@
 #include <sys/ioctl.h>
 #include <linux/can.h>
 #include <sys/socket.h>
+#include <json-c/json.h>
 #include <linux/can/raw.h>
 
 #include "timer.hpp"
@@ -49,13 +50,6 @@ extern "C"
 
 #define CAN_ACTIVE_TIMEOUT_S 30
 
-/**
- * @brief Function representing thread activated by can bus objects
- */
-void can_reader(can_bus_dev_t& can_bus);
-void can_decode_message(can_bus_t& can_bus);
-void can_event_push(can_bus_t& can_bus);
-
 /**
  * @brief The type signature for a CAN signal decoder.
  *
@@ -122,24 +116,26 @@ typedef struct CanMessage CanMessage;
 */
 class can_message_t {
        private:
-               const struct afb_binding_interface *interface_;
+               const struct afb_binding_interface* interface_;
                uint32_t id_;
                CanMessageFormat format_;
-               uint8_t data_[CAN_MESSAGE_SIZE];
+               uint8_t data_;
                uint8_t length_;
 
        public:
+               can_message_t(const struct afb_binding_interface* interface);
+
                uint32_t get_id() const;
                int get_format() const;
-               uint8_t get_data() const;
-               uint8_t get_lenght() const;
+               const uint8_t* get_data() const;
+               uint8_t get_length() const;
 
-               void set_id(uint32_t id);
-               void set_format(CanMessageFormat format);
-               void set_data(uint8_t data);
-               void set_lenght(uint8_t length);
+               void set_id(const uint32_t new_id);
+               void set_format(const CanMessageFormat format);
+               void set_data(const uint8_t new_data);
+               void set_length(const uint8_t new_length);
 
-               void convert_from_canfd_frame(canfd_frame frame);
+               void convert_from_canfd_frame(const canfd_frame& frame);
                canfd_frame convert_to_canfd_frame();
 };
 
@@ -171,9 +167,11 @@ class can_bus_dev_t {
                void start_reading();
                canfd_frame read(const struct afb_binding_interface *interface);
                
-               can_message_t next_can_message();
+               can_message_t next_can_message(const struct afb_binding_interface* interface);
                void push_new_can_message(const can_message_t& can_msg);                
                bool has_can_message() const;
+
+               int send_can_message(can_message_t& can_msg, const struct afb_binding_interface* interface);
 };
 
 /** 
@@ -200,9 +198,7 @@ class can_bus_t {
                
                void start_threads();
                
-               int send_can_message(can_message_t can_msg);
-
-               openxc_VehicleMessage& next_vehicle_message();
+               openxc_VehicleMessage next_vehicle_message();
                void push_new_vehicle_message(const openxc_VehicleMessage& v_msg);
                bool has_vehicle_message() const;
 };
@@ -287,7 +283,7 @@ typedef struct CanSignal CanSignal;
  * @param[in] format - the format of the message's ID.
  * @param[in] clock - an optional frequency clock to control the output of this
  *             message, if sent raw, or simply to mark the max frequency for custom
- *             handlers to retrieve.
+ *             handlers to retriec++ if ? syntaxve.
  * @param[in] forceSendChanged - If true, regardless of the frequency, it will send CAN
  *             message if it has changed when using raw passthrough.
  * @param[in] lastValue - The last received value of the message. Defaults to undefined.
@@ -399,3 +395,10 @@ bool isBusActive(can_bus_dev_t* bus);
  * busCount - the length of the buses array.
  */
 void logBusStatistics(can_bus_dev_t* buses, const int busCount);
+
+/**
+ * @brief Function representing thread activated by can bus objects
+ */
+void can_reader(can_bus_dev_t& can_bus);
+void can_decode_message(can_bus_t& can_bus);
+void can_event_push(can_bus_t& can_bus);
\ No newline at end of file