From e0c501ddc9390abc831562d06dd821be9cf00553 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Fri, 30 Aug 2019 00:28:45 +0200 Subject: [PATCH 1/4] return values when its meaningful --- FlippR-Driver/CMakeLists.txt | 3 ++- FlippR-Driver/src/utility/wiringPiTesting.hpp | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/FlippR-Driver/CMakeLists.txt b/FlippR-Driver/CMakeLists.txt index 922538c..9d1f8a1 100644 --- a/FlippR-Driver/CMakeLists.txt +++ b/FlippR-Driver/CMakeLists.txt @@ -11,7 +11,6 @@ set(LIB_DIR lib) set(DEFAULT_BUILD_TYPE DEBUG) set(CMAKE_CXX_STANDARD 14) -SET(DBoost_NO_BOOST_CMAKE=ON) IF(NOT_PI) add_definitions(-DNOT_PI) @@ -86,6 +85,8 @@ endif(Boost_FOUND) ##################### WIRING_PI ########################## find_library(wiringPi_LIB wiringPi) + +add_definitions(-DNO_WIRING_PI) if(NOT wiringPi_LIB) message(WARNING "Could not find wiringPi library, used testing wiring pi lib instead.") add_definitions(-DNO_WIRING_PI) diff --git a/FlippR-Driver/src/utility/wiringPiTesting.hpp b/FlippR-Driver/src/utility/wiringPiTesting.hpp index 981f24d..d40c8a8 100644 --- a/FlippR-Driver/src/utility/wiringPiTesting.hpp +++ b/FlippR-Driver/src/utility/wiringPiTesting.hpp @@ -13,6 +13,7 @@ static int wiringPiSetup() { std::cout << "WiringPiSetup() called" << std::endl; + return 0; } void pinMode(int pin, int mode) @@ -23,6 +24,7 @@ void pinMode(int pin, int mode) int digitalRead(int pin) { std::cout << "Reading pin " << pin << std::endl; + return 0; } void digitalWrite(int pin, int value) @@ -34,6 +36,7 @@ void digitalWrite(int pin, int value) int mcp23017Setup(const int pinBase, const int i2cAddress) { std::cout << "mcp23017Setup called with pinBase " << pinBase << " and i2cAddress " << i2cAddress << std::endl; + return 0; } From ffe89ba51438ae6bdf195cbcc06d3b3c30015586 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 12 Sep 2019 20:19:58 +0200 Subject: [PATCH 2/4] added slash --- cli/FlippR_Networking.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/FlippR_Networking.py b/cli/FlippR_Networking.py index 875269e..3c56a45 100644 --- a/cli/FlippR_Networking.py +++ b/cli/FlippR_Networking.py @@ -28,7 +28,7 @@ class Networking: return self.get("/displays").json() def triggerSolenoid(self, solenoid): - self.get("/solenoids" + solenoid + "/trigger") + self.get("/solenoids/" + solenoid + "/trigger") def playSound(self, sound): self.get("/sounds/" + sound + "/play") From b9db3df62f04261c84c305d13f621ba27023e115 Mon Sep 17 00:00:00 2001 From: andi Date: Thu, 12 Sep 2019 22:48:55 +0200 Subject: [PATCH 3/4] first steps towards game logic --- .gitignore | 3 +-- cli/FlippR_Networking.py | 2 +- cli/game.py | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 cli/game.py diff --git a/.gitignore b/.gitignore index 704ad01..0b5ff62 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ *.idea* cmake-build-debug -.idea/* -*__pycache__/* +*__pycache__* diff --git a/cli/FlippR_Networking.py b/cli/FlippR_Networking.py index 875269e..2732b93 100644 --- a/cli/FlippR_Networking.py +++ b/cli/FlippR_Networking.py @@ -46,4 +46,4 @@ class Networking: self.get("/displays" + display + "/write_score/" + str(score)) def getInputEvent(self): - pass + return '' diff --git a/cli/game.py b/cli/game.py new file mode 100644 index 0000000..7dcefe1 --- /dev/null +++ b/cli/game.py @@ -0,0 +1,38 @@ +from FlippR_Networking import Networking + +output_server_address = '' +input_server_address = '' + +#network = Networking(output_server_address, input_server_address) +network = '' + +class EventHandler(): + def __init__(self, network): + self.subclasses = {subcls.__name__: subcls for subcls in self.__class__.__subclasses__()} + self.network = network + + def handle(self, name): + # brace yourselves, python incoming + self.subclasses[name](network) + +class LeftFlapEventHandler(EventHandler): + def __init__(self, network): + print('Left Flap Event gets handled') + self.handle() + + def handle(self): + # do stuff... + pass + +def snake_to_camel(word): + return ''.join(x.capitalize() or '' for x in word.split('_')) + +handler = EventHandler(network) +# handler.handle(snake_to_camel('left_flap') + 'EventHandler') + +# while True: +# event_name = snake_to_camel(network.getInputEvent()) +# handler.handle(event_name + 'EventHandler') + + + From 170d6b48dc0f9b4353a1c965f9cb2f7e99b9e28c Mon Sep 17 00:00:00 2001 From: andi Date: Thu, 12 Sep 2019 22:51:35 +0200 Subject: [PATCH 4/4] minor changes to game.py --- cli/game.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/game.py b/cli/game.py index 7dcefe1..a0e8dcc 100644 --- a/cli/game.py +++ b/cli/game.py @@ -8,11 +8,11 @@ network = '' class EventHandler(): def __init__(self, network): + # brace yourselves, python incoming self.subclasses = {subcls.__name__: subcls for subcls in self.__class__.__subclasses__()} self.network = network def handle(self, name): - # brace yourselves, python incoming self.subclasses[name](network) class LeftFlapEventHandler(EventHandler):