Merge branch 'dev'

.gitignore

@@ -1,5 +1,6 @@
 .vscode
 bin
+obj
 .ionide
 .ccls-cache
 sketch/*.elf

Changelog

@@ -1,3 +1,86 @@
+MCL 2.50 01/12/2019
+
+Complete GUI overhaul:
+
+Button assignment has been improved to provide consistency across all pages.
+
+    [ Save ] button: Cancel/Exit/No
+    [ Write ] button: Confirm/Enter/Yes
+    [ Shift1 ] button now opens PageSelect menu in all sub-pages.
+    [ Shift2 ] button opens an options menu on sequencer pages.
+
+    Encoder buttons no are no longer used for navigating the GUI and instead
+    work as fast rotate mode, as per the Elektron devices.
+
+    PageSelect layout has been improved:
+	   [ Encoder 1] to scroll through all available pages
+	   [ Encoder 2] to scroll through page categories
+	   [ Save ] to exit back to grid
+
+Enahanced Graphics:
+    New graphics for Sequencer Pages.
+	Visual Chromatic Keyboard + Visual uTIMING.
+	Graphical icons for PageSelect.
+    Trimetric Spites.
+	GUI popups.
+	Loading screens.
+	Graphical Encoders.
+    User action feedback textboxes for almost all user actions.
+
+Improved Project and File navigation.
+    Abiltiy to rename/delete files/projects
+
+Improved Text Input:
+    Text input page now features a Char Select Pane.
+
+Sequencer Track Menu and Trig Menu.
+    Track menu accessible by holding shift 2.
+	   Allows for changing current tracks.
+       Copying/pasting/deleting/shifting/reversing tracks.
+
+
+    Trig menu accessible by pressing a trig and then holding shift 2. Allows
+	copying/pasting of trigs, adding/remove trig mutes clearing locks.
+
+Save/Chain Pages:
+    3 Save modes now: SEQ, MD, MERGE. (MD and MERGE only available when
+	sequencer is stopped and are used for copying MD pattern data)
+
+	New GUI popup menu.
+
+Grid Page:
+  Slot menu, provides copy + paste options. Encoders 3 and 4 are used to
+  select a rectangular region of tracks/slots to be copied.
+  They can be pasted between projects.
+
+SD Drive:
+  Poor man's plus drive. Backup/restore MD's entire memory including pattern +
+  kits + globals. All stored on the SD Card for retrieval.
+
+RAM Pages:
+  Two RAM pages are provided Page Select pages 15 + 16.
+  These machines take the hastle out of RAM record + playback by automating RAM machine sampling of the MD output or external input.
+  Recordings can be sliced, and maniputated using a variety of effects.
+
+FX Pages:
+  Two FX pages used to control Delay or Reverb.
+
+LFO Page:
+  A single global LFO (Lower frequency oscillator) page is provided which can
+  be used to manipulate any MD parameter, either a Track Param or Global FX.
+  Two destinations are selectable and a variatey of wave shapes available.
+  The LFO can be triggered by a dedicated 16 step sequencer track, or be set
+  to run freely.
+
+Firmware Performance & MIDI Timing :
+  Improvements to the low level MIDI interrupt code means reduced latency and
+  tighter sequencer performance.
+  Faster GUI routines, means higher framerate and snappier performance.
+  Improved latency coompensation for realtime recording on Chromatic and
+  Record pages.
+  Device peering now works from any page.
+  Numerous bug and workflow fixes.
+
 MCL 2.40 25/06/2019
 
 Important:

art/fonts/md_light.txt

@@ -0,0 +1,3 @@
+https://www.pentacom.jp/pentacom/bitfontmaker2/
+
+{"33":[0,0,0,0,0,0,0,4,4,4,0,4,0,0,0,0],"38":[0,0,0,0,0,0,0,60,4,124,36,60,0,0,0,0],"39":[0,0,0,0,0,0,0,8,4,0,0,0,0,0,0,0],"40":[0,0,0,0,0,0,0,8,4,4,4,8,0,0,0,0],"41":[0,0,0,0,0,0,0,4,8,8,8,4,0,0,0,0],"43":[0,0,0,0,0,0,0,0,0,8,28,8,0,0,0,0],"45":[0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0],"46":[0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0],"47":[0,0,0,0,0,0,0,16,16,8,4,4,0,0,0,0],"48":[0,0,0,0,0,0,0,60,36,36,36,60,0,0,0,0],"49":[0,0,0,0,0,0,0,12,8,8,8,28,0,0,0,0],"50":[0,0,0,0,0,0,0,60,32,60,4,60,0,0,0,0],"51":[0,0,0,0,0,0,0,60,32,56,32,60,0,0,0,0],"52":[0,0,0,0,0,0,0,36,36,60,32,32,0,0,0,0],"53":[0,0,0,0,0,0,0,60,4,60,32,60,0,0,0,0],"54":[0,0,0,0,0,0,0,60,4,60,36,60,0,0,0,0],"55":[0,0,0,0,0,0,0,60,32,48,8,8,0,0,0,0],"56":[0,0,0,0,0,0,0,60,36,60,36,60,0,0,0,0],"57":[0,0,0,0,0,0,0,60,36,60,32,60,0,0,0,0],"61":[0,0,0,0,0,0,0,0,0,28,0,28,0,0,0,0],"63":[0,0,0,0,0,0,0,124,68,48,0,8,0,0,0,0],"65":[0,0,0,0,0,0,0,24,36,36,60,36,0,0,0,0],"66":[0,0,0,0,0,0,0,28,36,28,36,28,0,0,0,0],"67":[0,0,0,0,0,0,0,24,36,4,36,24,0,0,0,0],"68":[0,0,0,0,0,0,0,28,36,36,36,28,0,0,0,0],"69":[0,0,0,0,0,0,0,60,4,28,4,60,0,0,0,0],"70":[0,0,0,0,0,0,0,60,4,28,4,4,0,0,0,0],"71":[0,0,0,0,0,0,0,24,4,52,36,24,0,0,0,0],"72":[0,0,0,0,0,0,0,36,36,60,36,36,0,0,0,0],"73":[0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,0],"74":[0,0,0,0,0,0,0,16,16,16,20,12,0,0,0,0],"75":[0,0,0,0,0,0,0,36,36,28,36,36,0,0,0,0],"76":[0,0,0,0,0,0,0,4,4,4,4,60,0,0,0,0],"77":[0,0,0,0,0,0,0,44,84,84,68,68,0,0,0,0],"78":[0,0,0,0,0,0,0,24,36,36,36,36,0,0,0,0],"79":[0,0,0,0,0,0,0,24,36,36,36,24,0,0,0,0],"80":[0,0,0,0,0,0,0,28,36,36,28,4,0,0,0,0],"81":[0,0,0,0,0,0,0,24,36,36,52,56,0,0,0,0],"82":[0,0,0,0,0,0,0,28,36,36,28,36,0,0,0,0],"83":[0,0,0,0,0,0,0,56,4,24,32,28,0,0,0,0],"84":[0,0,0,0,0,0,0,28,8,8,8,8,0,0,0,0],"85":[0,0,0,0,0,0,0,36,36,36,36,24,0,0,0,0],"86":[0,0,0,0,0,0,0,36,36,36,20,12,0,0,0,0],"87":[0,0,0,0,0,0,0,68,68,84,84,60,0,0,0,0],"88":[0,0,0,0,0,0,0,20,20,8,20,20,0,0,0,0],"89":[0,0,0,0,0,0,0,36,36,56,32,28,0,0,0,0],"90":[0,0,0,0,0,0,0,60,32,24,4,60,0,0,0,0],"95":[0,0,0,0,0,0,0,0,0,0,0,60,0,0,0,0],"97":[0,0,0,0,0,0,0,0,8,20,20,40,0,0,0,0],"98":[0,0,0,0,0,0,0,4,12,20,20,12,0,0,0,0],"99":[0,0,0,0,0,0,0,0,24,4,4,24,0,0,0,0],"100":[0,0,0,0,0,0,0,16,24,20,20,40,0,0,0,0],"101":[0,0,0,0,0,0,0,0,8,20,12,24,0,0,0,0],"102":[0,0,0,0,0,0,0,0,24,4,12,4,0,0,0,0],"103":[0,0,0,0,0,0,0,0,12,20,24,12,0,0,0,0],"104":[0,0,0,0,0,0,0,4,12,20,20,20,0,0,0,0],"105":[0,0,0,0,0,0,0,4,0,4,4,8,0,0,0,0],"106":[0,0,0,0,0,0,0,8,0,8,8,4,0,0,0,0],"107":[0,0,0,0,0,0,0,4,20,12,20,20,0,0,0,0],"108":[0,0,0,0,0,0,0,0,4,4,4,24,0,0,0,0],"109":[0,0,0,0,0,0,0,0,40,84,84,68,0,0,0,0],"110":[0,0,0,0,0,0,0,0,8,20,20,20,0,0,0,0],"111":[0,0,0,0,0,0,0,0,8,20,20,8,0,0,0,0],"112":[0,0,0,0,0,0,0,0,24,36,28,4,0,0,0,0],"113":[0,0,0,0,0,0,0,0,24,36,56,32,0,0,0,0],"114":[0,0,0,0,0,0,0,0,24,4,4,4,0,0,0,0],"115":[0,0,0,0,0,0,0,0,24,12,16,12,0,0,0,0],"116":[0,0,0,0,0,0,0,8,28,8,8,16,0,0,0,0],"117":[0,0,0,0,0,0,0,0,20,20,20,40,0,0,0,0],"118":[0,0,0,0,0,0,0,0,20,20,20,8,0,0,0,0],"119":[0,0,0,0,0,0,0,0,68,84,84,40,0,0,0,0],"120":[0,0,0,0,0,0,0,0,20,8,8,20,0,0,0,0],"121":[0,0,0,0,0,0,0,0,20,28,16,12,0,0,0,0],"122":[0,0,0,0,0,0,0,0,28,16,8,28,0,0,0,0],"193":[0,0,0,0,0,0,0,24,60,36,60,36,0,0,0,0],"258":[0,0,0,0,0,0,0,36,24,36,60,36,0,0,0,0],"334":[0,0,0,0,0,0,0,36,24,36,36,24,0,0,0,0],"name":"test","copy":"test","letterspace":"64","basefont_size":"512","basefont_left":"62","basefont_top":"0","basefont":"Arial","basefont2":""}

art/fonts/md_light_larger.txt

@@ -0,0 +1,3 @@
+https://www.pentacom.jp/pentacom/bitfontmaker2/
+
+{"33":[0,0,0,0,0,4,4,4,4,4,0,4,0,0,0,0],"38":[0,0,0,0,0,124,4,4,252,68,68,124,0,0,0,0],"39":[0,0,0,0,0,0,8,4,0,0,0,0,0,0,0,0],"40":[0,0,0,0,0,8,4,4,4,4,4,8,0,0,0,0],"41":[0,0,0,0,0,4,8,8,8,8,8,4,0,0,0,0],"43":[0,0,0,0,0,0,0,16,16,124,16,16,0,0,0,0],"45":[0,0,0,0,0,0,0,0,0,124,0,0,0,0,0,0],"46":[0,0,0,0,0,0,0,0,0,0,12,12,0,0,0,0],"47":[0,0,0,0,0,0,128,64,32,16,8,4,0,0,0,0],"48":[0,0,0,0,0,124,68,68,68,68,68,124,0,0,0,0],"49":[0,0,0,0,0,28,16,16,16,16,16,124,0,0,0,0],"50":[0,0,0,0,0,124,64,64,124,4,4,124,0,0,0,0],"51":[0,0,0,0,0,124,64,64,120,64,64,124,0,0,0,0],"52":[0,0,0,0,0,68,68,68,124,64,64,64,0,0,0,0],"53":[0,0,0,0,0,124,4,4,124,64,64,124,0,0,0,0],"54":[0,0,0,0,0,124,4,4,124,68,68,124,0,0,0,0],"55":[0,0,0,0,0,124,64,64,32,16,8,8,0,0,0,0],"56":[0,0,0,0,0,124,68,68,124,68,68,124,0,0,0,0],"57":[0,0,0,0,0,124,68,68,124,64,64,124,0,0,0,0],"61":[0,0,0,0,0,0,0,0,124,0,124,0,0,0,0,0],"63":[0,0,0,0,0,124,68,64,32,16,0,16,0,0,0,0],"65":[0,0,0,0,0,56,68,68,124,68,68,68,0,0,0,0],"66":[0,0,0,0,0,60,68,68,60,68,68,60,0,0,0,0],"67":[0,0,0,0,0,56,68,4,4,4,68,56,0,0,0,0],"68":[0,0,0,0,0,60,68,68,68,68,68,60,0,0,0,0],"69":[0,0,0,0,0,124,4,4,60,4,4,124,0,0,0,0],"70":[0,0,0,0,0,124,4,4,60,4,4,4,0,0,0,0],"71":[0,0,0,0,0,56,4,4,100,68,68,56,0,0,0,0],"72":[0,0,0,0,0,68,68,68,124,68,68,68,0,0,0,0],"73":[0,0,0,0,0,4,4,4,4,4,4,4,0,0,0,0],"74":[0,0,0,0,0,32,32,32,32,32,36,28,0,0,0,0],"75":[0,0,0,0,0,68,68,68,60,68,68,68,0,0,0,0],"76":[0,0,0,0,0,4,4,4,4,4,4,124,0,0,0,0],"77":[0,0,0,0,0,40,84,84,84,68,68,68,0,0,0,0],"78":[0,0,0,0,0,56,68,68,68,68,68,68,0,0,0,0],"79":[0,0,0,0,0,56,68,68,68,68,68,56,0,0,0,0],"80":[0,0,0,0,0,60,68,68,68,60,4,4,0,0,0,0],"81":[0,0,0,0,0,56,68,68,68,68,100,120,0,0,0,0],"82":[0,0,0,0,0,56,68,68,60,68,68,68,0,0,0,0],"83":[0,0,0,0,0,120,4,4,56,64,64,60,0,0,0,0],"84":[0,0,0,0,0,124,16,16,16,16,16,16,0,0,0,0],"85":[0,0,0,0,0,68,68,68,68,68,68,56,0,0,0,0],"86":[0,0,0,0,0,68,68,68,68,68,36,28,0,0,0,0],"87":[0,0,0,0,0,68,68,68,84,84,84,120,0,0,0,0],"88":[0,0,0,0,0,68,68,68,56,68,68,68,0,0,0,0],"89":[0,0,0,0,0,68,68,68,56,64,64,60,0,0,0,0],"90":[0,0,0,0,0,124,64,32,16,8,4,124,0,0,0,0],"95":[0,0,0,0,0,0,0,0,0,0,0,252,0,0,0,0],"97":[0,0,0,0,0,0,24,36,36,36,36,88,0,0,0,0],"98":[0,0,0,0,0,4,28,36,36,36,36,28,0,0,0,0],"99":[0,0,0,0,0,0,24,36,4,4,36,24,0,0,0,0],"100":[0,0,0,0,0,32,56,36,36,36,36,88,0,0,0,0],"101":[0,0,0,0,0,0,24,36,36,28,4,56,0,0,0,0],"102":[0,0,0,0,0,16,8,28,8,8,8,4,0,0,0,0],"103":[0,0,0,0,0,0,24,36,36,56,32,28,0,0,0,0],"104":[0,0,0,0,0,4,28,36,36,36,36,36,0,0,0,0],"105":[0,0,0,0,0,4,0,4,4,4,4,24,0,0,0,0],"106":[0,0,0,0,0,8,0,8,8,8,8,4,0,0,0,0],"107":[0,0,0,0,0,4,36,20,28,36,36,36,0,0,0,0],"108":[0,0,0,0,0,0,4,4,4,4,4,24,0,0,0,0],"109":[0,0,0,0,0,0,40,84,84,68,68,68,0,0,0,0],"110":[0,0,0,0,0,0,24,36,36,36,36,36,0,0,0,0],"111":[0,0,0,0,0,0,24,36,36,36,36,24,0,0,0,0],"112":[0,0,0,0,0,0,24,36,36,28,4,4,0,0,0,0],"113":[0,0,0,0,0,0,24,36,36,56,32,32,0,0,0,0],"114":[0,0,0,0,0,0,24,4,4,4,4,4,0,0,0,0],"115":[0,0,0,0,0,0,56,4,28,32,32,28,0,0,0,0],"116":[0,0,0,0,0,8,28,8,8,8,8,16,0,0,0,0],"117":[0,0,0,0,0,0,36,36,36,36,36,88,0,0,0,0],"118":[0,0,0,0,0,0,36,36,36,36,36,24,0,0,0,0],"119":[0,0,0,0,0,0,68,84,84,84,84,40,0,0,0,0],"120":[0,0,0,0,0,0,20,8,8,8,8,20,0,0,0,0],"121":[0,0,0,0,0,0,36,36,56,32,32,24,0,0,0,0],"122":[0,0,0,0,0,0,60,32,16,8,4,60,0,0,0,0],"193":[0,0,0,0,0,56,124,68,68,124,68,68,0,0,0,0],"258":[0,0,0,0,0,68,56,68,124,68,68,68,0,0,0,0],"334":[0,0,0,0,0,68,56,68,68,68,68,56,0,0,0,0],"name":"mdlightlarger","copy":"JustinM","letterspace":"128","basefont_size":"512","basefont_left":"62","basefont_top":"0","basefont":"Arial","basefont2":""}

avr/cores/megacommand/.ccls

@@ -0,0 +1,53 @@
+clang++
+%c -std=gnu11
+%cpp -std=c++14
+#  Treats all headers as c++ headers
+%h %hpp -x c++-header
+#  Include dirs in Makefile:
+#  DIRS = Sequencer SDCard Elektron A4 Wire Wire/utility Midi MidiTools Adafruit-GFX-Library Adafruit-GFX-Library/Fonts SdFat SdFat/SdCard SdFat/FatLib SdFat/SpiDriver SdFat/SpiDriver/boards MCL SPI Adafruit_SSD1305_Library CommonTools GUI MD MNM
+#  LDIRS = $(foreach dir,$(DIRS),$(CORE_DIR)/$(dir)) ${CORE_DIR} ${VARIENTS_DIR}
+#  INCS = $(foreach dir,$(LDIRS),-I$(dir))
+#
+#  DIRS
+-ISequencer
+-ISDCard
+-IElektron
+-IA4
+-IWire
+-IWire/utility
+-IMidi
+-IMidiTools
+-IAdafruit-GFX-Library
+-IAdafruit-GFX-Library/Fonts
+-ISdFat
+-ISdFat/SdCard
+-ISdFat/FatLib
+-ISdFat/SpiDriver
+-ISdFat/SpiDriver/boards
+-IMCL
+-ISPI
+-IAdafruit_SSD1305_Library
+-ICommonTools
+-IGUI
+-IMD
+-IMNM
+#  CORE_DIR
+-I./
+#  VARIENTS_DIR
+-I../../variants/mega
+#  Additionally include the AVR environment
+-IC:/Program Files (x86)/Arduino/hardware/tools/avr/avr/include
+#
+#  CXXFLAGS = -c -g -Os -Wall -Wextra -std=gnu++11 -fpermissive -fno-exceptions -ffunction-sections -fdata-sections -fno-threadsafe-statics -MMD -flto -Wl,--gc-sections,--defsym=__stack=0x8021ff,--section-start,.data=0x82200,--defsym=__heap_end=0x80ffff -mmcu=atmega2560 -DF_CPU=16000000L -DARDUINO=10803 -DARDUINO_AVR_MEGA2560 -DARDUINO_ARCH_AVR
+#  Define the flags: -DF_CPU=16000000L -DARDUINO=10803 -DARDUINO_AVR_MEGA2560 -DARDUINO_ARCH_AVR
+-DF_CPU=16000000L
+-DARDUINO=10803
+-DARDUINO_AVR_MEGA2560
+-DARDUINO_ARCH_AVR
+#  Additional define flags
+-D__AVR_ATmega2560__
+-DAVR
+#  Compiler options
+-Wall
+-Wextra
+%c %cpp -fpermissive -fno-exceptions -ffunction-sections -fdata-sections -fno-threadsafe-statics

avr/cores/megacommand/.gitignore

@@ -0,0 +1 @@
+.vim