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

Merge branch 'master' of github.com:swinginbird/flippr-code

Browse Source
This commit is contained in:
Jonas Zeunert
2020-01-16 21:55:13 +01:00
parent e76ac057a7 d5d267ec5f
commit f01eff8068
4 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FlippR-Driver/CMakeLists.txt
View File

@@ -56,7 +56,7 @@ file(GLOB_RECURSE SOURCES src/*.cpp)
if(BUILD_SHARED_LIB) if(BUILD_SHARED_LIB)
add_library(${PROJECT_NAME} SHARED ${SOURCES}) add_library(${PROJECT_NAME} SHARED ${SOURCES})
else() else()
add_library(${PROJECT_NAME} STATIC ${SOURCES} cli/OutputInterpreter.cpp cli/OutputInterpreter.h src/output/items/detail/DriverBoardItem.cpp src/output/items/detail/DriverBoardItem.h include/DriverFactory.h src/utility/Colors.h src/output/factories/SoundFactory.cpp src/output/factories/SoundFactory.h src/output/factories/ItemFactory.cpp src/output/factories/ItemFactory.h src/output/factories/FlipperFactory.cpp src/output/factories/FlipperFactory.h src/output/factories/LampFactory.cpp src/output/factories/LampFactory.h src/output/factories/DisplayFactory.cpp src/output/factories/DisplayFactory.h src/output/factories/SolenoidFactory.cpp src/output/factories/SolenoidFactory.h) add_library(${PROJECT_NAME} STATIC ${SOURCES} cli/OutputInterpreter.cpp cli/OutputInterpreter.h src/output/items/detail/DriverBoardItem.cpp src/output/items/detail/DriverBoardItem.h include/DriverFactory.h src/utility/Colors.h src/output/factories/SoundFactory.cpp src/output/factories/SoundFactory.h src/output/factories/ItemFactory.cpp src/output/factories/ItemFactory.h src/output/factories/FlipperFactory.cpp src/output/factories/FlipperFactory.h src/output/factories/LampFactory.cpp src/output/factories/LampFactory.h src/output/factories/DisplayFactory.cpp src/output/factories/DisplayFactory.h src/output/factories/SolenoidFactory.cpp src/output/factories/SolenoidFactory.h src/utility/helper_functions.hpp)
endif(BUILD_SHARED_LIB) endif(BUILD_SHARED_LIB)
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/src) target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/src)

14
FlippR-Driver/src/output/detail/DriverBoardPinController.cpp
View File

@@ -2,6 +2,7 @@
// Created by rhetenor on 14.12.18. // Created by rhetenor on 14.12.18.
// //
#include <utility/helper_functions.hpp>
#include "output/detail/DriverBoardPinController.h" #include "output/detail/DriverBoardPinController.h"
#include "output/items/DriverBoardItem.h" #include "output/items/DriverBoardItem.h"
@@ -94,34 +95,25 @@ void DriverBoardPinController::set_address_pins(std::array<uint8_t, 3> address_p
{ {
this->address_pins = address_pins; this->address_pins = address_pins;
std::stringstream ss;
for(auto pin : address_pins) for(auto pin : address_pins)
{ {
ss << int{pin} << ", ";
initialize_output_pin(pin); initialize_output_pin(pin);
write_pin(pin, 1); write_pin(pin, 1);
} }
ss << std::string(2, 0x08);
CLOG(DEBUG, OUTPUT_LOGGER) << "Pin addresses for driver board set to: [" << ss.str() << "]"; CLOG(DEBUG, OUTPUT_LOGGER) << "Pin addresses for driver board set to: " + help::make_list_string<std::array<uint8_t, 3>>(address_pins);
} }
void DriverBoardPinController::set_mux_pins(std::array<uint8_t, 13> mux_enable_pins) void DriverBoardPinController::set_mux_pins(std::array<uint8_t, 13> mux_enable_pins)
{ {
this->mux_enable_pins = mux_enable_pins; this->mux_enable_pins = mux_enable_pins;
std::stringstream ss;
for(auto pin : mux_enable_pins) for(auto pin : mux_enable_pins)
{ {
ss << int{pin} << ", ";
initialize_output_pin(pin); initialize_output_pin(pin);
write_pin(pin, 1); write_pin(pin, 1);
} }
ss << std::string(2, 0x08);
CLOG(DEBUG, OUTPUT_LOGGER) << "Pin addresses for multiplexers set to: [" << ss.str() << "]"; CLOG(DEBUG, OUTPUT_LOGGER) << "Pin addresses for multiplexers set to: " + help::make_list_string<std::array<uint8_t, 13>>(mux_enable_pins);
} }
void DriverBoardPinController::set_data_pin(uint8_t data_pin) void DriverBoardPinController::set_data_pin(uint8_t data_pin)
{ {

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

@@ -2,6 +2,7 @@
// Created by rhetenor on 14.12.18. // Created by rhetenor on 14.12.18.
// //
#include <utility/helper_functions.hpp>
#include "output/detail/SoundBoardPinController.h" #include "output/detail/SoundBoardPinController.h"
#include "utility/config.h" #include "utility/config.h"
@@ -80,15 +81,7 @@ void SoundBoardPinController::set_address_pins(std::array<uint8_t, 7> address_pi
this->initialize_output_pin(pin); this->initialize_output_pin(pin);
} }
//print string in a nice manner CLOG(DEBUG, OUTPUT_LOGGER) << "Pin addresses for sounds set to: " + help::make_list_string<std::array<uint8_t, 7>>(address_pins);
std::stringstream ss;
for (auto & p : address_pins)
{
ss << int{p} << ", ";
}
ss << std::string(2, 0x08);
CLOG(DEBUG, OUTPUT_LOGGER) << "Pin addresses for sounds set to: [" << ss.str() << "]";
} }
void SoundBoardPinController::set_fire_address(const uint8_t &fire_address) void SoundBoardPinController::set_fire_address(const uint8_t &fire_address)

24
FlippR-Driver/src/utility/helper_functions.hpp Normal file
View File

@@ -0,0 +1,24 @@
/*
* helper_functions.hpp
*
* Created on: Jan 16, 2020
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
*/
#include <string>
#include <sstream>
namespace help
{
template<typename Container>
std::string make_list_string(Container container)
{
std::stringstream ss;
for(auto & elem : container)
{
ss << std::to_string(elem) << ", ";
}
ss << std::string(2, 0x08);
return std::string("[") + ss.str() + "]";
}
}