working on gpio interface and refactored author names

This commit is contained in:
Jonas Zeunert
2018-11-23 13:46:09 +01:00
parent 972f16b0f7
commit 00e640f469
63 changed files with 127 additions and 91 deletions

View File

@@ -2,7 +2,7 @@
* OutputGPIOInterface.h
*
* Created on: May 31, 2018
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
*/
#ifndef SRC_UTILITIES_OUTPUTGPIOINTERFACE_H_
@@ -15,7 +15,7 @@
#include <mcp23017.h>
#include <mutex>
#include <map>
namespace flippR_driver
{
namespace utility
@@ -23,6 +23,7 @@ namespace utility
class OutputGPIOInterface : public GPIOInterface
{
using namespace nlohmann;
public:
OutputGPIOInterface(std::istream &output_config_stream);
@@ -40,27 +41,23 @@ public:
void write_display(output::items::IDisplay &display);
private:
void parse_pin_bases(json &output_config_stream);
void initialize_i2c_addresses(json &output_config);
char parse_i2c_address_driver_board(json &output_config_stream);
char parse_i2c_address_sound_board(json &output_config_stream);
char parse_i2c_address_display_board(json &output_config_stream);
void parse_output_config(json &output_config);
void parse_pins_driver_board(json &driver_board_config);
void parse_pins_sound(json &sound_board_config);
void parse_pins_display(json &display_board_config);
void initialize_i2c_addresses();
void initialize_pins();
void initialize_all_pins(u_int8_t pin_base);
void activate(output::items::IOutputItem outputItem);
private:
std::mutex output_item_mutex;
unsigned int pin_base_driver_board;
unsigned int pin_base_sounds;
unsigned int pin_base_displays;
std::map<std::string, u_int8_t> pins_driver_board = {{"i2c_address", 0}, {"pin_base", 0}, {"data", 0}. {"CL", 0}, {"latch-select-A", "0"}, {"latch-select-B", "0"}, {"latch-select-C", 0}, {"mux1", 0}, {"mux2", 0}, {"pin-select-A", 0}, {"pin-select-B", 0}, {"pin-select-C", 0}};
std::map<std::string, u_int8_t> pins_sound = {{"i2c_address", 0}, {"pin_base", 0}, {"fire", 0}. {"A", 0}, {"B", "0"}, {"C", "0"}, {"D", 0}, {"E", 0}, {"F", 0}, {"G", 0}};
std::map<std::string, u_int8_t> pins_display = {{"i2c_address", 0}, {"pin_base", 0}, {"fire", 0}. {"A", 0}, {"B", "0"}, {"C", "0"}, {"D", 0}, {"E", 0}, {"F", 0}, {"G", 0}};
};
}