Compare commits
37 Commits
c9c23c3c00
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5564ff44f1 | ||
|
|
cc476bf5b0 | ||
|
|
0f58d2fde4 | ||
|
|
d022c67a58 | ||
|
|
484f8f26e7 | ||
|
|
60c9b3d1a6 | ||
|
|
8f314b9ed6 | ||
|
|
4aae0fadf2 | ||
|
|
3942a8f2d4 | ||
|
|
185f8874cb | ||
|
|
edba98266c | ||
|
|
cb1b3abd34 | ||
|
|
6c9512669d | ||
|
|
7de0238d2a | ||
|
|
fa194c0ede | ||
|
|
1e91fdd175 | ||
|
|
f68f9fc8cc | ||
|
|
f6c7403aa8 | ||
|
|
7c56b1d6c7 | ||
|
|
95ca5b4901 | ||
|
|
440d706f5b | ||
|
|
6a1a7cdd2b | ||
|
|
74aa8040fb | ||
|
|
5ae61ae228 | ||
|
|
a9751483ee | ||
|
|
94ac6a92b9 | ||
|
|
9cd3d445ff | ||
|
|
4170962fb5 | ||
|
|
4015aef0ab | ||
|
|
f18613174f | ||
|
|
1e724cae03 | ||
|
|
7172b754d7 | ||
|
|
bce4423793 | ||
|
|
3474bbd44d | ||
|
|
0846ae3753 | ||
|
|
6a403d2218 | ||
|
|
fb3baf9cff |
@@ -1 +0,0 @@
|
||||
input events entprellen über flanken statt zeit
|
||||
164
FlippR-Driver/contrib/json_example/README.md
Normal file
164
FlippR-Driver/contrib/json_example/README.md
Normal file
@@ -0,0 +1,164 @@
|
||||
# JSON
|
||||
This is an example for the JSON files passed to the Server for configuration
|
||||
|
||||
All outputs may use port_externders in the form of:
|
||||
|
||||
```
|
||||
"port_extenders" :
|
||||
[
|
||||
{
|
||||
"name" : "extender_1",
|
||||
"i2c_address" : 32,
|
||||
"pin_base" : 65
|
||||
}
|
||||
]
|
||||
```
|
||||
|
||||
To use them the output pins bust have an additional property `"extender"` where the name of the extender were the address belongs to is specified.
|
||||
|
||||
## server_config.json
|
||||
This is a Collector file in which all other json files might be specified
|
||||
|
||||
```
|
||||
{
|
||||
"input-config": Path,
|
||||
"matrix-config": Path,
|
||||
"lamp-config": Path,
|
||||
"solenoid-config": Path,
|
||||
"sound-config": Path,
|
||||
"display-config": Path
|
||||
}
|
||||
|
||||
```
|
||||
## input/Input_Pin_Config.json
|
||||
Contains the hardware configuration of the inputs.
|
||||
|
||||
```
|
||||
{
|
||||
"update_frequency": number, // How often the inputs should be read in Hz
|
||||
"row": { // The input pins of the rows
|
||||
"A": number,
|
||||
"B": number,
|
||||
"C": number
|
||||
},
|
||||
"col": { // The input pins of the cols
|
||||
"A": number,
|
||||
"B": number,
|
||||
"C": number
|
||||
},
|
||||
"data": number // The data pin to read
|
||||
}
|
||||
```
|
||||
## input/Input_Matrix_Config.json
|
||||
This contains all possible events that might happen on the pinball machine.
|
||||
|
||||
```
|
||||
{
|
||||
"global_bounce_time" : number, // How long to wait between input events
|
||||
"input_matrix": // The actual matrix
|
||||
[
|
||||
{
|
||||
"name" : string, // Name of the event that should be fired
|
||||
"address" : number, // Adress of the event
|
||||
"priority" : number, // Priority of the event. In case multiple events get read this fires first.
|
||||
"bounce_time": number // Individual bounce time. Overwrites globale_bounce_time for this event.
|
||||
},
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
## output/Display_Config.json
|
||||
|
||||
This contains the config for the displays.
|
||||
|
||||
```
|
||||
{
|
||||
"update_frequency": number, // How often the displays should be updated in Hz.
|
||||
"display_board": // The pin configuration of the hardware
|
||||
{
|
||||
"segment_select" : // pins for the segment select
|
||||
{
|
||||
"A" : number,
|
||||
"B" : number,
|
||||
"C" : number
|
||||
},
|
||||
"digit_select" : // pins for the digit select
|
||||
{
|
||||
"A": number,
|
||||
"B": number,
|
||||
"C": number,
|
||||
"D": number
|
||||
},
|
||||
"run" : number, // Run pin
|
||||
"lt" : number // lt pin
|
||||
},
|
||||
"displays" : // The actual displays
|
||||
[
|
||||
{
|
||||
"digits" : number, // how many digits the displays have. Possible values are 8 and 7
|
||||
"name" : string, // Human Readable name
|
||||
"address" : number // Address of the display
|
||||
},
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
## output/Lamp_Config.json
|
||||
Contains the configuration of the lamps.
|
||||
|
||||
Similar hardware configuration to above. Except a port extender may be used here.
|
||||
|
||||
```
|
||||
{
|
||||
...
|
||||
"lamps" :
|
||||
[
|
||||
{
|
||||
"address" : number, // address of the lamp
|
||||
"name" : string // Humand readable name
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
## output/Solenoid_Config.json
|
||||
|
||||
Contains the configuration for the solenoids
|
||||
|
||||
```
|
||||
{
|
||||
"deactivation_time_milliseconds" : number, // Time how long the solenoid should be triggerd
|
||||
"flippers" : // addresses and names of the flippers
|
||||
[
|
||||
{
|
||||
"address" : number,
|
||||
"name" : string
|
||||
},
|
||||
],
|
||||
"solenoids" :
|
||||
[
|
||||
{
|
||||
"address" : number, // Address of the solenoid
|
||||
"name" : string, // Human readable name
|
||||
"deactivation_time_milliseconds" : number // Individual deactivation time for this solenoid
|
||||
},
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
## output/Sound_Config.json
|
||||
Contains the configuration for the sounds.
|
||||
|
||||
Please note that address 0 is the deactivation sound for this flippers.
|
||||
|
||||
```
|
||||
"sounds" :
|
||||
[
|
||||
{
|
||||
"id": number, // Id of the sound
|
||||
"address" : number, // Address of the sound
|
||||
"name" : string, // Human readable string
|
||||
},
|
||||
]
|
||||
}
|
||||
```
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"update_frequency": 500,
|
||||
"update_frequency": 75,
|
||||
"display_board" :
|
||||
{
|
||||
"segment_select" :
|
||||
@@ -23,7 +23,7 @@
|
||||
{
|
||||
"digits" : 8,
|
||||
"name" : "Player_1",
|
||||
"address" : 31
|
||||
"address" : 11
|
||||
},
|
||||
{
|
||||
"digits" : 8,
|
||||
@@ -33,7 +33,7 @@
|
||||
{
|
||||
"digits" : 8,
|
||||
"name" : "Player_3",
|
||||
"address" : 26
|
||||
"address" : 7
|
||||
},
|
||||
{
|
||||
"digits" : 8,
|
||||
@@ -43,7 +43,7 @@
|
||||
{
|
||||
"digits" : 8,
|
||||
"name" : "Special_Display",
|
||||
"address" : 7
|
||||
"address" : 26
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
{
|
||||
"port_extenders" :
|
||||
"port_extenders" :
|
||||
[
|
||||
{
|
||||
"name" : "extender_0",
|
||||
"i2c_address" : 32,
|
||||
"pin_base" : 65
|
||||
"name" : "extender_0",
|
||||
"i2c_address" : 32,
|
||||
"pin_base" : 65
|
||||
}
|
||||
],
|
||||
"deactivation_time_milliseconds" : 10,
|
||||
"deactivation_time_milliseconds" : 55,
|
||||
"flippers" :
|
||||
[
|
||||
{
|
||||
"address" : 60,
|
||||
"name" : "Flipper Relay"
|
||||
},
|
||||
{
|
||||
{
|
||||
"address" : 92,
|
||||
"name" : "Top Flipper Relay"
|
||||
}
|
||||
@@ -25,7 +25,7 @@
|
||||
"_comment" :"addresses relative to port_extender",
|
||||
"address" : 80,
|
||||
"name" : "Out Hole",
|
||||
"deactivation_time_milliseconds" : 15
|
||||
"deactivation_time_milliseconds" : 25
|
||||
},
|
||||
{
|
||||
"address" : 83,
|
||||
@@ -37,7 +37,8 @@
|
||||
},
|
||||
{
|
||||
"address" : 95,
|
||||
"name" : "Top Central Bank"
|
||||
"name" : "Top Central Bank",
|
||||
"deactivation_time_milliseconds" : 55
|
||||
},
|
||||
{
|
||||
"address" : 96,
|
||||
@@ -49,11 +50,13 @@
|
||||
},
|
||||
{
|
||||
"address" : 98,
|
||||
"name" : "Bottom Right Bank"
|
||||
"name" : "Bottom Right Bank",
|
||||
"deactivation_time_milliseconds" : 40
|
||||
},
|
||||
{
|
||||
"address" : 99,
|
||||
"name" : "Bottom Left Bank"
|
||||
"name" : "Bottom Left Bank",
|
||||
"deactivation_time_milliseconds" : 400
|
||||
},
|
||||
{
|
||||
"address" : 100,
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
{
|
||||
"type" : "Solenoid",
|
||||
"name" : "Right flap",
|
||||
"functions" :
|
||||
{
|
||||
"trigger" : false
|
||||
}
|
||||
}
|
||||
string function;
|
||||
lamp
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"input-config" :"../../contrib/json_example/input/Input_Pin_Config.json",
|
||||
"matrix-config" :"../../contrib/json_example/input/Input_Matrix_Config.json",
|
||||
"lamp-config" :"../../contrib/json_example/output/Lamp_Config.json",
|
||||
"solenoid-config" :"../../contrib/json_example/output/Solenoid_Config.json",
|
||||
"sound-config" :"../../contrib/json_example/output/Sound_Config.json",
|
||||
"display-config" :"../../contrib/json_example/output/Display_Config.json"
|
||||
"input-config" :"/home/pi/flippr-code/FlippR-Driver/contrib/json_example/input/Input_Pin_Config.json",
|
||||
"matrix-config" :"/home/pi/flippr-code/FlippR-Driver/contrib/json_example/input/Input_Matrix_Config.json",
|
||||
"lamp-config" :"/home/pi/flippr-code/FlippR-Driver/contrib/json_example/output/Lamp_Config.json",
|
||||
"solenoid-config" :"/home/pi/flippr-code/FlippR-Driver/contrib/json_example/output/Solenoid_Config.json",
|
||||
"sound-config" :"/home/pi/flippr-code/FlippR-Driver/contrib/json_example/output/Sound_Config.json",
|
||||
"display-config" :"/home/pi/flippr-code/FlippR-Driver/contrib/json_example/output/Display_Config.json"
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* InputEvent.h
|
||||
*
|
||||
* Created on: Apr 5, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef INPUTEVENT_H_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* EventHandler.h
|
||||
*
|
||||
* Created on: Jun 13, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef SRC_IEVENTHANDLER_H_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* InputDriver.h
|
||||
*
|
||||
* Created on: Jun 14, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef SRC_INPUT_IINPUTDRIVER_H_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* OutputDriver.h
|
||||
*
|
||||
* Created on: Aug 2, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef _SRC_OUTPUT_IOUTPUTDRIVER_H_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* IOutputDisplay.h
|
||||
*
|
||||
* Created on: Nov 20, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef FLIPPR_DRIVER_OUTPUT_ITEMS_DISPLAY_H_
|
||||
@@ -23,7 +23,8 @@ class Display : public virtual items::Item
|
||||
public:
|
||||
virtual ~Display() = default;
|
||||
|
||||
virtual void write_score(unsigned int score) = 0;
|
||||
virtual void write_score(uint64_t score) = 0;
|
||||
virtual void write_content(const std::string content) = 0;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -20,8 +20,6 @@ class EightDigitDisplay : public virtual Display
|
||||
{
|
||||
public:
|
||||
virtual ~EightDigitDisplay() = default;
|
||||
|
||||
virtual void write_content(std::string content) = 0;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* Flipper.h
|
||||
*
|
||||
* Created on: May 5, 2019
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef _INCLUDE_FLIPPR_CODE_FLIPPER_H
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* ICabinetItem.h
|
||||
*
|
||||
* Created on: Aug 7, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef _SRC_OUTPUT_ICABINETITEM_H_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* Lamp.h
|
||||
*
|
||||
* Created on: Aug 7, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef _SRC_OUTPUT_ILAMP_H_
|
||||
|
||||
@@ -20,8 +20,6 @@ class SevenDigitDisplay : public virtual Display
|
||||
{
|
||||
public:
|
||||
virtual ~SevenDigitDisplay() = default;
|
||||
|
||||
virtual void write_content(std::string & content) = 0;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* Solenoid.h
|
||||
*
|
||||
* Created on: Aug 7, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef _SRC_OUTPUT_ISOLENOID_H_
|
||||
@@ -17,12 +17,12 @@ namespace output
|
||||
{
|
||||
namespace items
|
||||
{
|
||||
// todo get name? parent calss output_item?
|
||||
class Solenoid : public virtual Item
|
||||
{
|
||||
public:
|
||||
virtual ~Solenoid() = default;
|
||||
|
||||
virtual void deactivate() = 0;
|
||||
virtual void trigger() = 0;
|
||||
};
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* Sound.h
|
||||
*
|
||||
* Created on: Aug 2, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef _SRC_OUTPUT_ISOUND_H_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* SocketConnection.cpp
|
||||
*
|
||||
* Created on: Jun 13, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include "InputSocketHandler.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* SocketConnection.h
|
||||
*
|
||||
* Created on: Jun 13, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef FLIPPR_CODE_INPUTSOCKETCONNECTION_H
|
||||
|
||||
@@ -254,7 +254,7 @@ boost::optional<Poco::JSON::Object> OutputRequestHandler::parseDisplay(const std
|
||||
{
|
||||
try
|
||||
{
|
||||
unsigned int numerical_score = std::stoi(score);
|
||||
uint64_t numerical_score = std::stoi(score);
|
||||
display->write_score(numerical_score);
|
||||
}
|
||||
catch(std::invalid_argument &e)
|
||||
@@ -262,6 +262,10 @@ boost::optional<Poco::JSON::Object> OutputRequestHandler::parseDisplay(const std
|
||||
throw new Poco::InvalidArgumentException("Could not convert " + score + " to a number!\n" + e.what());
|
||||
}
|
||||
}
|
||||
else if(action == "write_content")
|
||||
{
|
||||
display->write_content(score);
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new Poco::NotFoundException("No Action with name \"" + action + "\" on sounds!");
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* PinController.cpp
|
||||
*
|
||||
* Created on: Jun 15, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include "PinController.h"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* Responsible for communicating with the actual GPIO hardware.
|
||||
*
|
||||
* Created on: May 6, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef SRC_UTILITIES_GPIOINTERFACE_H_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* Detector.h
|
||||
*
|
||||
* Created on: Jun 13, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef SRC_INPUT_DETECTOR_H_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* Event.cpp
|
||||
*
|
||||
* Created on: Jun 15, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
#include "input/Event.h"
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* EventNotifier.h
|
||||
*
|
||||
* Created on: Jun 13, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef SRC_INPUT_IEVENTNOTIFIER_H_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* InputDriverFactory.cpp
|
||||
*
|
||||
* Created on: Jun 14, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* InputFactory.h
|
||||
*
|
||||
* Created on: Apr 5, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef INPUTFACTORY_H_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* InputPinController.h
|
||||
*
|
||||
* Created on: May 31, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef SRC_UTILITIES_IINPUTGPIOINTERFACE_H_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* Detector.cpp
|
||||
*
|
||||
* Created on: Apr 5, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include "Detector.h"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* The other cycles over the queue and notifies input event handlers.
|
||||
*
|
||||
* Created on: Apr 5, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef INPUT_IMPL_DETECTOR_H_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* EventNotifier.cpp
|
||||
*
|
||||
* Created on: May 17, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include <boost/thread.hpp>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* InputEventNotifier.h
|
||||
*
|
||||
* Created on: May 17, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef INPUT_IMPL_EVENTNOTIFIER_H_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* InputDriver.cpp
|
||||
*
|
||||
* Created on: Jun 15, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
#include "InputDriver.h"
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* InputDriver.hpp
|
||||
*
|
||||
* Created on: May 31, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
#ifndef INPUT_IMPL_INPUTDRIVER_H_
|
||||
#define INPUT_IMPL_INPUTDRIVER_H_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* InputPinController.cpp
|
||||
*
|
||||
* Created on: May 31, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include "InputPinController.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* InputPinController.h
|
||||
*
|
||||
* Created on: May 31, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef SRC_UTILITIES_INPUTGPIOINTERFACE_H_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* DisplayController.h
|
||||
*
|
||||
* Created on: Aug 2, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef _SRC_OUTPUT_IDISPLAYCONTROLLER_H_
|
||||
|
||||
@@ -39,6 +39,10 @@ std::shared_ptr<OutputDriver> get_OutputDriver(const std::string & solenoid_conf
|
||||
|
||||
auto flippers = get_items<FlipperFactory, detail::DriverBoardPinController, items::Flipper>(solenoid_config_path, driver_board_pin_controller);
|
||||
auto solenoids = get_items<SolenoidFactory, detail::DriverBoardPinController, items::Solenoid>(solenoid_config_path, driver_board_pin_controller);
|
||||
for(auto solenoid : solenoids) {
|
||||
solenoid.second->deactivate();
|
||||
}
|
||||
|
||||
auto lamps = get_items<LampFactory, detail::DriverBoardPinController, items::Lamp>(lamp_config_path, driver_board_pin_controller);
|
||||
|
||||
driver_board_pin_controller->clear();
|
||||
|
||||
@@ -9,8 +9,6 @@
|
||||
|
||||
#include "utility/config.h"
|
||||
|
||||
|
||||
#define DISPLAY_SLEEP_TIME_MICRO 10000
|
||||
namespace flippR_driver
|
||||
{
|
||||
namespace output
|
||||
@@ -55,7 +53,10 @@ void DisplayBoardPinController::write_display(const items::OutputDisplay &displa
|
||||
for (uint8_t i = 0; i < content.size(); i++)
|
||||
{
|
||||
write_display_digit(display.get_address(), content.at(i) - '0', content.size() - i - 1);
|
||||
std::this_thread::sleep_for(this->update_time);
|
||||
}
|
||||
|
||||
write_pin(display.get_address(), DISPLAY_HIGH);
|
||||
}
|
||||
|
||||
void DisplayBoardPinController::write_display_digit(uint8_t display_address, uint8_t content, uint8_t position) const
|
||||
@@ -63,7 +64,6 @@ void DisplayBoardPinController::write_display_digit(uint8_t display_address, uin
|
||||
select_display_segment(position);
|
||||
select_display_digit(content);
|
||||
run_display(display_address);
|
||||
std::this_thread::sleep_for(this->update_time);
|
||||
}
|
||||
|
||||
void DisplayBoardPinController::select_display_segment(uint8_t segment) const
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* DisplayController.cpp
|
||||
*
|
||||
* Created on: Aug 7, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include "output/detail/DisplayController.h"
|
||||
@@ -19,11 +19,11 @@ namespace detail
|
||||
{
|
||||
|
||||
DisplayController::DisplayController(std::map<std::string, std::shared_ptr<items::Display>> & displays,
|
||||
std::shared_ptr<DisplayBoardPinController> pin_controller
|
||||
const std::shared_ptr<DisplayBoardPinController>& pin_controller
|
||||
)
|
||||
: pin_controller{pin_controller}, is_running(true)
|
||||
{
|
||||
for (auto display : displays)
|
||||
for (const auto& display : displays)
|
||||
{
|
||||
this->displays.push_back(std::dynamic_pointer_cast<items::OutputDisplay>(display.second));
|
||||
}
|
||||
@@ -32,8 +32,6 @@ DisplayController::DisplayController(std::map<std::string, std::shared_ptr<items
|
||||
pin_controller->initDisplay(*display);
|
||||
}
|
||||
|
||||
activate_displays();
|
||||
|
||||
this->display_cycle_thread = std::thread(&DisplayController::cycle_displays, this);
|
||||
|
||||
CLOG(DEBUG, OUTPUT_LOGGER) << "Created DisplayController and started cycling them.";
|
||||
@@ -48,9 +46,10 @@ DisplayController::~DisplayController()
|
||||
|
||||
void DisplayController::cycle_displays() const
|
||||
{
|
||||
activate_displays();
|
||||
|
||||
while (is_running)
|
||||
{
|
||||
//std::this_thread::sleep_for(update_frequency);
|
||||
for (auto &display : this->displays)
|
||||
{
|
||||
pin_controller->write_display(*display);
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* DisplayController.h
|
||||
*
|
||||
* Created on: Aug 7, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef _SRC_OUTPUT_DISPLAYCONTROLLER_H_
|
||||
@@ -25,7 +25,10 @@ namespace detail
|
||||
class DisplayController : public output::DisplayController
|
||||
{
|
||||
public:
|
||||
DisplayController(std::map<std::string, std::shared_ptr<items::Display>> &displays, std::shared_ptr<DisplayBoardPinController> pin_controller);
|
||||
DisplayController(std::map<std::string, std::shared_ptr<items::Display>> &displays,
|
||||
const std::shared_ptr<DisplayBoardPinController>& pin_controller
|
||||
);
|
||||
|
||||
~DisplayController() override;
|
||||
|
||||
void activate_displays() const override;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* OutputDriver.cpp
|
||||
*
|
||||
* Created on: Aug 2, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include <boost/range/adaptor/map.hpp>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* DisplayFactory.cpp
|
||||
*
|
||||
* Created on: December 28, 2019
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include "output/DisplayBoardPinController.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* DisplayFactory.h
|
||||
*
|
||||
* Created on: December 28, 2019
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef FLIPPR_DRIVER_DISPLAYFACTORY_H
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* FlipperFactory.cpp
|
||||
*
|
||||
* Created on: December 28, 2019
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include <output/DriverBoardPinController.h>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* FlipperFactory.h
|
||||
*
|
||||
* Created on: December 28, 2019
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef FLIPPR_DRIVER_FLIPPERFACTORY_H
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* ItemFactory.cpp
|
||||
*
|
||||
* Created on: December 28, 2019
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include "ItemFactory.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* ItemFactory.h
|
||||
*
|
||||
* Created on: December 28, 2019
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef FLIPPR_DRIVER_ITEMFACTORY_H
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* LampFactory.cpp
|
||||
*
|
||||
* Created on: December 28, 2019
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include <output/items/Lamp.h>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* LampFactory.h
|
||||
*
|
||||
* Created on: December 28, 2019
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef FLIPPR_DRIVER_LAMPFACTORY_H
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* SolenoidFactory.cpp
|
||||
*
|
||||
* Created on: January 6, 2020
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include "output/items/detail/Solenoid.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* SolenoidFactory.h
|
||||
*
|
||||
* Created on: January 6, 2020
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef FLIPPR_DRIVER_SOLENOIDFACTORY_H
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* SoundFactory.cpp
|
||||
*
|
||||
* Created on: December 28, 2019
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include "SoundFactory.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* SoundFactory.h
|
||||
*
|
||||
* Created on: December 28, 2019
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef FLIPPR_DRIVER_SOUNDFACTORY_H
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* Display.h
|
||||
*
|
||||
* Created on: Aug 2, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef _SRC_OUTPUT_IDISPLAY_H_
|
||||
|
||||
@@ -30,7 +30,7 @@ std::string Display::get_name() const
|
||||
return this->name;
|
||||
}
|
||||
|
||||
void Display::write_score(const unsigned int & score, const unsigned int & length)
|
||||
void Display::write_score(const uint64_t & score, const unsigned int & length)
|
||||
{
|
||||
auto score_string = std::to_string(score);
|
||||
|
||||
@@ -54,12 +54,13 @@ std::string Display::fit_score_string(std::string & score_string, const unsigned
|
||||
return score_string;
|
||||
}
|
||||
|
||||
void Display::write_content(std::string & content, const unsigned int & length)
|
||||
void Display::write_content(const std::string content, const unsigned int & length)
|
||||
{
|
||||
if(content.size() > length)
|
||||
{
|
||||
CLOG(WARNING, OUTPUT_LOGGER) << "Cannot write more than " << length << " digits on " << length << "-Digit Display. Truncating!";
|
||||
content = content.substr(0, length);
|
||||
this->content = content.substr(0, length);
|
||||
return;
|
||||
}
|
||||
|
||||
this->content = content;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* Display.h
|
||||
*
|
||||
* Created on: Aug 2, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef FLIPPR_DRIVER_OUTPUT_ITEMS_IMPL_DISPLAY_H_
|
||||
@@ -27,8 +27,8 @@ public:
|
||||
Display(const uint8_t & address, const std::string & name);
|
||||
virtual ~Display() = default;
|
||||
|
||||
void write_score(const unsigned int & score, const unsigned int & length);
|
||||
void write_content(std::string & content, const unsigned int & length);
|
||||
void write_score(const uint64_t & score, const unsigned int & length);
|
||||
void write_content(const std::string content, const unsigned int & length);
|
||||
|
||||
std::string get_content() const override;
|
||||
uint8_t get_address() const override;
|
||||
|
||||
@@ -31,12 +31,12 @@ public:
|
||||
|
||||
~EightDigitDisplay() override = default;
|
||||
|
||||
void write_score(unsigned int score) override
|
||||
void write_score(uint64_t score) override
|
||||
{
|
||||
detail::Display::write_score(score, 8);
|
||||
}
|
||||
|
||||
void write_content(std::string content) override
|
||||
void write_content(const std::string content) override
|
||||
{
|
||||
detail::Display::write_content(content, 8);
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* Flipper.cpp
|
||||
*
|
||||
* Created on: May 6, 2019
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include "Flipper.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* Flipper.h
|
||||
*
|
||||
* Created on: May 6, 2019
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef _SRC_FLIPPR_CODE_FLIPPER_H
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* CabinetItem.h
|
||||
*
|
||||
* Created on: Aug 2, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef _SRC_OUTPUT_CABINETITEM_H_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* Lamp.cpp
|
||||
*
|
||||
* Created on: Aug 2, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include "Lamp.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* Lamp.h
|
||||
*
|
||||
* Created on: Aug 2, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef _SRC_OUTPUT_LAMP_H_
|
||||
|
||||
@@ -27,11 +27,11 @@ public:
|
||||
CLOG(DEBUG, OUTPUT_LOGGER) << "Created SevenDigitDisplay " << name << " with address " << int{this->address};
|
||||
}
|
||||
|
||||
void write_score(unsigned int score) override
|
||||
void write_score(uint64_t score) override
|
||||
{
|
||||
detail::Display::write_score(score, 7);
|
||||
}
|
||||
void write_content(std::string & content) override
|
||||
void write_content(const std::string content) override
|
||||
{
|
||||
detail::Display::write_content(content, 7);
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* Solenoid.cppthis->pins_display_board.end(),
|
||||
*
|
||||
* Created on: Aug 2, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include "Solenoid.h"
|
||||
@@ -33,6 +33,10 @@ void Solenoid::triggerTask()
|
||||
this->pin_controller->deactivate(*this);
|
||||
}
|
||||
|
||||
void Solenoid::deactivate() {
|
||||
this->pin_controller->deactivate(*this);
|
||||
}
|
||||
|
||||
void Solenoid::trigger()
|
||||
{
|
||||
CLOG(DEBUG, OUTPUT_LOGGER) << "Trigger Solenoid " << name << " for " << deactivation_time.count() << "ms";
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* Solenoid.h
|
||||
*
|
||||
* Created on: Aug 2, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef _SRC_OUTPUT_SOLENOID_H_
|
||||
@@ -32,6 +32,7 @@ public:
|
||||
Solenoid(std::shared_ptr<DriverBoardPinController> pin_controller, const uint8_t & address, const std::string & name, const std::chrono::milliseconds & deactivation_time);
|
||||
~Solenoid() override = default;
|
||||
|
||||
void deactivate() override;
|
||||
void trigger() override;
|
||||
|
||||
private:
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* Sound.cpp
|
||||
*
|
||||
* Created on: Aug 2, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include "Sound.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* Sound.h
|
||||
*
|
||||
* Created on: Aug 2, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef _SRC_OUTPUT_SOUND_H_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* BlockingQueue.hpp
|
||||
*
|
||||
* Created on: May 17, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
|
||||
* Author: Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
|
||||
*/
|
||||
|
||||
#ifndef SRC_UTILITIES_BLOCKINGQUEUE_HPP_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* BlockingQueue.hpp
|
||||
*
|
||||
* Created on: May 17, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef SRC_UTILITIES_IBLOCKINGQUEUE_H_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* LoggerFactory.hpp
|
||||
*
|
||||
* Created on: Jun 19, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#ifndef SRC_UTILITIES_LOGGERFACTORY_HPP_
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* config.h
|
||||
*
|
||||
* Created on: May 17, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include "easylogging++.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* helper_functions.hpp
|
||||
*
|
||||
* Created on: Jan 16, 2020
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
#include <string>
|
||||
#include <sstream>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* TestDetector.cpp
|
||||
*
|
||||
* Created on: Jun 27, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* TestEventHandler.cpp
|
||||
*
|
||||
* Created on: Jun 28, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include "catch.hpp"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* TestEventNotifier.cpp
|
||||
*
|
||||
* Created on: Jun 19, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* TestInputDriver.cpp
|
||||
*
|
||||
* Created on: May 31, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include "catch.hpp"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* tests-main.cpp
|
||||
*
|
||||
* Created on: May 6, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#define CATCH_CONFIG_MAIN
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* TestDisplay.cpp
|
||||
*
|
||||
* Created on: Aug 7, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* TestDisplayController.cpp
|
||||
*
|
||||
* Created on: Aug 7, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include <vector>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* TestLamp.cpp
|
||||
*
|
||||
* Created on: Aug 7, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include "catch.hpp"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* TestOutputDriver.cpp
|
||||
*
|
||||
* Created on: Aug 7, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include "catch.hpp"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* TestCabinetItem.cpp
|
||||
*
|
||||
* Created on: Aug 7, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* TestSolenoid.cpp
|
||||
*
|
||||
* Created on: Aug 7, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* TestSound.cpp
|
||||
*
|
||||
* Created on: Aug 7, 2018
|
||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
|
||||
* Author: Johannes Wendel, Jonas Zeunert
|
||||
*/
|
||||
|
||||
#include "catch.hpp"
|
||||
|
||||
674
LICENSE
Normal file
674
LICENSE
Normal file
@@ -0,0 +1,674 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||
90
README.md
90
README.md
@@ -1,6 +1,22 @@
|
||||
## Build the driver library
|
||||
# FlippR Driver
|
||||
This is a driver written to control Zaccaria pinball machines from the 2nd Generation. It controls the hardware that can be found in the [[flippr-circuit|https://gitlab.rhetenor.de/rhetenor/flippr-circuit]] repository.
|
||||
|
||||
An example game implementation for the Zaccaria Pinball Champ '82 can be found at [[flippr-game|https://gitlab.rhetenor.de/rhetenor/flippr-game]].
|
||||
|
||||
## Build Instructions
|
||||
By default a static library gets build together with a networking target which enables communication over a UNIX Socket, for possible games.
|
||||
|
||||
### Dependencies
|
||||
* wiringPi [^1]
|
||||
* Boost: program_options thread timer chrono filesystem
|
||||
* libthread
|
||||
|
||||
[^1]: Please note that wiringPi is deprecated and may not work on future releases of raspbian and most probably not on a Raspberry Pi5 and future versions.
|
||||
|
||||
### Build
|
||||
To build the flippr-driver library run the following commands:
|
||||
```sh1
|
||||
$ mkdir flippr-code/Flippr-Driver/build
|
||||
$ cd flippr-code/FlippR-Driver/build
|
||||
$ cmake ..
|
||||
$ make
|
||||
@@ -10,3 +26,75 @@ This will create you the static-library file: _flippr-code/FlippR-Driver/bin/lib
|
||||
The library uses wiringPi Pin numbering important for the config files
|
||||
|
||||
We added a script /usr/bin/reset_flippr this can be found in the repo and must be chosen in /etc/rc.local. It prevents the solenois from burning!
|
||||
|
||||
#### Build Options
|
||||
* `-DCROSS_COMPILE` Cross compile for raspberry pi. Default: Off
|
||||
* `-DBUILD_SHARED_LIB` Build a shared library. Default: Off
|
||||
* `-DENABLE_TESTING` Enables Tests after build. Default: On
|
||||
* `-DBUILD_NETWORKING` Builds the networking target binary. Default: On
|
||||
* `-DBUILD_CLI` Build a basic TUI to control the flipper by hand. Default: Off
|
||||
|
||||
|
||||
## Usage
|
||||
### Configuration
|
||||
The driver must be configured according to your needs and machine through JSON files.
|
||||
|
||||
Exemplary Files that describe this can be found in [[json_example|https://gitlab.rhetenor.de/rhetenor/flippr-code/src/branch/master/FlippR-Driver/contrib/json_example]].
|
||||
The Readme there contains all necessary information about the specific files.
|
||||
|
||||
### Networking
|
||||
When built with the networking target (default), the driver is accessible via two UNIX Domain Socket through a simple HTTP/REST API.
|
||||
The sockets can be found either in the folder specified through the env variable `XDG_RUNTIME_DIR` or if it is not set in `/tmp`.
|
||||
|
||||
The sockets are:
|
||||
|
||||
* `S.flippR_driver.in`: All input events that occure on the pinball machine get pushed there.
|
||||
* `S.flippr_driver.out`: With this socket the driver can be controlled.
|
||||
|
||||
An example connector writtin in Python can be found in the TUI [[FlippR_Networking.py|https://gitlab.rhetenor.de/rhetenor/flippr-code/src/branch/master/cli/FlippR_Networking.py]]
|
||||
|
||||
In the following subsection the API is described.
|
||||
|
||||
#### Output Socket
|
||||
The following GET commands are understood by the Output Socket:
|
||||
|
||||
##### Solenoids
|
||||
|
||||
* `/solenoids`: Returns all available solenoids
|
||||
* `/solenoids/ + name + /trigger`: Triggers the solenoid with the given name
|
||||
|
||||
##### Sounds
|
||||
|
||||
* `/sounds`: Returns all available sounds
|
||||
* `/sounds/ + name + /play`: Plays the sound with the given name
|
||||
|
||||
##### Lamps
|
||||
|
||||
* `/lamps`: Returns all available lamps
|
||||
* `/lamps/ + name + /activate`: Activates the lamp with the given name
|
||||
* `/lamps/ + name + /deactivate`: Deactivates the lamp with the given name
|
||||
* `/lamps/ + name + /status`: Returns the status of the lamp (active/inactive)
|
||||
|
||||
##### Displays
|
||||
|
||||
* `/displays`: Returns all available displays
|
||||
* `/displays/ + name + /write_score/ + score`: Writes the given number to the display
|
||||
* `/displays/ + name + /write_content/ + content`: Writes the given content to the display
|
||||
|
||||
##### Flippers
|
||||
|
||||
* `/flippers/ + name + /activate`: Activates the flippers (top or bottom)
|
||||
* `/flippers/ + name + /deactivate`: Deactivates the flippers (top or bottom)
|
||||
|
||||
#### Input Socket
|
||||
|
||||
The input socket events are character terminated with a 0x02 byte [^2] and contain the JSON events defined in the `Input Matrix Config`:
|
||||
```
|
||||
{
|
||||
"name": string,
|
||||
"address": number,
|
||||
"priority": number
|
||||
}
|
||||
```
|
||||
|
||||
[^2]: This should be 0x03 ETX (End of text)
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
import requests_unixsocket as req
|
||||
import socket
|
||||
import json
|
||||
|
||||
|
||||
class Networking:
|
||||
def __init__(self, output_server_address, input_socket_address):
|
||||
@@ -13,22 +15,19 @@ class Networking:
|
||||
def get(self, path):
|
||||
response = self.output_session.get(self.server_address + path)
|
||||
assert response.status_code == 200
|
||||
return response
|
||||
return response.content
|
||||
|
||||
def getSolenoids(self):
|
||||
return self.get("/solenoids").json()
|
||||
|
||||
def getSounds(self):
|
||||
return self.get("/sounds").json()
|
||||
|
||||
def getLamps(self):
|
||||
return self.get("/lamps").json()
|
||||
|
||||
def getDisplays(self):
|
||||
return self.get("/displays").json()
|
||||
return json.loads(self.get("/solenoids"))
|
||||
|
||||
def testDisplays(self):
|
||||
return self.get("/displays/test")
|
||||
def getSounds(self):
|
||||
return json.loads(self.get("/sounds"))
|
||||
|
||||
def getLamps(self):
|
||||
return json.loads(self.get("/lamps"))
|
||||
|
||||
def getDisplays(self):
|
||||
return json.loads(self.get("/displays"))
|
||||
|
||||
def triggerSolenoid(self, solenoid):
|
||||
self.get("/solenoids/" + solenoid + "/trigger")
|
||||
@@ -37,13 +36,19 @@ class Networking:
|
||||
self.get("/sounds/" + sound + "/play")
|
||||
|
||||
def activateLamp(self, lamp):
|
||||
self.get("/lamps/" + lamp + "/activate")
|
||||
|
||||
self.get("/lamps/" + lamp.name + "/activate")
|
||||
|
||||
def deactivateLamp(self, lamp):
|
||||
self.get("/lamps/" + lamp + "/deactivate")
|
||||
|
||||
self.get("/lamps/" + lamp.name + "/deactivate")
|
||||
|
||||
def activateFlipper(self, name):
|
||||
self.get("/flippers/" + name + "/activate")
|
||||
|
||||
def deactivateFlipper(self, name):
|
||||
self.get("/flippers/" + name + "deactivate")
|
||||
|
||||
def lampStatus(self, lamp):
|
||||
return self.get("/lamps/" + lamp + "/status").json()
|
||||
return json.loads(self.get("/lamps/" + lamp + "/status"))
|
||||
|
||||
def writeDisplayScore(self, display, score):
|
||||
self.get("/displays/" + display + "/write_score/" + str(score))
|
||||
@@ -55,4 +60,8 @@ class Networking:
|
||||
header.append(byte)
|
||||
header = [x.decode('utf8') for x in header[:-1]]
|
||||
|
||||
return str().join(header)
|
||||
headerAsString = str().join(header)
|
||||
|
||||
eventAsJson = json.loads(headerAsString)
|
||||
|
||||
return eventAsJson
|
||||
|
||||
27
cli/main.py
27
cli/main.py
@@ -34,13 +34,28 @@ def create_menu():
|
||||
|
||||
input_item = FunctionItem("Print Input", print_input)
|
||||
menu.append_item(input_item)
|
||||
|
||||
#win = curses.newwin(20,20,20,20)
|
||||
|
||||
flippr_item = FunctionItem("Activate Flippers", activate_flipper)
|
||||
menu.append_item(flippr_item)
|
||||
top_flipper_item = FunctionItem("Activate Top Flippers", activate_top_flipper)
|
||||
menu.append_item(top_flipper_item)
|
||||
deac_flippr_item = FunctionItem("Deactivate Flippers", deactivate_flipper)
|
||||
menu.append_item(deac_flippr_item)
|
||||
deac_top_flippr_item = FunctionItem("Deactivate Top Flippers", deactivate_top_flipper)
|
||||
menu.append_item(deac_top_flippr_item)
|
||||
menu.show()
|
||||
|
||||
#quit = False
|
||||
#def sigint_handler(quit):
|
||||
# quit = True
|
||||
|
||||
def activate_flipper():
|
||||
networking.activateFlipper("Flipper Relay")
|
||||
|
||||
def activate_top_flipper():
|
||||
networking.activateFlipper("Top Flipper Relay")
|
||||
|
||||
def deactivate_flipper():
|
||||
networking.deactivateFlipper("Flipper Relay")
|
||||
|
||||
def deactivate_top_flipper():
|
||||
networking.deactivateFlipper("Top Flipper Relay")
|
||||
|
||||
def print_input():
|
||||
print("Starting to print incoming events:")
|
||||
|
||||
37
init/init.py
37
init/init.py
@@ -1,37 +0,0 @@
|
||||
#!/usr/bin/python3
|
||||
|
||||
from time import sleep
|
||||
import os
|
||||
import subprocess
|
||||
import re
|
||||
import wiringpi
|
||||
|
||||
p = subprocess.Popen(['gpio', 'i2cdetect'],stdout=subprocess.PIPE,)
|
||||
#cmdout = str(p.communicate())
|
||||
|
||||
mcps = list()
|
||||
p.stdout.readline()
|
||||
for i in range(1,9):
|
||||
line = str(p.stdout.readline()).split(' ')[1:]
|
||||
base_multiplier = 1
|
||||
for mcp in line:
|
||||
base_multiplier += 1
|
||||
if re.search('\d\d', mcp):
|
||||
base = 64+16*base_multiplier
|
||||
mcps.append((mcp,base))
|
||||
|
||||
wiringpi.wiringPiSetup()
|
||||
for mcp in mcps:
|
||||
print("Setting base for MCP: ", mcp[0], " with base: ", mcp[1])
|
||||
wiringpi.mcp23017Setup(mcp[1], int(mcp[0], 16))
|
||||
for pin in range(16):
|
||||
wiringpi.pinMode(mcp[1] + pin, 1)
|
||||
wiringpi.digitalWrite(mcp[1] + pin, 1)
|
||||
sleep(0.1)
|
||||
|
||||
except_pins = [2, 3]
|
||||
|
||||
for i in range(32):
|
||||
wiringpi.pinMode(i, 1)
|
||||
wiringpi.digitalWrite(pin, 1)
|
||||
sleep(0.1)
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 30 KiB |
Binary file not shown.
Binary file not shown.
@@ -1,13 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
#echo "hello world"
|
||||
|
||||
cd /home/pi/firmware/flippr-code
|
||||
OUTPUT="$(git pull)"
|
||||
if [ "$OUTPUT" != "Already up-to-date." ]; then
|
||||
echo "repo has updated. compile now..."
|
||||
cd /home/pi/firmware/flippr-code/FlippR-Driver/build
|
||||
cmake ..
|
||||
make
|
||||
fi
|
||||
echo "repo on track, nothing to do here..."
|
||||
174
test/andi/v1.py
174
test/andi/v1.py
@@ -1,174 +0,0 @@
|
||||
import wiringpi as wp
|
||||
from time import sleep
|
||||
|
||||
i2c_addr = 0x21
|
||||
base_addr = 81
|
||||
pins = range(base_addr, base_addr + 16)
|
||||
pins = [22, 27, 17, 19, 13, 6, 5, 20, 21, 26, 1, 12, 16, 4]
|
||||
|
||||
""" has to be inverted
|
||||
pins_segment_select = [81, 82, 83]"""
|
||||
pins_segment_select = [83, 82, 81]
|
||||
pins_segment_select = [22, 27, 17]
|
||||
|
||||
""" has to be inverted
|
||||
pins_digit_select = [84, 85, 86, 87] """
|
||||
#pins_digit_select = [87, 86, 85, 84]
|
||||
pins_digit_select = [19, 13, 6, 5]
|
||||
|
||||
#pins_display_select = [89, 90, 91, 92, 93]
|
||||
pins_display_select = [1, 20, 12, 16, 4]
|
||||
pin_run = 95
|
||||
pin_run = 21
|
||||
pin_lt = 88
|
||||
pin_lt = 26
|
||||
|
||||
high = False
|
||||
low = not high
|
||||
|
||||
"""
|
||||
def init():
|
||||
wp.mcp23017Setup(base_addr, i2c_addr)
|
||||
for pin in pins:
|
||||
wp.pinMode(pin, 1)
|
||||
init()
|
||||
"""
|
||||
def init():
|
||||
wp.wiringPiSetupGpio()
|
||||
for pin in pins:
|
||||
wp.pinMode(pin, 1)
|
||||
init()
|
||||
|
||||
def init_ones():
|
||||
for pin in pins:
|
||||
wp.digitalWrite(pin, 1)
|
||||
def init_zeros():
|
||||
for pin in pins:
|
||||
wp.digitalWrite(pin, 0)
|
||||
def init_high():
|
||||
for pin in pins:
|
||||
wp.digitalWrite(pin, high)
|
||||
def init_low():
|
||||
for pin in pins:
|
||||
wp.digitalWrite(pin, low)
|
||||
def dec2bin_high(dec, digits):
|
||||
bin_str = format(dec, '#0' + str(digits + 2) + 'b')[2:]
|
||||
return map(lambda x: high if x == '1' else low, bin_str)
|
||||
def dec2bin_low(dec, digits):
|
||||
bin_str = format(dec, '#0' + str(digits + 2) + 'b')[2:]
|
||||
return map(lambda x: low if x == '1' else high, bin_str)
|
||||
def toggle_run():
|
||||
if wp.digitalRead(pin_run) == 0:
|
||||
#print("enable RUN")
|
||||
wp.digitalWrite(pin_run, 1)
|
||||
else:
|
||||
#print("disable RUN")
|
||||
wp.digitalWrite(pin_run, 0)
|
||||
def toggle_lt():
|
||||
if wp.digitalRead(pin_lt) == 0:
|
||||
#print("enable LT")
|
||||
wp.digitalWrite(pin_lt, 1)
|
||||
else:
|
||||
#print("disable LT")
|
||||
wp.digitalWrite(pin_lt, 0)
|
||||
def check_decimal_for_validity(decimal, lower, upper):
|
||||
if type(decimal) is not type(1):
|
||||
print("input not a decimal")
|
||||
return False
|
||||
if decimal < lower or decimal > upper:
|
||||
print("decimal out of range")
|
||||
return False
|
||||
return True
|
||||
|
||||
def select_segment(decimal):
|
||||
#if not check_decimal_for_validity(decimal, 0, 7):
|
||||
# print("input error, no segment selected")
|
||||
# return
|
||||
values = dec2bin_high(decimal, 3)
|
||||
pss = pins_segment_select
|
||||
wp.digitalWrite(pss[0], values[0])
|
||||
wp.digitalWrite(pss[1], values[1])
|
||||
wp.digitalWrite(pss[2], values[2])
|
||||
|
||||
def select_digit(decimal):
|
||||
#if not check_decimal_for_validity(decimal, 0, 9):
|
||||
# print("input error, no digit selected")
|
||||
# return
|
||||
values = dec2bin_low(decimal, 4)
|
||||
pds = pins_digit_select
|
||||
wp.digitalWrite(pds[0], values[0])
|
||||
wp.digitalWrite(pds[1], values[1])
|
||||
wp.digitalWrite(pds[2], values[2])
|
||||
wp.digitalWrite(pds[3], values[3])
|
||||
|
||||
def select_display(decimal):
|
||||
#if not check_decimal_for_validity(decimal, 1, 5):
|
||||
# print("input error, no display selected")
|
||||
# return
|
||||
wp.digitalWrite(pins_display_select[int(decimal) - 1], high)
|
||||
|
||||
def unselect_display(decimal):
|
||||
#if not check_decimal_for_validity(decimal, 1, 5):
|
||||
# print("input error, no display unselected")
|
||||
# return
|
||||
wp.digitalWrite(pins_display_select[int(decimal) - 1], low)
|
||||
|
||||
def unselect_all_displays():
|
||||
for pin in pins_display_select:
|
||||
wp.digitalWrite(pin, low)
|
||||
|
||||
def select_all_displays():
|
||||
for pin in pins_display_select:
|
||||
wp.digitalWrite(pin, high)
|
||||
|
||||
def toggle_display(decimal):
|
||||
select_display(decimal)
|
||||
unselect_display(decimal)
|
||||
|
||||
def read_pins():
|
||||
for pin in pins:
|
||||
print(str(pin) + ' --> ' + str(wp.digitalRead(pin)))
|
||||
|
||||
def digit2display(disp, dig):
|
||||
select_display(disp)
|
||||
select_digit(dig)
|
||||
unselect_all_displays()
|
||||
|
||||
def num2seg(num, seg):
|
||||
select_segment(seg)
|
||||
select_digit(num)
|
||||
toggle_display(3)
|
||||
|
||||
def fancy(number,disp):
|
||||
num_arr = map(int, list(str(number)))
|
||||
num_arr = num_arr + [0] * max(0, (8 - len(num_arr)))
|
||||
if len(num_arr) > 8:
|
||||
num_arr = num_arr[:8]
|
||||
print(num_arr)
|
||||
num_arr = num_arr[-1::-1]
|
||||
|
||||
for j in range(5000):
|
||||
for i in range(8):
|
||||
select_segment(i)
|
||||
select_digit(num_arr[i])
|
||||
toggle_display(disp)
|
||||
sleep(0.001)
|
||||
|
||||
def al(number,s):
|
||||
num_arr = map(int, list(str(number)))[-1::-1]
|
||||
for i in range(5000):
|
||||
for segment in range(8):
|
||||
for disp in range(2,6):
|
||||
select_segment(segment)
|
||||
select_digit(num_arr[segment])
|
||||
num_arr = num_arr[-1::-1]
|
||||
toggle_display(disp)
|
||||
sleep(s)
|
||||
|
||||
def ini():
|
||||
init()
|
||||
init_low()
|
||||
toggle_run()
|
||||
|
||||
|
||||
|
||||
BIN
test/andi/v1.pyc
BIN
test/andi/v1.pyc
Binary file not shown.
@@ -1,187 +0,0 @@
|
||||
import wiringpi
|
||||
import tty
|
||||
import itertools
|
||||
import sys
|
||||
from time import sleep
|
||||
|
||||
class Test(object):
|
||||
|
||||
def __init__(self, i2c_addr, base):
|
||||
self.i2c_addr = i2c_addr
|
||||
self.base = base
|
||||
self.pins = range(base, base+16)
|
||||
self.init_component()
|
||||
|
||||
def init_component(self):
|
||||
wiringpi.mcp23017Setup(self.base, self.i2c_addr)
|
||||
for i in self.pins:
|
||||
wiringpi.pinMode(i,1)
|
||||
wiringpi.digitalWrite(i, 1)
|
||||
print(self.pins)
|
||||
|
||||
def write(self, pin, value):
|
||||
print(str(self.pins[pin]) + " " + str(value))
|
||||
wiringpi.digitalWrite(self.pins[pin], value)
|
||||
|
||||
class Test_Display(Test):
|
||||
def __init__(self, i2c_addr = 0x21, base = 65 + 16):
|
||||
super(Test_Display, self).__init__(i2c_addr, base)
|
||||
self.pin_dic = {'d0' : base, 'd1' : base + 1, 'd2' : base + 2, 'bcd0': base + 3, 'bcd1': base + 4, 'bcd2' : base + 5, 'bcd3' : base + 6, 'bcdLT' : base + 7, 'disp1' : base + 8, 'disp2' : base + 9, 'disp3' : base + 10, 'disp4' : base + 11, 'disp5' : base + 12, 'disp6' : base + 13, 'run' : base + 14}
|
||||
|
||||
def write_number(self, number):
|
||||
print('Writing number: ' + str(number))
|
||||
wiringpi.digitalWrite(self.pin_dic['bcd0'], bool(number % 2))
|
||||
number = number / 2
|
||||
wiringpi.digitalWrite(self.pin_dic['bcd1'], bool(number % 2))
|
||||
number = number / 2
|
||||
wiringpi.digitalWrite(self.pin_dic['bcd2'], bool(number % 2))
|
||||
number = number / 2
|
||||
wiringpi.digitalWrite(self.pin_dic['bcd3'], bool(number % 2))
|
||||
|
||||
def select_digit(self, digit):
|
||||
print('Selecting 7 segment number: ' + str(digit))
|
||||
wiringpi.digitalWrite(self.pin_dic['d0'], bool(digit % 2))
|
||||
digit = digit / 2
|
||||
wiringpi.digitalWrite(self.pin_dic['d1'], bool(digit % 2))
|
||||
digit = digit / 2
|
||||
wiringpi.digitalWrite(self.pin_dic['d2'], bool(digit % 2))
|
||||
|
||||
def disp_select(self, number):
|
||||
print('Selecting Display: ' + str(number))
|
||||
for i in range(1, 6):
|
||||
if(i == number):
|
||||
wiringpi.digitalWrite(self.pin_dic['disp' + str(i)], 0)
|
||||
else:
|
||||
wiringpi.digitalWrite(self.pin_dic['disp' + str(i)], 1)
|
||||
#sleep(.1)
|
||||
|
||||
def run(self):
|
||||
wiringpi.digitalWrite(self.pin_dic['run'], 0)
|
||||
#sleep(.001)
|
||||
wiringpi.digitalWrite(self.pin_dic['run'], 1)
|
||||
|
||||
def toggleLT(self):
|
||||
sleep(.1)
|
||||
wiringpi.digitalWrite(self.pin_dic['bcdLT'], 0)
|
||||
sleep(.1)
|
||||
wiringpi.digitalWrite(self.pin_dic['bcdLT'], 1)
|
||||
def clear_disp_select(self):
|
||||
print("Clearing Display")
|
||||
for i in range(1, 7):
|
||||
wiringpi.digitalWrite(self.pin_dic['disp' + str(i)], 1)
|
||||
|
||||
def test_digit1(self):
|
||||
for i in range(0, 8):
|
||||
for j in range(0, 10):
|
||||
self.select_digit(i)
|
||||
self.clear_disp_select()
|
||||
self.write_number(j)
|
||||
self.disp_select(1)
|
||||
self.run()
|
||||
def test(self):
|
||||
for k in range(1, 6):
|
||||
for i in range(0, 8):
|
||||
self.select_digit(i)
|
||||
for j in range(0, 10):
|
||||
self.write_number(j)
|
||||
# self.toggleLT()
|
||||
self.disp_select(k)
|
||||
self.clear_disp_select()
|
||||
self.run()
|
||||
|
||||
def test123(self):
|
||||
self.clear_disp_select()
|
||||
self.select_digit(0)
|
||||
self.write_number(7)
|
||||
wiringpi.digitalWrite(self.pin_dic['run'], 0)
|
||||
self.disp_select(1)
|
||||
|
||||
def manual_test(self, display, digit, number):
|
||||
self.select_digit(digit)
|
||||
self.write_number(number)
|
||||
self.disp_select(display)
|
||||
self.clear_disp_select()
|
||||
self.run()
|
||||
def test_digits(self):
|
||||
tty.setcbreak(sys.stdin.fileno())
|
||||
self.write_number(3)
|
||||
for i in range(0,8):
|
||||
self.select_digit(i)
|
||||
self.disp_select(0)
|
||||
self.run()
|
||||
sleep(.5)
|
||||
def permutation_test(self):
|
||||
self.select_digit(3)
|
||||
self.write_number(0)
|
||||
functions = [self.disp_select, self.clear_disp_select, self.run, self.toggleLT]
|
||||
i = 0
|
||||
for permutation in itertools.permutations(functions, 4):
|
||||
print(str(i))
|
||||
for function in permutation:
|
||||
function(3)
|
||||
print(permutation)
|
||||
i = i+1
|
||||
raw_input()
|
||||
|
||||
class Sound_Test(Test):
|
||||
def __init__(self, i2c_addr = 0x22, base = 65):
|
||||
super(Sound_Test, self).__init__(i2c_addr, base)
|
||||
self.pins = [x + base for x in [15, 14, 12, 10, 8, 9, 11, 13]]
|
||||
|
||||
def fire(self):
|
||||
self.write(7, 0)
|
||||
|
||||
|
||||
def stop(self):
|
||||
self.write(7, 1)
|
||||
|
||||
def init_component(self):
|
||||
super(Sound_Test, self).init_component()
|
||||
wiringpi.digitalWrite(self.base + 12, 1)
|
||||
|
||||
def fire_sound(self, i):
|
||||
self.write(0, bool(i & 0b00000001))
|
||||
self.write(1, bool(i & 0b00000010))
|
||||
self.write(2, bool(i & 0b00000100))
|
||||
self.write(3, bool(i & 0b00001000))
|
||||
self.write(4, bool(i & 0b00010000))
|
||||
self.write(5, bool(i & 0b00100000))
|
||||
self.write(6, bool(i & 0b01000000))
|
||||
self.write(7, bool(i & 0b10000000))
|
||||
self.fire()
|
||||
a = raw_input()
|
||||
self.stop()
|
||||
|
||||
def rotate(self):
|
||||
for i in range(22, 78):
|
||||
self.fire_sound(i)
|
||||
|
||||
"""
|
||||
def init_flipper(self):
|
||||
init_driver()
|
||||
init_display()
|
||||
init_sound()
|
||||
|
||||
def init_driver(self):
|
||||
i2c_driver = 0x20
|
||||
base_driver = 65
|
||||
wiringpi.mcp23017Setup(base_driver, i2c_driver)
|
||||
|
||||
def init_display(self):
|
||||
i2c_display= 0x21
|
||||
base_display = 65 + 16
|
||||
wiringpi.mcp23017Setup(base_display, i2c_display)
|
||||
for i in range(base_display, base_display+16):
|
||||
wiringpi.pinMode(i,1)
|
||||
wiringpi.digitalWrite(i, 0)
|
||||
|
||||
def init_sound(self):
|
||||
i2c_sound = 0x22
|
||||
base_sound = 65 + 32
|
||||
wiringpi.mcp23017Setup(base_sound, i2c_sound)
|
||||
for i in range(base_sound, base_sound+16):
|
||||
wiringpi.pinMode(i,1)
|
||||
wiringpi.digitalWrite(i, 0)
|
||||
# set fire to 1 (out)
|
||||
|
||||
def """
|
||||
@@ -1,186 +0,0 @@
|
||||
import wiringpi
|
||||
import tty
|
||||
import itertools
|
||||
import sys
|
||||
from time import sleep
|
||||
|
||||
class Test(object):
|
||||
|
||||
def __init__(self, i2c_addr, base):
|
||||
self.i2c_addr = i2c_addr
|
||||
self.base = base
|
||||
self.pins = range(base, base+16)
|
||||
self.init_component()
|
||||
|
||||
def init_component(self):
|
||||
wiringpi.mcp23017Setup(self.base, self.i2c_addr)
|
||||
for i in self.pins:
|
||||
wiringpi.pinMode(i,1)
|
||||
wiringpi.digitalWrite(i, 1)
|
||||
print(self.pins)
|
||||
|
||||
def write(self, pin, value):
|
||||
print(self.pins[pin])
|
||||
wiringpi.digitalWrite(self.pins[pin], value)
|
||||
|
||||
class Test_Display(Test):
|
||||
def __init__(self, i2c_addr = 0x21, base = 65 + 16):
|
||||
super(Test_Display, self).__init__(i2c_addr, base)
|
||||
self.pin_dic = {'d0' : base, 'd1' : base + 1, 'd2' : base + 2, 'bcd0': base + 3, 'bcd1': base + 4, 'bcd2' : base + 5, 'bcd3' : base + 6, 'bcdLT' : base + 7, 'disp1' : base + 8, 'disp2' : base + 9, 'disp3' : base + 10, 'disp4' : base + 11, 'disp5' : base + 12, 'disp6' : base + 13, 'run' : base + 14}
|
||||
|
||||
def write_number(self, number):
|
||||
print('Writing number: ' + str(number))
|
||||
wiringpi.digitalWrite(self.pin_dic['bcd0'], bool(number % 2))
|
||||
number = number / 2
|
||||
wiringpi.digitalWrite(self.pin_dic['bcd1'], bool(number % 2))
|
||||
number = number / 2
|
||||
wiringpi.digitalWrite(self.pin_dic['bcd2'], bool(number % 2))
|
||||
number = number / 2
|
||||
wiringpi.digitalWrite(self.pin_dic['bcd3'], bool(number % 2))
|
||||
|
||||
def select_digit(self, digit):
|
||||
print('Selecting 7 segment number: ' + str(digit))
|
||||
wiringpi.digitalWrite(self.pin_dic['d0'], bool(digit % 2))
|
||||
digit = digit / 2
|
||||
wiringpi.digitalWrite(self.pin_dic['d1'], bool(digit % 2))
|
||||
digit = digit / 2
|
||||
wiringpi.digitalWrite(self.pin_dic['d2'], bool(digit % 2))
|
||||
|
||||
def disp_select(self, number):
|
||||
print('Selecting Display: ' + str(number))
|
||||
for i in range(1, 6):
|
||||
if(i == number):
|
||||
wiringpi.digitalWrite(self.pin_dic['disp' + str(i)], 0)
|
||||
else:
|
||||
wiringpi.digitalWrite(self.pin_dic['disp' + str(i)], 1)
|
||||
#sleep(.1)
|
||||
|
||||
def run(self):
|
||||
wiringpi.digitalWrite(self.pin_dic['run'], 0)
|
||||
#sleep(.001)
|
||||
wiringpi.digitalWrite(self.pin_dic['run'], 1)
|
||||
|
||||
def toggleLT(self):
|
||||
sleep(.1)
|
||||
wiringpi.digitalWrite(self.pin_dic['bcdLT'], 0)
|
||||
sleep(.1)
|
||||
wiringpi.digitalWrite(self.pin_dic['bcdLT'], 1)
|
||||
def clear_disp_select(self):
|
||||
print("Clearing Display")
|
||||
for i in range(1, 7):
|
||||
wiringpi.digitalWrite(self.pin_dic['disp' + str(i)], 1)
|
||||
|
||||
def test_digit1(self):
|
||||
for i in range(0, 8):
|
||||
for j in range(0, 10):
|
||||
self.select_digit(i)
|
||||
self.clear_disp_select()
|
||||
self.write_number(j)
|
||||
self.disp_select(1)
|
||||
self.run()
|
||||
def test(self):
|
||||
for k in range(1, 6):
|
||||
for i in range(0, 8):
|
||||
self.select_digit(i)
|
||||
for j in range(0, 10):
|
||||
self.write_number(j)
|
||||
# self.toggleLT()
|
||||
self.disp_select(k)
|
||||
self.clear_disp_select()
|
||||
self.run()
|
||||
|
||||
def test123(self):
|
||||
self.clear_disp_select()
|
||||
self.select_digit(0)
|
||||
self.write_number(7)
|
||||
wiringpi.digitalWrite(self.pin_dic['run'], 0)
|
||||
self.disp_select(1)
|
||||
|
||||
def manual_test(self, display, digit, number):
|
||||
self.select_digit(digit)
|
||||
self.write_number(number)
|
||||
self.disp_select(display)
|
||||
self.clear_disp_select()
|
||||
self.run()
|
||||
def test_digits(self):
|
||||
tty.setcbreak(sys.stdin.fileno())
|
||||
self.write_number(3)
|
||||
for i in range(0,8):
|
||||
self.select_digit(i)
|
||||
self.disp_select(0)
|
||||
self.run()
|
||||
sleep(.5)
|
||||
def permutation_test(self):
|
||||
self.select_digit(3)
|
||||
self.write_number(0)
|
||||
functions = [self.disp_select, self.clear_disp_select, self.run, self.toggleLT]
|
||||
i = 0
|
||||
for permutation in itertools.permutations(functions, 4):
|
||||
print(str(i))
|
||||
for function in permutation:
|
||||
function(3)
|
||||
print(permutation)
|
||||
i = i+1
|
||||
raw_input()
|
||||
|
||||
class Sound_Test(Test):
|
||||
def __init__(self, i2c_addr = 0x22, base = 65 + 32):
|
||||
super(Sound_Test, self).__init__(i2c_addr, base)
|
||||
self.pins = [x + base for x in [15, 14, 12, 10, 8, 9, 11, 13]]
|
||||
|
||||
def fire(self):
|
||||
self.write(7, 0)
|
||||
|
||||
|
||||
def stop(self):
|
||||
self.write(7, 1)
|
||||
|
||||
def init_component(self):
|
||||
super(Sound_Test, self).init_component()
|
||||
wiringpi.digitalWrite(self.base + 12, 1)
|
||||
|
||||
def rotate(self):
|
||||
for i in range(22, 78):
|
||||
self.write(0, i & 0b00000001)
|
||||
self.write(1, i & 0b00000010)
|
||||
self.write(2, i & 0b00000100)
|
||||
self.write(3, i & 0b00001000)
|
||||
self.write(4, i & 0b00010000)
|
||||
self.write(5, i & 0b00100000)
|
||||
self.write(6, i & 0b01000000)
|
||||
self.write(7, i & 0b10000000)
|
||||
|
||||
self.fire()
|
||||
# sleep(1)
|
||||
a = raw_input()
|
||||
self.stop()
|
||||
|
||||
"""
|
||||
def init_flipper(self):
|
||||
init_driver()
|
||||
init_display()
|
||||
init_sound()
|
||||
|
||||
def init_driver(self):
|
||||
i2c_driver = 0x20
|
||||
base_driver = 65
|
||||
wiringpi.mcp23017Setup(base_driver, i2c_driver)
|
||||
|
||||
def init_display(self):
|
||||
i2c_display= 0x21
|
||||
base_display = 65 + 16
|
||||
wiringpi.mcp23017Setup(base_display, i2c_display)
|
||||
for i in range(base_display, base_display+16):
|
||||
wiringpi.pinMode(i,1)
|
||||
wiringpi.digitalWrite(i, 0)
|
||||
|
||||
def init_sound(self):
|
||||
i2c_sound = 0x22
|
||||
base_sound = 65 + 32
|
||||
wiringpi.mcp23017Setup(base_sound, i2c_sound)
|
||||
for i in range(base_sound, base_sound+16):
|
||||
wiringpi.pinMode(i,1)
|
||||
wiringpi.digitalWrite(i, 0)
|
||||
# set fire to 1 (out)
|
||||
|
||||
def """
|
||||
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user