Merge branch 'dev'

Author: flipcoder

.gitignore

@@ -5,3 +5,4 @@ test.py
 midimech.spec
 build/
 dist/
+.idea/

midimech.py

@@ -10,21 +10,21 @@
 
 from src.util import *
 from src.constants import *
-from src.options import Options
 from src.note import Note
 from src.settings import DeviceSettings
 from src.core import Core
 from src.gamepad import Gamepad
 
+# suppress pygame messages to keep console clean
 with open(os.devnull, "w") as devnull:
-    # suppress pygame messages
     stdout = sys.stdout
     sys.stdout = devnull
     import pygame, pygame.midi, pygame.gfxdraw
 
     sys.stdout = stdout
 import pygame_gui
 
+# pymsgbox crashes on Mac, so we can't use this right now
 # try:
 #     import pymsgbox
 # except ImportError:
@@ -52,9 +52,6 @@
     error("The project dependencies have changed! Run the requirements setup command again!")
 
 
-DEFAULT_OPTIONS = Options()
-
-
 def main():
     core = None
     try:

scales.yaml

@@ -18,6 +18,9 @@
     - Minor Pentatonic
 - name: Blues
   notes: 'x..x.xxx..x.'
+  modes:
+    - Minor Blues
+    - Major Blues
 - name: Melodic Minor
   notes: 'x.xx.x.x.x.x'
   modes:

settings.ini.example

@@ -1,9 +1,14 @@
+; Rename this file to settings.ini to apply settings.
+; Uncomment options and change them to customize look and behavior.
+
 [general]
-velocity_curve=1.0
-min_velocity=0
-max_velocity=127
 size=128
-midi_out=midimech
-split_out=split
-fps=60
-split=false
+;velocity_curve=1.0
+;lights=1,9,9,2,2,3,3,5,8,8,11,11
+;split_lights=4,7,5,7,5,5,7,5,7,5,7,5
+;colors=red,darkred,orange,goldenrod,yellow,green,darkolivegreen,blue,darkslateblue,indigo,darkorchid,pink
+;split_colors=cyan,blue,blue,blue,blue,blue,blue,blue,blue,blue,blue,blue
+;mark_light=1
+;mark_color=red
+;one_channel=0
+;lite=false