changed config and show versions from 4 to 5

missionpinball · Jul 11, 2017 · a10e2a5 · a10e2a5
1 parent 25ffee9
commit a10e2a5
Show file tree

Hide file tree

Showing 33 changed files with 89 additions and 68 deletions.
diff --git a/MpfDocsTestCase.py b/MpfDocsTestCase.py
@@ -26,7 +26,7 @@ class MpfDocsTestCase(MpfTestCase):
 
     ::
 
-        #config_version=4
+        #config_version=5
 
         switches:
             s_left_flipper:

diff --git a/config/instructions/config_version.rst b/config/instructions/config_version.rst
@@ -12,7 +12,7 @@ this:
 
 ::
 
-    #config_version=4
+    #config_version=5
 
 In YAML, lines that start with # are ignored, which means the YAML
 processor skips this line, but MPF uses it to make sure the config
@@ -32,8 +32,8 @@ migrate your config files to the latest version.
 Which versions of MPF require which config_versions?
 ----------------------------------------------------
 
-
-+ MPF 0.30+: ``#config_version=4``
++ MPF 0.50+: ``#config_version=5``
++ MPF 0.30-0.33: ``#config_version=4``
 + MPF 0.20-0.21: ``#config_version=3``
 + MPF 0.19: ``#config_version=2``
 + MPF 0.17-0.18: ``#config_version=1``

diff --git a/config/slide_player.rst b/config/slide_player.rst
@@ -117,7 +117,7 @@ section). Any of the examples above apply, you just don't include the event name
 
 ::
 
-   #show_version=4
+   #show_version=5
 
    - time: 0
      slides: slide1

diff --git a/config/widget_player.rst b/config/widget_player.rst
@@ -76,7 +76,7 @@ So again, the format in a config file would be:
 
 .. code-block:: yaml
 
-   #config_version=4
+   #config_version=5
 
    widget_player:
       some_event:
@@ -90,7 +90,7 @@ And the format in a show file would be:
 
 .. code-block:: yaml
 
-   #show_version=4
+   #show_version=5
 
    - duration: 1s
      widgets:

diff --git a/cookbook/TAF_mansion_awards.rst b/cookbook/TAF_mansion_awards.rst
@@ -98,7 +98,7 @@ then you'll probably have a lot more than this in your machine config file.)
 
 .. code-block:: yaml
 
-   #config_version=4
+   #config_version=5
 
    modes:
      - mansion_awards
@@ -157,37 +157,52 @@ then you'll probably have a lot more than this in your machine config file.)
      electric_chair:
        number: 01
 
-   matrix_lights:
+   lights:
      9_mil:
        number: L66
+       subtype: matrix
      6_mil:
        number: L54
+       subtype: matrix
      3_mil:
        number: L68
+       subtype: matrix
      thing:
        number: L51
+       subtype: matrix
      quick_multiball:
        number: L55
+       subtype: matrix
      graveyard_at_max:
        number: L67
+       subtype: matrix
      raise_the_dead:
        number: L52
+       subtype: matrix
      festers_tunnel_hunt:
        number: L56
+       subtype: matrix
      lite_extra_ball:
        number: L53
+       subtype: matrix
      seance:
        number: L57
+       subtype: matrix
      hit_cousin_it:
        number: L58
+       subtype: matrix
      mamushka:
        number: L45
+       subtype: matrix
      mansion_question:
        number: L65
+       subtype: matrix
      electric_chair_yellow:
        number: L64
+       subtype: matrix
      electric_chair_red:
        number: L47
+       subtype: matrix
 
    ball_devices:
 
@@ -427,7 +442,7 @@ Let's look at the config for the "chair_lit_3s" mode:
 
 .. code-block:: yaml
 
-   #config_version=4
+   #config_version=5
 
    mode:
      priority: 101
@@ -499,7 +514,7 @@ Here's the config for this mode:
 
 .. code-block:: yaml
 
