meeeeerging

This commit is contained in:
Jonas Zeunert
2018-11-09 13:07:36 +01:00
76 changed files with 495 additions and 307 deletions

View File

@@ -16,7 +16,7 @@
using namespace boost;
namespace FlippR_Driver
namespace flippR_driver
{
namespace utility
{

View File

@@ -0,0 +1,20 @@
/*
* DisplayGPIOInterface.cpp
*
* Created on: Nov 9, 2018
* Author: johannes
*/
#include "DisplayGPIOInterface.h"
DisplayGPIOInterface::DisplayGPIOInterface()
{
// TODO Auto-generated constructor stub
}
DisplayGPIOInterface::~DisplayGPIOInterface()
{
// TODO Auto-generated destructor stub
}

View File

@@ -0,0 +1,19 @@
/*
* DisplayGPIOInterface.h
*
* Created on: Nov 9, 2018
* Author: johannes
*/
#ifndef SRC_UTILITY_DISPLAYGPIOINTERFACE_H_
#define SRC_UTILITY_DISPLAYGPIOINTERFACE_H_
class DisplayGPIOInterface
{
public:
DisplayGPIOInterface();
virtual
~DisplayGPIOInterface();
};
#endif /* SRC_UTILITY_DISPLAYGPIOINTERFACE_H_ */

View File

@@ -12,7 +12,7 @@
#include "wiringPi/wiringPi.h"
#include "json/json.hpp"
namespace FlippR_Driver
namespace flippR_driver
{
namespace utility
{

View File

@@ -15,7 +15,7 @@
#include <mutex>
#include <fstream>
namespace FlippR_Driver
namespace flippR_driver
{
namespace utility
{

View File

@@ -8,7 +8,7 @@
#ifndef SRC_UTILITIES_IBLOCKINGQUEUE_H_
#define SRC_UTILITIES_IBLOCKINGQUEUE_H_
namespace FlippR_Driver
namespace flippR_driver
{
namespace utility
{

View File

@@ -8,7 +8,7 @@
#ifndef SRC_UTILITIES_IINPUTGPIOINTERFACE_H_
#define SRC_UTILITIES_IINPUTGPIOINTERFACE_H_
namespace FlippR_Driver
namespace flippR_driver
{
namespace utility
{

View File

@@ -2,19 +2,30 @@
// Created by rhetenor on 10.10.18.
//
#ifndef FLIPPR_DRIVER_IOUTPUTGPIOINTERFACE_H
#define FLIPPR_DRIVER_IOUTPUTGPIOINTERFACE_H
#ifndef flippR_driver_IOUTPUTGPIOINTERFACE_H
#define flippR_driver_IOUTPUTGPIOINTERFACE_H
namespace FlippR_Driver
#include "OutputItem.h"
#include "IOutputGPIOInterface.h"
#include <memory>
namespace flippR_driver
{
namespace utility
{
class IOutputGPIOInterface
{
public:
//muss alles geschützt sein
void set_address(int i2c_address, int address);
void activate_pin(int i2c_address, int pin);
void deactivate_pin(int i2c_address, int pin);
//Display gpio interface!
};
}
}
#endif //FLIPPR_DRIVER_IOUTPUTGPIOINTERFACE_H
#endif //flippR_driver_IOUTPUTGPIOINTERFACE_H

View File

@@ -13,7 +13,7 @@
#include "easylogging/easylogging++.h"
#include "config.h"
#include <string>
namespace FlippR_Driver
namespace flippR_driver
{
namespace utility
{
@@ -46,7 +46,7 @@ void InputGPIOInterface::write_col(char data)
write_pin(this->col_address_C, data & 0b100);
}
InputGPIOInterface::InputGPIOInterface(std::istream &input_config_stream)
InputGPIOInterface::inputGPIOInterface(std::istream &input_config_stream)
{
init_members(input_config_stream);

View File

@@ -12,7 +12,7 @@
#include "IInputGPIOInterface.h"
#include "GPIOInterface.h"
namespace FlippR_Driver
namespace flippR_driver
{
namespace utility
{

View File

@@ -11,7 +11,7 @@
INITIALIZE_EASYLOGGINGPP
#endif
namespace FlippR_Driver
namespace flippR_driver
{
namespace utility
{

View File

@@ -10,20 +10,20 @@
#include "config.h"
namespace FlippR_Driver
namespace flippR_driver
{
namespace utility
{
namespace LoggerFactory
{
void CreateInputTestLogger(el::Level level = el::Level::Global);
void CreateInputTestLogger(el::Level level = el::Level::Global);
void CreateInputLogger(el::Level level = el::Level::Info);
void CreateInputLogger(el::Level level = el::Level::Info);
void CreateOutputLogger(el::Level level = el::Level::Info);
void CreateOutputLogger(el::Level level = el::Level::Info);
};
}
}
#endif
#endif

View File

@@ -14,7 +14,7 @@
#include <mcp23017.h>
namespace FlippR_Driver
namespace flippR_driver
{
namespace utility
{

View File

@@ -12,13 +12,9 @@
#define LOGGER_FILE "driver.log"
#define DRIVER_CONF_FILE "/var/log/flippr_driver.conf"
#define HIGHEST_LOG_VERBOSITY 10
#define INPUT_MATRIX_SIZE 8
#define INPUT_SLEEP_DURATION_NANO 800
#define PULLDOWN false
#define HIGHEST_INPUT_EVENT_PRIORITY 0
#define VALID_DISPLAY_CHARACTERS [1,2,3,4,5,6,7,8,9,0,\0]