mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
Removed bug in Hyperion.cpp and warning in TestRs232HighSpeed.cpp
Former-commit-id: 63e992a3590db5a4e2c8d121b08291588f347ac7
This commit is contained in:
parent
b63fdb0333
commit
47d3f475ed
@ -42,7 +42,8 @@ include_directories(${CMAKE_SOURCE_DIR}/include)
|
||||
set(CMAKE_BUILD_TYPE "Release")
|
||||
|
||||
# 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
|
||||
find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED QUIET)
|
||||
|
@ -363,7 +363,7 @@ void Hyperion::clear(int priority)
|
||||
_muxer.clearInput(priority);
|
||||
|
||||
// update leds if necessary
|
||||
if (priority < _muxer.getCurrentPriority());
|
||||
if (priority < _muxer.getCurrentPriority())
|
||||
{
|
||||
update();
|
||||
}
|
||||
|
@ -12,8 +12,8 @@ public:
|
||||
// empty
|
||||
}
|
||||
|
||||
int write(const std::vector<ColorRgb> &ledValues) {}
|
||||
int switchOff() {};
|
||||
int write(const std::vector<ColorRgb> &ledValues) { return 0; }
|
||||
int switchOff() { return 0; };
|
||||
|
||||
void writeTestSequence()
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user