Skip to content

Commit 286c54b

Browse files
josephdadamsjosephdadams
committed
run prettier
1 parent 9d95760 commit 286c54b

File tree

10 files changed

+1737
-1618
lines changed

10 files changed

+1737
-1618
lines changed

‎config.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
'use strict';
2-
const Store = require('electron-store');
1+
'use strict'
2+
const Store = require('electron-store')
33

44
module.exports = new Store({
55
defaults: {
@@ -24,6 +24,6 @@ module.exports = new Store({
2424
plugin_companion: true,
2525
switch_mdns: true,
2626
switch_settings: true,
27-
switch_monitor: true
28-
}
29-
});
27+
switch_monitor: true,
28+
},
29+
})

‎help.md

+116-110
Original file line numberDiff line numberDiff line change
@@ -1,190 +1,196 @@
11
# Presentation Bridge Client
22

3-
This software is designed to work with your presentation lyrics software, accessing slide data in real time and then performing custom actions. It integrates with PresentationBridge, a free server program that allows you to send lyric data to end devices such as phones, tablets, and tv sticks through the built in web browser on those devices.
3+
This software is designed to work with your presentation lyrics software, accessing slide data in real time and then performing custom actions. It integrates with PresentationBridge, a free server program that allows you to send lyric data to end devices such as phones, tablets, and tv sticks through the built in web browser on those devices.
44

5-
The Settings window is used to configure the software for ProPresenter, PresentationBridge, midi-relay, Vista, Companion and HTTP.
5+
The Settings window is used to configure the software for ProPresenter, PresentationBridge, midi-relay, Vista, Companion and HTTP.
66

7-
Text on slides is sent to the bridge for display on devices that are connected.
7+
Text on slides is sent to the bridge for display on devices that are connected.
88

99
Text will be converted to upper case if the 'Upper Case' switch is set. This is used to match text display if a ProPresenter upper case theme is being used.
1010

11-
Images of the slides will be sent if the 'Send Images' switch in settings is on.
11+
Images of the slides will be sent if the 'Send Images' switch in settings is on.
1212

1313
The stage display shows the slide text and notes for both the current slide and next.
1414

