From 582ac0859bcab8dc89652cc1da4a20992e2ac99d Mon Sep 17 00:00:00 2001 From: Jakob Bak Date: Sun, 10 Feb 2013 10:42:14 +0100 Subject: [PATCH] updated keywords --- .../_7_spaghetti_tones/_7_spaghetti_tones.ino | 3 ++ software/lib/MMM/keywords.txt | 35 +++++++++++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/software/lib/MMM/examples/Music/_7_spaghetti_tones/_7_spaghetti_tones.ino b/software/lib/MMM/examples/Music/_7_spaghetti_tones/_7_spaghetti_tones.ino index 7f0aad8..ffb0f12 100644 --- a/software/lib/MMM/examples/Music/_7_spaghetti_tones/_7_spaghetti_tones.ino +++ b/software/lib/MMM/examples/Music/_7_spaghetti_tones/_7_spaghetti_tones.ino @@ -1,3 +1,6 @@ +#define NUM_OSCILLATORS 3 +#define BIT_DEPTH 12 + // The Music and Midi objects are automatically instantiated when the header file is included. // Make calls to the Music and Midi objects with "Music.function(args)" and "Midi.function(args)" // You still need to call Music.init() and Midi.init() in the setup() function below. diff --git a/software/lib/MMM/keywords.txt b/software/lib/MMM/keywords.txt index 0873ae5..096a4b8 100644 --- a/software/lib/MMM/keywords.txt +++ b/software/lib/MMM/keywords.txt @@ -18,12 +18,43 @@ init KEYWORD2 checkMidi KEYWORD2 enableEnvelope KEYWORD2 diableEnvelope KEYWORD2 +setEnvStage KEYWORD2 setDetune KEYWORD2 - +setDetune1 KEYWORD2 +setDetune2 KEYWORD2 +setDetune3 KEYWORD2 +setFrequency KEYWORD2 +setFrequency1 KEYWORD2 +setFrequency2 KEYWORD2 +setFrequency3 KEYWORD2 +setSemitone1 KEYWORD2 +setSemitone2 KEYWORD2 +setSemitone3 KEYWORD2 +setWaveform KEYWORD2 +setWaveform1 KEYWORD2 +setWaveform2 KEYWORD2 +setWaveform3 KEYWORD2 +setGain KEYWORD2 +setGain1 KEYWORD2 +setGain2 KEYWORD2 +setGain3 KEYWORD2 +getGain KEYWORD2 +getGain1 KEYWORD2 +getGain2 KEYWORD2 +getGain3 KEYWORD2 +noteOn KEYWORD2 +noteOff KEYWORD2 +getNoteFrequency KEYWORD2 +setAttack KEYWORD2 +setDecay KEYWORD2 +setSustain KEYWORD2 +setRelease KEYWORD2 ####################################### # Constants (LITERAL1) ####################################### -NUM_OSCILLATORS LITERAL1 \ No newline at end of file +NUM_OSCILLATORS LITERAL1 +BIT_DEPTH LITERAL1 +MIDI LITERAL1 \ No newline at end of file