Subversion Repositories HomeAutomation

Rev

Rev 1596 | Rev 1599 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed

Rev 1596 Rev 1598
Line 25... Line 25...
25 
 
 25 
 
26 
#include <string>
 26 
#include <string>
27 
 
 27 
 
28 
#include "xml/Node.h"
 28 
#include "xml/Node.h"
29 
#include "logging/Logger.h"
 29 
#include "logging/Logger.h"
- 
 
 30 
#include "type/Bitset.h"
30 
 
 31 
 
31 
namespace atom {
 32 
namespace atom {
32 
namespace can {
 33 
namespace can {
33 
 
 34 
 
34 
class Protocol
 35 
class Protocol
Line 62... Line 63...
62 
    unsigned int ResolveNMTCommandId(std::string command_name);
 63 
    unsigned int ResolveNMTCommandId(std::string command_name);
63 
 
 64 
 
64 
    xml::Node::NodeList GetCommandVariables(std::string command_name, std::string module_name);
 65 
    xml::Node::NodeList GetCommandVariables(std::string command_name, std::string module_name);
65 
    xml::Node::NodeList GetNMTCommandVariables(std::string command_name);
 66 
    xml::Node::NodeList GetNMTCommandVariables(std::string command_name);
66 
   
 67 
   
67 
   
 - 
 
68 
    /*
 - 
 
69 
   
 - 
 
- 
 
 68 
    std::string DecodeInt(type::Bitset& bitset, unsigned int start_bit, unsigned int bit_length);
70 
    std::map<std::string, CanVariable> TranslateData(unsigned int command_id, std::string module_name, std::string data_hex);
 69 
    void EncodeInt(type::Bitset& bitset, unsigned int start_bit, unsigned int bit_length, std::string value);
- 
 
 70 
    std::string DecodeUint(type::Bitset& bitset, unsigned int start_bit, unsigned int bit_length);
71 
    std::string TranslateDataToHex(unsigned int command_id, std::string module_name, std::map<std::string, CanVariable> &data);
 71 
    void EncodeUint(type::Bitset& bitset, unsigned int start_bit, unsigned int bit_length, std::string value);
72 
   
 - 
 
- 
 
 72 
    std::string DecodeFloat(type::Bitset& bitset, unsigned int start_bit, unsigned int bit_length);
73 
        void MakeDataValid(int command_id, std::string module_name, std::map<std::string, CanVariable> &data);
 73 
    void EncodeFloat(type::Bitset& bitset, unsigned int start_bit, unsigned int bit_length, std::string value);
74 
   
 - 
 
75 
   
 - 
 
- 
 
 74 
    std::string DecodeAscii(type::Bitset& bitset, unsigned int start_bit, unsigned int bit_length);
76 
        std::map<std::string, CanVariable> TranslateNMTData(unsigned int command_id, std::string raw_hex_data);
 75 
    void EncodeAscii(type::Bitset& bitset, unsigned int start_bit, unsigned int bit_length, std::string value);
77 
        std::string TranslateNMTDataToHex(std::string command_name, std::map<std::string, CanVariable> &data);
 76 
    std::string DecodeHexstring(type::Bitset& bitset, unsigned int start_bit, unsigned int bit_length);
78 
   
 - 
 
79 
        void MakeNMTDataValid(std::string command_name, std::map<std::string, CanVariable> &data);*/
 77 
    void EncodeHexstring(type::Bitset& bitset, unsigned int start_bit, unsigned int bit_length, std::string value);
80 
   
 78 
   
81 
private:
 79 
private:
82 
    static Pointer instance_;
 80 
    static Pointer instance_;
83 
   
 81 
   
84 
    xml::Node root_node_;
 82 
    xml::Node root_node_;
85 
   
 83 
   
86 
    Protocol();
 84 
    Protocol();
87 
    /*
 - 
 
88 
        std::string translateValidDataToHex(std::map<std::string, CanVariable> &data);
 - 
 
89 
        std::map<std::string, CanVariable> translateData(xml::Node::NodeList variable_nodes, std::string data_hex);
 - 
 
90 
   
 - 
 
91 
        void makeDataValid(xml::Node::NodeList variable_nodes, std::map<std::string, CanVariable> &data);*/
 - 
 
92 
       
 85 
       
93 
    logging::Logger LOG;
 86 
    logging::Logger LOG;
94 
};
 87 
};
95 
 
 88 
 
96 
}; // namespace can
 89 
}; // namespace can