rhetenor/flippr-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/swinginbird/flippr-code

Browse Source
This commit is contained in:
Jonas Zeunert
2018-09-04 23:48:34 +02:00
parent dcac238fbd e8548991a9
commit cadf31a226
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
FlippR-Driver/CMakeLists.txt
View File

@@ -46,7 +46,8 @@ ENDIF(CROSS_COMPILE)
###################### START_CMAKE ####################### ###################### START_CMAKE #######################
cmake_minimum_required(VERSION 3.9.1) cmake_minimum_required(VERSION 3.9.1)
project(FlippR-Driver VERSION 0.1.0 LANGUAGES CXX) #cmake_minimum_required(VERSION 3.0.2)
project(FlippR-Driver VERSION 0.1.0)# LANGUAGES CXX)
#set easylogging flags #set easylogging flags
add_definitions(-DELPP_NO_DEFAULT_LOG_FILE) add_definitions(-DELPP_NO_DEFAULT_LOG_FILE)

8
FlippR-Driver/cross-docker/dockerfile
View File

@@ -1,7 +1,7 @@
FROM sdthirlwall/raspberry-pi-cross-compiler FROM sdthirlwall/raspberry-pi-cross-compiler
# axel uses gettext in the build context # jojo uses beer to get drunk
RUN install-debian --update cmake RUN install-debian --update cmake libboost-all-dev
# axel links against openssl # jojo links against shit
RUN install-raspbian --update libboost-dev-all RUN install-raspbian --update wiringPi

2
FlippR-Driver/src/input/EventNotifier.cpp
View File

@@ -65,7 +65,7 @@ void EventNotifier::notify()
} }
// getting a guard and calling all registered handlers // getting a guard and calling all registered handlers
std::lock_guard event_handler_guard(this->event_handler_mutex); std::lock_guard event_handler_guard<std::mutex>(this->event_handler_mutex);
for(auto handler : this->event_handlers) for(auto handler : this->event_handlers)
{ {
boost::thread handler_caller(boost::bind(&IEventHandler::handle, handler, event)); boost::thread handler_caller(boost::bind(&IEventHandler::handle, handler, event));