nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

namespace 'libebus' removed.

Browse Source
This commit is contained in:
Roland Jax
2014-11-19 19:44:04 +01:00
parent 5b14d6dbec
commit a5605c40be
33 changed files with 10 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusctl/ebusctl.cpp
-2
View File
@@ -30,8 +30,6 @@
#include <iomanip>
#include <unistd.h>
using namespace libebus;
Appl& A = Appl::Instance(true);
void define_args()
src/ebusd/baseloop.h
-3
View File
@@ -24,9 +24,6 @@
#include "network.h"
#include "ebusloop.h"
using namespace libebus;
class BaseLoop
{
src/ebusd/ebusd.cpp
-2
View File
@@ -28,8 +28,6 @@
#include <csignal>
#include <iostream>
using namespace libebus;
Appl& A = Appl::Instance();
Daemon& D = Daemon::Instance();
Logger& L = Logger::Instance();
src/ebusd/ebusloop.h
-3
View File
@@ -30,9 +30,6 @@
/** the maximum time [us] allowed for retrieving a byte from an addressed slave */
#define RECV_TIMEOUT 10000
using namespace libebus;
class EBusLoop : public Thread
{
src/lib/ebus/buscommand.cpp
-6
View File
@@ -19,9 +19,6 @@
#include "buscommand.h"
namespace libebus
{
BusCommand::BusCommand(const std::string commandStr, const bool poll, const bool scan)
: m_poll(poll), m_scan(scan), m_command(commandStr), m_result(), m_resultCode(RESULT_OK)
{
@@ -64,6 +61,3 @@ const std::string BusCommand::getMessageStr()
return result;
}
} //namespace
src/lib/ebus/buscommand.h
+2 -9
View File
@@ -23,11 +23,6 @@
#include "symbol.h"
#include "result.h"
namespace libebus
{
enum CommandType { invalid, broadcast, masterMaster, masterSlave };
class BusCommand
@@ -45,7 +40,7 @@ public:
SymbolString getResult() const { return m_result; }
bool isErrorResult() const { return m_resultCode < 0; }
const char* getResultCodeCStr() const { return libebus::getResultCodeCStr(m_resultCode); }
const char* getResultCodeCStr() const { return getResultCode(m_resultCode); }
void setResult(const SymbolString result, const int resultCode)
{ m_result = result; m_resultCode = resultCode; }
@@ -66,7 +61,5 @@ private:
pthread_cond_t m_cond;
};
} //namespace
#endif // LIBEBUS_BUSCOMMAND_H_
src/lib/ebus/command.cpp
-7
View File
@@ -27,10 +27,6 @@
#include <vector>
#include <cstring>
namespace libebus
{
std::string Command::calcData()
{
// encode - only first entry will be encoded
@@ -340,6 +336,3 @@ void Command::encode(const std::string& data, const std::string& type,
delete help;
}
} //namespace
src/lib/ebus/command.h
-7
View File
@@ -23,10 +23,6 @@
#include <string>
#include <vector>
namespace libebus
{
typedef std::vector<std::string> cmd_t;
typedef cmd_t::const_iterator cmdCI_t;
@@ -63,7 +59,4 @@ private:
};
} //namespace
#endif // LIBEBUS_COMMAND_H_
src/lib/ebus/commands.cpp
-7
View File
@@ -25,10 +25,6 @@
#include <vector>
#include <cstring>
namespace libebus
{
Commands::~Commands()
{
for (mapCI_t iter = m_pollDB.begin(); iter != m_pollDB.end(); ++iter)
@@ -260,6 +256,3 @@ void Commands::printCommand(const cmd_t& command) const
std::cout << *i << ';';
}
} //namespace
src/lib/ebus/commands.h
+1 -7
View File
@@ -25,10 +25,6 @@
#include <vector>
#include <map>
namespace libebus
{
typedef std::vector<cmd_t> cmdDB_t;
typedef cmdDB_t::const_iterator cmdDBCI_t;
@@ -79,7 +75,5 @@ private:
};
} //namespace
#endif // LIBEBUS_COMMANDS_H_
src/lib/ebus/configfile.cpp
-7
View File
@@ -22,10 +22,6 @@
#include <fstream>
#include <dirent.h>
namespace libebus
{
void ConfigFileCSV::parse(std::istream& is, Commands& commands)
{
std::string line;
@@ -132,6 +128,3 @@ void ConfigCommands::addFiles(const std::string path, const std::string extensio
closedir(dir);
};
} //namespace
src/lib/ebus/configfile.h
+1 -6
View File
@@ -24,9 +24,6 @@
#include <string>
#include <vector>
namespace libebus
{
/** available file endings / types. */
enum FileType { CSV, XML };
@@ -147,7 +144,5 @@ private:
};
} //namespace
#endif // LIBEBUS_CONFIGFILE_H_
src/lib/ebus/data.cpp
-6
View File
@@ -27,9 +27,6 @@
#include <vector>
#include <cstring>
namespace libebus
{
/** the known data field types. */
static const dataType_t dataTypes[] = {
{"STR", 16, bt_str, ADJ, ' ', 1, 16, 0}, // >= 1 byte character string filled up with space
@@ -658,6 +655,3 @@ result_t ValueListDataField::writeSymbols(std::istringstream& input, SymbolStrin
return RESULT_ERR_INVALID_ARG; // value assignment not found
}
} //namespace
src/lib/ebus/data.h
-7
View File
@@ -26,10 +26,6 @@
#include <vector>
#include <map>
namespace libebus
{
/** the message part in which a data field is stored. */
enum PartType {
pt_masterData, // stored in master data
@@ -315,7 +311,4 @@ protected:
};
} //namespace
#endif // LIBEBUS_DATA_H_
src/lib/ebus/decode.cpp
-7
View File
@@ -26,10 +26,6 @@
#include <vector>
#include <cstring>
namespace libebus
{
Decode::Decode(const std::string& data, const std::string& factor)
: m_data(data)
{
@@ -347,6 +343,3 @@ std::string DecodeTTM::decode()
return result.str();
}
} //namespace
src/lib/ebus/decode.h
-7
View File
@@ -22,10 +22,6 @@
#include <string>
namespace libebus
{
class Decode
{
@@ -285,7 +281,4 @@ public:
};
} //namespace
#endif // LIBEBUS_DECODE_H_
src/lib/ebus/dump.cpp
-7
View File
@@ -21,9 +21,6 @@
#include <fstream>
#include <cstdio>
namespace libebus
{
int Dump::write(const char* byte)
{
int ret = 0;
@@ -47,7 +44,3 @@ int Dump::write(const char* byte)
return ret;
}
} //namespace
src/lib/ebus/dump.h
-6
View File
@@ -22,9 +22,6 @@
#include <string>
namespace libebus
{
/**
* @brief Class for writing raw bytes to binary file.
*/
@@ -68,7 +65,4 @@ private:
};
} //namespace
#endif // LIBEBUS_DUMP_H_
src/lib/ebus/encode.cpp
-7
View File
@@ -26,10 +26,6 @@
#include <vector>
#include <cstring>
namespace libebus
{
Encode::Encode(const std::string& data, const std::string& factor)
: m_data(data)
{
@@ -364,6 +360,3 @@ std::string EncodeTTM::encode()
return result.str();
}
} //namespace
src/lib/ebus/encode.h
-7
View File
@@ -22,10 +22,6 @@
#include <string>
namespace libebus
{
class Encode
{
@@ -285,7 +281,4 @@ public:
};
} //namespace
#endif // LIBEBUS_ENCODE_H_
src/lib/ebus/port.cpp
-10
View File
@@ -26,11 +26,6 @@
#include <netdb.h>
#include <poll.h>
namespace libebus
{
bool Device::isOpen()
{
if (isValid() == false)
@@ -257,8 +252,3 @@ void Port::setType(const DeviceType type)
};
};
} //namespace
src/lib/ebus/port.h
-6
View File
@@ -25,9 +25,6 @@
#include <termios.h>
#include <unistd.h>
namespace libebus
{
/** available device types. */
enum DeviceType { SERIAL, NETWORK };
@@ -267,7 +264,4 @@ private:
};
} //namespace
#endif // LIBEBUS_PORT_H_
src/lib/ebus/result.cpp
+1 -6
View File
@@ -19,10 +19,7 @@
#include "result.h"
namespace libebus
{
const char* getResultCodeCStr(result_t resultCode) {
const char* getResultCode(result_t resultCode) {
switch (resultCode) {
case RESULT_ERR_SEND: return "ERR_SEND: send error";
case RESULT_ERR_EXTRA_DATA: return "ERR_EXTRA_DATA: received bytes > sent bytes";
@@ -43,5 +40,3 @@ const char* getResultCodeCStr(result_t resultCode) {
}
}
} //namespace
src/lib/ebus/result.h
+1 -8
View File
@@ -20,10 +20,6 @@
#ifndef LIBEBUS_RESULT_H_
#define LIBEBUS_RESULT_H_
namespace libebus
{
static const int RESULT_OK = 0;
static const int RESULT_BUS_ACQUIRED = 1; // bus successfully acquired
@@ -54,9 +50,6 @@ typedef int result_t;
* @param resultCode the result code (see RESULT_ constants).
* @return the string corresponding to the result code.
*/
const char* getResultCodeCStr(result_t resultCode);
} //namespace
const char* getResultCode(result_t resultCode);
#endif // LIBEBUS_RESULT_H_
src/lib/ebus/symbol.cpp
-4
View File
@@ -22,9 +22,6 @@
#include <iostream>
#include <iomanip>
namespace libebus
{
/**
* @brief CRC8 lookup table for the polynom 0x9b = x^8 + x^7 + x^4 + x^3 + x^1 + 1.
*/
@@ -190,4 +187,3 @@ bool isMaster(unsigned char addr) {
&& ((addrLo == 0x0) || (addrLo == 0x1) || (addrLo == 0x3) || (addrLo == 0x7) || (addrLo == 0xF));
}
} //namespace
src/lib/ebus/symbol.h
-7
View File
@@ -25,10 +25,6 @@
#include <sstream>
#include <queue>
namespace libebus
{
static const unsigned char ESC = 0xA9; // escape symbol, either followed by 0x00 for the value 0xA9, or 0x01 for the value 0xAA
static const unsigned char SYN = 0xAA; // synchronization symbol
static const unsigned char ACK = 0x00; // positive acknowledge
@@ -139,7 +135,4 @@ private:
*/
bool isMaster(unsigned char addr);
} //namespace
#endif // LIBEBUS_SYMBOL_H_
src/lib/ebus/test/test_commands.cpp
-2
View File
@@ -25,8 +25,6 @@
#include <sstream>
#include <vector>
using namespace libebus;
// will be part of cfg csv class
void readCSV(std::istream& is, Commands& commands){
std::string line;
src/lib/ebus/test/test_configfile.cpp
-3
View File
@@ -24,9 +24,6 @@
#include <sstream>
#include <vector>
using namespace libebus;
int main() {
std::string dir("test");
src/lib/ebus/test/test_data.cpp
+4 -6
View File
@@ -21,8 +21,6 @@
#include <iostream>
#include <iomanip>
using namespace libebus;
int main ()
{
std::string checks[][4] = {
@@ -72,7 +70,7 @@ int main ()
result_t result = DataField::create(mstr[1], false, it, entries.end(), predefined, fields, nextPos);
if (result != RESULT_OK) {
std::cout << "create \"" << checks[i][0] << "\" failed: " << getResultCodeCStr(result) << std::endl;
std::cout << "create \"" << checks[i][0] << "\" failed: " << getResultCode(result) << std::endl;
continue;
}
if (fields.empty() == true) {
@@ -86,7 +84,7 @@ int main ()
std::ostringstream output;
result = field->read(mstr, sstr, output);
if (result != RESULT_OK) {
std::cout << "read \"" << checks[i][0] << "\" failed: " << getResultCodeCStr(result) << std::endl;
std::cout << "read \"" << checks[i][0] << "\" failed: " << getResultCode(result) << std::endl;
}
else {
std::string gotStr = output.str();
@@ -101,12 +99,12 @@ int main ()
SymbolString writeSstr = SymbolString(sstr.getDataStr().substr(0, 2), false);
if (result != RESULT_OK) {
std::cout << "create \"" << checks[i][0] << "\" failed: " << getResultCodeCStr(result) << std::endl;
std::cout << "create \"" << checks[i][0] << "\" failed: " << getResultCode(result) << std::endl;
return 1;
}
result = field->write(gotStr, writeMstr, writeSstr);
if (result != RESULT_OK) {
std::cout << "write \"" << checks[i][0] << "\" failed: " << getResultCodeCStr(result) << std::endl;
std::cout << "write \"" << checks[i][0] << "\" failed: " << getResultCode(result) << std::endl;
}
else {
if (mstr == writeMstr && sstr == writeSstr)
src/lib/ebus/test/test_decode.cpp
-4
View File
@@ -21,10 +21,6 @@
#include <iostream>
#include <iomanip>
using namespace libebus;
int main()
{
Decode* help_dec = NULL;
src/lib/ebus/test/test_encode.cpp
-4
View File
@@ -21,10 +21,6 @@
#include <iostream>
#include <iomanip>
using namespace libebus;
int main()
{
Encode* help_enc = NULL;
src/lib/ebus/test/test_port.cpp
-2
View File
@@ -21,8 +21,6 @@
#include <iostream>
#include <iomanip>
using namespace libebus;
int main ()
{
std::string dev("/dev/ttyUSB20");
src/lib/ebus/test/test_symbol.cpp
-2
View File
@@ -21,8 +21,6 @@
#include <iostream>
#include <iomanip>
using namespace libebus;
int main ()
{
SymbolString sstr = SymbolString("10feb5050427a915aa");