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

Compiling should work now on Pi as well as on desktop

Browse Source
This commit is contained in:
Johannes Wendel
2019-08-06 20:54:50 +02:00
parent 40ee54a1f8
commit 12a86989ae
40 changed files with 11 additions and 1913 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
FlippR-Driver/src/PinController.cpp
View File

@@ -8,13 +8,11 @@
#include "PinController.h"
#include "utility/config.h"
#define NOT_PI
#ifndef NOT_PI
#ifndef NO_WIRING_PI
#include "wiringPi/wiringPi.h"
#include "wiringPi/mcp23017.h"
#endif
#ifdef NOT_PI
#elif
#include "utility/wiringPiTesting.hpp"
#endif

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

@@ -81,10 +81,10 @@ std::shared_ptr<items::detail::Solenoid> create_solenoid(nlohmann::json &solenoi
auto name = get_value<std::string>("name", solenoid_json, config_file_name);
auto address = get_value<uint8_t>("address", solenoid_json, config_file_name);
if(solenoid_json.find("deactivation_time_milliseconds") != solenoid_json.end())
{
deactivation_time = std::chrono::milliseconds(get_value<uint8_t>("deactivation_time_milliseconds", solenoid_json, config_file_name));
}
if(solenoid_json.find("deactivation_time_milliseconds") != solenoid_json.end())
{
deactivation_time = std::chrono::milliseconds(get_value<uint8_t>("deactivation_time_milliseconds", solenoid_json, config_file_name));
}
return std::make_shared<items::detail::Solenoid>(pin_controller, address, pin_base, name, deactivation_time);
}