make N.CS scale order consistent with N.S and docs (monome#324)

scanner-darkly · Jul 15, 2023 · 772b900 · 772b900
1 parent 7604b33
commit 772b900
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,7 +29,7 @@
 - **NEW**: new op: `CV.GET`
 - **NEW**: basic menu for reading/writing scenes when a USB stick is inserted
 - **NEW**: new ops: `CV.CAL` and `CV.CAL.RESET` to calibrate CV outputs
-- **FIX**: in N.CS docs, correctly identify scales 7 (Locrian) and 8 (Mixolydian)
+- **FIX**: N.CS scales 7 & 8 were incorrectly swapped; make them consistent with N.S and docs
 
 ## v4.0.0
 

diff --git a/docs/ops/maths.toml b/docs/ops/maths.toml
@@ -498,8 +498,8 @@ Chord Scales - Refer to chord indices in `N.C` OP
  - `4` = Dorian `{1, 1, 0, 2, 1, 6, 0}`
  - `5` = Phrygian `{1, 0, 2, 1, 6, 0, 1}`
  - `6` = Lydian `{0, 2, 1, 6, 0, 1, 1}`
- - `7` = Locrian `{6, 0, 1, 1, 0, 2, 1}`
- - `8` = Mixolydian `{2, 1, 6, 0, 1, 1, 0}`
+ - `7` = Mixolydian `{2, 1, 6, 0, 1, 1, 0}`
+ - `8` = Locrian `{6, 0, 1, 1, 0, 2, 1}`
  """
 
 [V]

diff --git a/docs/whats_new.md b/docs/whats_new.md
@@ -27,7 +27,7 @@
 - **NEW**: new op: `CV.GET`
 - **NEW**: basic menu for reading/writing scenes when a USB stick is inserted
 - **NEW**: new ops: `CV.CAL` and `CV.CAL.RESET` to calibrate CV outputs
-- **FIX**: in N.CS docs, correctly identify scales 7 (Locrian) and 8 (Mixolydian)
+- **FIX**: N.CS scales 7 & 8 were incorrectly swapped; make them consistent with N.S and docs
 
 ## v4.0.0
 

diff --git a/module/help_mode.c b/module/help_mode.c
@@ -233,7 +233,7 @@ const char* help4[HELP4_LENGTH] = { "4/17 DATA AND TABLES",
                                     "   4 = DORIAN",
                                     "   5 = PHRYGIAN",
                                     "   6 = LYDIAN",
-                                    "   7 = MYXOLIDIAN",
+                                    "   7 = MIXOLYDIAN",
                                     "   8 = LOCRIAN",
                                     "   RETURNS N TABLE VALUE",
                                     "  ",
@@ -276,8 +276,8 @@ const char* help4[HELP4_LENGTH] = { "4/17 DATA AND TABLES",
                                     "  DOR = 1, 1, 0, 2, 1, 6, 0",
                                     "  PHR = 1, 0, 2, 1, 6, 0, 1",
                                     "  LYD = 0, 2, 1, 6, 0, 1, 1",
+                                    "  MIX = 2, 1, 6, 0, 1, 1, 0",
                                     "  LOC = 6, 0, 1, 1, 0, 2, 1",
-                                    "  MYX = 2, 1, 6, 0, 1, 1, 0",
                                     "  RETURNS N TABLE VALUE", 
                                     "   ",
                                     "DRUM PATTERN OP - DR.P",

diff --git a/src/table.c b/src/table.c
@@ -110,7 +110,7 @@ const uint8_t table_n_s[9][7] = {
     { 0, 2, 3, 5, 7, 9, 10 },  // Dorian
     { 0, 1, 3, 5, 7, 8, 10 },  // Phrygian
     { 0, 2, 4, 6, 7, 9, 11 },  // Lydian
-    { 0, 2, 4, 5, 7, 9, 10 },  // Myxolidian
+    { 0, 2, 4, 5, 7, 9, 10 },  // Mixolydian
     { 0, 1, 3, 5, 6, 8, 10 },  // Locrian
 };
 
@@ -140,8 +140,8 @@ const uint8_t table_n_cs[9][7] = {
     { 1, 1, 0, 2, 1, 6, 0 },  // Dorian
     { 1, 0, 2, 1, 6, 0, 1 },  // Phrygian
     { 0, 2, 1, 6, 0, 1, 1 },  // Lydian
+    { 2, 1, 6, 0, 1, 1, 0 },  // Mixolydian
     { 6, 0, 1, 1, 0, 2, 1 },  // Locrian
-    { 2, 1, 6, 0, 1, 1, 0 },  // Myxolydian
 };
 
 // preset bit mask scales for N.B and N.BX