-   #config_version=4
+   #config_version=5
 
    mode:
      priority: 102

diff --git a/displays/slides/creating_slides.rst b/displays/slides/creating_slides.rst
@@ -124,7 +124,7 @@ step in that show:
 
 ::
 
-    # show_version=4
+    # show_version=5
     - time: 0
       slides:
         my_show_slide_1:

diff --git a/displays/widgets/bezier/index.rst b/displays/widgets/bezier/index.rst
@@ -6,9 +6,11 @@ The bezier widget is used to draw a curved line on a :doc:`slide </displays/slid
 
 Here's an example:
 
+TODO This example just shows a blank slide in MPF 0.50?
+
 .. code-block:: yaml
 
-   #config_version=4
+   #config_version=5
 
    slide_player:
      mc_ready:
@@ -17,7 +19,7 @@ Here's an example:
            points: 10, 10, 150, 450, 300, 100, 790, 590
            color: lime
            thickness: 5
-           cap: none
+           cap: square
          - type: bezier
            points: 0, 600, 400, 400, 400, 0
            color: pink
@@ -86,7 +88,7 @@ default, ``0.5`` is half as thick, etc.
 cap:
 ~~~~
 
-Determine the cap of the line, defaults to ‘round’. Can be one of ‘none’, ‘square’ or ‘round’
+Determine the cap of the line, defaults to ‘round’. Can be one of ‘square’ or ‘round’
 
 joint:
 ~~~~~~

diff --git a/displays/widgets/camera/index.rst b/displays/widgets/camera/index.rst
@@ -7,7 +7,11 @@ Here's an example:
 
 .. code-block:: yaml
 
-   #config_version=4
+   #config_version=5
+
+   mpf-mc:
+     widgets:
+       camera: mpfmc.widgets.camera
 
    slide_player:
      mc_ready:

diff --git a/displays/widgets/easing_config.rst b/displays/widgets/easing_config.rst
@@ -35,7 +35,7 @@ core engine to run this example.)
 
 ::
 
-    # config_version=4
+    # config_version=5
 
     displays:
       default:
@@ -129,7 +129,7 @@ And here's the example where we animate the opacity:
 
 ::
 
-    # config_version=4
+    # config_version=5
 
     displays:
       default:

diff --git a/displays/widgets/ellipse/index.rst b/displays/widgets/ellipse/index.rst
@@ -12,7 +12,7 @@ Here's an example:
 
 .. code-block:: yaml
 
-   #config_version=4
+   #config_version=5
 
    slide_player:
     mc_ready:

diff --git a/displays/widgets/line/index.rst b/displays/widgets/line/index.rst
@@ -9,7 +9,7 @@ Here's an example:
 
 .. code-block:: yaml
 
-   #config_version=4
+   #config_version=5
 
    slide_player:
     mc_ready:

diff --git a/displays/widgets/points/index.rst b/displays/widgets/points/index.rst
@@ -7,7 +7,7 @@ Here's an example:
 
 .. code-block:: yaml
 
-   #config_version=4
+   #config_version=5
 
    slide_player:
       mc_ready:

diff --git a/displays/widgets/quad/index.rst b/displays/widgets/quad/index.rst
@@ -7,7 +7,7 @@ Here's an example:
 
 .. code-block:: yaml
 
-   #config_version=4
+   #config_version=5
 
    slide_player:
      mc_ready:

diff --git a/displays/widgets/rectangle/index.rst b/displays/widgets/rectangle/index.rst
@@ -9,7 +9,7 @@ Here's an example:
 
 .. code-block:: yaml
 
-   #config_version=4
+   #config_version=5
 
    slide_player:
      mc_ready:

diff --git a/displays/widgets/slide_frame/index.rst b/displays/widgets/slide_frame/index.rst
@@ -8,7 +8,7 @@ Here's an example:
 
 .. code-block:: yaml
 
-   #config_version=4
+   #config_version=5
 
    slides:
      base_slide:

diff --git a/displays/widgets/triangle/index.rst b/displays/widgets/triangle/index.rst
@@ -7,7 +7,7 @@ Here's an example:
 
 .. code-block:: yaml
 
-   #config_version=4
+   #config_version=5
 
    slide_player:
      mc_ready:

diff --git a/game_logic/bonus/configuring_bonus.rst b/game_logic/bonus/configuring_bonus.rst
@@ -12,7 +12,7 @@ machine config's ``modes:`` section, like this:
 
 .. code-block:: yaml
 
-   #config_version=4
+   #config_version=5
 
    modes:
       - base
@@ -88,7 +88,7 @@ Now go back into your bonus mode folder open up ``bonus.yaml`` config file
 
 .. code-block:: yaml
 
-   #config_version=4
+   #config_version=5
 
    mode_settings:
       bonus_entries:

diff --git a/mechs/flippers/disabled_flippers.rst b/mechs/flippers/disabled_flippers.rst
@@ -5,7 +5,7 @@ TODO
 
 ::
 
-    #config_version=4
+    #config_version=5
 
     flippers:
       flipper_left_front:
@@ -35,7 +35,7 @@ TODO
 
 ::
 
-    #config_version=4
+    #config_version=5
 
     mode:
       start_events: ball_starting, one_on_one_started

diff --git a/mechs/flippers/dual_wound.rst b/mechs/flippers/dual_wound.rst
@@ -21,7 +21,7 @@ Here's an example ``config.yaml`` with two switches added:
 
 ::
 
-    #config_version=4
+    #config_version=5
 
     switches:
         s_left_flipper:

diff --git a/mechs/flippers/single_wound.rst b/mechs/flippers/single_wound.rst
@@ -12,7 +12,7 @@ Read more about "dual wound" versus "single wound" coils in the
 :doc:`/mechs/dual_wound_coils/dual_vs_single_wound` guide.
 
 1. Add your flipper buttons
-----------------------------
+---------------------------
 
 First, make sure you have entries in your machine config for your flipper
 buttons.
@@ -21,7 +21,7 @@ Here's an example ``config.yaml`` with two switches added:
 
 ::
 
-    #config_version=4
+    #config_version=5
 
     switches:
         s_left_flipper:
@@ -176,7 +176,7 @@ we created in this How To guide:
 
 ::
 
-    #config_version=4
+    #config_version=5
 
     switches:
         s_left_flipper:

diff --git a/mechs/troughs/classic_single_ball.rst b/mechs/troughs/classic_single_ball.rst
@@ -129,7 +129,7 @@ Here's the complete config
 
 ::
 
-    #config_version=4
+    #config_version=5
 
     switches:
         s_drain:

diff --git a/mechs/troughs/modern_mechanical.rst b/mechs/troughs/modern_mechanical.rst
@@ -295,7 +295,7 @@ Here's the complete config
 
 ::
 
-    #config_version=4
+    #config_version=5
 
     switches:
         s_trough1:

diff --git a/mechs/troughs/modern_opto.rst b/mechs/troughs/modern_opto.rst
@@ -296,7 +296,7 @@ Here's the complete config
 
 ::
 
-    #config_version=4
+    #config_version=5
 
     switches:
         s_trough1:

diff --git a/mechs/troughs/two_coil_multiple_switches.rst b/mechs/troughs/two_coil_multiple_switches.rst
@@ -211,7 +211,7 @@ Here's the complete config
 
 ::
 
-    #config_version=4
+    #config_version=5
 
     switches:
         s_drain:

diff --git a/mechs/troughs/two_coil_one_switch.rst b/mechs/troughs/two_coil_one_switch.rst
@@ -238,7 +238,7 @@ Here's the complete config
 
 ::
 
-    #config_version=4
+    #config_version=5
 
     switches:
         s_drain: