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

various clean ups after libebus merging.

Browse Source
This commit is contained in:
Roland Jax
2014-10-28 20:05:29 +01:00
parent 9a07c5d492
commit cbbfe1ccd9
54 changed files with 598 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AUTHORS
+2 -1
View File
@@ -1 +1,2 @@
Roland Jax <roland.jax@liwest.at> Roland Jax <ebusd@liwest.at>
John Baier <ebusd@johnm.de>
README
+1 -1
View File
@@ -66,4 +66,4 @@ ebusctl - client program for ebusd.
For usage and further information take a look on help page. For usage and further information take a look on help page.
The author can be contacted at roland.jax@liwest.at. The author can be contacted at ebusd@liwest.at.
configure.ac
+1 -1
View File
@@ -1,5 +1,5 @@
AC_PREREQ([2.65]) AC_PREREQ([2.65])
AC_INIT([ebusd], [0.4.0], [roland.jax@liwest.at], [ebusd], [https://github.com/yuhu-/ebusd]) AC_INIT([ebusd], [0.5.0], [ebusd@liwest.at], [ebusd], [https://github.com/yuhu-/ebusd])
AC_PROG_CXX AC_PROG_CXX
src/ebusd/baseloop.cpp
+2 -3
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
@@ -359,8 +359,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
<< " dump - change dump state 'dump state' (state: on|off)" << std::endl << std::endl << " dump - change dump state 'dump state' (state: on|off)" << std::endl << std::endl
<< " log - change log areas 'log areas area,area,..' (areas: bas|net|bus|cyc|all)" << std::endl << " log - change log areas 'log areas area,area,..' (areas: bas|net|bus|cyc|all)" << std::endl
<< " - change log level 'log level level' (level: error|event|trace|debug)" << std::endl << std::endl << " - change log level 'log level level' (level: error|event|trace|debug)" << std::endl << std::endl
<< " config - list ebus configuration 'config list'" << std::endl << " reload - reload ebus configuration" << std::endl << std::endl
<< " - reload ebus configuration 'config reload'" << std::endl << std::endl
<< " stop - stop daemon" << std::endl << " stop - stop daemon" << std::endl
<< " quit - close connection" << std::endl << std::endl << " quit - close connection" << std::endl << std::endl
<< " help - print this page"; << " help - print this page";
src/ebusd/baseloop.h
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
src/ebusd/connection.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
src/ebusd/connection.h
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
src/ebusd/ebusloop.cpp
+1 -5
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
@@ -70,7 +70,6 @@ void* EBusLoop::run()
time_t pollStart, pollEnd; time_t pollStart, pollEnd;
time(&pollStart); time(&pollStart);
double pollDelta = 0.0; double pollDelta = 0.0;
bool pollCommandActive = false;
for (;;) { for (;;) {
if (m_bus->isConnected() == true) { if (m_bus->isConnected() == true) {
@@ -154,7 +153,6 @@ void* EBusLoop::run()
m_bus->addCommand(busCommand); m_bus->addCommand(busCommand);
L.log(bus, debug, " addCommand success"); L.log(bus, debug, " addCommand success");
busCommandActive = true; busCommandActive = true;
pollCommandActive = true;
time(&pollStart); time(&pollStart);
} }
@@ -181,7 +179,6 @@ void* EBusLoop::run()
m_commands->storePolData(busCommand->getMessageStr().c_str()); // TODO use getResult() m_commands->storePolData(busCommand->getMessageStr().c_str()); // TODO use getResult()
delete busCommand; delete busCommand;
pollCommandActive = false;
} else { } else {
busCommand->sendSignal(); busCommand->sendSignal();
} }
@@ -206,7 +203,6 @@ void* EBusLoop::run()
} }
lookbusretries = 0; lookbusretries = 0;
busCommandActive = false; busCommandActive = false;
pollCommandActive = false;
}else { }else {
lookbusretries++; lookbusretries++;
} }
src/ebusd/ebusloop.h
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
src/ebusd/main.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
src/ebusd/message.h
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
src/ebusd/network.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
src/ebusd/network.h
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
src/libcore/appl.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
src/libcore/appl.h
+4 -4
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
@@ -17,8 +17,8 @@
* along with ebusd. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#ifndef APPL_H_ #ifndef LIBCORE_APPL_H_
#define APPL_H_ #define LIBCORE_APPL_H_
#include <string> #include <string>
#include <cstring> #include <cstring>
@@ -109,4 +109,4 @@ private:
void addParam(const char* name, const std::string arg, Datatype datatype); void addParam(const char* name, const std::string arg, Datatype datatype);
}; };
#endif // APPL_H_ #endif // LIBCORE_APPL_H_
src/libcore/daemon.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
src/libcore/daemon.h
+4 -4
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
@@ -17,8 +17,8 @@
* along with ebusd. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#ifndef DAEMON_H_ #ifndef LIBCORE_DAEMON_H_
#define DAEMON_H_ #define LIBCORE_DAEMON_H_
class Daemon class Daemon
{ {
@@ -45,4 +45,4 @@ private:
}; };
#endif // DAEMON_H_ #endif // LIBCORE_DAEMON_H_
src/libcore/logger.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
src/libcore/logger.h
+4 -4
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
@@ -17,8 +17,8 @@
* along with ebusd. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#ifndef LOGGER_H_ #ifndef LIBCORE_LOGGER_H_
#define LOGGER_H_ #define LIBCORE_LOGGER_H_
#include "wqueue.h" #include "wqueue.h"
#include "thread.h" #include "thread.h"
@@ -178,4 +178,4 @@ private:
}; };
#endif // LOGGER_H_ #endif // LIBCORE_LOGGER_H_
src/libcore/notify.h
+4 -4
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
@@ -17,8 +17,8 @@
* along with ebusd. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#ifndef NOTIFY_H_ #ifndef LIBCORE_NOTIFY_H_
#define NOTIFY_H_ #define LIBCORE_NOTIFY_H_
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
@@ -51,6 +51,6 @@ private:
}; };
#endif // NOTIFY_H_ #endif // LIBCORE_NOTIFY_H_
src/libcore/tcpsocket.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
src/libcore/tcpsocket.h
+4 -4
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
@@ -17,8 +17,8 @@
* along with ebusd. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#ifndef TCPSOCKET_H_ #ifndef LIBCORE_TCPSOCKET_H_
#define TCPSOCKET_H_ #define LIBCORE_TCPSOCKET_H_
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
@@ -84,5 +84,5 @@ private:
}; };
#endif // TCPSOCKET_H_ #endif // LIBCORE_TCPSOCKET_H_
src/libcore/thread.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
src/libcore/thread.h
+4 -4
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
@@ -17,8 +17,8 @@
* along with ebusd. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#ifndef THREAD_H_ #ifndef LIBCORE_THREAD_H_
#define THREAD_H_ #define LIBCORE_THREAD_H_
#include <pthread.h> #include <pthread.h>
@@ -43,4 +43,4 @@ private:
}; };
#endif // THREAD_H_ #endif // LIBCORE_THREAD_H_
src/libcore/wqueue.h
+4 -4
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *
@@ -17,8 +17,8 @@
* along with ebusd. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#ifndef WQUEUE_H_ #ifndef LIBCORE_WQUEUE_H_
#define WQUEUE_H_ #define LIBCORE_WQUEUE_H_
#include <list> #include <list>
#include <pthread.h> #include <pthread.h>
@@ -82,4 +82,4 @@ private:
}; };
#endif // WQUEUE_H_ #endif // LIBCORE_WQUEUE_H_
src/libebus/bus.cpp
+5 -5
View File
@@ -1,20 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#include "bus.h" #include "bus.h"
src/libebus/bus.h
+5 -5
View File
@@ -1,20 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#ifndef LIBEBUS_BUS_H_ #ifndef LIBEBUS_BUS_H_
src/libebus/command.cpp
+5 -5
View File
@@ -1,20 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#include "command.h" #include "command.h"
src/libebus/command.h
+5 -5
View File
@@ -1,20 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#ifndef LIBEBUS_COMMAND_H_ #ifndef LIBEBUS_COMMAND_H_
src/libebus/commands.cpp
+5 -5
View File
@@ -1,20 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#include "commands.h" #include "commands.h"
src/libebus/commands.h
+5 -5
View File
@@ -1,20 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#ifndef LIBEBUS_COMMANDS_H_ #ifndef LIBEBUS_COMMANDS_H_
src/libebus/configfile.cpp
+5 -5
View File
@@ -1,20 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#include "configfile.h" #include "configfile.h"
src/libebus/configfile.h
+5 -5
View File
@@ -1,20 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#ifndef LIBEBUS_CONFIGFILE_H_ #ifndef LIBEBUS_CONFIGFILE_H_
src/libebus/decode.cpp
+5 -6
View File
@@ -1,21 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* crc calculations from http://www.mikrocontroller.net/topic/75698
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#include "decode.h" #include "decode.h"
src/libebus/decode.h
+5 -6
View File
@@ -1,21 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* crc calculations from http://www.mikrocontroller.net/topic/75698
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#ifndef LIBEBUS_DECODE_H_ #ifndef LIBEBUS_DECODE_H_
src/libebus/dump.cpp
+7 -7
View File
@@ -1,20 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#include "dump.h" #include "dump.h"
@@ -27,7 +27,7 @@ namespace libebus
int Dump::write(const char* byte) int Dump::write(const char* byte)
{ {
int ret = 0; int ret = 0;
std::ofstream fs(m_filename.c_str(), std::ios::out | std::ios::binary | std::ios::app); std::ofstream fs(m_filename.c_str(), std::ios::out | std::ios::binary | std::ios::app);
if (fs == 0) if (fs == 0)
@@ -41,7 +41,7 @@ int Dump::write(const char* byte)
oldfile += ".old"; oldfile += ".old";
ret = rename(m_filename.c_str(), oldfile.c_str()); ret = rename(m_filename.c_str(), oldfile.c_str());
} }
fs.close(); fs.close();
return ret; return ret;
src/libebus/dump.h
+7 -7
View File
@@ -1,20 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#ifndef LIBEBUS_DUMP_H_ #ifndef LIBEBUS_DUMP_H_
@@ -34,10 +34,10 @@ public:
: m_filename(filename), m_filesize(filesize) {} : m_filename(filename), m_filesize(filesize) {}
int write(const char* byte); int write(const char* byte);
void setFilename(const std::string& filename) { m_filename = filename; } void setFilename(const std::string& filename) { m_filename = filename; }
void setFilesize(const long filesize) { m_filesize = filesize; } void setFilesize(const long filesize) { m_filesize = filesize; }
private: private:
std::string m_filename; std::string m_filename;
long m_filesize; long m_filesize;
src/libebus/encode.cpp
+5 -6
View File
@@ -1,21 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* crc calculations from http://www.mikrocontroller.net/topic/75698
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#include "encode.h" #include "encode.h"
src/libebus/encode.h
+5 -6
View File
@@ -1,21 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* crc calculations from http://www.mikrocontroller.net/topic/75698
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#ifndef LIBEBUS_ENCODE_H_ #ifndef LIBEBUS_ENCODE_H_
src/libebus/port.cpp
+6 -6
View File
@@ -1,20 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#include "port.h" #include "port.h"
@@ -89,7 +89,7 @@ ssize_t Device::recvBytes(const long timeout, size_t maxCount)
ssize_t bytes_read = sizeof(m_buffer); ssize_t bytes_read = sizeof(m_buffer);
if (maxCount > sizeof(m_buffer)) if (maxCount > sizeof(m_buffer))
maxCount = sizeof(m_buffer); maxCount = sizeof(m_buffer);
// read bytes from device // read bytes from device
bytes_read = read(m_fd, m_buffer, maxCount); bytes_read = read(m_fd, m_buffer, maxCount);
src/libebus/port.h
+5 -5
View File
@@ -1,20 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#ifndef LIBEBUS_PORT_H_ #ifndef LIBEBUS_PORT_H_
src/libebus/result.cpp
+43 -43
View File
@@ -1,43 +1,43 @@
/* /*
* Copyright (C) John Baier 2014 <john@johnm.de> * Copyright (C) John Baier 2012-2014 <ebusd@johnm.de>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#include "result.h" #include "result.h"
namespace libebus namespace libebus
{ {
const char* getResultCodeCStr(int resultCode) { const char* getResultCodeCStr(int resultCode) {
switch (resultCode) { switch (resultCode) {
case RESULT_ERR_SEND: return "ERR_SEND: send error"; case RESULT_ERR_SEND: return "ERR_SEND: send error";
case RESULT_ERR_EXTRA_DATA: return "ERR_EXTRA_DATA: received bytes > sent bytes"; case RESULT_ERR_EXTRA_DATA: return "ERR_EXTRA_DATA: received bytes > sent bytes";
case RESULT_ERR_NAK: return "ERR_NAK: NAK received"; case RESULT_ERR_NAK: return "ERR_NAK: NAK received";
case RESULT_ERR_CRC: return "ERR_CRC: CRC error"; case RESULT_ERR_CRC: return "ERR_CRC: CRC error";
case RESULT_ERR_ACK: return "ERR_ACK: ACK error"; case RESULT_ERR_ACK: return "ERR_ACK: ACK error";
case RESULT_ERR_TIMEOUT: return "ERR_TIMEOUT: read timeout"; case RESULT_ERR_TIMEOUT: return "ERR_TIMEOUT: read timeout";
case RESULT_ERR_SYN: return "ERR_SYN: SYN received"; case RESULT_ERR_SYN: return "ERR_SYN: SYN received";
case RESULT_ERR_BUS_LOST: return "ERR_BUS_LOST: lost bus arbitration"; case RESULT_ERR_BUS_LOST: return "ERR_BUS_LOST: lost bus arbitration";
case RESULT_ERR_ESC: return "ERR_ESC: invalid escape sequence received"; case RESULT_ERR_ESC: return "ERR_ESC: invalid escape sequence received";
case RESULT_ERR_INVALID_ARG: return "ERR_INVALID_ARG: invalid argument specified"; case RESULT_ERR_INVALID_ARG: return "ERR_INVALID_ARG: invalid argument specified";
case RESULT_ERR_DEVICE: return "ERR_DEVICE: generic device error"; case RESULT_ERR_DEVICE: return "ERR_DEVICE: generic device error";
default: return "success"; default: return "success";
} }
} }
} //namespace } //namespace
src/libebus/result.h
+58 -58
View File
@@ -1,58 +1,58 @@
/* /*
* Copyright (C) John Baier 2014 <john@johnm.de> * Copyright (C) John Baier 2012-2014 <ebusd@johnm.de>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#ifndef LIBEBUS_RESULT_H_ #ifndef LIBEBUS_RESULT_H_
#define LIBEBUS_RESULT_H_ #define LIBEBUS_RESULT_H_
namespace libebus namespace libebus
{ {
static const int RESULT_OK = 0; static const int RESULT_OK = 0;
static const int RESULT_BUS_ACQUIRED = 1; // bus successfully acquired static const int RESULT_BUS_ACQUIRED = 1; // bus successfully acquired
static const int RESULT_DATA = 2; // some data received static const int RESULT_DATA = 2; // some data received
static const int RESULT_SYN = 3; // regular SYN after message received static const int RESULT_SYN = 3; // regular SYN after message received
static const int RESULT_BUS_LOCKED = 4; // bus is locked for access static const int RESULT_BUS_LOCKED = 4; // bus is locked for access
static const int RESULT_BUS_PRIOR_RETRY = 5; // retry to access bus static const int RESULT_BUS_PRIOR_RETRY = 5; // retry to access bus
static const int RESULT_ERR_SEND = -1; // send error static const int RESULT_ERR_SEND = -1; // send error
static const int RESULT_ERR_EXTRA_DATA = -2; // received bytes > sent bytes static const int RESULT_ERR_EXTRA_DATA = -2; // received bytes > sent bytes
static const int RESULT_ERR_NAK = -3; // NAK received static const int RESULT_ERR_NAK = -3; // NAK received
static const int RESULT_ERR_CRC = -4; // CRC error static const int RESULT_ERR_CRC = -4; // CRC error
static const int RESULT_ERR_ACK = -5; // ACK error static const int RESULT_ERR_ACK = -5; // ACK error
static const int RESULT_ERR_TIMEOUT = -6; // read timeout static const int RESULT_ERR_TIMEOUT = -6; // read timeout
static const int RESULT_ERR_SYN = -7; // SYN received static const int RESULT_ERR_SYN = -7; // SYN received
static const int RESULT_ERR_BUS_LOST = -8; // arbitration lost static const int RESULT_ERR_BUS_LOST = -8; // arbitration lost
static const int RESULT_ERR_ESC = -9; // invalid escape sequence received static const int RESULT_ERR_ESC = -9; // invalid escape sequence received
static const int RESULT_ERR_INVALID_ARG = -10; // invalid argument static const int RESULT_ERR_INVALID_ARG = -10; // invalid argument
static const int RESULT_ERR_DEVICE = -11; // generic device error (usually fatal) static const int RESULT_ERR_DEVICE = -11; // generic device error (usually fatal)
/** /**
* @brief Return the string corresponding to the result code. * @brief Return the string corresponding to the result code.
* @param resultCode the result code (see RESULT_ constants). * @param resultCode the result code (see RESULT_ constants).
* @return the string corresponding to the result code. * @return the string corresponding to the result code.
*/ */
const char* getResultCodeCStr(int resultCode); const char* getResultCodeCStr(int resultCode);
} //namespace } //namespace
#endif // LIBEBUS_RESULT_H_ #endif // LIBEBUS_RESULT_H_
src/libebus/symbol.cpp
+176 -176
View File
@@ -1,176 +1,176 @@
/* /*
* Copyright (C) John Baier 2014 <john@johnm.de> * Copyright (C) John Baier 2012-2014 <ebusd@johnm.de>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#include "symbol.h" #include "symbol.h"
#include <iostream> #include <iostream>
#include <iomanip> #include <iomanip>
namespace libebus namespace libebus
{ {
/** /**
* @brief CRC8 lookup table for the polynom 0x9b = x^8 + x^7 + x^4 + x^3 + x^1 + 1. * @brief CRC8 lookup table for the polynom 0x9b = x^8 + x^7 + x^4 + x^3 + x^1 + 1.
*/ */
static const unsigned char CRC_LOOKUP_TABLE[] static const unsigned char CRC_LOOKUP_TABLE[]
{ {
0x00, 0x9b, 0xad, 0x36, 0xc1, 0x5a, 0x6c, 0xf7, 0x19, 0x82, 0xb4, 0x2f, 0xd8, 0x43, 0x75, 0xee, 0x00, 0x9b, 0xad, 0x36, 0xc1, 0x5a, 0x6c, 0xf7, 0x19, 0x82, 0xb4, 0x2f, 0xd8, 0x43, 0x75, 0xee,
0x32, 0xa9, 0x9f, 0x04, 0xf3, 0x68, 0x5e, 0xc5, 0x2b, 0xb0, 0x86, 0x1d, 0xea, 0x71, 0x47, 0xdc, 0x32, 0xa9, 0x9f, 0x04, 0xf3, 0x68, 0x5e, 0xc5, 0x2b, 0xb0, 0x86, 0x1d, 0xea, 0x71, 0x47, 0xdc,
0x64, 0xff, 0xc9, 0x52, 0xa5, 0x3e, 0x08, 0x93, 0x7d, 0xe6, 0xd0, 0x4b, 0xbc, 0x27, 0x11, 0x8a, 0x64, 0xff, 0xc9, 0x52, 0xa5, 0x3e, 0x08, 0x93, 0x7d, 0xe6, 0xd0, 0x4b, 0xbc, 0x27, 0x11, 0x8a,
0x56, 0xcd, 0xfb, 0x60, 0x97, 0x0c, 0x3a, 0xa1, 0x4f, 0xd4, 0xe2, 0x79, 0x8e, 0x15, 0x23, 0xb8, 0x56, 0xcd, 0xfb, 0x60, 0x97, 0x0c, 0x3a, 0xa1, 0x4f, 0xd4, 0xe2, 0x79, 0x8e, 0x15, 0x23, 0xb8,
0xc8, 0x53, 0x65, 0xfe, 0x09, 0x92, 0xa4, 0x3f, 0xd1, 0x4a, 0x7c, 0xe7, 0x10, 0x8b, 0xbd, 0x26, 0xc8, 0x53, 0x65, 0xfe, 0x09, 0x92, 0xa4, 0x3f, 0xd1, 0x4a, 0x7c, 0xe7, 0x10, 0x8b, 0xbd, 0x26,
0xfa, 0x61, 0x57, 0xcc, 0x3b, 0xa0, 0x96, 0x0d, 0xe3, 0x78, 0x4e, 0xd5, 0x22, 0xb9, 0x8f, 0x14, 0xfa, 0x61, 0x57, 0xcc, 0x3b, 0xa0, 0x96, 0x0d, 0xe3, 0x78, 0x4e, 0xd5, 0x22, 0xb9, 0x8f, 0x14,
0xac, 0x37, 0x01, 0x9a, 0x6d, 0xf6, 0xc0, 0x5b, 0xb5, 0x2e, 0x18, 0x83, 0x74, 0xef, 0xd9, 0x42, 0xac, 0x37, 0x01, 0x9a, 0x6d, 0xf6, 0xc0, 0x5b, 0xb5, 0x2e, 0x18, 0x83, 0x74, 0xef, 0xd9, 0x42,
0x9e, 0x05, 0x33, 0xa8, 0x5f, 0xc4, 0xf2, 0x69, 0x87, 0x1c, 0x2a, 0xb1, 0x46, 0xdd, 0xeb, 0x70, 0x9e, 0x05, 0x33, 0xa8, 0x5f, 0xc4, 0xf2, 0x69, 0x87, 0x1c, 0x2a, 0xb1, 0x46, 0xdd, 0xeb, 0x70,
0x0b, 0x90, 0xa6, 0x3d, 0xca, 0x51, 0x67, 0xfc, 0x12, 0x89, 0xbf, 0x24, 0xd3, 0x48, 0x7e, 0xe5, 0x0b, 0x90, 0xa6, 0x3d, 0xca, 0x51, 0x67, 0xfc, 0x12, 0x89, 0xbf, 0x24, 0xd3, 0x48, 0x7e, 0xe5,
0x39, 0xa2, 0x94, 0x0f, 0xf8, 0x63, 0x55, 0xce, 0x20, 0xbb, 0x8d, 0x16, 0xe1, 0x7a, 0x4c, 0xd7, 0x39, 0xa2, 0x94, 0x0f, 0xf8, 0x63, 0x55, 0xce, 0x20, 0xbb, 0x8d, 0x16, 0xe1, 0x7a, 0x4c, 0xd7,
0x6f, 0xf4, 0xc2, 0x59, 0xae, 0x35, 0x03, 0x98, 0x76, 0xed, 0xdb, 0x40, 0xb7, 0x2c, 0x1a, 0x81, 0x6f, 0xf4, 0xc2, 0x59, 0xae, 0x35, 0x03, 0x98, 0x76, 0xed, 0xdb, 0x40, 0xb7, 0x2c, 0x1a, 0x81,
0x5d, 0xc6, 0xf0, 0x6b, 0x9c, 0x07, 0x31, 0xaa, 0x44, 0xdf, 0xe9, 0x72, 0x85, 0x1e, 0x28, 0xb3, 0x5d, 0xc6, 0xf0, 0x6b, 0x9c, 0x07, 0x31, 0xaa, 0x44, 0xdf, 0xe9, 0x72, 0x85, 0x1e, 0x28, 0xb3,
0xc3, 0x58, 0x6e, 0xf5, 0x02, 0x99, 0xaf, 0x34, 0xda, 0x41, 0x77, 0xec, 0x1b, 0x80, 0xb6, 0x2d, 0xc3, 0x58, 0x6e, 0xf5, 0x02, 0x99, 0xaf, 0x34, 0xda, 0x41, 0x77, 0xec, 0x1b, 0x80, 0xb6, 0x2d,
0xf1, 0x6a, 0x5c, 0xc7, 0x30, 0xab, 0x9d, 0x06, 0xe8, 0x73, 0x45, 0xde, 0x29, 0xb2, 0x84, 0x1f, 0xf1, 0x6a, 0x5c, 0xc7, 0x30, 0xab, 0x9d, 0x06, 0xe8, 0x73, 0x45, 0xde, 0x29, 0xb2, 0x84, 0x1f,
0xa7, 0x3c, 0x0a, 0x91, 0x66, 0xfd, 0xcb, 0x50, 0xbe, 0x25, 0x13, 0x88, 0x7f, 0xe4, 0xd2, 0x49, 0xa7, 0x3c, 0x0a, 0x91, 0x66, 0xfd, 0xcb, 0x50, 0xbe, 0x25, 0x13, 0x88, 0x7f, 0xe4, 0xd2, 0x49,
0x95, 0x0e, 0x38, 0xa3, 0x54, 0xcf, 0xf9, 0x62, 0x8c, 0x17, 0x21, 0xba, 0x4d, 0xd6, 0xe0, 0x7b, 0x95, 0x0e, 0x38, 0xa3, 0x54, 0xcf, 0xf9, 0x62, 0x8c, 0x17, 0x21, 0xba, 0x4d, 0xd6, 0xe0, 0x7b,
}; };
SymbolString::SymbolString(const std::string str) SymbolString::SymbolString(const std::string str)
: m_crc(0) : m_crc(0)
{ {
// parse + escape // parse + escape
for (size_t i = 0; i+1 < str.size(); i += 2) { for (size_t i = 0; i+1 < str.size(); i += 2) {
unsigned long value = strtoul(str.substr(i, 2).c_str(), NULL, 16); unsigned long value = strtoul(str.substr(i, 2).c_str(), NULL, 16);
push_back_escape((unsigned char)value); push_back_escape((unsigned char)value);
} }
// add CRC + escape // add CRC + escape
push_back_escape(m_crc, false); push_back_escape(m_crc, false);
} }
SymbolString::SymbolString(const std::string str, bool escaped) SymbolString::SymbolString(const std::string str, bool escaped)
: m_crc(0) : m_crc(0)
{ {
bool previousEscape = false; bool previousEscape = false;
// parse + optionally unescape // parse + optionally unescape
for (size_t i = 0; i+1 < str.size(); i += 2) { for (size_t i = 0; i+1 < str.size(); i += 2) {
unsigned long value = strtoul(str.substr(i, 2).c_str(), NULL, 16); unsigned long value = strtoul(str.substr(i, 2).c_str(), NULL, 16);
if (escaped == true) { if (escaped == true) {
push_back_unescape((unsigned char)value, previousEscape, false); push_back_unescape((unsigned char)value, previousEscape, false);
} }
else else
m_data.push_back((unsigned char)value); m_data.push_back((unsigned char)value);
} }
} }
const std::string SymbolString::getDataStr(bool unescape) const std::string SymbolString::getDataStr(bool unescape)
{ {
std::stringstream sstr; std::stringstream sstr;
bool previousEscape = false; bool previousEscape = false;
for (size_t i = 0; i < size(); i++) { for (size_t i = 0; i < size(); i++) {
unsigned char value = at(i); unsigned char value = at(i);
if (unescape == true && previousEscape == true) { if (unescape == true && previousEscape == true) {
if (value == 0x00) { if (value == 0x00) {
sstr << "a9"; // ESC sstr << "a9"; // ESC
} }
else if (value == 0x01) { else if (value == 0x01) {
sstr << "aa"; // SYN sstr << "aa"; // SYN
} }
else { else {
sstr << "XX"; // invalid escape sequence sstr << "XX"; // invalid escape sequence
} }
previousEscape = false; previousEscape = false;
} }
else if (unescape == true && value == ESC) { else if (unescape == true && value == ESC) {
previousEscape = true; // escape sequence not yet finished previousEscape = true; // escape sequence not yet finished
} }
else { else {
sstr << std::nouppercase << std::setw(2) << std::hex sstr << std::nouppercase << std::setw(2) << std::hex
<< std::setfill('0') << static_cast<unsigned>(value); << std::setfill('0') << static_cast<unsigned>(value);
} }
} }
return sstr.str(); return sstr.str();
} }
void SymbolString::push_back_escape(const unsigned char value, bool updateCRC) void SymbolString::push_back_escape(const unsigned char value, bool updateCRC)
{ {
if (value == ESC) { if (value == ESC) {
m_data.push_back(ESC); m_data.push_back(ESC);
m_data.push_back(0x00); m_data.push_back(0x00);
if (updateCRC) { if (updateCRC) {
addCRC(ESC); addCRC(ESC);
addCRC(0x00); addCRC(0x00);
} }
} }
else if (value == SYN) { else if (value == SYN) {
m_data.push_back(ESC); m_data.push_back(ESC);
m_data.push_back(0x01); m_data.push_back(0x01);
if (updateCRC) { if (updateCRC) {
addCRC(ESC); addCRC(ESC);
addCRC(0x01); addCRC(0x01);
} }
} }
else { else {
m_data.push_back(value); m_data.push_back(value);
if (updateCRC) { if (updateCRC) {
addCRC(value); addCRC(value);
} }
} }
} }
unsigned char SymbolString::push_back_unescape(const unsigned char value, bool& previousEscape, bool updateCRC) unsigned char SymbolString::push_back_unescape(const unsigned char value, bool& previousEscape, bool updateCRC)
{ {
if (updateCRC) { if (updateCRC) {
addCRC(value); addCRC(value);
} }
if (previousEscape == true) { if (previousEscape == true) {
if (value == 0x00) { if (value == 0x00) {
m_data.push_back(ESC); m_data.push_back(ESC);
previousEscape = false; previousEscape = false;
return ESC; return ESC;
} }
if (value == 0x01) { if (value == 0x01) {
m_data.push_back(SYN); m_data.push_back(SYN);
previousEscape = false; previousEscape = false;
return SYN; return SYN;
} }
return 0; // invalid escape sequence return 0; // invalid escape sequence
} }
if (value == ESC) { if (value == ESC) {
previousEscape = true; previousEscape = true;
return 1; // escape sequence not yet finished return 1; // escape sequence not yet finished
} }
m_data.push_back(value); m_data.push_back(value);
return value; return value;
} }
void SymbolString::addCRC(const unsigned char value) { void SymbolString::addCRC(const unsigned char value) {
m_crc = CRC_LOOKUP_TABLE[m_crc]^value; m_crc = CRC_LOOKUP_TABLE[m_crc]^value;
} }
bool isMaster(unsigned char addr) { bool isMaster(unsigned char addr) {
unsigned char addrHi = (addr & 0xF0) >> 4; unsigned char addrHi = (addr & 0xF0) >> 4;
unsigned char addrLo = (addr & 0x0F); unsigned char addrLo = (addr & 0x0F);
return ((addrHi == 0x0) || (addrHi == 0x1) || (addrHi == 0x3) || (addrHi == 0x7) || (addrHi == 0xF)) return ((addrHi == 0x0) || (addrHi == 0x1) || (addrHi == 0x3) || (addrHi == 0x7) || (addrHi == 0xF))
&& ((addrLo == 0x0) || (addrLo == 0x1) || (addrLo == 0x3) || (addrLo == 0x7) || (addrLo == 0xF)); && ((addrLo == 0x0) || (addrLo == 0x1) || (addrLo == 0x3) || (addrLo == 0x7) || (addrLo == 0xF));
} }
} //namespace } //namespace
src/libebus/symbol.h
+148 -148
View File
@@ -1,148 +1,148 @@
/* /*
* Copyright (C) John Baier 2014 <john@johnm.de> * Copyright (C) John Baier 2012-2014 <ebusd@johnm.de>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#ifndef LIBEBUS_SYMBOL_H_ #ifndef LIBEBUS_SYMBOL_H_
#define LIBEBUS_SYMBOL_H_ #define LIBEBUS_SYMBOL_H_
#include <cstring> #include <cstring>
#include <cstdlib> #include <cstdlib>
#include <sstream> #include <sstream>
#include <queue> #include <queue>
namespace libebus 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 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 SYN = 0xAA; // synchronization symbol
static const unsigned char ACK = 0x00; // positive acknowledge static const unsigned char ACK = 0x00; // positive acknowledge
static const unsigned char NAK = 0xFF; // negative acknowledge static const unsigned char NAK = 0xFF; // negative acknowledge
static const unsigned char BROADCAST = 0xFE; // the broadcast destination address static const unsigned char BROADCAST = 0xFE; // the broadcast destination address
/** /**
* @brief A string of bus symbols. * @brief A string of bus symbols.
*/ */
class SymbolString class SymbolString
{ {
public: public:
/** /**
* @brief Creates a new empty SymbolString. * @brief Creates a new empty SymbolString.
*/ */
SymbolString() : m_crc(0) {} SymbolString() : m_crc(0) {}
/** /**
* @brief Creates a new escaped SymbolString from an unescaped hex string and adds the calculated CRC. * @brief Creates a new escaped SymbolString from an unescaped hex string and adds the calculated CRC.
* @param str the unescaped hex string. * @param str the unescaped hex string.
*/ */
SymbolString(const std::string str); SymbolString(const std::string str);
/** /**
* @brief Creates a new unescaped SymbolString from a hex string. * @brief Creates a new unescaped SymbolString from a hex string.
* @param escaped whether the hex string is escaped and shall be unescaped. * @param escaped whether the hex string is escaped and shall be unescaped.
* @param str the hex string. * @param str the hex string.
*/ */
SymbolString(const std::string str, bool escaped); SymbolString(const std::string str, bool escaped);
/** /**
* @brief Returns the symbols as hex string. * @brief Returns the symbols as hex string.
* @param escaped whether to unescape the symbols. * @param escaped whether to unescape the symbols.
* @return the symbols as hex string. * @return the symbols as hex string.
*/ */
const std::string getDataStr(bool unescape=false); const std::string getDataStr(bool unescape=false);
/** /**
* @brief Returns the symbol at the specified index. * @brief Returns the symbol at the specified index.
* @param index the index of the symbol to return. * @param index the index of the symbol to return.
* @return the symbol at the specified index. * @return the symbol at the specified index.
* @throw std::out_of_range if @a index is invalid. * @throw std::out_of_range if @a index is invalid.
*/ */
unsigned char at(const size_t index) { return m_data.at(index); } unsigned char at(const size_t index) { return m_data.at(index); }
/** /**
* @brief Returns the symbol at the specified index. * @brief Returns the symbol at the specified index.
* @param index the index of the symbol to return. * @param index the index of the symbol to return.
* @return the symbol at the specified index. * @return the symbol at the specified index.
*/ */
unsigned char operator[](const size_t index) { return m_data[index]; } unsigned char operator[](const size_t index) { return m_data[index]; }
/** /**
* @brief Returns the symbol at the specified index. * @brief Returns the symbol at the specified index.
* @param index the index of the symbol to return. * @param index the index of the symbol to return.
* @return the symbol at the specified index. * @return the symbol at the specified index.
*/ */
unsigned char operator[](const size_t index) const { return m_data[index]; } unsigned char operator[](const size_t index) const { return m_data[index]; }
/** /**
* @brief Inserts a the symbol at the specified index. * @brief Inserts a the symbol at the specified index.
* @param index the index at which to insert the symbol. * @param index the index at which to insert the symbol.
* @param value the symbol to insert. * @param value the symbol to insert.
*/ */
void insert(const size_t index, const unsigned char value) { m_data.insert(m_data.begin()+index, value); } void insert(const size_t index, const unsigned char value) { m_data.insert(m_data.begin()+index, value); }
/** /**
* @brief Appends a the symbol to the end of the symbol string and escapes it if necessary. * @brief Appends a the symbol to the end of the symbol string and escapes it if necessary.
* @param value the symbol to append. * @param value the symbol to append.
* @param updateCrc whether to update the calculated CRC in @a m_crc. * @param updateCrc whether to update the calculated CRC in @a m_crc.
*/ */
void push_back_escape(const unsigned char value, bool updateCRC=true); void push_back_escape(const unsigned char value, bool updateCRC=true);
/** /**
* @brief Appends a the symbol to the end of the symbol string and unescapes it. * @brief Appends a the symbol to the end of the symbol string and unescapes it.
* @param value the symbol to append. * @param value the symbol to append.
* @param previousEscape whether the previous value was the escape symbol (set to false for the initial call). * @param previousEscape whether the previous value was the escape symbol (set to false for the initial call).
* @param updateCrc whether to update the calculated CRC in @a m_crc. * @param updateCrc whether to update the calculated CRC in @a m_crc.
* @return if previousEscape is false on return: the unescaped symbol. otherwise: zero if the escape sequence was invalid, one if the escape sequence is not yet finished. * @return if previousEscape is false on return: the unescaped symbol. otherwise: zero if the escape sequence was invalid, one if the escape sequence is not yet finished.
*/ */
unsigned char push_back_unescape(const unsigned char value, bool& previousEscape, bool updateCRC=true); unsigned char push_back_unescape(const unsigned char value, bool& previousEscape, bool updateCRC=true);
/** /**
* @brief Returns the number of symbols in this symbol string. * @brief Returns the number of symbols in this symbol string.
* @return the number of available symbols. * @return the number of available symbols.
*/ */
size_t size() const { return m_data.size(); } size_t size() const { return m_data.size(); }
/** /**
* @brief Returns the calculated CRC. * @brief Returns the calculated CRC.
* @return the calculated CRC. * @return the calculated CRC.
*/ */
unsigned char getCRC() const { return m_crc; } unsigned char getCRC() const { return m_crc; }
/** /**
* @brief Clears the symbols. * @brief Clears the symbols.
*/ */
void clear() { m_crc=0; m_data.clear(); } void clear() { m_crc=0; m_data.clear(); }
private: private:
/** /**
* @brief Updates the calculated CRC in @a m_crc by adding a value. * @brief Updates the calculated CRC in @a m_crc by adding a value.
* @param value the (escaped) value to add to the calculated CRC in @a m_crc. * @param value the (escaped) value to add to the calculated CRC in @a m_crc.
*/ */
void addCRC(const unsigned char value); void addCRC(const unsigned char value);
/** /**
* @brief the string of bus symbols. * @brief the string of bus symbols.
*/ */
std::vector<unsigned char> m_data; std::vector<unsigned char> m_data;
/** /**
* @brief the calculated CRC. * @brief the calculated CRC.
*/ */
unsigned char m_crc; unsigned char m_crc;
}; };
/** /**
* Returns whether the address is one of the 25 master addresses. * Returns whether the address is one of the 25 master addresses.
* @param addr the address to check. * @param addr the address to check.
* @return <code>true</code> if the specified address is a master address. * @return <code>true</code> if the specified address is a master address.
*/ */
bool isMaster(unsigned char addr); bool isMaster(unsigned char addr);
} //namespace } //namespace
#endif // LIBEBUS_SYMBOL_H_ #endif // LIBEBUS_SYMBOL_H_
src/test/command.csv
+4 -4
View File
@@ -1,4 +1,4 @@
# type;class;cmd;comment;msg type;ZZ;PBSB;NN;D1D2D3;elements;sub;part;position;datatype;factor;unit;valid;comment;sub;part;position;datatype;factor;unit;valid;comment;sub;part;position;datatype;factor;unit;valid;comment;sub;part;position;datatype;factor;unit;valid;comment # type;class;cmd;comment;QQ;ZZ;PBSB;NN;D1D2D3;elements;sub;part;position;datatype;factor;unit;valid;comment;sub;part;position;datatype;factor;unit;valid;comment;sub;part;position;datatype;factor;unit;valid;comment;sub;part;position;datatype;factor;unit;valid;comment
c;broad;date_time_temp;Datum, Uhrzeit und Aussentempertur;BR;FE;0700;9;-;4;temp;md;1,2;d2b;1.0;°C;-;Temperatur;day;md;8;bdy;-;-;-;Wochentag;date;md;6,7,9;bda;-;-;-;Datum;time;md;5,4,3;bti;-;-;-;Uhrzeit c;broad;date_time_temp;Datum, Uhrzeit und Aussentempertur;;FE;0700;9;-;4;temp;md;1,2;d2b;1.0;°C;-;Temperatur;day;md;8;bdy;-;-;-;Wochentag;date;md;6,7,9;bda;-;-;-;Datum;time;md;5,4,3;bti;-;-;-;Uhrzeit
g;ci;Password;Kennwort;MS;15;B509;3;0D2C00;4;pin1;sd;1;uch;-;-;-;Pin 1;pin2;sd;2;uch;-;-;-;Pin 2;pin3;sd;3;uch;-;-;-;Pin 3;pin4;sd;4;uch;-;-;-;Pin 4 g;ci;Password;Kennwort;;15;B509;3;0D2C00;4;pin1;sd;1;uch;-;-;-;Pin 1;pin2;sd;2;uch;-;-;-;Pin 2;pin3;sd;3;uch;-;-;-;Pin 3;pin4;sd;4;uch;-;-;-;Pin 4
s;vwxmk;DesiredTemp;Solltemperatur;MS;50;B509;4;0E3200;1;-;sd;1;d1c;1.0;°C;-;-;;;;;;;;;;;;;;;;;;;;;;;; s;vwxmk;DesiredTemp;Solltemperatur;;50;B509;4;0E3200;1;-;sd;1;d1c;1.0;°C;-;-;;;;;;;;;;;;;;;;;;;;;;;;
1 # type class cmd comment msg type QQ ZZ PBSB NN D1D2D3 elements sub part position datatype factor unit valid comment sub part position datatype factor unit valid comment sub part position datatype factor unit valid comment sub part position datatype factor unit valid comment
2 c broad date_time_temp Datum, Uhrzeit und Aussentempertur BR FE 0700 9 - 4 temp md 1,2 d2b 1.0 °C - Temperatur day md 8 bdy - - - Wochentag date md 6,7,9 bda - - - Datum time md 5,4,3 bti - - - Uhrzeit
3 g ci Password Kennwort MS 15 B509 3 0D2C00 4 pin1 sd 1 uch - - - Pin 1 pin2 sd 2 uch - - - Pin 2 pin3 sd 3 uch - - - Pin 3 pin4 sd 4 uch - - - Pin 4
4 s vwxmk DesiredTemp Solltemperatur MS 50 B509 4 0E3200 1 - sd 1 d1c 1.0 °C - -
src/test/test_bus.cpp
+5 -5
View File
@@ -1,20 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#include "bus.h" #include "bus.h"
src/test/test_commands.cpp
+5 -5
View File
@@ -1,20 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#include "configfile.h" #include "configfile.h"
src/test/test_configfile.cpp
+5 -5
View File
@@ -1,20 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#include "configfile.h" #include "configfile.h"
src/test/test_decode.cpp
+5 -5
View File
@@ -1,20 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#include "decode.h" #include "decode.h"
src/test/test_encode.cpp
+5 -5
View File
@@ -1,20 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#include "encode.h" #include "encode.h"
src/test/test_port.cpp
+5 -5
View File
@@ -1,20 +1,20 @@
/* /*
* Copyright (C) Roland Jax 2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#include "port.h" #include "port.h"
src/test/test_symbol.cpp
+5 -5
View File
@@ -1,20 +1,20 @@
/* /*
* Copyright (C) John Baier 2014 <john@johnm.de> * Copyright (C) John Baier 2012-2014 <ebusd@johnm.de>
* *
* This file is part of libebus. * This file is part of ebusd.
* *
* libebus is free software: you can redistribute it and/or modify * ebusd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* libebus is distributed in the hope that it will be useful, * ebusd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libebus. If not, see http://www.gnu.org/licenses/. * along with ebusd. If not, see http://www.gnu.org/licenses/.
*/ */
#include "symbol.h" #include "symbol.h"
src/tools/ebusctl.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at> * Copyright (C) Roland Jax 2012-2014 <ebusd@liwest.at>
* *
* This file is part of ebusd. * This file is part of ebusd.
* *