Chromatic keymap

Author: 203Null

Applications/Note/Note.cpp

@@ -392,12 +392,7 @@ void Note::LayoutSelector() {
   UIButton octaveModeBtn;
   octaveModeBtn.SetName("Octave Mode");
   octaveModeBtn.SetColorFunc([&]() -> Color { return Color(0xFFFF00).DimIfNot(notePadConfigs[activeConfig].mode == OCTAVE_LAYOUT); });
-  octaveModeBtn.OnPress([&]() -> void { 
-    if(notePadConfigs[activeConfig].mode != OCTAVE_LAYOUT)
-    {
-      notePadConfigs[activeConfig].mode = OCTAVE_LAYOUT; 
-    }
-  });
+  octaveModeBtn.OnPress([&]() -> void { notePadConfigs[activeConfig].mode = OCTAVE_LAYOUT; });
   layoutSelector.AddUIComponent(octaveModeBtn, Point(2, 0));
 
   UIButton offsetModeBtn;
@@ -413,16 +408,17 @@ void Note::LayoutSelector() {
   });
   layoutSelector.AddUIComponent(offsetModeBtn, Point(3, 0));
 
+  UIButton chromaticModeBtn;
+  chromaticModeBtn.SetName("Chromatic Mode");
+  chromaticModeBtn.SetColorFunc([&]() -> Color { return Color(0xFFFF00).DimIfNot(notePadConfigs[activeConfig].mode == CHROMATIC_LAYOUT); });
+  chromaticModeBtn.OnPress([&]() -> void { notePadConfigs[activeConfig].mode = CHROMATIC_LAYOUT; });
+  layoutSelector.AddUIComponent(chromaticModeBtn, Point(4, 0));
+
   UIButton pianoModeBtn;
   pianoModeBtn.SetName("Piano Mode");
   pianoModeBtn.SetColorFunc([&]() -> Color { return Color(0xFFFF00).DimIfNot(notePadConfigs[activeConfig].mode == PIANO_LAYOUT); });
-  pianoModeBtn.OnPress([&]() -> void { 
-    if(notePadConfigs[activeConfig].mode != PIANO_LAYOUT)
-    {
-      notePadConfigs[activeConfig].mode = PIANO_LAYOUT;
-    }
-  });
-  layoutSelector.AddUIComponent(pianoModeBtn, Point(4, 0));
+  pianoModeBtn.OnPress([&]() -> void { notePadConfigs[activeConfig].mode = PIANO_LAYOUT; });
+  layoutSelector.AddUIComponent(pianoModeBtn, Point(5, 0));
 
   // Offset Mode
   UISelector yOffsetInput;
@@ -465,7 +461,7 @@ void Note::LayoutSelector() {
   inKeyNoteOnlyToggle.SetName("In Key Notes Only");
   inKeyNoteOnlyToggle.SetColorFunc([&]() -> Color { return Color(0xFFFFFF).DimIfNot(notePadConfigs[activeConfig].inKeyNoteOnly); });
   inKeyNoteOnlyToggle.OnPress([&]() -> void { notePadConfigs[activeConfig].inKeyNoteOnly = !notePadConfigs[activeConfig].inKeyNoteOnly; });
-  inKeyNoteOnlyToggle.SetEnableFunc([&]() -> bool { return notePadConfigs[activeConfig].mode == OCTAVE_LAYOUT || notePadConfigs[activeConfig].mode == OFFSET_LAYOUT; });
+  inKeyNoteOnlyToggle.SetEnableFunc([&]() -> bool { return notePadConfigs[activeConfig].mode == OCTAVE_LAYOUT || notePadConfigs[activeConfig].mode == OFFSET_LAYOUT || notePadConfigs[activeConfig].mode == CHROMATIC_LAYOUT;; });
   layoutSelector.AddUIComponent(inKeyNoteOnlyToggle, Point(0, 7));
 
   layoutSelector.Start();

Applications/Note/NotePad.h

@@ -8,6 +8,7 @@
 enum NoteLayoutMode : uint8_t {
   OCTAVE_LAYOUT,
   OFFSET_LAYOUT,
+  CHROMATIC_LAYOUT,
   PIANO_LAYOUT,
 };
 
@@ -253,6 +254,27 @@ class NotePad : public UIComponent {
     }
   }    
 
+  void GenerateChromaticKeymap() {
+    noteMap.reserve(dimension.Area());
+    uint8_t note = 12 * config->octave + config->rootKey;
+    for(uint8_t i = 0; i < dimension.Area(); i++)
+    {
+      uint8_t x = i % dimension.x;
+      uint8_t y = i / dimension.x;
+      int8_t ui_y = dimension.y - y - 1;
+      noteMap[ui_y * dimension.x + x] = note;
+      if(!config->inKeyNoteOnly)
+      {
+        note++;
+      }
+      else
+      {
+        note = GetNextInScaleNote(note);
+      }
+    }
+  }    
+
+
   void GeneratePianoKeymap() {
     noteMap.reserve(dimension.Area());
     const int8_t blackKeys[7] = {-1, 1,  3, -1, 6, 8, 10};
@@ -298,6 +320,9 @@ class NotePad : public UIComponent {
       case OFFSET_LAYOUT:
         GenerateOffsetKeymap();
         break;
+      case CHROMATIC_LAYOUT:
+        GenerateChromaticKeymap();
+        break;
       case PIANO_LAYOUT:
         GeneratePianoKeymap();
         break;