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

changed input paths

Browse Source
This commit is contained in:
Neeflix
2018-07-10 21:20:37 +02:00
parent 22552f9acd
commit 7d9c740341
15 changed files with 41 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
FlippR-Driver/.settings/language.settings.xml
View File

@@ -1,28 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project> <project>
<configuration id="cdt.managedbuild.toolchain.gnu.base.1201473626" name="Default">
<configuration id="cdt.managedbuild.toolchain.gnu.base.1201473626" name="Default"> <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider"> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-525411911894964134" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
</extension>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="709603775115835139" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> </configuration>
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
</extension>
</configuration>
</project> </project>

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

@@ -10,7 +10,7 @@
#include <iostream> #include <iostream>
#include <math.h> #include <math.h>
#include "../utilities/config.h" #include "utilities/config.h"
namespace Input namespace Input
{ {

2
FlippR-Driver/src/input/Detector.h
View File

@@ -19,7 +19,7 @@
#include <thread> #include <thread>
#include <map> #include <map>
#include "../utilities/IInputGPIOInterface.h" #include "utilities/IInputGPIOInterface.h"
#include "Event.h" #include "Event.h"
#include "IEventNotifier.h" #include "IEventNotifier.h"

2
FlippR-Driver/src/input/Event.h
View File

@@ -11,7 +11,7 @@
#include <set> #include <set>
#include <string> #include <string>
#include "../utilities/config.h" #include "utilities/config.h"
namespace Input namespace Input
{ {

4
FlippR-Driver/src/input/EventHandler.h
View File

@@ -14,8 +14,8 @@
#include "IInputDriver.h" #include "IInputDriver.h"
#include "../utilities/IEventHandler.h" #include "utilities/IEventHandler.h"
#include "../utilities/config.h" #include "utilities/config.h"
#include "Event.h" #include "Event.h"
namespace Input namespace Input

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

@@ -7,7 +7,7 @@
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include "../utilities/config.h" #include "utilities/config.h"
#include "EventNotifier.h" #include "EventNotifier.h"

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

@@ -14,7 +14,7 @@
#include <thread> #include <thread>
#include <mutex> #include <mutex>
#include "../utilities/BlockingQueue.hpp" #include "utilities/BlockingQueue.hpp"
#include "Event.h" #include "Event.h"
#include "EventHandler.h" #include "EventHandler.h"

5
FlippR-Driver/src/input/InputDriver.cpp
View File

@@ -6,7 +6,8 @@
*/ */
#include "InputDriver.h" #include "InputDriver.h"
using namespace Input; namespace Input
{
InputDriver::InputDriver(IEventNotifier* event_notifier, IDetector* detector) : InputDriver::InputDriver(IEventNotifier* event_notifier, IDetector* detector) :
event_notifier(event_notifier), detector(detector) event_notifier(event_notifier), detector(detector)
@@ -33,4 +34,6 @@ void InputDriver::unregister_event_handler(IEventHandler* handler)
event_notifier->unregister_event_handler(handler); event_notifier->unregister_event_handler(handler);
} }
}

2
FlippR-Driver/src/input/InputDriver.h
View File

@@ -7,7 +7,7 @@
#ifndef SRC_INPUT_INPUTDRIVER_H_ #ifndef SRC_INPUT_INPUTDRIVER_H_
#define SRC_INPUT_INPUTDRIVER_H_ #define SRC_INPUT_INPUTDRIVER_H_
#include "../utilities/config.h" #include "utilities/config.h"
#include "IInputDriver.h" #include "IInputDriver.h"
#include "IDetector.h" #include "IDetector.h"

8
FlippR-Driver/src/input/InputDriverFactory.cpp
View File

@@ -13,7 +13,10 @@
#include "EventNotifier.h" #include "EventNotifier.h"
using namespace nlohmann; using namespace nlohmann;
using namespace Input;
namespace Input
{
std::shared_ptr<InputDriver> InputDriverFactory::get_InputDriver(std::string& input_config_path, std::string& matrix_config_path) std::shared_ptr<InputDriver> InputDriverFactory::get_InputDriver(std::string& input_config_path, std::string& matrix_config_path)
{ {
@@ -70,3 +73,6 @@ void InputDriverFactory::ConfigureLogger()
{ {
LoggerFactory::CreateInputLogger(); LoggerFactory::CreateInputLogger();
} }
}

8
FlippR-Driver/src/input/InputDriverFactory.h
View File

@@ -14,10 +14,10 @@
#include "Detector.h" #include "Detector.h"
#include "InputDriver.h" #include "InputDriver.h"
#include "../utilities/InputGPIOInterface.h" #include "utilities/InputGPIOInterface.h"
#include "../utilities/config.h" #include "utilities/config.h"
#include "../lib/json/json.hpp" #include "lib/json/json.hpp"
#include "../lib/easylogging/easylogging++.h" #include "lib/easylogging/easylogging++.h"
#include "IEventNotifier.h" #include "IEventNotifier.h"

4
FlippR-Driver/src/utilities/GPIOInterface.cpp
View File

@@ -7,8 +7,8 @@
#include "GPIOInterface.h" #include "GPIOInterface.h"
//#include "../lib/wiringPi/wiringPi.h" //#include "lib/wiringPi/wiringPi.h"
#include "../lib/json/json.hpp" #include "lib/json/json.hpp"
void GPIOInterface::write_pin(char address, char data) void GPIOInterface::write_pin(char address, char data)

2
FlippR-Driver/src/utilities/IEventHandler.h
View File

@@ -8,7 +8,7 @@
#ifndef SRC_IEVENTHANDLER_H_ #ifndef SRC_IEVENTHANDLER_H_
#define SRC_IEVENTHANDLER_H_ #define SRC_IEVENTHANDLER_H_
#include "../input/Event.h" #include "input/Event.h"
class IEventHandler class IEventHandler
{ {

4
FlippR-Driver/src/utilities/InputGPIOInterface.cpp
View File

@@ -9,8 +9,8 @@
#include <thread> #include <thread>
#include "InputGPIOInterface.h" #include "InputGPIOInterface.h"
#include "../lib/json/json.hpp" #include "lib/json/json.hpp"
#include "../lib/easylogging/easylogging++.h" #include "lib/easylogging/easylogging++.h"
#include "config.h" #include "config.h"
#include <string> #include <string>
using namespace nlohmann; using namespace nlohmann;

2
FlippR-Driver/src/utilities/config.h
View File

@@ -5,7 +5,7 @@
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht * 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 INPUT_LOGGER "driver_logger"
#define DRIVER_LOG_FILE "/var/log/flippr_driver.conf" #define DRIVER_LOG_FILE "/var/log/flippr_driver.conf"