Skip to content
This repository was archived by the owner on Dec 27, 2019. It is now read-only.

Commit fde1c85

Browse files
committed
Merge branch 'release/0.5.0'
2 parents b8419f0 + 12464c0 commit fde1c85

20 files changed

Lines changed: 307 additions & 49 deletions

File tree

README.md

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,35 @@
11
# AV Switch Control Board
22

3-
A control board for operating several AV switches at once when selecting
4-
several devices.
3+
A control board for operating several AV switches at once when selecting several devices.
54

65
## Synopsis
76

8-
The main goal of this project is to help retro console gamers using older
9-
professional matrix audio/video switch, such as Extron's Crosspoint series, and
10-
professional monitors, such as Sony's PVM and BVM series, better select the
11-
channels to which they have connected consoles.
7+
The main goal of this project is to help retro console gamers using older professional matrix audio/video switch, such as Extron's Crosspoint series, and professional monitors, such as Sony's PVM and BVM series, better select the channels to which they have connected consoles.
128

139
## Installation
1410

15-
Though this is designed for Raspian out of the box, it still requires one
16-
additional library. You can install it by running
17-
`sudo apt install python3-pil.imagetk`
11+
Installation is pretty straightforward, read the [Wiki on GitHub](https://www.github.com/6XGate/PiAvSwitchController/wiki) for complete instructions.
1812

1913
## Usage and Configuration
2014

21-
See the [Wiki on GitHub](http://www.github.com/6XGate/PiAvSwitchController/wiki)
22-
for information on setting up, configuring, and using PiAvSwitchController.
15+
See the [Wiki on GitHub](https://www.github.com/6XGate/PiAvSwitchController/wiki) for information on setting up, configuring, and using PiAvSwitchController.
2316

2417
## Plans
2518

26-
- More drivers, specifically for profession monitors like Sony PVM and BVM
27-
series.
19+
- Move the configuration file to an XDG standard location.
2820
- Stream or location aware configuration handling for better error reporting.
21+
- More drivers, which will likely be on-going.
2922

3023
## Change Log
3124

32-
See the [Project on GitHub](http://www.github.com/6XGate/PiAvSwitchController).
25+
See the [Releases on GitHub](https://github.com/6XGate/PiAvSwitchController/releases).
3326

3427
## Example Images
3528

36-
The example images where taken from Wikipedia pages for each console and the
37-
trademarks and art belongs to their respective companies, no new license is
38-
implied by their presence in this code-base. Their inclusion is simply an
39-
educational example presumed under fair use.
29+
The example images where taken from Wikipedia pages for each console and the trademarks and art belongs to their respective companies, no new license is implied by their presence in this code-base. Their inclusion is simply an educational example presumed under fair use.
4030

4131
## Interface Icons
4232

4333
Icons not defined by the configuration have the following license:
4434

45-
- _ui/res/poweroff.png_, CC BY-SA 3.0, canvas enlarged to 128x128,
46-
[Source](https://upload.wikimedia.org/wikipedia/commons/7/72/Power_off_icon.png)
35+
- _ui/res/poweroff.png_, CC BY-SA 3.0, canvas enlarged to 128x128, [Source](https://upload.wikimedia.org/wikipedia/commons/7/72/Power_off_icon.png)

app/__init__.py

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import signal
2+
3+
from .support.Switch import load_switches
4+
from .support.Device import load_devices
5+
from .support.config import load_config
6+
from .ui.Main import Main
7+
8+
root = None # type: Main
9+
10+
11+
# noinspection PyUnusedLocal
12+
def on_quit(signum: int, frame) -> None:
13+
root.destroy()
14+
15+
16+
def main():
17+
global root
18+
19+
config = load_config()
20+
load_switches(config['switches'])
21+
load_devices(config['devices'])
22+
23+
signal.signal(signal.SIGTERM, on_quit)
24+
25+
root = Main()
26+
root.mainloop()
27+
return 0
File renamed without changes.
File renamed without changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from typing import Dict, Any
22

33
from .validation import validate_arg
4-
from drivers import load_driver
4+
from .drivers import load_driver
55

66

77
class Switch:
File renamed without changes.
File renamed without changes.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
from serial import Serial
55

6-
from support import Driver
7-
from support.validation import validate_arg
6+
from .. import Driver
7+
from ..validation import validate_arg
88

99

1010
class Extron(Driver):
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import serial
55
from serial import Serial
66

7-
from support import Driver
8-
from support.validation import validate_arg
7+
from .. import Driver
8+
from ..validation import validate_arg
99
from .libraries.sony_bvm_rs485.protocol import AddressKind, Address, Command, CommandBlock
1010

1111

0 commit comments

Comments
 (0)