1515
In addition, using the notes section of a slide, this Client can also send commands using midi-relay, HTTP and Companion:
16-
* Send MIDI voice messages, using the free program [midi-relay](http://github.com/josephdadams/midi-relay)
17-
* Make HTTP Requests (GET and POST, with JSON data if needed)
18-
* Press Companion Buttons using the TCP protocol
16+
17+
- Send MIDI voice messages, using the free program [midi-relay](http://github.com/josephdadams/midi-relay)
18+
- Make HTTP Requests (GET and POST, with JSON data if needed)
19+
- Press Companion Buttons using the TCP protocol
1920

2021
In general, the format is as follows:
2122

2223
`[command type]:[parameter 1],[parameter 2][etc.];`
2324

2425
Each parameter is separated by a comma and a command should be terminated with a semicolon if there are other text notes or commands on the same notes page. A single command on the notes page does not need the terminating semicolon (for backwards compatibility).
2526

26-
The program works by listening to the "current slide notes" data within ProPresenter. If the text contains valid commands then these will be processed. Other text is sent to the stagedisplay bridge.
27+
The program works by listening to the "current slide notes" data within ProPresenter. If the text contains valid commands then these will be processed. Other text is sent to the stagedisplay bridge.
2728

2829
## Sending MIDI Relay Messages
2930

3031
### Supported MIDI Relay Types
31-
* Note On
32-
33-
Format: `noteon:[channel],[note],[velocity];`
34-
35-
* `channel` should be a integer between 0 and 15.
36-
* `note` should be an integer of the MIDI Number value that represents the note, between 0 and 127.
37-
* `velocity` should be a integer between 1 and 127. A value of 0 is considered a Note Off message.
3832

39-
Example: `noteon:0,55,100;`
40-
41-
* Note Off
42-
43-
Format: `noteoff:[channel],[note],[velocity];`
44-
45-
* `channel` should be a integer between 0 and 15.
46-
* `note` should be an integer of the MIDI Number value that represents the note, between 0 and 127.
47-
* `velocity` should be 0.
33+
- Note On
34+
35+
Format: `noteon:[channel],[note],[velocity];`
36+
37+
- `channel` should be a integer between 0 and 15.
38+
- `note` should be an integer of the MIDI Number value that represents the note, between 0 and 127.
39+
- `velocity` should be a integer between 1 and 127. A value of 0 is considered a Note Off message.
40+
41+
Example: `noteon:0,55,100;`
42+
43+
- Note Off
44+
45+
Format: `noteoff:[channel],[note],[velocity];`
46+
47+
- `channel` should be a integer between 0 and 15.
48+
- `note` should be an integer of the MIDI Number value that represents the note, between 0 and 127.
49+
- `velocity` should be 0.
50+
51+
Example: `noteoff:0,55,100;`
52+
53+
- Polyphonic Aftertouch
54+
55+
Format: `aftertouch:[channel],[note],[value];`
4856

49-
Example: `noteoff:0,55,100;`
57+
- `channel` should be a integer between 0 and 15.
58+
- `note` should be an integer of the MIDI Number value that represents the note, between 0 and 127.
59+
- `velocity` should be a integer between 0 and 127.
5060

51-
* Polyphonic Aftertouch
61+
Example: `aftertouch:0,55,100;`
5262

53-
Format: `aftertouch:[channel],[note],[value];`
54-
55-
* `channel` should be a integer between 0 and 15.
56-
* `note` should be an integer of the MIDI Number value that represents the note, between 0 and 127.
57-
* `velocity` should be a integer between 0 and 127.
63+
- CC (Control Change)
5864

59-
Example: `aftertouch:0,55,100;`
65+
Format: `cc:[channel],[controller],[value];`
6066

61-
* CC (Control Change)
67+
- `channel` should be a integer between 0 and 15.
68+
- `controller` should be a integer between 0 and 127.
69+
- `value` should be a integer between 0 and 127.
6270

63-
Format: `cc:[channel],[controller],[value];`
64-
65-
* `channel` should be a integer between 0 and 15.
66-
* `controller` should be a integer between 0 and 127.
67-
* `value` should be a integer between 0 and 127.
71+
Example: `cc:0,32,100;`
6872

69-
Example: `cc:0,32,100;`
70-
71-
* PC (Program Change)
73+
- PC (Program Change)
7274

73-
Format: `pc:[channel],[value];`
75+
Format: `pc:[channel],[value];`
7476

75-
* `channel` should be a integer between 0 and 15.
76-
* `value` should be a integer between 0 and 127.
77+
- `channel` should be a integer between 0 and 15.
78+
- `value` should be a integer between 0 and 127.
7779

78-
Example: `pc:0,100;`
80+
Example: `pc:0,100;`
7981

80-
* Channel Pressure / Aftertouch
82+
- Channel Pressure / Aftertouch
8183

82-
Format: `pressure:[channel],[value];`
83-
84-
* `channel` should be a integer between 0 and 15.
85-
* `value` should be a integer between 0 and 127.
84+
Format: `pressure:[channel],[value];`
8685

87-
Example: `pressure:0,100;`
86+
- `channel` should be a integer between 0 and 15.
87+
- `value` should be a integer between 0 and 127.
8888

89-
* Pitch Bend / Pitch Wheel
89+
Example: `pressure:0,100;`
9090

91-
Format: `pitchbend:[channel],[value];`
92-
93-
* `channel` should be a integer between 0 and 15.
94-
* `value` should be a integer between 0 and 16,383.
91+
- Pitch Bend / Pitch Wheel
9592

96-
Example: `pitchbend:0,100;`
93+
Format: `pitchbend:[channel],[value];`
9794

98-
* MSC (MIDI Show Control)
95+
- `channel` should be a integer between 0 and 15.
96+
- `value` should be a integer between 0 and 16,383.
9997

100-
Format: `msc:[device id],[command format],[command],[cue],[cuelist],[cuepath];`
98+
Example: `pitchbend:0,100;`
10199

102-
* `deviceid` should be an integer between 0 and 111. It can also be a string 'g1' through 'g15' to represent groups, or it can be `all`.
100+
- MSC (MIDI Show Control)
103101

104-
* `commandformat` should be a string with one of the following values:
105-
* lighting.general
106-
* sound.general
107-
* machinery.general
108-
* video.general
109-
* projection.general
110-
* processcontrol.general
111-
* pyro.general
112-
* all
113-
* Any other value for _commandformat_ will default to `all`.
114-
115-
* `command` should be a string with one of the following values:
116-
* go
117-
* stop
118-
* gojam
119-
* gooff
120-
* resume
121-
* timedgo
122-
* load
123-
* set
124-
* fire
125-
* alloff
126-
* restore
127-
* reset
128-
* opencuelist
129-
* closecuelist
130-
* startclock
131-
* stopclock
102+
Format: `msc:[device id],[command format],[command],[cue],[cuelist],[cuepath];`
132103

133-
* Values for `cue`, `cuelist`, and `cuepath` are all optional strings. If you don't want to include them, just include the `,` delimiter.
134-
135-
Example: `msc:0,lighting.general,go,1,12,,;`
104+
- `deviceid` should be an integer between 0 and 111. It can also be a string 'g1' through 'g15' to represent groups, or it can be `all`.
136105

137-
* Sysex MIDI Message
106+
- `commandformat` should be a string with one of the following values:
138107

139-
Format: `sysex:[message];`
140-
141-
* `message` should contain the actual MIDI message in bytes. Bytes can be either in hexadecimal or decimal, separated by commas.
142-
* A response of `{result: 'sysex-sent-successfully'}` indicates the SysEx MIDI message was successfully sent.
108+
- lighting.general
109+
- sound.general
110+
- machinery.general
111+
- video.general
112+
- projection.general
113+
- processcontrol.general
114+
- pyro.general
115+
- all
116+
- Any other value for _commandformat_ will default to `all`.
117+
118+
- `command` should be a string with one of the following values:
119+
120+
- go
121+
- stop
122+
- gojam
123+
- gooff
124+
- resume
125+
- timedgo
126+
- load
127+
- set
128+
- fire
129+
- alloff
130+
- restore
131+
- reset
132+
- opencuelist
133+
- closecuelist
134+
- startclock
135+
- stopclock
136+
137+
- Values for `cue`, `cuelist`, and `cuepath` are all optional strings. If you don't want to include them, just include the `,` delimiter.
138+
139+
Example: `msc:0,lighting.general,go,1,12,,;`
140+
141+
- Sysex MIDI Message
142+
143+
Format: `sysex:[message];`
144+
145+
- `message` should contain the actual MIDI message in bytes. Bytes can be either in hexadecimal or decimal, separated by commas.
146+
- A response of `{result: 'sysex-sent-successfully'}` indicates the SysEx MIDI message was successfully sent.
147+
148+
Example: `sysex:0xF0,0x41,0x10,0x00,0x00,0x00,0x20,0x12,0x71,0x00,0x08,0x00,0x07,0xF7;`
143149

144-
Example: `sysex:0xF0,0x41,0x10,0x00,0x00,0x00,0x20,0x12,0x71,0x00,0x08,0x00,0x07,0xF7;`
145-
146150
All values for `channel` are zero-based. (e.g., Channel of `1` should be sent as `0`.)
147151

148152
## Additional MIDI Notations
153+
149154
In addition to the primary MIDI voice message notations, the following notations are also available:
150155

151-
* Chroma-Q Vista Lighting MSC Message (the Vista console must be running midi-relay)
156+
- Chroma-Q Vista Lighting MSC Message (the Vista console must be running midi-relay)
152157

153-
Format: `vista:[cue list],[cue];`
158+
Format: `vista:[cue list],[cue];`
154159

155-
* `cue list`: The cue list you want to control
156-
* `cue`: The cue to play
160+
- `cue list`: The cue list you want to control
161+
- `cue`: The cue to play
157162

158-
Example: `vista:1,2.5;` : This would run Cue 2.5 on Cuelist 1. This assumes a `device id` of `0`, `command format` is `lighting.general`, and the `command` is `go`.
163+
Example: `vista:1,2.5;` : This would run Cue 2.5 on Cuelist 1. This assumes a `device id` of `0`, `command format` is `lighting.general`, and the `command` is `go`.
159164

160165
## HTTP Requests
166+
161167
HTTP Requests to perform actions or send data can also be easily performed.
162168

163169
Format: `http:[url];`
164170

165-
* `url`: The URL to perform an HTTP GET request
171+
- `url`: The URL to perform an HTTP GET request
166172

167173
You can also use the following notations to perform specific HTTP request types:
168174

169-
* `http:get,[url];`
170-
* `http:post,[url];`
171-
* `http:post,[url],[json];`
175+
- `http:get,[url];`
176+
- `http:post,[url];`
177+
- `http:post,[url],[json];`
172178

173179
Example: `http:get,http://www.techministry.blog;` : This would perform an HTTP GET request to the URL, `http://www.techministry.blog`.
174180

175181
## Companion Button Press
176182

177183
Format: `companion:[bank],[button];` or `cbp:[bank],[button];`
178184

179-
* `bank`: The page in Companion where the button is
180-
* `button`: The button on the page that you wish to press
185+
- `bank`: The page in Companion where the button is
186+
- `button`: The button on the page that you wish to press
181187

182188
Example: `companion:1,2;` : This would press Button 2 on Page 1.
183189

184190
## Turn bridge logo on or off
185191

186192
Format: `logo:[switch];`
187193

188-
* `switch`: Either `on` or `off`
194+
- `switch`: Either `on` or `off`
189195

190196
Example: `logo:on;` : To turn the logo on.

‎index.css

+11-16
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,8 @@ body {
77

88
/* Use OS default fonts */
99
body {
10-
font-family: -apple-system,
11-
BlinkMacSystemFont,
12-
'Segoe UI',
13-
Roboto,
14-
Oxygen-Sans,
15-
Ubuntu,
16-
Cantarell,
17-
'Helvetica Neue',
18-
sans-serif,
19-
'Apple Color Emoji',
20-
'Segoe UI Emoji',
21-
'Segoe UI Symbol';
10+
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue',
11+
sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
2212
text-rendering: optimizeLegibility;
2313
font-feature-settings: 'liga', 'clig', 'kern';
2414
}
@@ -34,19 +24,24 @@ header h1 {
3424
padding: 0;
3525
opacity: 0.7;
3626
}
37-
header h2, h3 {
27+
header h2,
28+
h3 {
3829
width: 50%;
3930
display: inline;
4031
}
4132

42-
header h2 { font-size: 30px}
43-
header h3 { font-size: 15px}
33+
header h2 {
34+
font-size: 30px;
35+
}
36+
header h3 {
37+
font-size: 15px;
38+
}
4439

4540
.vertical-space {
4641
margin-top: 3px;
4742
}
4843

4944
.horizontal-line {
50-
border-top: 3px solid #000000;
45+
border-top: 3px solid #000000;
5146
margin-bottom: 1px;
5247
}

0 commit comments

Comments
 (0)