various clean ups after libebus merging.

AUTHORS

@@ -1 +1,2 @@
-Roland Jax <roland.jax@liwest.at>
+Roland Jax <ebusd@liwest.at>
+John Baier <ebusd@johnm.de>

README

@@ -66,4 +66,4 @@ ebusctl  - client program for ebusd.
 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,5 +1,5 @@
 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
 

src/ebusd/baseloop.cpp

@@ -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.
  *
@@ -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
 		       << " 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
-		       << " 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
 		       << " quit      - close connection" << std::endl << std::endl
 		       << " help      - print this page";

src/ebusd/baseloop.h

@@ -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.
  *

src/ebusd/connection.cpp

@@ -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.
  *

src/ebusd/connection.h

@@ -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.
  *

src/ebusd/ebusloop.cpp

@@ -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.
  *
@@ -70,7 +70,6 @@ void* EBusLoop::run()
 	time_t pollStart, pollEnd;
 	time(&pollStart);
 	double pollDelta = 0.0;
-	bool pollCommandActive = false;
 
 	for (;;) {
 		if (m_bus->isConnected() == true) {
@@ -154,7 +153,6 @@ void* EBusLoop::run()
 					m_bus->addCommand(busCommand);
 					L.log(bus, debug, " addCommand success");
 					busCommandActive = true;
-					pollCommandActive = true;
 
 					time(&pollStart);
 				}
@@ -181,7 +179,6 @@ void* EBusLoop::run()
 							m_commands->storePolData(busCommand->getMessageStr().c_str()); // TODO use getResult()
 
 						delete busCommand;
-						pollCommandActive = false;
 					} else {
 						busCommand->sendSignal();
 					}
@@ -206,7 +203,6 @@ void* EBusLoop::run()
 					}
 					lookbusretries = 0;
 					busCommandActive = false;
-					pollCommandActive = false;
 				}else {
 					lookbusretries++;
 				}

src/ebusd/ebusloop.h

@@ -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.
  *

src/ebusd/main.cpp

@@ -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.
  *

src/ebusd/message.h

@@ -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.
  *

src/ebusd/network.cpp

@@ -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.
  *

src/ebusd/network.h

@@ -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.
  *

src/libcore/appl.cpp

@@ -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.
  *

src/libcore/appl.h

@@ -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.
  *
@@ -17,8 +17,8 @@
  * 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 <cstring>
@@ -109,4 +109,4 @@ private:
 	void addParam(const char* name, const std::string arg, Datatype datatype);
 };
 
-#endif // APPL_H_
+#endif // LIBCORE_APPL_H_

src/libcore/daemon.cpp

@@ -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.
  *

src/libcore/daemon.h

@@ -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.
  *
@@ -17,8 +17,8 @@
  * 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
 {
@@ -45,4 +45,4 @@ private:
 
 };
 
-#endif // DAEMON_H_
+#endif // LIBCORE_DAEMON_H_

src/libcore/logger.cpp

@@ -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.
  *

src/libcore/logger.h

@@ -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.
  *
@@ -17,8 +17,8 @@
  * 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 "thread.h"
@@ -178,4 +178,4 @@ private:
 
 };
 
-#endif // LOGGER_H_
+#endif // LIBCORE_LOGGER_H_

src/libcore/notify.h

@@ -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.
  *
@@ -17,8 +17,8 @@
  * 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 <fcntl.h>
@@ -51,6 +51,6 @@ private:
 
 };
 
-#endif // NOTIFY_H_
+#endif // LIBCORE_NOTIFY_H_
 
 

src/libcore/tcpsocket.cpp

@@ -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.
  *

src/libcore/tcpsocket.h

@@ -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.
  *
@@ -17,8 +17,8 @@
  * 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/socket.h>
@@ -84,5 +84,5 @@ private:
 
 };
 
-#endif // TCPSOCKET_H_
+#endif // LIBCORE_TCPSOCKET_H_
 

src/libcore/thread.cpp

@@ -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.
  *

src/libcore/thread.h

@@ -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.
  *
@@ -17,8 +17,8 @@
  * 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>
 
@@ -43,4 +43,4 @@ private:
 
 };
 
-#endif // THREAD_H_
+#endif // LIBCORE_THREAD_H_

src/libcore/wqueue.h

@@ -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.
  *
@@ -17,8 +17,8 @@
  * 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 <pthread.h>
@@ -82,4 +82,4 @@ private:
 
 };
 
-#endif // WQUEUE_H_
+#endif // LIBCORE_WQUEUE_H_

src/libebus/bus.cpp

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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"

src/libebus/bus.h

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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_

src/libebus/command.cpp

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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"

src/libebus/command.h

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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_

src/libebus/commands.cpp

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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"

src/libebus/commands.h

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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_

src/libebus/configfile.cpp

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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"

src/libebus/configfile.h

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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_

src/libebus/decode.cpp

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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"

src/libebus/decode.h

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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_

src/libebus/dump.cpp

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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"

src/libebus/dump.h

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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_

src/libebus/encode.cpp

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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"

src/libebus/encode.h

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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_

src/libebus/port.cpp

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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"

src/libebus/port.h

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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_

src/libebus/result.cpp

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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"

src/libebus/result.h

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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_

src/libebus/symbol.cpp

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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"

src/libebus/symbol.h

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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_

src/test/command.csv

@@ -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;-;-;;;;;;;;;;;;;;;;;;;;;;;;

src/test/test_bus.cpp

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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"

src/test/test_commands.cpp

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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"

src/test/test_configfile.cpp

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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"

src/test/test_decode.cpp

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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"

src/test/test_encode.cpp

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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"

src/test/test_port.cpp

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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"

src/test/test_symbol.cpp

@@ -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
  * the Free Software Foundation, either version 3 of the License, or
  * (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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * 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"

src/tools/ebusctl.cpp

@@ -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.
  *