Moving around some things. Starting to add Transcoders.

Author: Joshua Whitley

include/common_defs.hpp

@@ -78,6 +78,15 @@ static const std::array<std::string, 10> PREAMBLES =
   "BA_"           // ATTRIBUTE VALUE
 };
 
+enum class AttributeType
+{
+  ENUM,
+  FLOAT,
+  HEX,
+  INT,
+  STRING
+};
+
 enum class DbcObjType
 {
   VERSION,
@@ -91,21 +100,17 @@ enum class DbcObjType
   ATTRIBUTE_VAL
 };
 
-enum class AttributeType
-{
-  ENUM,
-  FLOAT,
-  HEX,
-  INT,
-  STRING
-};
-
 enum class Order
 {
   BE,
   LE
 };
 
+enum class TranscodeErrorType
+{
+  NONE
+};
+
 struct DbcReadException
   : public std::exception
 {
@@ -169,6 +174,14 @@ class AttrObj
   std::unordered_map<std::string, std::string> attribute_values_;
 };
 
+struct TranscodeError
+{
+  TranscodeError(TranscodeErrorType type, std::string desc)
+    : type(type), desc(desc) {};
+  TranscodeErrorType type;
+  std::string desc;
+};
+
 }  // namespace DbcLoader
 }  // namespace CAN
 }  // namespace AS

include/database.hpp

@@ -61,6 +61,7 @@ class Database
   std::vector<const Attribute *> getAttributeDefinitions() const;
   void writeDbcToFile(const std::string & dbc_path) const;
   void writeDbcToStream(std::ostream & mem_stream) const;
+  std::unordered_map<unsigned int, MessageTranscoder> getTranscoders();
 
 private:
   std::string version_;

include/message.hpp

@@ -63,9 +63,10 @@ class Message
   std::unordered_map<std::string, const Signal *> getSignals() const;
   const std::string * getComment() const;
 
-  unsigned char dlcToLength(const unsigned char & dlc) const;
+  static unsigned char dlcToLength(const unsigned char & dlc);
 
   friend class Database;
+  friend class MessageTranscoder;
 
 private:
   unsigned int id_;
@@ -79,6 +80,23 @@ class Message
   void parse() override;
 };
 
+class MessageTranscoder
+{
+public:
+  MessageTranscoder(Message * dbc_msg);
+
+  const Message * getMessageDef();
+  void decode(std::vector<uint8_t> && raw_data, TranscodeError * err = nullptr);
+  std::vector<uint8_t> encode(TranscodeError * err = nullptr);
+
+private:
+  void decodeRawData(TranscodeError * err);
+
+  Message * msg_def_;
+  std::vector<uint8_t> data_;
+  std::unordered_map<std::string, SignalTranscoder> signal_xcoders_;
+};
+
 }  // namespace DbcLoader
 }  // namespace CAN
 }  // namespace AS

include/signal.hpp

@@ -80,8 +80,8 @@ class Signal
   std::map<unsigned int, const std::string *> getValueDescriptions() const;
   const std::string * getComment() const;
 
-  friend class Message;
   friend class Database;
+  friend class Message;
 
 private:
   std::string name_;
@@ -104,6 +104,15 @@ class Signal
   void parse() override;
 };
 
+class SignalTranscoder
+{
+public:
+  SignalTranscoder(Signal * dbc_sig);
+
+private:
+  Signal * sig_def_;
+};
+
 }  // namespace DbcLoader
 }  // namespace CAN
 }  // namespace AS

src/database.cpp

@@ -169,6 +169,17 @@ void Database::writeDbcToStream(std::ostream & mem_stream) const
   generate(mem_stream);
 }
 
+std::unordered_map<unsigned int, MessageTranscoder> Database::getTranscoders()
+{
+  std::unordered_map<unsigned int, MessageTranscoder> xcoders;
+
+  for (auto msg = messages_.begin(); msg != messages_.end(); ++msg) {
+    xcoders.emplace(msg->first, &(msg->second));
+  }
+
+  return xcoders;
+}
+
 void Database::generate(std::ostream & output) const
 {
   std::vector<BusNodeComment> bus_node_comments;

src/message.cpp

@@ -146,11 +146,45 @@ void Message::parse()
   name_ = name_.substr(0, name_.length() - 1);
 }
 
-unsigned char Message::dlcToLength(const unsigned char & dlc) const
+unsigned char Message::dlcToLength(const unsigned char & dlc)
 {
   return DLC_LENGTH[dlc];
 }
 
+MessageTranscoder::MessageTranscoder(Message * dbc_msg)
+  : msg_def_(dbc_msg),
+    data_()
+{
+  data_.assign(Message::dlcToLength(dbc_msg->getDlc()), 0);
+
+  for (auto sig = msg_def_->signals_.begin(); sig != msg_def_->signals_.end(); ++sig) {
+    signal_xcoders_.emplace(sig->first, &(sig->second));
+  }
+}
+
+const Message * MessageTranscoder::getMessageDef()
+{
+  return msg_def_;
+}
+
+void MessageTranscoder::decode(std::vector<uint8_t> && raw_data, TranscodeError * err)
+{
+  data_ = std::move(raw_data);
+  decodeRawData(err);
+}
+
+void MessageTranscoder::decodeRawData(TranscodeError * err)
+{
+  err = new TranscodeError(TranscodeErrorType::NONE, "");
+
+  // TODO(jwhitleyastuff): Do the thing.
+}
+
+std::vector<uint8_t> MessageTranscoder::encode(TranscodeError * err)
+{
+  return std::vector<uint8_t>(data_.begin(), data_.end());
+}
+
 }  // namespace DbcLoader
 }  // namespace CAN
 }  // namespace AS

src/signal.cpp

@@ -341,6 +341,11 @@ void Signal::parse()
   }
 }
 
+SignalTranscoder::SignalTranscoder(Signal * dbc_sig)
+  : sig_def_(dbc_sig)
+{
+}
+
 }  // namespace DbcLoader
 }  // namespace CAN
 }  // namespace AS