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:
andi
2019-09-12 22:49:36 +02:00
parent d52b597f88 30ff863ead
commit 90ee8d2e17
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
FlippR-Driver/CMakeLists.txt
View File

@@ -11,7 +11,6 @@ set(LIB_DIR lib)
set(DEFAULT_BUILD_TYPE DEBUG) set(DEFAULT_BUILD_TYPE DEBUG)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
SET(DBoost_NO_BOOST_CMAKE=ON)
IF(NOT_PI) IF(NOT_PI)
add_definitions(-DNOT_PI) add_definitions(-DNOT_PI)
@@ -86,6 +85,8 @@ endif(Boost_FOUND)
##################### WIRING_PI ########################## ##################### WIRING_PI ##########################
find_library(wiringPi_LIB wiringPi) find_library(wiringPi_LIB wiringPi)
add_definitions(-DNO_WIRING_PI)
if(NOT wiringPi_LIB) if(NOT wiringPi_LIB)
message(WARNING "Could not find wiringPi library, used testing wiring pi lib instead.") message(WARNING "Could not find wiringPi library, used testing wiring pi lib instead.")
add_definitions(-DNO_WIRING_PI) add_definitions(-DNO_WIRING_PI)

3
FlippR-Driver/src/utility/wiringPiTesting.hpp
View File

@@ -13,6 +13,7 @@
static int wiringPiSetup() static int wiringPiSetup()
{ {
std::cout << "WiringPiSetup() called" << std::endl; std::cout << "WiringPiSetup() called" << std::endl;
return 0;
} }
void pinMode(int pin, int mode) void pinMode(int pin, int mode)
@@ -23,6 +24,7 @@ void pinMode(int pin, int mode)
int digitalRead(int pin) int digitalRead(int pin)
{ {
std::cout << "Reading pin " << pin << std::endl; std::cout << "Reading pin " << pin << std::endl;
return 0;
} }
void digitalWrite(int pin, int value) void digitalWrite(int pin, int value)
@@ -34,6 +36,7 @@ void digitalWrite(int pin, int value)
int mcp23017Setup(const int pinBase, const int i2cAddress) int mcp23017Setup(const int pinBase, const int i2cAddress)
{ {
std::cout << "mcp23017Setup called with pinBase " << pinBase << " and i2cAddress " << i2cAddress << std::endl; std::cout << "mcp23017Setup called with pinBase " << pinBase << " and i2cAddress " << i2cAddress << std::endl;
return 0;
} }

2
cli/FlippR_Networking.py
View File

@@ -28,7 +28,7 @@ class Networking:
return self.get("/displays").json() return self.get("/displays").json()
def triggerSolenoid(self, solenoid): def triggerSolenoid(self, solenoid):
self.get("/solenoids" + solenoid + "/trigger") self.get("/solenoids/" + solenoid + "/trigger")
def playSound(self, sound): def playSound(self, sound):
self.get("/sounds/" + sound + "/play") self.get("/sounds/" + sound + "/play")