Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mpf/config_spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1573,7 +1573,7 @@ settings:
label: single|str|
sort: single|int|
values: dict|str:str|
key_type: single|enum(str,float,int)|str
key_type: single|enum(str,float,int,bool)|str
default: single|str|
machine_var: single|str|None
settingType: single|str|standard
Expand Down
4 changes: 3 additions & 1 deletion mpf/core/utility_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ def convert_to_type(value, type_name):
return float(value)
if type_name == "str":
return str(value)
if type_name == "bool":
return str(value).lower() in ['true', 't', 'yes', 'enable', 'on', '1']

raise AssertionError("Unknown type {}".format(type_name))

Expand Down Expand Up @@ -847,4 +849,4 @@ def check_bit(hex_string, bit):
bool: True if the bit is set, False otherwise
"""
num = int(hex_string, 16)
return bool(num & (1 << bit))
return bool(num & (1 << bit))
27 changes: 27 additions & 0 deletions mpf/tests/machine_files/settings/config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,30 @@ settings:
zero: "Zero"
one: "One"
two: "Two"
custom_setting_float:
label: "Float Setting"
key_type: float
default: 0.1
sort: 3
values:
0: "Zero"
0.1: "Point One"
1.0: "One"
2.5: "Two Point Five"
custom_setting_bool_t:
label: "Boolean Setting Default True"
key_type: bool
default: true
sort: 4
values:
true: "yes"
false: "off"

custom_setting_bool_f:
label: "Boolean Setting Default False"
key_type: bool
default: false
sort: 5
values:
true: "on"
false: "no"
16 changes: 16 additions & 0 deletions mpf/tests/test_Settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,19 @@ def test_settings_values(self):
self.assertEqual("one", self.machine.settings.custom_setting_str)
self.machine.settings.set_setting_value("custom_setting_str", "zero")
self.assertEqual("zero", self.machine.settings.custom_setting_str)

self.assertEqual(0.1, self.machine.settings.custom_setting_float)
self.machine.settings.set_setting_value("custom_setting_float", 2.5)
self.assertEqual(2.5, self.machine.settings.custom_setting_float)
self.machine.settings.set_setting_value("custom_setting_float", 0)
self.assertEqual(0, self.machine.settings.custom_setting_float)

self.assertEqual(True, self.machine.settings.custom_setting_bool_t)
self.machine.settings.set_setting_value("custom_setting_bool_t", False)
self.assertEqual(False, self.machine.settings.custom_setting_bool_t)
self.machine.settings.set_setting_value("custom_setting_bool_t", True)
self.assertEqual(True, self.machine.settings.custom_setting_bool_t)

self.assertEqual(False, self.machine.settings.custom_setting_bool_f)
self.machine.settings.set_setting_value("custom_setting_bool_f", True)
self.assertEqual(True, self.machine.settings.custom_setting_bool_f)
Loading