From 9cc3a7eb91be2d29dd84e4c3251b9d92f2c95b3d Mon Sep 17 00:00:00 2001 From: Johannes Wendel Date: Wed, 17 Jul 2019 09:36:33 +0200 Subject: [PATCH] Added wiringPi substitute for testing purposes on other systems. --- .../input/Input_Matrix_Config.json | 2 +- .../json_example/output/Lamp_Config.json | 4 +- FlippR-Driver/include/output/OutputDriver.h | 2 +- FlippR-Driver/src/PinController.cpp | 6 +++ .../src/output/detail/OutputDriver.cpp | 10 ++++- FlippR-Driver/src/utility/wiringPiTesting.hpp | 40 +++++++++++++++++++ 6 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 FlippR-Driver/src/utility/wiringPiTesting.hpp diff --git a/FlippR-Driver/contrib/json_example/input/Input_Matrix_Config.json b/FlippR-Driver/contrib/json_example/input/Input_Matrix_Config.json index 3287ea4..14acd4b 100644 --- a/FlippR-Driver/contrib/json_example/input/Input_Matrix_Config.json +++ b/FlippR-Driver/contrib/json_example/input/Input_Matrix_Config.json @@ -99,7 +99,7 @@ "priority" : 2 }, { - "name" : "1st button", + "name" : "1st Button", "address" : 35, "priority" : 2 }, diff --git a/FlippR-Driver/contrib/json_example/output/Lamp_Config.json b/FlippR-Driver/contrib/json_example/output/Lamp_Config.json index adb51d4..d978a8c 100644 --- a/FlippR-Driver/contrib/json_example/output/Lamp_Config.json +++ b/FlippR-Driver/contrib/json_example/output/Lamp_Config.json @@ -249,7 +249,7 @@ "address" : 59, "name" : "1st Button" }, - { // todo! + { "todo" : "whatever", "address" : 60, "name" : "Flipper Relay" }, @@ -324,6 +324,6 @@ { "address" : 78, "name" : "100000 Points" - }, + } ] } diff --git a/FlippR-Driver/include/output/OutputDriver.h b/FlippR-Driver/include/output/OutputDriver.h index 0dc9895..0d96ccc 100644 --- a/FlippR-Driver/include/output/OutputDriver.h +++ b/FlippR-Driver/include/output/OutputDriver.h @@ -20,7 +20,7 @@ #include "output/items/Lamp.h" #include "output/items/Sound.h" #include "output/items/Display.h" -#include +#include "output/items/Flipper.h" namespace flippR_driver diff --git a/FlippR-Driver/src/PinController.cpp b/FlippR-Driver/src/PinController.cpp index d4b287f..69b1dd9 100644 --- a/FlippR-Driver/src/PinController.cpp +++ b/FlippR-Driver/src/PinController.cpp @@ -9,8 +9,14 @@ #include "utility/config.h" +#ifndef NOT_PI #include "wiringPi/wiringPi.h" #include "wiringPi/mcp23017.h" +#endif + +#ifdef NOT_PI +#include "utility/wiringPiTesting.hpp" +#endif #include "json/json.hpp" diff --git a/FlippR-Driver/src/output/detail/OutputDriver.cpp b/FlippR-Driver/src/output/detail/OutputDriver.cpp index 166df99..f346cf3 100644 --- a/FlippR-Driver/src/output/detail/OutputDriver.cpp +++ b/FlippR-Driver/src/output/detail/OutputDriver.cpp @@ -68,12 +68,18 @@ void OutputDriver::rotate_all_lamps() const void OutputDriver::activate_all_flipper_relays() const { - + for(auto flipper_relay : this->flippers) + { + flipper_relay.second->activate(); + } } void OutputDriver::deactivate_all_flipper_relays() const { - + for(auto flipper_relay : this->flippers) + { + flipper_relay.second->deactivate(); + } } std::vector> OutputDriver::get_sounds() const diff --git a/FlippR-Driver/src/utility/wiringPiTesting.hpp b/FlippR-Driver/src/utility/wiringPiTesting.hpp new file mode 100644 index 0000000..981f24d --- /dev/null +++ b/FlippR-Driver/src/utility/wiringPiTesting.hpp @@ -0,0 +1,40 @@ +// +// Created by johannes on 17.07.19. +// + +#ifndef FLIPPR_DRIVER_WIRINGPITESTING_H +#define FLIPPR_DRIVER_WIRINGPITESTING_H + +#include + +#define INPUT 0 +#define OUTPUT 1 + +static int wiringPiSetup() +{ + std::cout << "WiringPiSetup() called" << std::endl; +} + +void pinMode(int pin, int mode) +{ + std::cout << "Set pin " << pin << " into mode " << mode << std::endl; +} + +int digitalRead(int pin) +{ + std::cout << "Reading pin " << pin << std::endl; +} + +void digitalWrite(int pin, int value) +{ + std::cout << "Writing pin " << pin << " with value " << value << std::endl; +} + + +int mcp23017Setup(const int pinBase, const int i2cAddress) +{ + std::cout << "mcp23017Setup called with pinBase " << pinBase << " and i2cAddress " << i2cAddress << std::endl; +} + + +#endif //FLIPPR_DRIVER_WIRINGPITESTING_H