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

merged

Browse Source
This commit is contained in:
Johannes Wendel
2019-07-16 22:38:29 +02:00
parent 5fe28d46d9 264044393f
commit 5e5c196a25
7 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FlippR-Driver/contrib/json_example/output/Sound_Config.json
View File

@@ -2,11 +2,17 @@
"deactivation_time_milliseconds" : 10, "deactivation_time_milliseconds" : 10,
"port_extenders" : "port_extenders" :
[ [
<<<<<<< HEAD
{ {
"name" : "extender_0", "name" : "extender_0",
"i2c_address" : 33, "i2c_address" : 33,
"pin_base" : 81 "pin_base" : 81
} }
=======
"name" : "extender_0",
"i2c_address" : 33,
"pin_base" : 81
>>>>>>> aa1d6409ea18cff1ad4b0ef06804fcf5a521dee9
], ],
"fire_pin" : "fire_pin" :
{ {

1
FlippR-Driver/src/output/OutputDriverFactory.cpp
View File

@@ -39,6 +39,7 @@ std::shared_ptr<OutputDriver> get_OutputDriver(std::istream& solenoid_config,
auto lamps = create_lamps(lamp_config, driver_board_pin_controller); auto lamps = create_lamps(lamp_config, driver_board_pin_controller);
uint8_t sound_fire_address = get_sound_fire_address(sound_config); uint8_t sound_fire_address = get_sound_fire_address(sound_config);
std::shared_ptr<SoundBoardPinController> sound_board_pin_controller(new detail::SoundBoardPinController(output_pin_mutex, sound_fire_address)); std::shared_ptr<SoundBoardPinController> sound_board_pin_controller(new detail::SoundBoardPinController(output_pin_mutex, sound_fire_address));
auto sounds = create_sounds(sound_config, sound_board_pin_controller); auto sounds = create_sounds(sound_config, sound_board_pin_controller);

6
FlippR-Driver/src/output/OutputDriverFactory.h
View File

@@ -24,9 +24,9 @@ namespace output
namespace OutputDriverFactory namespace OutputDriverFactory
{ {
std::shared_ptr<OutputDriver> get_OutputDriver(std::istream& solenoid_config, std::shared_ptr<OutputDriver> get_OutputDriver(std::istream& solenoid_config,
std::istream& lamp_config, std::istream& lamp_config,
std::istream& sound_config, std::istream& sound_config,
std::istream& display_config); std::istream& display_config);
std::map<std::string, std::shared_ptr<items::Solenoid>> create_solenoids(std::istream& solenoid_config, std::shared_ptr<DriverBoardPinController> &driverBoardPinController); std::map<std::string, std::shared_ptr<items::Solenoid>> create_solenoids(std::istream& solenoid_config, std::shared_ptr<DriverBoardPinController> &driverBoardPinController);
std::shared_ptr<items::detail::Solenoid> create_solenoid(nlohmann::json &solenoid_json, nlohmann::json &port_extenders, std::shared_ptr<DriverBoardPinController> &pin_controller, std::chrono::milliseconds deactivation_time); std::shared_ptr<items::detail::Solenoid> create_solenoid(nlohmann::json &solenoid_json, nlohmann::json &port_extenders, std::shared_ptr<DriverBoardPinController> &pin_controller, std::chrono::milliseconds deactivation_time);

3
FlippR-Driver/src/output/detail/DisplayBoardPinController.h
View File

@@ -5,10 +5,9 @@
#ifndef FLIPPR_DRIVER_OUTPUT_IMPL_DISPLAYPINCONTROLLER_H #ifndef FLIPPR_DRIVER_OUTPUT_IMPL_DISPLAYPINCONTROLLER_H
#define FLIPPR_DRIVER_OUTPUT_IMPL_DISPLAYPINCONTROLLER_H #define FLIPPR_DRIVER_OUTPUT_IMPL_DISPLAYPINCONTROLLER_H
#include <map>
#include "output/DisplayBoardPinController.h" #include "output/DisplayBoardPinController.h"
#include <map>
namespace flippR_driver namespace flippR_driver
{ {

2
FlippR-Driver/src/output/detail/DisplayController.cpp
View File

@@ -7,6 +7,8 @@
#include "output/detail/DisplayController.h" #include "output/detail/DisplayController.h"
#include "output/DisplayController.h"
#include "utility/config.h" #include "utility/config.h"
namespace flippR_driver namespace flippR_driver

1
FlippR-Driver/src/output/detail/DisplayController.h
View File

@@ -12,7 +12,6 @@
#include <thread> #include <thread>
#include "output/DisplayController.h" #include "output/DisplayController.h"
#include "output/items/OutputDisplay.h" #include "output/items/OutputDisplay.h"
#include "output/DisplayBoardPinController.h" #include "output/DisplayBoardPinController.h"

6
FlippR-Driver/src/output/detail/SoundBoardPinController.cpp
View File

@@ -14,8 +14,7 @@ namespace detail
{ {
SoundBoardPinController::SoundBoardPinController(std::shared_ptr<std::mutex> output_item_mutex, SoundBoardPinController::SoundBoardPinController(std::shared_ptr<std::mutex> output_item_mutex,
const uint8_t &fire_address const uint8_t &fire_address) :
) :
output_item_mutex(std::move(output_item_mutex)), output_item_mutex(std::move(output_item_mutex)),
fire_address(fire_address) fire_address(fire_address)
{ {
@@ -62,6 +61,9 @@ void SoundBoardPinController::fire_sound() const
void SoundBoardPinController::write_pin(const uint8_t &pin, const bool &value) const void SoundBoardPinController::write_pin(const uint8_t &pin, const bool &value) const
{ {
// PinController::write_pin(pins_sound.at("pin_base") + pin, value); // PinController::write_pin(pins_sound.at("pin_base") + pin, value);
// PinController::write_pin(pins_sound.at("fire"), true);
//
// PinController::write_pin(pins_sound.at("fire"), false);
} }
} }