Rename In scale note only mode to enforce scale

Author: 203Null

Applications/Note/Note.cpp

@@ -704,13 +704,13 @@ void Note::LayoutSelector() {
   pioTextDisplay.SetEnableFunc([&]() -> bool { return notePadConfigs[activeConfig].mode == PIANO_LAYOUT; });
   layoutSelector.AddUIComponent(pioTextDisplay, Point(0, 2));
 
-  // Show Off Scale Notes Toggle (only for Octave and Offset modes)
-  UIButton inKeyNoteOnlyToggle;
-  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 || notePadConfigs[activeConfig].mode == CHROMATIC_LAYOUT;; });
-  layoutSelector.AddUIComponent(inKeyNoteOnlyToggle, Point(0, 7));
+  // Show Enforce Scale Toggle (only for Octave, Offset, and Chromatic modes)
+  UIButton enforceScaleToggle;
+  enforceScaleToggle.SetName("Enforce Scale");
+  enforceScaleToggle.SetColorFunc([&]() -> Color { return Color(0xFFFFFF).DimIfNot(notePadConfigs[activeConfig].enforceScale); });
+  enforceScaleToggle.OnPress([&]() -> void { notePadConfigs[activeConfig].enforceScale = !notePadConfigs[activeConfig].enforceScale; });
+  enforceScaleToggle.SetEnableFunc([&]() -> bool { return notePadConfigs[activeConfig].mode == OCTAVE_LAYOUT || notePadConfigs[activeConfig].mode == OFFSET_LAYOUT || notePadConfigs[activeConfig].mode == CHROMATIC_LAYOUT;; });
+  layoutSelector.AddUIComponent(enforceScaleToggle, Point(0, 7));
 
   layoutSelector.Start();
 }

Applications/Note/NotePad.cpp

@@ -176,7 +176,7 @@ void NotePad::GenerateOctaveKeymap() {
             if (nextNote > 127) { // If next note is out of range, fill with 255
                 noteMap[id] = 255;
             }
-            else if(!rt->config->inKeyNoteOnly) { // If enforce scale is false, just add the next note
+            else if(!rt->config->enforceScale) { // If enforce scale is false, just add the next note
                 noteMap[id] = nextNote;  // Add to map
                 nextNote++;
             }
@@ -202,7 +202,7 @@ void NotePad::GenerateOctaveKeymap() {
 void NotePad::GenerateOffsetKeymap() {
     noteMap.reserve(dimension.Area());
     int16_t root = 12 * rt->config->octave + rt->config->rootKey;
-    if (!rt->config->inKeyNoteOnly) {
+    if (!rt->config->enforceScale) {
         for (int8_t y = 0; y < dimension.y; y++) {
             int8_t ui_y = dimension.y - y - 1;
             for (int8_t x = 0; x < dimension.x; x++) {
@@ -260,7 +260,7 @@ void NotePad::GenerateChromaticKeymap() {
         } else {
             noteMap[ui_y * dimension.x + x] = note;
         }
-        if(!rt->config->inKeyNoteOnly) {
+        if(!rt->config->enforceScale) {
             note++;
         }
         else {

Applications/Note/NotePad.h

@@ -43,7 +43,7 @@ struct NotePadConfig {
   int8_t octave = 4;
   uint8_t channel = 0;
   NoteLayoutMode mode = OCTAVE_LAYOUT;
-  bool inKeyNoteOnly = true;
+  bool enforceScale = true;
   union {
     struct // Octave Mode
     {