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

weis nimmer

Browse Source
This commit is contained in:
Jonas Zeunert
2018-05-31 15:25:36 +02:00
parent 957373935a
commit 4c820110d5
9 changed files with 230 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,62 +10,22 @@
#include <iostream>
#include <math.h>
#include "../lib/wiringPi/wiringPi.h"
namespace Input
{
Detector::Detector(std::map<std::string, char> input_config, std::map<char, InputEvent> events) :
gpio(input_config), input_events(events), is_running(true)
Detector::Detector(GPIOInterface& gpio_interface, std::map<char, InputEvent> events, InputEventNotifier& input_event_notifier) :
gpio_interface(gpio_interface), input_events(events), is_running(true), input_event_notifier(input_event_notifier)
{
detect_thread = std::thread(&Detector::detect, this);
notify_thread = std::thread(&Detector::notify_handlers, this);
}
Detector::~Detector()
{
is_running = false;
notify_thread.join();
detect_thread.join();
}
void Detector::register_input_event_handler(InputEventHandler* handler)
{
LOCK_EVENT_HANDLER();
event_handler.insert(handler);
}
void Detector::unregister_input_event_handler(InputEventHandler* handler)
{
LOCK_EVENT_HANDLER();
event_handler.erase(handler);
}
void Detector::notify_handlers()
{
while(is_running)
{
// return if no event in queue
if(event_queue.empty())
{
std::this_thread::yield();
return;
}
InputEvent event = event_queue.front();
event_queue.pop();
// getting a guard and calling all registered handlers
LOCK_EVENT_HANDLER();
for(auto handler : event_handler)
{
// todo timeout!
handler->handle(event);
}
}
}
// Cycles over all inputs and enqueues an input event if detected.
void Detector::detect()
{
@@ -77,7 +37,7 @@ void Detector::detect()
try
{
InputEvent& event = input_events.at(address);
event_queue.emplace(event);
input_event_notifier.distribute_event(event);
}
catch(std::out_of_range& e)
{
@@ -87,24 +47,19 @@ void Detector::detect()
}
}
// todo work with gpiointerface
bool Detector::check_inputs(char& address)
{
for(int row = 0; row < 8; row++)
{
digitalWrite(gpio["ROW_A"], row & 0b001);
digitalWrite(gpio["ROW_B"], row & 0b010);
digitalWrite(gpio["ROW_C"], row & 0b100);
gpio_interface.write_input_row(row);
for(int col = 0; col < 8; col++)
{
digitalWrite(gpio["COL_A"], col & 0b001);
digitalWrite(gpio["COL_B"], col & 0b010);
digitalWrite(gpio["COL_C"], col & 0b100);
gpio_interface.write_input_col(col);
// wait for mux to set address
std::this_thread::sleep_for(std::chrono::nanoseconds(SLEEP_DURATION_NANO));
if(digitalRead(gpio["INPUT"]))
if(gpio_interface.read_input_data())
{
address = pow(2, row) + col;
return true;