diff --git a/FlippR-Driver/.cproject b/FlippR-Driver/.cproject deleted file mode 100644 index 07c8c37..0000000 --- a/FlippR-Driver/.cproject +++ /dev/null @@ -1,525 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /usr/bin/make - -j8 - rebuild_cache - true - false - - - /usr/bin/make - -j8 - FlippR-Driver - true - false - - - /usr/bin/make - -j8 - FlippR-Driver/fast - true - false - - - /usr/bin/make - -C "/home/rhetenor/FlippR/flippr-code/FlippR-Driver" -j8 - FlippR-Driver - true - false - - - /usr/bin/cmake - -E chdir "/home/rhetenor/FlippR/flippr-code/FlippR-Driver" "/usr/bin/cmake" -P "CMakeFiles/FlippR-Driver.dir/cmake_clean.cmake" - - true - false - - - /usr/bin/make - -j8 - edit_cache - true - false - - - /usr/bin/make - -j8 - all - true - false - - - /usr/bin/make - -j8 - clean - true - false - - - /usr/bin/make - -j8 - all - true - false - - - /usr/bin/make - -j8 - clean - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/FlippR-Driver/.gitignore b/FlippR-Driver/.gitignore index 975711f..b87e325 100644 --- a/FlippR-Driver/.gitignore +++ b/FlippR-Driver/.gitignore @@ -7,3 +7,5 @@ bin *.bin *.cmake *.out +.settings/* +Makefile diff --git a/FlippR-Driver/.project b/FlippR-Driver/.project deleted file mode 100644 index dfeb1cb..0000000 --- a/FlippR-Driver/.project +++ /dev/null @@ -1,200 +0,0 @@ - - - FlippR-Driver-Debug@FlippR-Driver - - - - - org.eclipse.cdt.make.core.makeBuilder - clean,full,incremental, - - - org.eclipse.cdt.make.core.cleanBuildTarget - clean - - - org.eclipse.cdt.make.core.enableCleanBuild - true - - - org.eclipse.cdt.make.core.append_environment - true - - - org.eclipse.cdt.make.core.stopOnError - true - - - org.eclipse.cdt.make.core.enabledIncrementalBuild - true - - - org.eclipse.cdt.make.core.build.command - /usr/bin/make - - - org.eclipse.cdt.make.core.contents - org.eclipse.cdt.make.core.activeConfigSettings - - - org.eclipse.cdt.make.core.build.target.inc - all - - - org.eclipse.cdt.make.core.build.arguments - -j8 - - - org.eclipse.cdt.make.core.buildLocation - /home/rhetenor/FlippR/flippr-code/FlippR-Driver - - - org.eclipse.cdt.make.core.useDefaultBuildCmd - false - - - org.eclipse.cdt.make.core.environment - VERBOSE=1|CMAKE_NO_VERBOSE=1| - - - org.eclipse.cdt.make.core.enableFullBuild - true - - - org.eclipse.cdt.make.core.build.target.auto - all - - - org.eclipse.cdt.make.core.enableAutoBuild - false - - - org.eclipse.cdt.make.core.build.target.clean - clean - - - org.eclipse.cdt.make.core.fullBuildTarget - all - - - org.eclipse.cdt.make.core.buildArguments - - - - org.eclipse.cdt.make.core.build.location - /home/rhetenor/FlippR/flippr-code/FlippR-Driver - - - org.eclipse.cdt.make.core.autoBuildTarget - all - - - org.eclipse.cdt.core.errorOutputParser - org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser; - - - - - org.eclipse.cdt.make.core.ScannerConfigBuilder - - - - - org.eclipse.cdt.make.core.makeNature - org.eclipse.cdt.make.core.ScannerConfigNature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.core.cnature - - - - [Subprojects] - 2 - virtual:/virtual - - - [Targets] - 2 - virtual:/virtual - - - [Targets]/[lib] FlippR-Driver - 2 - virtual:/virtual - - - [Targets]/[lib] FlippR-Driver/ - 2 - virtual:/virtual - - - [Targets]/[lib] FlippR-Driver/Source Files - 2 - virtual:/virtual - - - [Targets]/[lib] FlippR-Driver/Source Files/Detector.cpp - 1 - /home/rhetenor/FlippR/flippr-code/FlippR-Driver/src/input/Detector.cpp - - - [Targets]/[lib] FlippR-Driver/Source Files/Event.cpp - 1 - /home/rhetenor/FlippR/flippr-code/FlippR-Driver/src/input/Event.cpp - - - [Targets]/[lib] FlippR-Driver/Source Files/EventHandler.cpp - 1 - /home/rhetenor/FlippR/flippr-code/FlippR-Driver/src/input/EventHandler.cpp - - - [Targets]/[lib] FlippR-Driver/Source Files/EventNotifier.cpp - 1 - /home/rhetenor/FlippR/flippr-code/FlippR-Driver/src/input/EventNotifier.cpp - - - [Targets]/[lib] FlippR-Driver/Source Files/InputDriver.cpp - 1 - /home/rhetenor/FlippR/flippr-code/FlippR-Driver/src/input/InputDriver.cpp - - - [Targets]/[lib] FlippR-Driver/Source Files/InputDriverFactory.cpp - 1 - /home/rhetenor/FlippR/flippr-code/FlippR-Driver/src/input/InputDriverFactory.cpp - - - [Targets]/[lib] FlippR-Driver/Source Files/GPIOInterface.cpp - 1 - /home/rhetenor/FlippR/flippr-code/FlippR-Driver/src/utilities/GPIOInterface.cpp - - - [Targets]/[lib] FlippR-Driver/Source Files/InputGPIOInterface.cpp - 1 - /home/rhetenor/FlippR/flippr-code/FlippR-Driver/src/utilities/InputGPIOInterface.cpp - - - [Targets]/[lib] FlippR-Driver/Header Files - 2 - virtual:/virtual - - - [Targets]/[lib] FlippR-Driver/CMake Rules - 2 - virtual:/virtual - - - [Targets]/[lib] FlippR-Driver/Resources - 2 - virtual:/virtual - - - [Targets]/[lib] FlippR-Driver/Object Files - 2 - virtual:/virtual - - - [Targets]/[lib] FlippR-Driver/Object Libraries - 2 - virtual:/virtual - - - \ No newline at end of file diff --git a/FlippR-Driver/src/Debug/FlippR-Driver b/FlippR-Driver/src/Debug/FlippR-Driver deleted file mode 100755 index a46a2b7..0000000 Binary files a/FlippR-Driver/src/Debug/FlippR-Driver and /dev/null differ diff --git a/FlippR-Driver/src/Debug/Input/Detector.d b/FlippR-Driver/src/Debug/Input/Detector.d deleted file mode 100644 index 0b3a2d4..0000000 --- a/FlippR-Driver/src/Debug/Input/Detector.d +++ /dev/null @@ -1,8 +0,0 @@ -Input/Detector.o: ../Input/Detector.cpp ../Input/Detector.h \ - ../Input/InputEvent.h ../Input/InputEventHandler.h - -../Input/Detector.h: - -../Input/InputEvent.h: - -../Input/InputEventHandler.h: diff --git a/FlippR-Driver/src/Debug/Input/Detector.o b/FlippR-Driver/src/Debug/Input/Detector.o deleted file mode 100644 index 5695f5c..0000000 Binary files a/FlippR-Driver/src/Debug/Input/Detector.o and /dev/null differ diff --git a/FlippR-Driver/src/Debug/Input/main.d b/FlippR-Driver/src/Debug/Input/main.d deleted file mode 100644 index c0762fc..0000000 --- a/FlippR-Driver/src/Debug/Input/main.d +++ /dev/null @@ -1,8 +0,0 @@ -Input/main.o: ../Input/main.cpp ../Input/InputEvent.h \ - ../Input/InputEventHandler.h ../Input/Detector.h - -../Input/InputEvent.h: - -../Input/InputEventHandler.h: - -../Input/Detector.h: diff --git a/FlippR-Driver/src/Debug/Input/main.o b/FlippR-Driver/src/Debug/Input/main.o deleted file mode 100644 index 726af63..0000000 Binary files a/FlippR-Driver/src/Debug/Input/main.o and /dev/null differ diff --git a/FlippR-Driver/src/Debug/Input/subdir.mk b/FlippR-Driver/src/Debug/Input/subdir.mk deleted file mode 100644 index e3d9270..0000000 --- a/FlippR-Driver/src/Debug/Input/subdir.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -# Add inputs and outputs from these tool invocations to the build variables -CPP_SRCS += \ -../Input/Detector.cpp \ -../Input/main.cpp - -OBJS += \ -./Input/Detector.o \ -./Input/main.o - -CPP_DEPS += \ -./Input/Detector.d \ -./Input/main.d - - -# Each subdirectory must supply rules for building sources it contributes -Input/%.o: ../Input/%.cpp - @echo 'Building file: $<' - @echo 'Invoking: GCC C++ Compiler' - g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - - diff --git a/FlippR-Driver/src/Debug/makefile b/FlippR-Driver/src/Debug/makefile deleted file mode 100644 index 4478750..0000000 --- a/FlippR-Driver/src/Debug/makefile +++ /dev/null @@ -1,58 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - --include ../makefile.init - -RM := rm -rf - -# All of the sources participating in the build are defined here --include sources.mk --include Input/subdir.mk --include subdir.mk --include objects.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(strip $(CC_DEPS)),) --include $(CC_DEPS) -endif -ifneq ($(strip $(C++_DEPS)),) --include $(C++_DEPS) -endif -ifneq ($(strip $(C_UPPER_DEPS)),) --include $(C_UPPER_DEPS) -endif -ifneq ($(strip $(CXX_DEPS)),) --include $(CXX_DEPS) -endif -ifneq ($(strip $(CPP_DEPS)),) --include $(CPP_DEPS) -endif -ifneq ($(strip $(C_DEPS)),) --include $(C_DEPS) -endif -endif - --include ../makefile.defs - -# Add inputs and outputs from these tool invocations to the build variables - -# All Target -all: FlippR-Driver - -# Tool invocations -FlippR-Driver: $(OBJS) $(USER_OBJS) - @echo 'Building target: $@' - @echo 'Invoking: GCC C++ Linker' - g++ -o "FlippR-Driver" $(OBJS) $(USER_OBJS) $(LIBS) - @echo 'Finished building target: $@' - @echo ' ' - -# Other Targets -clean: - -$(RM) $(CC_DEPS)$(C++_DEPS)$(EXECUTABLES)$(C_UPPER_DEPS)$(CXX_DEPS)$(OBJS)$(CPP_DEPS)$(C_DEPS) FlippR-Driver - -@echo ' ' - -.PHONY: all clean dependents - --include ../makefile.targets diff --git a/FlippR-Driver/src/Debug/objects.mk b/FlippR-Driver/src/Debug/objects.mk deleted file mode 100644 index 9895eb6..0000000 --- a/FlippR-Driver/src/Debug/objects.mk +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -USER_OBJS := - -LIBS := -lpthread - diff --git a/FlippR-Driver/src/Debug/sources.mk b/FlippR-Driver/src/Debug/sources.mk deleted file mode 100644 index 06373b5..0000000 --- a/FlippR-Driver/src/Debug/sources.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -C_UPPER_SRCS := -CXX_SRCS := -C++_SRCS := -OBJ_SRCS := -CC_SRCS := -ASM_SRCS := -CPP_SRCS := -C_SRCS := -O_SRCS := -S_UPPER_SRCS := -CC_DEPS := -C++_DEPS := -EXECUTABLES := -C_UPPER_DEPS := -CXX_DEPS := -OBJS := -CPP_DEPS := -C_DEPS := - -# Every subdirectory with source files must be described here -SUBDIRS := \ -Input \ - diff --git a/FlippR-Driver/src/input/Detector.cpp b/FlippR-Driver/src/input/Detector.cpp index 6e0e8a8..c9f125c 100644 --- a/FlippR-Driver/src/input/Detector.cpp +++ b/FlippR-Driver/src/input/Detector.cpp @@ -10,7 +10,7 @@ #include #include -#include "../utilities/config.h" +#include "utilities/config.h" namespace Input { diff --git a/FlippR-Driver/src/input/Detector.h b/FlippR-Driver/src/input/Detector.h index 172fa97..cf3200f 100644 --- a/FlippR-Driver/src/input/Detector.h +++ b/FlippR-Driver/src/input/Detector.h @@ -14,12 +14,13 @@ #ifndef DETECTOR_H_ #define DETECTOR_H_ -#include "IDetector.h" #include #include -#include "../utilities/IInputGPIOInterface.h" +#include "utilities/IInputGPIOInterface.h" + +#include "IDetector.h" #include "Event.h" #include "IEventNotifier.h" diff --git a/FlippR-Driver/src/input/Event.h b/FlippR-Driver/src/input/Event.h index ee370a4..99972a1 100644 --- a/FlippR-Driver/src/input/Event.h +++ b/FlippR-Driver/src/input/Event.h @@ -11,7 +11,7 @@ #include #include -#include "../utilities/config.h" +#include "utilities/config.h" namespace Input { diff --git a/FlippR-Driver/src/input/EventHandler.h b/FlippR-Driver/src/input/EventHandler.h index 95760ae..db0bfdd 100644 --- a/FlippR-Driver/src/input/EventHandler.h +++ b/FlippR-Driver/src/input/EventHandler.h @@ -14,8 +14,8 @@ #include "IInputDriver.h" -#include "../utilities/IEventHandler.h" -#include "../utilities/config.h" +#include "utilities/IEventHandler.h" +#include "utilities/config.h" #include "Event.h" namespace Input diff --git a/FlippR-Driver/src/input/EventNotifier.cpp b/FlippR-Driver/src/input/EventNotifier.cpp index 485d078..29d8449 100644 --- a/FlippR-Driver/src/input/EventNotifier.cpp +++ b/FlippR-Driver/src/input/EventNotifier.cpp @@ -7,7 +7,7 @@ #include -#include "../utilities/config.h" +#include "utilities/config.h" #include "EventNotifier.h" diff --git a/FlippR-Driver/src/input/EventNotifier.h b/FlippR-Driver/src/input/EventNotifier.h index 610f1c9..d9d2f80 100644 --- a/FlippR-Driver/src/input/EventNotifier.h +++ b/FlippR-Driver/src/input/EventNotifier.h @@ -14,7 +14,7 @@ #include #include -#include "../utilities/BlockingQueue.hpp" +#include "utilities/BlockingQueue.hpp" #include "Event.h" #include "EventHandler.h" diff --git a/FlippR-Driver/src/input/InputDriver.cpp b/FlippR-Driver/src/input/InputDriver.cpp index f2f9124..fd1e4b1 100644 --- a/FlippR-Driver/src/input/InputDriver.cpp +++ b/FlippR-Driver/src/input/InputDriver.cpp @@ -6,7 +6,8 @@ */ #include "InputDriver.h" -using namespace Input; +namespace Input +{ InputDriver::InputDriver(IEventNotifier* event_notifier, IDetector* detector) : event_notifier(event_notifier), detector(detector) @@ -33,4 +34,6 @@ void InputDriver::unregister_event_handler(IEventHandler* handler) event_notifier->unregister_event_handler(handler); } +} + diff --git a/FlippR-Driver/src/input/InputDriver.h b/FlippR-Driver/src/input/InputDriver.h index 9ae7687..6660f1c 100644 --- a/FlippR-Driver/src/input/InputDriver.h +++ b/FlippR-Driver/src/input/InputDriver.h @@ -7,7 +7,7 @@ #ifndef SRC_INPUT_INPUTDRIVER_H_ #define SRC_INPUT_INPUTDRIVER_H_ -#include "../utilities/config.h" +#include "utilities/config.h" #include "IInputDriver.h" #include "IDetector.h" diff --git a/FlippR-Driver/src/input/InputDriverFactory.cpp b/FlippR-Driver/src/input/InputDriverFactory.cpp index 4bede47..9240f3c 100644 --- a/FlippR-Driver/src/input/InputDriverFactory.cpp +++ b/FlippR-Driver/src/input/InputDriverFactory.cpp @@ -13,7 +13,10 @@ #include "EventNotifier.h" using namespace nlohmann; -using namespace Input; + + +namespace Input +{ std::shared_ptr InputDriverFactory::get_InputDriver(std::string& input_config_path, std::string& matrix_config_path) { @@ -70,3 +73,6 @@ void InputDriverFactory::ConfigureLogger() { LoggerFactory::CreateInputLogger(); } + + +} diff --git a/FlippR-Driver/src/input/InputDriverFactory.h b/FlippR-Driver/src/input/InputDriverFactory.h index ed09f13..1479853 100644 --- a/FlippR-Driver/src/input/InputDriverFactory.h +++ b/FlippR-Driver/src/input/InputDriverFactory.h @@ -14,10 +14,10 @@ #include "Detector.h" #include "InputDriver.h" -#include "../utilities/InputGPIOInterface.h" -#include "../utilities/config.h" -#include "../lib/json/json.hpp" -#include "../lib/easylogging/easylogging++.h" +#include "utilities/InputGPIOInterface.h" +#include "utilities/config.h" +#include "lib/json/json.hpp" +#include "lib/easylogging/easylogging++.h" #include "IEventNotifier.h" diff --git a/FlippR-Driver/src/utilities/GPIOInterface.cpp b/FlippR-Driver/src/utilities/GPIOInterface.cpp index 29be310..a58b32b 100644 --- a/FlippR-Driver/src/utilities/GPIOInterface.cpp +++ b/FlippR-Driver/src/utilities/GPIOInterface.cpp @@ -7,8 +7,8 @@ #include "GPIOInterface.h" -//#include "../lib/wiringPi/wiringPi.h" -#include "../lib/json/json.hpp" +//#include "lib/wiringPi/wiringPi.h" +#include "lib/json/json.hpp" void GPIOInterface::write_pin(char address, char data) diff --git a/FlippR-Driver/src/utilities/IEventHandler.h b/FlippR-Driver/src/utilities/IEventHandler.h index 6503f30..6ec9759 100644 --- a/FlippR-Driver/src/utilities/IEventHandler.h +++ b/FlippR-Driver/src/utilities/IEventHandler.h @@ -8,12 +8,12 @@ #ifndef SRC_IEVENTHANDLER_H_ #define SRC_IEVENTHANDLER_H_ -#include "../input/Event.h" +#include "input/Event.h" class IEventHandler { public: - virtual ~IEventHandler() = 0; + virtual ~IEventHandler(){}; virtual void handle(Input::Event& event) = 0; }; diff --git a/FlippR-Driver/src/utilities/InputGPIOInterface.cpp b/FlippR-Driver/src/utilities/InputGPIOInterface.cpp index 5724d60..987f7cd 100644 --- a/FlippR-Driver/src/utilities/InputGPIOInterface.cpp +++ b/FlippR-Driver/src/utilities/InputGPIOInterface.cpp @@ -9,8 +9,8 @@ #include #include "InputGPIOInterface.h" -#include "../lib/json/json.hpp" -#include "../lib/easylogging/easylogging++.h" +#include "lib/json/json.hpp" +#include "lib/easylogging/easylogging++.h" #include "config.h" #include using namespace nlohmann; diff --git a/FlippR-Driver/src/utilities/config.h b/FlippR-Driver/src/utilities/config.h index 148461c..f8d41a2 100644 --- a/FlippR-Driver/src/utilities/config.h +++ b/FlippR-Driver/src/utilities/config.h @@ -5,7 +5,7 @@ * Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht */ -#include "../lib/easylogging/easylogging++.h" +#include "lib/easylogging/easylogging++.h" #define INPUT_LOGGER "driver_logger" #define DRIVER_LOG_FILE "/var/log/flippr_driver.conf" diff --git a/FlippR-Driver/tests/input/TestDetector.cpp b/FlippR-Driver/tests/input/TestDetector.cpp index 4d22728..12821e3 100644 --- a/FlippR-Driver/tests/input/TestDetector.cpp +++ b/FlippR-Driver/tests/input/TestDetector.cpp @@ -27,7 +27,7 @@ using namespace Input; SCENARIO("Creating a Detector object", "") { - GIVEN("An IEventNofifier, two Events and an IInputGPIOInterface") + GIVEN("An IEventNofifier, three Events and an IInputGPIOInterface") { LoggerFactory::CreateInputLogger(); diff --git a/FlippR-Driver/tests/input/TestEventHandler.cpp b/FlippR-Driver/tests/input/TestEventHandler.cpp index 4977c50..a074834 100644 --- a/FlippR-Driver/tests/input/TestEventHandler.cpp +++ b/FlippR-Driver/tests/input/TestEventHandler.cpp @@ -5,3 +5,40 @@ * Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht */ +#include "../catch.hpp" +#include "../fakeit.hpp" + +#include "../../src/utilities/LoggerFactory.hpp" +#include "../../src/input/EventHandler.h" +#include "../../src/input/IInputDriver.h" + + +// testing purposes +#define private public + + +using namespace fakeit; + +SCENARIO("An EventHandler gets created", "[construction}") +{ + GIVEN("An IInputDriver") + { + LoggerFactory::CreateInputLogger(); + + Mock input_driver_mock; + Fake(Dtor(input_driver_mock)); + When(Method(input_driver_mock, register_event_handler)).AlwaysReturn(); + When(Method(input_driver_mock, operator=)).AlwaysReturn(); + + WHEN("the event handler gets created") + { + std::shared_ptr driver_ptr(&input_driver_mock.get()); + Input::EventHandler handler(driver_ptr); + + THEN("It should register itself at the input_driver") + { + REQUIRE((bool)Verify(Method(input_driver_mock, register_event_handler).Using(&handler))); + } + } + } +} diff --git a/README.md b/README.md index 64e1117..f80ae92 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# Build the driver library +## Build the driver library To build the flippr-driver library run the following commands: ```sh1 $ cd flippr-code/FlippR-Driver/build $ cmake .. $ make ``` -This will create you the static-library file: _flippr-code/FlippR-Driver/bin/libflippr-driver.a_ +This will create you the static-library file: _flippr-code/FlippR-Driver/bin/libFlippR-Driver.a_