frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Removed bug in Hyperion.cpp and warning in TestRs232HighSpeed.cpp

Browse Source 
Former-commit-id: 63e992a3590db5a4e2c8d121b08291588f347ac7
This commit is contained in:
T. van der Zwan 2013-12-28 08:41:23 +01:00
parent b63fdb0333
commit 47d3f475ed
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -42,7 +42,8 @@ include_directories(${CMAKE_SOURCE_DIR}/include)
set(CMAKE_BUILD_TYPE "Release") set(CMAKE_BUILD_TYPE "Release")
# enable C++11 # enable C++11
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -std=c++11 -Wall")
# Configure the use of QT4 # Configure the use of QT4
find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED QUIET) find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED QUIET)

2
libsrc/hyperion/Hyperion.cpp
View File

@ -363,7 +363,7 @@ void Hyperion::clear(int priority)
_muxer.clearInput(priority); _muxer.clearInput(priority);
// update leds if necessary // update leds if necessary
if (priority < _muxer.getCurrentPriority()); if (priority < _muxer.getCurrentPriority())
{ {
update(); update();
} }

4
test/TestRs232HighSpeed.cpp
View File

@ -12,8 +12,8 @@ public:
// empty // empty
} }
int write(const std::vector<ColorRgb> &ledValues) {} int write(const std::vector<ColorRgb> &ledValues) { return 0; }
int switchOff() {}; int switchOff() { return 0; };
void writeTestSequence() void writeTestSequence()
{ {