Skip to content

Commit

Permalink
Upping version to 0.92. Added some scales to the firmware from Distin…
Browse files Browse the repository at this point in the history
…g Mk.4 that are musically useful for compositions
  • Loading branch information
Logarhythm1 committed Jul 18, 2020
1 parent d730618 commit 3f5fffc
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 4 deletions.
33 changes: 31 additions & 2 deletions software/o_c_REV/OC_scales.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,22 @@ const char* const scale_names_short[] = {
"14S3",
"12S3",
"10S3",
"8S3"
"8S3",


#ifdef HEM_LOGARHYTHM_MOD_SCALES
"5+7", // Root +5th + 7th (5+7),
"5+6", // Root + 5th + 6th (5+6),
"3b7-",// Minor Triad + 7 (3b+5+7),
"3b7+",// Major Triad + 7 (Triad+7),
"3b6-",// Minor Triad + 6th (3b+5+6),
"3b6+",// Major Triad + 6th (Triad+6),
"5th", // Fifth,
"3b+", // major triad (Triad),
"3b-", // minor triad (3b+5),
"HAR-",// Harmonic Minor (Harm Minor),
#endif

};

const char* const scale_names[] = {
Expand Down Expand Up @@ -298,7 +313,21 @@ const char* const scale_names[] = {
"21-7-SD3[14]",
"18-6-SD3[12]",
"15-5-SD3[10]",
"12-4-SD3[8]"
"12-4-SD3[8]",

#ifdef HEM_LOGARHYTHM_MOD_SCALES
"5th+7th", // Root +5th + 7th (5+7),
"5th+6th", // Root + 5th + 6th (5+6),
"Triad min+7",// Minor Triad + 7 (3b+5+7),
"Triad maj+7",// Major Triad + 7 (Triad+7),
"Triad min+6",// Minor Triad + 6th (3b+5+6),
"Triad maj+6",// Major Triad + 6th (Triad+6),
"Fifth",// Fifth,
"TriadMaj", // major triad (Triad),
"TriadMin",// minor triad (3b+5),
"HarmonicMin",// Harmonic Minor (Harm Minor),
#endif

};

const char* const voltage_scalings[] = {
Expand Down
2 changes: 1 addition & 1 deletion software/o_c_REV/OC_version.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#ifndef OC_VERSION_H_
#define OC_VERSION_H_
#define OC_VERSION "v1.8A-Log0.9"
#define OC_VERSION "v1.8A-Log0.92"
#endif
41 changes: 40 additions & 1 deletion software/o_c_REV/braids_quantizer_scales.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@

#include "braids_quantizer.h"


// Define this to include custom scales for Hemispheres Logarhythm Mod (optional if porting individual applets)
#define HEM_LOGARHYTHM_MOD_SCALES

namespace braids {

const Scale scales[] = {
Expand Down Expand Up @@ -301,7 +305,42 @@ const Scale scales[] = {
// // 15-5-HD3 (10 step subharmonic series scale on the tritave) - see Xen-Arts VSTi microtuning library at http://www.xen-arts.net/Xen-Arts%20VSTi%20Microtuning%20Library.zip
{ 12 << 7, 10, { 0, 96, 200, 312, 434, 567, 714, 879, 1066, 1281} },
// // 12-4-HD3 (8 step subharmonic series scale on the tritave) - see Xen-Arts VSTi microtuning library at http://www.xen-arts.net/Xen-Arts%20VSTi%20Microtuning%20Library.zip
{ 12 << 7, 8, { 0, 122, 255, 402, 567, 754, 969, 1224} }
{ 12 << 7, 8, { 0, 122, 255, 402, 567, 754, 969, 1224} },

#ifdef HEM_LOGARHYTHM_MOD_SCALES
// Logarhythm Mod: Adding some musically useful equal temperment scales from the Disting mk.4 set that are otherwise not present here

// Root +5th + 7th (5+7),
{ 12 << 7, 3, { 0, 896, 1408} },

// Root + 5th + 6th (5+6),
{ 12 << 7, 3, { 0, 896, 1152} },

// Minor Triad + 7 (3b+5+7),
{ 12 << 7, 4, { 0, 384, 896, 1280} },

// Major Triad + 7 (Triad+7),
{ 12 << 7, 4, { 0, 512, 896, 1408} },

// Minor Triad + 6th (3b+5+6),
{ 12 << 7, 4, { 0, 384, 896, 1152} },

// Major Triad + 6th (Triad+6),
{ 12 << 7, 4, { 0, 512, 896, 1152} },

// Fifth,
{ 12 << 7, 2, { 0, 896} },

// major triad (Triad),
{ 12 << 7, 3, { 0, 512, 896} },

// minor triad (3b+5),
{ 12 << 7, 3, { 0, 384, 896} },

// Harmonic Minor (Harm Minor),
{ 12 << 7, 7, { 0, 256, 384, 640, 896, 1024, 1408} },
#endif

} ;
}// namespace braids

Expand Down

0 comments on commit 3f5fffc

Please sign in to comment.