Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Game variables added #233

Closed
wants to merge 65 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
3e47031
changes for release
jabdoa2 Feb 2, 2019
b1ac217
Downgrade headers to subheaders; clear whitespace
avanwinkle Feb 2, 2019
2a2c4b3
Merge pull request #202 from avanwinkle/avanwinkle/mac-instructions-h…
jabdoa2 Feb 2, 2019
190bedd
Update power_entry.rst
colemanomartin Feb 13, 2019
02fab48
Merge pull request #203 from colemanomartin/patch-11
jabdoa2 Feb 14, 2019
a1548f1
Update game_mode.rst
gregsealby Feb 27, 2019
6f4db49
Merge pull request #204 from gregsealby/patch-3
jabdoa2 Feb 28, 2019
fe6afd6
fix tutorial bug. thanks to pablo for noticing!
jabdoa2 Mar 8, 2019
87c49d2
use python 3.6
jabdoa2 Mar 8, 2019
c3da944
use stable image
jabdoa2 Mar 8, 2019
e28fb16
Update index.rst
colemanomartin Mar 9, 2019
8aa084f
Merge pull request #208 from colemanomartin/patch-13
jabdoa2 Mar 9, 2019
3005a40
add image and example to steppers
jabdoa2 Mar 9, 2019
44cf7a9
Update servos.rst
colemanomartin Mar 11, 2019
3352f89
Update steppers.rst
colemanomartin Mar 11, 2019
54ea899
Merge pull request #210 from colemanomartin/patch-15
jabdoa2 Mar 11, 2019
5634ffa
Merge branch 'patch-16' of https://github.com/colemanomartin/mpf-docs…
jabdoa2 Mar 11, 2019
49b38b8
fix example
jabdoa2 Mar 11, 2019
4d00c8a
Merge branch 'colemanomartin-patch-16' into latest
jabdoa2 Mar 11, 2019
d554147
Update multiple_screens.rst
cfbenn Mar 14, 2019
6be039b
Merge pull request #212 from cfbenn/patch-11
jabdoa2 Mar 14, 2019
5d56e15
slight clarification of example
colemanomartin Mar 17, 2019
80e496b
Merge pull request #214 from colemanomartin/patch-17
jabdoa2 Mar 17, 2019
e8fd818
Update accruals.rst
colemanomartin Apr 7, 2019
b1ad487
fix example
jabdoa2 Apr 9, 2019
1251b35
Merge branch 'colemanomartin-patch-18' into latest
jabdoa2 Apr 9, 2019
cde8c0a
Update optos.rst
colemanomartin Apr 14, 2019
b7c4dce
Update animation.rst
colemanomartin Apr 20, 2019
d5bb295
Update common_settings.rst
colemanomartin Apr 20, 2019
f721d5b
Merge pull request #216 from colemanomartin/patch-19
jabdoa2 Apr 20, 2019
0f05dfd
Merge pull request #218 from colemanomartin/patch-21
jabdoa2 Apr 20, 2019
0f0e552
Merge pull request #217 from colemanomartin/patch-20
jabdoa2 Apr 20, 2019
f719b2b
Dipswitch 6 warning when using servos with PD-LED
colemanomartin Apr 28, 2019
671561d
OK if I add myself to authors?
colemanomartin Apr 28, 2019
5a6c49f
Update authors.rst
colemanomartin Apr 28, 2019
5017937
Update servos.rst
colemanomartin Apr 28, 2019
1827ad1
More info on DIP switch 6
colemanomartin Apr 28, 2019
e47a676
Merge pull request #221 from colemanomartin/patch-23
jabdoa2 Apr 28, 2019
77defce
Merge pull request #222 from colemanomartin/patch-24
jabdoa2 Apr 28, 2019
7d76701
Merge pull request #220 from colemanomartin/patch-22
jabdoa2 Apr 28, 2019
af43976
Update mac.rst
GabeKnuth May 16, 2019
095e22e
Update mpf-examples.rst
GabeKnuth May 16, 2019
deb2c52
Spelling error wireing to wiring
ironspider May 16, 2019
3ac5270
Merge pull request #225 from ironspider/patch-1
jabdoa2 May 16, 2019
c555172
Spelling for > four
ironspider May 17, 2019
2165c00
Merge pull request #226 from ironspider/patch-2
jabdoa2 May 17, 2019
f5255ea
add debug: yes
ironspider May 19, 2019
3e3d4cd
numbers don't match
ironspider May 19, 2019
3b89d1d
Merge pull request #227 from ironspider/patch-3
jabdoa2 May 19, 2019
3552e9b
Merge pull request #228 from ironspider/patch-4
jabdoa2 May 19, 2019
4a62fd3
Spelling be > by
ironspider May 20, 2019
fadc24a
spelling add > adding
ironspider May 20, 2019
6c4fc67
Merge pull request #229 from ironspider/patch-5
jabdoa2 May 20, 2019
598b64a
Merge pull request #230 from ironspider/patch-6
jabdoa2 May 20, 2019
9091f7b
rotation documentation error
colemanomartin May 24, 2019
23e49ce
enstalling > Installing
ironspider May 24, 2019
7b3daa7
Merge pull request #232 from ironspider/patch-7
jabdoa2 May 25, 2019
222d47d
Merge pull request #231 from colemanomartin/patch-25
jabdoa2 May 25, 2019
4b8c606
Update shots.rst
GabeKnuth May 27, 2019
abef60e
Game variables section
cfbenn May 28, 2019
b53022d
Merge branch 'dev' into latest
cfbenn May 28, 2019
858a97e
Corrected underline
cfbenn May 28, 2019
bb40e42
Merge branch 'latest' into latest
cfbenn May 28, 2019
79673ef
Game Variables section added.
cfbenn May 28, 2019
1d2e10d
Updated TOC for game variables
cfbenn May 30, 2019
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Update power_entry.rst

additional detail
  • Loading branch information...
colemanomartin committed Feb 13, 2019
commit 190bedd23289d4cfdbbf712a958e4904fff24657
@@ -6,10 +6,19 @@ See :doc:`/hardware/voltages_and_power/index` for details.

.. image:: /hardware/images/multimorphic_Power_Entry.png

The Multimorphic Power Filter board connects 230V/110V AC to all your PSUs
using connectors J1, J2 or J3.
The Multimorphic Power Filter board serves four purposes.
1. It serves as a central connection point for 230V/110V AC
and all your PSUs using connectors J1, J2 or J3.
2. It provides a bank of capacitors to buffer current surges
on the high voltage rail.
3. It provides safety relay control of the high voltage rail.
4. It connects the ground (negative) terminals of each of
the power supplies to prevent a differential in ground
levels between the coil supply and the logic supply which is
a common cause of unstable operation.

Additionally, it allows to connect up to four DC rails:
The Multimorphic Power Entry Board allows connections for
up to four DC rails:

* 5V
* 12V
@@ -24,3 +33,4 @@ J10 will turn on HV on the ouput.
You should connect it to your door switch to cut high power when the door is
opened.
Make sure that J10 is closed during development or HV will be off.

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.