diff --git a/AUTHORS b/AUTHORS index f24a463e..b0fd6174 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1,2 @@ -Roland Jax +Roland Jax +John Baier diff --git a/README b/README index 677ccbd1..986de79e 100644 --- a/README +++ b/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. diff --git a/configure.ac b/configure.ac index 360b26cc..91356aaa 100644 --- a/configure.ac +++ b/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 diff --git a/src/ebusd/baseloop.cpp b/src/ebusd/baseloop.cpp index 4ef45f93..b74e34ee 100644 --- a/src/ebusd/baseloop.cpp +++ b/src/ebusd/baseloop.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * 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 ebus configuration 'config reload'" << std::endl << std::endl + << " reload - reload ebus configuration" << std::endl << std::endl << " stop - stop daemon" << std::endl << " quit - close connection" << std::endl << std::endl << " help - print this page"; diff --git a/src/ebusd/baseloop.h b/src/ebusd/baseloop.h index 9f66f57c..f71649f2 100644 --- a/src/ebusd/baseloop.h +++ b/src/ebusd/baseloop.h @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * diff --git a/src/ebusd/connection.cpp b/src/ebusd/connection.cpp index f633b71d..f48bfdd5 100644 --- a/src/ebusd/connection.cpp +++ b/src/ebusd/connection.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * diff --git a/src/ebusd/connection.h b/src/ebusd/connection.h index 4abf2da9..49c0d690 100644 --- a/src/ebusd/connection.h +++ b/src/ebusd/connection.h @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * diff --git a/src/ebusd/ebusloop.cpp b/src/ebusd/ebusloop.cpp index 836aa7c2..d6d8a26b 100644 --- a/src/ebusd/ebusloop.cpp +++ b/src/ebusd/ebusloop.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * 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++; } diff --git a/src/ebusd/ebusloop.h b/src/ebusd/ebusloop.h index 7ae993ae..09c69992 100644 --- a/src/ebusd/ebusloop.h +++ b/src/ebusd/ebusloop.h @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * diff --git a/src/ebusd/main.cpp b/src/ebusd/main.cpp index 303a40ef..015eee56 100644 --- a/src/ebusd/main.cpp +++ b/src/ebusd/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * diff --git a/src/ebusd/message.h b/src/ebusd/message.h index 5b91464b..8344643e 100644 --- a/src/ebusd/message.h +++ b/src/ebusd/message.h @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * diff --git a/src/ebusd/network.cpp b/src/ebusd/network.cpp index 9fbfc91d..ee0a649b 100644 --- a/src/ebusd/network.cpp +++ b/src/ebusd/network.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * diff --git a/src/ebusd/network.h b/src/ebusd/network.h index 88e9c21c..fc04ffc7 100644 --- a/src/ebusd/network.h +++ b/src/ebusd/network.h @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * diff --git a/src/libcore/appl.cpp b/src/libcore/appl.cpp index 4d12fef1..795898f0 100644 --- a/src/libcore/appl.cpp +++ b/src/libcore/appl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * diff --git a/src/libcore/appl.h b/src/libcore/appl.h index ae040b91..d9684644 100644 --- a/src/libcore/appl.h +++ b/src/libcore/appl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * @@ -17,8 +17,8 @@ * along with ebusd. If not, see http://www.gnu.org/licenses/. */ -#ifndef APPL_H_ -#define APPL_H_ +#ifndef LIBCORE_APPL_H_ +#define LIBCORE_APPL_H_ #include #include @@ -109,4 +109,4 @@ private: void addParam(const char* name, const std::string arg, Datatype datatype); }; -#endif // APPL_H_ +#endif // LIBCORE_APPL_H_ diff --git a/src/libcore/daemon.cpp b/src/libcore/daemon.cpp index 73cc07cc..18c35a3e 100644 --- a/src/libcore/daemon.cpp +++ b/src/libcore/daemon.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * diff --git a/src/libcore/daemon.h b/src/libcore/daemon.h index 2234557b..37ac41b3 100644 --- a/src/libcore/daemon.h +++ b/src/libcore/daemon.h @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * @@ -17,8 +17,8 @@ * along with ebusd. If not, see http://www.gnu.org/licenses/. */ -#ifndef DAEMON_H_ -#define DAEMON_H_ +#ifndef LIBCORE_DAEMON_H_ +#define LIBCORE_DAEMON_H_ class Daemon { @@ -45,4 +45,4 @@ private: }; -#endif // DAEMON_H_ +#endif // LIBCORE_DAEMON_H_ diff --git a/src/libcore/logger.cpp b/src/libcore/logger.cpp index ccfe11a5..c6708a7a 100644 --- a/src/libcore/logger.cpp +++ b/src/libcore/logger.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * diff --git a/src/libcore/logger.h b/src/libcore/logger.h index 94af4e93..d704e2c1 100644 --- a/src/libcore/logger.h +++ b/src/libcore/logger.h @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * @@ -17,8 +17,8 @@ * along with ebusd. If not, see http://www.gnu.org/licenses/. */ -#ifndef LOGGER_H_ -#define LOGGER_H_ +#ifndef LIBCORE_LOGGER_H_ +#define LIBCORE_LOGGER_H_ #include "wqueue.h" #include "thread.h" @@ -178,4 +178,4 @@ private: }; -#endif // LOGGER_H_ +#endif // LIBCORE_LOGGER_H_ diff --git a/src/libcore/notify.h b/src/libcore/notify.h index acd5890d..91909662 100644 --- a/src/libcore/notify.h +++ b/src/libcore/notify.h @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * @@ -17,8 +17,8 @@ * along with ebusd. If not, see http://www.gnu.org/licenses/. */ -#ifndef NOTIFY_H_ -#define NOTIFY_H_ +#ifndef LIBCORE_NOTIFY_H_ +#define LIBCORE_NOTIFY_H_ #include #include @@ -51,6 +51,6 @@ private: }; -#endif // NOTIFY_H_ +#endif // LIBCORE_NOTIFY_H_ diff --git a/src/libcore/tcpsocket.cpp b/src/libcore/tcpsocket.cpp index 9275bd3c..627d0d3c 100644 --- a/src/libcore/tcpsocket.cpp +++ b/src/libcore/tcpsocket.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * diff --git a/src/libcore/tcpsocket.h b/src/libcore/tcpsocket.h index eb61fe03..335cfb64 100644 --- a/src/libcore/tcpsocket.h +++ b/src/libcore/tcpsocket.h @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * @@ -17,8 +17,8 @@ * along with ebusd. If not, see http://www.gnu.org/licenses/. */ -#ifndef TCPSOCKET_H_ -#define TCPSOCKET_H_ +#ifndef LIBCORE_TCPSOCKET_H_ +#define LIBCORE_TCPSOCKET_H_ #include #include @@ -84,5 +84,5 @@ private: }; -#endif // TCPSOCKET_H_ +#endif // LIBCORE_TCPSOCKET_H_ diff --git a/src/libcore/thread.cpp b/src/libcore/thread.cpp index 3d913a05..48dbc250 100644 --- a/src/libcore/thread.cpp +++ b/src/libcore/thread.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * diff --git a/src/libcore/thread.h b/src/libcore/thread.h index b04fe264..913735a3 100644 --- a/src/libcore/thread.h +++ b/src/libcore/thread.h @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * @@ -17,8 +17,8 @@ * along with ebusd. If not, see http://www.gnu.org/licenses/. */ -#ifndef THREAD_H_ -#define THREAD_H_ +#ifndef LIBCORE_THREAD_H_ +#define LIBCORE_THREAD_H_ #include @@ -43,4 +43,4 @@ private: }; -#endif // THREAD_H_ +#endif // LIBCORE_THREAD_H_ diff --git a/src/libcore/wqueue.h b/src/libcore/wqueue.h index 159f73cf..15cca9a0 100644 --- a/src/libcore/wqueue.h +++ b/src/libcore/wqueue.h @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. * @@ -17,8 +17,8 @@ * along with ebusd. If not, see http://www.gnu.org/licenses/. */ -#ifndef WQUEUE_H_ -#define WQUEUE_H_ +#ifndef LIBCORE_WQUEUE_H_ +#define LIBCORE_WQUEUE_H_ #include #include @@ -82,4 +82,4 @@ private: }; -#endif // WQUEUE_H_ +#endif // LIBCORE_WQUEUE_H_ diff --git a/src/libebus/bus.cpp b/src/libebus/bus.cpp index 3c83ed2a..99f337ae 100644 --- a/src/libebus/bus.cpp +++ b/src/libebus/bus.cpp @@ -1,20 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 + * Copyright (C) Roland Jax 2012-2014 * - * 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" diff --git a/src/libebus/bus.h b/src/libebus/bus.h index 39d8a8b6..628c367a 100644 --- a/src/libebus/bus.h +++ b/src/libebus/bus.h @@ -1,20 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 + * Copyright (C) Roland Jax 2012-2014 * - * 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_ diff --git a/src/libebus/command.cpp b/src/libebus/command.cpp index 786435e5..8c475d34 100644 --- a/src/libebus/command.cpp +++ b/src/libebus/command.cpp @@ -1,20 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 + * Copyright (C) Roland Jax 2012-2014 * - * 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" diff --git a/src/libebus/command.h b/src/libebus/command.h index a948c1af..91bebf53 100644 --- a/src/libebus/command.h +++ b/src/libebus/command.h @@ -1,20 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 + * Copyright (C) Roland Jax 2012-2014 * - * 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_ diff --git a/src/libebus/commands.cpp b/src/libebus/commands.cpp index 2e6ab330..97146ce2 100644 --- a/src/libebus/commands.cpp +++ b/src/libebus/commands.cpp @@ -1,20 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 + * Copyright (C) Roland Jax 2012-2014 * - * 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" diff --git a/src/libebus/commands.h b/src/libebus/commands.h index 8f7793a1..121587a0 100644 --- a/src/libebus/commands.h +++ b/src/libebus/commands.h @@ -1,20 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 + * Copyright (C) Roland Jax 2012-2014 * - * 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_ diff --git a/src/libebus/configfile.cpp b/src/libebus/configfile.cpp index 61652d73..70e42917 100644 --- a/src/libebus/configfile.cpp +++ b/src/libebus/configfile.cpp @@ -1,20 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 + * Copyright (C) Roland Jax 2012-2014 * - * 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" diff --git a/src/libebus/configfile.h b/src/libebus/configfile.h index 7e6c58b8..95d778ac 100644 --- a/src/libebus/configfile.h +++ b/src/libebus/configfile.h @@ -1,20 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 + * Copyright (C) Roland Jax 2012-2014 * - * 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_ diff --git a/src/libebus/decode.cpp b/src/libebus/decode.cpp index 920ab1d1..e8fd7a9f 100644 --- a/src/libebus/decode.cpp +++ b/src/libebus/decode.cpp @@ -1,21 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 - * crc calculations from http://www.mikrocontroller.net/topic/75698 + * Copyright (C) Roland Jax 2012-2014 * - * 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" diff --git a/src/libebus/decode.h b/src/libebus/decode.h index 896702fc..d37cefe3 100644 --- a/src/libebus/decode.h +++ b/src/libebus/decode.h @@ -1,21 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 - * crc calculations from http://www.mikrocontroller.net/topic/75698 + * Copyright (C) Roland Jax 2012-2014 * - * 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_ diff --git a/src/libebus/dump.cpp b/src/libebus/dump.cpp index 2fa3595f..44104f0e 100644 --- a/src/libebus/dump.cpp +++ b/src/libebus/dump.cpp @@ -1,20 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 + * Copyright (C) Roland Jax 2012-2014 * - * 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" @@ -27,7 +27,7 @@ namespace libebus int Dump::write(const char* byte) { int ret = 0; - + std::ofstream fs(m_filename.c_str(), std::ios::out | std::ios::binary | std::ios::app); if (fs == 0) @@ -41,7 +41,7 @@ int Dump::write(const char* byte) oldfile += ".old"; ret = rename(m_filename.c_str(), oldfile.c_str()); } - + fs.close(); return ret; diff --git a/src/libebus/dump.h b/src/libebus/dump.h index 86940996..2062104a 100644 --- a/src/libebus/dump.h +++ b/src/libebus/dump.h @@ -1,20 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 + * Copyright (C) Roland Jax 2012-2014 * - * 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_ @@ -34,10 +34,10 @@ public: : m_filename(filename), m_filesize(filesize) {} int write(const char* byte); - + void setFilename(const std::string& filename) { m_filename = filename; } void setFilesize(const long filesize) { m_filesize = filesize; } - + private: std::string m_filename; long m_filesize; diff --git a/src/libebus/encode.cpp b/src/libebus/encode.cpp index 84a7d56a..76d55015 100644 --- a/src/libebus/encode.cpp +++ b/src/libebus/encode.cpp @@ -1,21 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 - * crc calculations from http://www.mikrocontroller.net/topic/75698 + * Copyright (C) Roland Jax 2012-2014 * - * 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" diff --git a/src/libebus/encode.h b/src/libebus/encode.h index c21e2efe..7730054b 100644 --- a/src/libebus/encode.h +++ b/src/libebus/encode.h @@ -1,21 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 - * crc calculations from http://www.mikrocontroller.net/topic/75698 + * Copyright (C) Roland Jax 2012-2014 * - * 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_ diff --git a/src/libebus/port.cpp b/src/libebus/port.cpp index 29189934..8b1dd1c8 100644 --- a/src/libebus/port.cpp +++ b/src/libebus/port.cpp @@ -1,20 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 + * Copyright (C) Roland Jax 2012-2014 * - * 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" @@ -89,7 +89,7 @@ ssize_t Device::recvBytes(const long timeout, size_t maxCount) ssize_t bytes_read = sizeof(m_buffer); if (maxCount > sizeof(m_buffer)) maxCount = sizeof(m_buffer); - + // read bytes from device bytes_read = read(m_fd, m_buffer, maxCount); diff --git a/src/libebus/port.h b/src/libebus/port.h index f01798d0..f69ba276 100644 --- a/src/libebus/port.h +++ b/src/libebus/port.h @@ -1,20 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 + * Copyright (C) Roland Jax 2012-2014 * - * 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_ diff --git a/src/libebus/result.cpp b/src/libebus/result.cpp index b7f574f2..4374d3d9 100644 --- a/src/libebus/result.cpp +++ b/src/libebus/result.cpp @@ -1,43 +1,43 @@ -/* - * Copyright (C) John Baier 2014 - * - * This file is part of libebus. - * - * libebus 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, - * 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/. - */ - -#include "result.h" - -namespace libebus -{ - -const char* getResultCodeCStr(int resultCode) { - switch (resultCode) { - case RESULT_ERR_SEND: return "ERR_SEND: send error"; - case RESULT_ERR_EXTRA_DATA: return "ERR_EXTRA_DATA: received bytes > sent bytes"; - case RESULT_ERR_NAK: return "ERR_NAK: NAK received"; - case RESULT_ERR_CRC: return "ERR_CRC: CRC error"; - case RESULT_ERR_ACK: return "ERR_ACK: ACK error"; - case RESULT_ERR_TIMEOUT: return "ERR_TIMEOUT: read timeout"; - case RESULT_ERR_SYN: return "ERR_SYN: SYN received"; - 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_INVALID_ARG: return "ERR_INVALID_ARG: invalid argument specified"; - case RESULT_ERR_DEVICE: return "ERR_DEVICE: generic device error"; - default: return "success"; - } -} - - -} //namespace +/* + * Copyright (C) John Baier 2012-2014 + * + * This file is part of ebusd. + * + * 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. + * + * 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 ebusd. If not, see http://www.gnu.org/licenses/. + */ + +#include "result.h" + +namespace libebus +{ + +const char* getResultCodeCStr(int resultCode) { + switch (resultCode) { + case RESULT_ERR_SEND: return "ERR_SEND: send error"; + case RESULT_ERR_EXTRA_DATA: return "ERR_EXTRA_DATA: received bytes > sent bytes"; + case RESULT_ERR_NAK: return "ERR_NAK: NAK received"; + case RESULT_ERR_CRC: return "ERR_CRC: CRC error"; + case RESULT_ERR_ACK: return "ERR_ACK: ACK error"; + case RESULT_ERR_TIMEOUT: return "ERR_TIMEOUT: read timeout"; + case RESULT_ERR_SYN: return "ERR_SYN: SYN received"; + 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_INVALID_ARG: return "ERR_INVALID_ARG: invalid argument specified"; + case RESULT_ERR_DEVICE: return "ERR_DEVICE: generic device error"; + default: return "success"; + } +} + + +} //namespace diff --git a/src/libebus/result.h b/src/libebus/result.h index 9248e204..bd0a9c13 100644 --- a/src/libebus/result.h +++ b/src/libebus/result.h @@ -1,58 +1,58 @@ -/* - * Copyright (C) John Baier 2014 - * - * This file is part of libebus. - * - * libebus 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, - * 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/. - */ - -#ifndef LIBEBUS_RESULT_H_ -#define LIBEBUS_RESULT_H_ - -namespace libebus -{ - - -static const int RESULT_OK = 0; - -static const int RESULT_BUS_ACQUIRED = 1; // bus successfully acquired -static const int RESULT_DATA = 2; // some data 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_PRIOR_RETRY = 5; // retry to access bus - -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_NAK = -3; // NAK received -static const int RESULT_ERR_CRC = -4; // CRC error -static const int RESULT_ERR_ACK = -5; // ACK error -static const int RESULT_ERR_TIMEOUT = -6; // read timeout -static const int RESULT_ERR_SYN = -7; // SYN received -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_INVALID_ARG = -10; // invalid argument -static const int RESULT_ERR_DEVICE = -11; // generic device error (usually fatal) - - -/** - * @brief Return the string corresponding to the result code. - * @param resultCode the result code (see RESULT_ constants). - * @return the string corresponding to the result code. - */ -const char* getResultCodeCStr(int resultCode); - - -} //namespace - -#endif // LIBEBUS_RESULT_H_ +/* + * Copyright (C) John Baier 2012-2014 + * + * This file is part of ebusd. + * + * 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. + * + * 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 ebusd. If not, see http://www.gnu.org/licenses/. + */ + +#ifndef LIBEBUS_RESULT_H_ +#define LIBEBUS_RESULT_H_ + +namespace libebus +{ + + +static const int RESULT_OK = 0; + +static const int RESULT_BUS_ACQUIRED = 1; // bus successfully acquired +static const int RESULT_DATA = 2; // some data 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_PRIOR_RETRY = 5; // retry to access bus + +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_NAK = -3; // NAK received +static const int RESULT_ERR_CRC = -4; // CRC error +static const int RESULT_ERR_ACK = -5; // ACK error +static const int RESULT_ERR_TIMEOUT = -6; // read timeout +static const int RESULT_ERR_SYN = -7; // SYN received +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_INVALID_ARG = -10; // invalid argument +static const int RESULT_ERR_DEVICE = -11; // generic device error (usually fatal) + + +/** + * @brief Return the string corresponding to the result code. + * @param resultCode the result code (see RESULT_ constants). + * @return the string corresponding to the result code. + */ +const char* getResultCodeCStr(int resultCode); + + +} //namespace + +#endif // LIBEBUS_RESULT_H_ diff --git a/src/libebus/symbol.cpp b/src/libebus/symbol.cpp index f9c571b7..102c4760 100644 --- a/src/libebus/symbol.cpp +++ b/src/libebus/symbol.cpp @@ -1,176 +1,176 @@ -/* - * Copyright (C) John Baier 2014 - * - * This file is part of libebus. - * - * libebus 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, - * 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/. - */ - -#include "symbol.h" -#include -#include - -namespace libebus -{ - -/** - * @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[] -{ - 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, - 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, - 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, - 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, - 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, - 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, - 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, - 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, -}; - - -SymbolString::SymbolString(const std::string str) - : m_crc(0) -{ - // parse + escape - for (size_t i = 0; i+1 < str.size(); i += 2) { - unsigned long value = strtoul(str.substr(i, 2).c_str(), NULL, 16); - push_back_escape((unsigned char)value); - } - // add CRC + escape - push_back_escape(m_crc, false); -} - -SymbolString::SymbolString(const std::string str, bool escaped) - : m_crc(0) -{ - bool previousEscape = false; - - // parse + optionally unescape - for (size_t i = 0; i+1 < str.size(); i += 2) { - unsigned long value = strtoul(str.substr(i, 2).c_str(), NULL, 16); - if (escaped == true) { - push_back_unescape((unsigned char)value, previousEscape, false); - } - else - m_data.push_back((unsigned char)value); - } -} - -const std::string SymbolString::getDataStr(bool unescape) -{ - std::stringstream sstr; - bool previousEscape = false; - - for (size_t i = 0; i < size(); i++) { - unsigned char value = at(i); - if (unescape == true && previousEscape == true) { - if (value == 0x00) { - sstr << "a9"; // ESC - } - else if (value == 0x01) { - sstr << "aa"; // SYN - } - else { - sstr << "XX"; // invalid escape sequence - } - previousEscape = false; - } - else if (unescape == true && value == ESC) { - previousEscape = true; // escape sequence not yet finished - } - else { - sstr << std::nouppercase << std::setw(2) << std::hex - << std::setfill('0') << static_cast(value); - } - } - - return sstr.str(); -} - -void SymbolString::push_back_escape(const unsigned char value, bool updateCRC) -{ - if (value == ESC) { - m_data.push_back(ESC); - m_data.push_back(0x00); - if (updateCRC) { - addCRC(ESC); - addCRC(0x00); - } - } - else if (value == SYN) { - m_data.push_back(ESC); - m_data.push_back(0x01); - if (updateCRC) { - addCRC(ESC); - addCRC(0x01); - } - } - else { - m_data.push_back(value); - if (updateCRC) { - addCRC(value); - } - } -} - -unsigned char SymbolString::push_back_unescape(const unsigned char value, bool& previousEscape, bool updateCRC) -{ - if (updateCRC) { - addCRC(value); - } - if (previousEscape == true) { - if (value == 0x00) { - m_data.push_back(ESC); - previousEscape = false; - return ESC; - } - if (value == 0x01) { - m_data.push_back(SYN); - previousEscape = false; - return SYN; - } - return 0; // invalid escape sequence - } - if (value == ESC) { - previousEscape = true; - return 1; // escape sequence not yet finished - } - m_data.push_back(value); - return value; -} - -void SymbolString::addCRC(const unsigned char value) { - m_crc = CRC_LOOKUP_TABLE[m_crc]^value; -} - - - -bool isMaster(unsigned char addr) { - unsigned char addrHi = (addr & 0xF0) >> 4; - unsigned char addrLo = (addr & 0x0F); - - return ((addrHi == 0x0) || (addrHi == 0x1) || (addrHi == 0x3) || (addrHi == 0x7) || (addrHi == 0xF)) - && ((addrLo == 0x0) || (addrLo == 0x1) || (addrLo == 0x3) || (addrLo == 0x7) || (addrLo == 0xF)); -} - -} //namespace +/* + * Copyright (C) John Baier 2012-2014 + * + * This file is part of ebusd. + * + * 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. + * + * 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 ebusd. If not, see http://www.gnu.org/licenses/. + */ + +#include "symbol.h" +#include +#include + +namespace libebus +{ + +/** + * @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[] +{ + 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, + 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, + 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, + 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, + 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, + 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, + 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, + 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, +}; + + +SymbolString::SymbolString(const std::string str) + : m_crc(0) +{ + // parse + escape + for (size_t i = 0; i+1 < str.size(); i += 2) { + unsigned long value = strtoul(str.substr(i, 2).c_str(), NULL, 16); + push_back_escape((unsigned char)value); + } + // add CRC + escape + push_back_escape(m_crc, false); +} + +SymbolString::SymbolString(const std::string str, bool escaped) + : m_crc(0) +{ + bool previousEscape = false; + + // parse + optionally unescape + for (size_t i = 0; i+1 < str.size(); i += 2) { + unsigned long value = strtoul(str.substr(i, 2).c_str(), NULL, 16); + if (escaped == true) { + push_back_unescape((unsigned char)value, previousEscape, false); + } + else + m_data.push_back((unsigned char)value); + } +} + +const std::string SymbolString::getDataStr(bool unescape) +{ + std::stringstream sstr; + bool previousEscape = false; + + for (size_t i = 0; i < size(); i++) { + unsigned char value = at(i); + if (unescape == true && previousEscape == true) { + if (value == 0x00) { + sstr << "a9"; // ESC + } + else if (value == 0x01) { + sstr << "aa"; // SYN + } + else { + sstr << "XX"; // invalid escape sequence + } + previousEscape = false; + } + else if (unescape == true && value == ESC) { + previousEscape = true; // escape sequence not yet finished + } + else { + sstr << std::nouppercase << std::setw(2) << std::hex + << std::setfill('0') << static_cast(value); + } + } + + return sstr.str(); +} + +void SymbolString::push_back_escape(const unsigned char value, bool updateCRC) +{ + if (value == ESC) { + m_data.push_back(ESC); + m_data.push_back(0x00); + if (updateCRC) { + addCRC(ESC); + addCRC(0x00); + } + } + else if (value == SYN) { + m_data.push_back(ESC); + m_data.push_back(0x01); + if (updateCRC) { + addCRC(ESC); + addCRC(0x01); + } + } + else { + m_data.push_back(value); + if (updateCRC) { + addCRC(value); + } + } +} + +unsigned char SymbolString::push_back_unescape(const unsigned char value, bool& previousEscape, bool updateCRC) +{ + if (updateCRC) { + addCRC(value); + } + if (previousEscape == true) { + if (value == 0x00) { + m_data.push_back(ESC); + previousEscape = false; + return ESC; + } + if (value == 0x01) { + m_data.push_back(SYN); + previousEscape = false; + return SYN; + } + return 0; // invalid escape sequence + } + if (value == ESC) { + previousEscape = true; + return 1; // escape sequence not yet finished + } + m_data.push_back(value); + return value; +} + +void SymbolString::addCRC(const unsigned char value) { + m_crc = CRC_LOOKUP_TABLE[m_crc]^value; +} + + + +bool isMaster(unsigned char addr) { + unsigned char addrHi = (addr & 0xF0) >> 4; + unsigned char addrLo = (addr & 0x0F); + + return ((addrHi == 0x0) || (addrHi == 0x1) || (addrHi == 0x3) || (addrHi == 0x7) || (addrHi == 0xF)) + && ((addrLo == 0x0) || (addrLo == 0x1) || (addrLo == 0x3) || (addrLo == 0x7) || (addrLo == 0xF)); +} + +} //namespace diff --git a/src/libebus/symbol.h b/src/libebus/symbol.h index 0498809e..7ed10ce4 100644 --- a/src/libebus/symbol.h +++ b/src/libebus/symbol.h @@ -1,148 +1,148 @@ -/* - * Copyright (C) John Baier 2014 - * - * This file is part of libebus. - * - * libebus 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, - * 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/. - */ - -#ifndef LIBEBUS_SYMBOL_H_ -#define LIBEBUS_SYMBOL_H_ - -#include -#include -#include -#include - -namespace libebus -{ - - -static const unsigned char ESC = 0xA9; // escape symbol, either followed by 0x00 for the value 0xA9, or 0x01 for the value 0xAA -static const unsigned char SYN = 0xAA; // synchronization symbol -static const unsigned char ACK = 0x00; // positive acknowledge -static const unsigned char NAK = 0xFF; // negative acknowledge -static const unsigned char BROADCAST = 0xFE; // the broadcast destination address - - -/** - * @brief A string of bus symbols. - */ -class SymbolString -{ -public: - /** - * @brief Creates a new empty SymbolString. - */ - SymbolString() : m_crc(0) {} - /** - * @brief Creates a new escaped SymbolString from an unescaped hex string and adds the calculated CRC. - * @param str the unescaped hex string. - */ - SymbolString(const std::string str); - /** - * @brief Creates a new unescaped SymbolString from a hex string. - * @param escaped whether the hex string is escaped and shall be unescaped. - * @param str the hex string. - */ - SymbolString(const std::string str, bool escaped); - /** - * @brief Returns the symbols as hex string. - * @param escaped whether to unescape the symbols. - * @return the symbols as hex string. - */ - const std::string getDataStr(bool unescape=false); - /** - * @brief Returns the symbol at the specified index. - * @param index the index of the symbol to return. - * @return the symbol at the specified index. - * @throw std::out_of_range if @a index is invalid. - */ - unsigned char at(const size_t index) { return m_data.at(index); } - /** - * @brief Returns the symbol at the specified index. - * @param index the index of the symbol to return. - * @return the symbol at the specified index. - */ - unsigned char operator[](const size_t index) { return m_data[index]; } - /** - * @brief Returns the symbol at the specified index. - * @param index the index of the symbol to return. - * @return the symbol at the specified index. - */ - unsigned char operator[](const size_t index) const { return m_data[index]; } - /** - * @brief Inserts a the symbol at the specified index. - * @param index the index at which to insert the symbol. - * @param value the symbol to insert. - */ - 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. - * @param value the symbol to append. - * @param updateCrc whether to update the calculated CRC in @a m_crc. - */ - 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. - * @param value the symbol to append. - * @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. - * @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); - /** - * @brief Returns the number of symbols in this symbol string. - * @return the number of available symbols. - */ - size_t size() const { return m_data.size(); } - /** - * @brief Returns the calculated CRC. - * @return the calculated CRC. - */ - unsigned char getCRC() const { return m_crc; } - /** - * @brief Clears the symbols. - */ - void clear() { m_crc=0; m_data.clear(); } - -private: - /** - * @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. - */ - void addCRC(const unsigned char value); - - /** - * @brief the string of bus symbols. - */ - std::vector m_data; - /** - * @brief the calculated CRC. - */ - unsigned char m_crc; -}; - - -/** - * Returns whether the address is one of the 25 master addresses. - * @param addr the address to check. - * @return true if the specified address is a master address. - */ -bool isMaster(unsigned char addr); - - -} //namespace - -#endif // LIBEBUS_SYMBOL_H_ +/* + * Copyright (C) John Baier 2012-2014 + * + * This file is part of ebusd. + * + * 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. + * + * 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 ebusd. If not, see http://www.gnu.org/licenses/. + */ + +#ifndef LIBEBUS_SYMBOL_H_ +#define LIBEBUS_SYMBOL_H_ + +#include +#include +#include +#include + +namespace libebus +{ + + +static const unsigned char ESC = 0xA9; // escape symbol, either followed by 0x00 for the value 0xA9, or 0x01 for the value 0xAA +static const unsigned char SYN = 0xAA; // synchronization symbol +static const unsigned char ACK = 0x00; // positive acknowledge +static const unsigned char NAK = 0xFF; // negative acknowledge +static const unsigned char BROADCAST = 0xFE; // the broadcast destination address + + +/** + * @brief A string of bus symbols. + */ +class SymbolString +{ +public: + /** + * @brief Creates a new empty SymbolString. + */ + SymbolString() : m_crc(0) {} + /** + * @brief Creates a new escaped SymbolString from an unescaped hex string and adds the calculated CRC. + * @param str the unescaped hex string. + */ + SymbolString(const std::string str); + /** + * @brief Creates a new unescaped SymbolString from a hex string. + * @param escaped whether the hex string is escaped and shall be unescaped. + * @param str the hex string. + */ + SymbolString(const std::string str, bool escaped); + /** + * @brief Returns the symbols as hex string. + * @param escaped whether to unescape the symbols. + * @return the symbols as hex string. + */ + const std::string getDataStr(bool unescape=false); + /** + * @brief Returns the symbol at the specified index. + * @param index the index of the symbol to return. + * @return the symbol at the specified index. + * @throw std::out_of_range if @a index is invalid. + */ + unsigned char at(const size_t index) { return m_data.at(index); } + /** + * @brief Returns the symbol at the specified index. + * @param index the index of the symbol to return. + * @return the symbol at the specified index. + */ + unsigned char operator[](const size_t index) { return m_data[index]; } + /** + * @brief Returns the symbol at the specified index. + * @param index the index of the symbol to return. + * @return the symbol at the specified index. + */ + unsigned char operator[](const size_t index) const { return m_data[index]; } + /** + * @brief Inserts a the symbol at the specified index. + * @param index the index at which to insert the symbol. + * @param value the symbol to insert. + */ + 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. + * @param value the symbol to append. + * @param updateCrc whether to update the calculated CRC in @a m_crc. + */ + 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. + * @param value the symbol to append. + * @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. + * @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); + /** + * @brief Returns the number of symbols in this symbol string. + * @return the number of available symbols. + */ + size_t size() const { return m_data.size(); } + /** + * @brief Returns the calculated CRC. + * @return the calculated CRC. + */ + unsigned char getCRC() const { return m_crc; } + /** + * @brief Clears the symbols. + */ + void clear() { m_crc=0; m_data.clear(); } + +private: + /** + * @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. + */ + void addCRC(const unsigned char value); + + /** + * @brief the string of bus symbols. + */ + std::vector m_data; + /** + * @brief the calculated CRC. + */ + unsigned char m_crc; +}; + + +/** + * Returns whether the address is one of the 25 master addresses. + * @param addr the address to check. + * @return true if the specified address is a master address. + */ +bool isMaster(unsigned char addr); + + +} //namespace + +#endif // LIBEBUS_SYMBOL_H_ diff --git a/src/test/command.csv b/src/test/command.csv index 501ccbff..9e2cb5f6 100644 --- a/src/test/command.csv +++ b/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 -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 -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 -s;vwxmk;DesiredTemp;Solltemperatur;MS;50;B509;4;0E3200;1;-;sd;1;d1c;1.0;°C;-;-;;;;;;;;;;;;;;;;;;;;;;;; +# 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;;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;;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;;50;B509;4;0E3200;1;-;sd;1;d1c;1.0;°C;-;-;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/src/test/test_bus.cpp b/src/test/test_bus.cpp index 2e165fce..518ddde3 100644 --- a/src/test/test_bus.cpp +++ b/src/test/test_bus.cpp @@ -1,20 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 + * Copyright (C) Roland Jax 2012-2014 * - * 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" diff --git a/src/test/test_commands.cpp b/src/test/test_commands.cpp index 41eb4a07..e51ed79b 100644 --- a/src/test/test_commands.cpp +++ b/src/test/test_commands.cpp @@ -1,20 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 + * Copyright (C) Roland Jax 2012-2014 * - * 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" diff --git a/src/test/test_configfile.cpp b/src/test/test_configfile.cpp index 35cc60e8..ce46f3d5 100644 --- a/src/test/test_configfile.cpp +++ b/src/test/test_configfile.cpp @@ -1,20 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 + * Copyright (C) Roland Jax 2012-2014 * - * 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" diff --git a/src/test/test_decode.cpp b/src/test/test_decode.cpp index aeb7e8c9..3da4e9ef 100644 --- a/src/test/test_decode.cpp +++ b/src/test/test_decode.cpp @@ -1,20 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 + * Copyright (C) Roland Jax 2012-2014 * - * 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" diff --git a/src/test/test_encode.cpp b/src/test/test_encode.cpp index 5977057b..f7a65fd4 100644 --- a/src/test/test_encode.cpp +++ b/src/test/test_encode.cpp @@ -1,20 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 + * Copyright (C) Roland Jax 2012-2014 * - * 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" diff --git a/src/test/test_port.cpp b/src/test/test_port.cpp index 27640f3c..9bdc12cb 100644 --- a/src/test/test_port.cpp +++ b/src/test/test_port.cpp @@ -1,20 +1,20 @@ /* - * Copyright (C) Roland Jax 2014 + * Copyright (C) Roland Jax 2012-2014 * - * 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" diff --git a/src/test/test_symbol.cpp b/src/test/test_symbol.cpp index d261f43d..2e495d0b 100644 --- a/src/test/test_symbol.cpp +++ b/src/test/test_symbol.cpp @@ -1,20 +1,20 @@ /* - * Copyright (C) John Baier 2014 + * Copyright (C) John Baier 2012-2014 * - * 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" diff --git a/src/tools/ebusctl.cpp b/src/tools/ebusctl.cpp index 6eb62833..5749f7b1 100644 --- a/src/tools/ebusctl.cpp +++ b/src/tools/ebusctl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * Copyright (C) Roland Jax 2012-2014 * * This file is part of ebusd. *