diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) MESSAGE( STATUS "Git Commit: ${GIT_VERSION}" ) - add_definitions( -DGIT_REVISION="${GIT_VERSION}") + add_definitions( -DGIT_REVISION="${GIT_VERSION}") ENDIF(GIT_FOUND) ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git) diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -126,10 +126,11 @@ You can reach us via:
[IRC] - freenode #kde-atelier
[Telegram] - KDE Atelier group
- +[Web] - Our web page ### Bugs For any bug that you find it you can go on [KDE Bugs] system and report it. Please try to give all the information about the issue, and backtrace if you have one. [IRC]: https://webchat.freenode.net/ [Telegram]: telegram.me/KDEAtelier [KDE Bugs]: https://bugs.kde.org/enter_bug.cgi?product=Atelier +[Web]: https://atelier.kde.org diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,3 +1,8 @@ +set(DOXYGEN_PROJECT_NUMBER "${PROJECT_VERSION}") +set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in) +set(DOXYGEN_OUT ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile) +configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY) + add_custom_target(doc ALL COMMAND ${DOXYGEN_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Building user's documentation into doxyDoc build dir..." diff --git a/doc/Doxyfile b/doc/Doxyfile.in rename from doc/Doxyfile rename to doc/Doxyfile.in --- a/doc/Doxyfile +++ b/doc/Doxyfile.in @@ -38,7 +38,7 @@ # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 0.1 +PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/src/atcore.cpp b/src/atcore.cpp --- a/src/atcore.cpp +++ b/src/atcore.cpp @@ -299,7 +299,9 @@ } //Check if have temperature info and decode it - temperature().decodeTemp(message); + if (d->lastMessage.contains("T:") || d->lastMessage.contains("B:")) { + temperature().decodeTemp(message); + } emit(receivedMessage(d->lastMessage)); } diff --git a/src/ifirmware.cpp b/src/ifirmware.cpp --- a/src/ifirmware.cpp +++ b/src/ifirmware.cpp @@ -22,7 +22,6 @@ License along with this library. If not, see . */ #include "ifirmware.h" -#include "temperature.h" #include "atcore.h" /** * @brief The IFirmwarePrivate struct diff --git a/src/plugins/aprinterplugin.cpp b/src/plugins/aprinterplugin.cpp --- a/src/plugins/aprinterplugin.cpp +++ b/src/plugins/aprinterplugin.cpp @@ -26,7 +26,6 @@ #include #include "aprinterplugin.h" -#include "temperature.h" #include "atcore.h" QString AprinterPlugin::_ok = QStringLiteral("ok"); diff --git a/src/plugins/marlinplugin.cpp b/src/plugins/marlinplugin.cpp --- a/src/plugins/marlinplugin.cpp +++ b/src/plugins/marlinplugin.cpp @@ -26,7 +26,6 @@ #include #include "marlinplugin.h" -#include "temperature.h" #include "atcore.h" QString MarlinPlugin::_ok = QStringLiteral("ok"); diff --git a/src/plugins/repetierplugin.cpp b/src/plugins/repetierplugin.cpp --- a/src/plugins/repetierplugin.cpp +++ b/src/plugins/repetierplugin.cpp @@ -26,7 +26,6 @@ #include #include "repetierplugin.h" -#include "temperature.h" #include "atcore.h" QString RepetierPlugin::_ok = QStringLiteral("ok"); diff --git a/src/plugins/smoothieplugin.cpp b/src/plugins/smoothieplugin.cpp --- a/src/plugins/smoothieplugin.cpp +++ b/src/plugins/smoothieplugin.cpp @@ -26,7 +26,6 @@ #include #include "smoothieplugin.h" -#include "temperature.h" #include "atcore.h" QString SmoothiePlugin::_ok = QStringLiteral("ok"); diff --git a/src/plugins/sprinterplugin.cpp b/src/plugins/sprinterplugin.cpp --- a/src/plugins/sprinterplugin.cpp +++ b/src/plugins/sprinterplugin.cpp @@ -26,7 +26,6 @@ #include #include "sprinterplugin.h" -#include "temperature.h" #include "atcore.h" QString SprinterPlugin::_ok = QStringLiteral("ok"); diff --git a/src/plugins/teacupplugin.cpp b/src/plugins/teacupplugin.cpp --- a/src/plugins/teacupplugin.cpp +++ b/src/plugins/teacupplugin.cpp @@ -26,7 +26,6 @@ #include #include "teacupplugin.h" -#include "temperature.h" #include "atcore.h" QString TeacupPlugin::_ok = QStringLiteral("ok"); diff --git a/unittests/atcoretests.h b/unittests/atcoretests.h --- a/unittests/atcoretests.h +++ b/unittests/atcoretests.h @@ -1,3 +1,21 @@ +/* + This file is part of the KDE project + + Copyright (C) 2017 Chris Rizzitello + + This program 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. + + This program 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 this program. If not, see . +*/ #include #include diff --git a/unittests/atcoretests.cpp b/unittests/atcoretests.cpp --- a/unittests/atcoretests.cpp +++ b/unittests/atcoretests.cpp @@ -1,3 +1,21 @@ +/* + This file is part of the KDE project + + Copyright (C) 2017 Chris Rizzitello + + This program 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. + + This program 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 this program. If not, see . +*/ #include #include "atcoretests.h" diff --git a/unittests/gcodetests.h b/unittests/gcodetests.h --- a/unittests/gcodetests.h +++ b/unittests/gcodetests.h @@ -1,3 +1,21 @@ +/* + This file is part of the KDE project + + Copyright (C) 2017 Chris Rizzitello + + This program 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. + + This program 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 this program. If not, see . +*/ #include #include diff --git a/unittests/gcodetests.cpp b/unittests/gcodetests.cpp --- a/unittests/gcodetests.cpp +++ b/unittests/gcodetests.cpp @@ -1,3 +1,21 @@ +/* + This file is part of the KDE project + + Copyright (C) 2017 Chris Rizzitello + + This program 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. + + This program 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 this program. If not, see . +*/ #include #include "gcodetests.h" diff --git a/unittests/temperaturetests.h b/unittests/temperaturetests.h --- a/unittests/temperaturetests.h +++ b/unittests/temperaturetests.h @@ -1,3 +1,21 @@ +/* + This file is part of the KDE project + + Copyright (C) 2017 Chris Rizzitello + + This program 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. + + This program 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 this program. If not, see . +*/ #include #include diff --git a/unittests/temperaturetests.cpp b/unittests/temperaturetests.cpp --- a/unittests/temperaturetests.cpp +++ b/unittests/temperaturetests.cpp @@ -1,3 +1,21 @@ +/* + This file is part of the KDE project + + Copyright (C) 2017 Chris Rizzitello + + This program 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. + + This program 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 this program. If not, see . +*/ #include #include "temperaturetests.h"