A few changes of possible interest

MaKey MaKey/README.md

@@ -1,10 +1,26 @@
 Makey Makey Monome
 ==============
 
+Original Project:
 Jenna deBoisblanc<br>
 2014<br>
 [jdeboi.com](http://jdeboi.com/makey-makey-monome/)
 
+Updated Project:<br>
+David Cool<br>
+http://davidcool.com<br>
+http://generactive.net<br>
+http://mystic.codes<br>
+December 2015<br>
+
+Arduino Updates:
+- Added rainbow loop when no serial data is detected
+- Changed initialization to R / G / B color wipe
+- Added a button reset to loop (fixes buttons left on when exiting processing)
+
+TODO:
+- Figure out big lag when "waking" from rainbow loop when serial is detected (use interrupts?)
+
 **Objective**: Build an uber kid-friendly monome (a complex electronic music instrument).
 <hr>
 

MaKey MaKey/complete/README.md

@@ -1,10 +1,26 @@
 (complete) Makey Makey Monome
 ==============
 
+Original Project:
 Jenna deBoisblanc<br>
 2014<br>
 [jdeboi.com](http://jdeboi.com/makey-makey-monome/)
 
+Updated Project:
+David Cool
+http://davidcool.com
+http://generactive.net
+http://mystic.codes
+December 2015
+
+Arduino Updates:
+- Added rainbow loop when no serial data is detected
+- Changed initialization to R / G / B color wipe
+- Added a button reset to loop (fixes buttons left on when exiting processing)
+
+TODO:
+- Figure out big lag when "waking" from rainbow loop when serial is detected (use interrupts?)
+
 **Overview:** All the files you need to build an RBG LED backlit touchscreen MaKey MaKey Monome that interfaces with Processing - an elegant, complex visual programming language.
 <hr>
 

MaKey MaKey/complete/makey_makey_monome/makey_makey_monome.ino

@@ -1,13 +1,26 @@
 /*
  ************************************************
- ********** MAKEY MAKEY PAPER MONOME ************
+ ************* MAKEY MAKEY MONOME ***************
  ************************************************
- //MAKER////////////
+ //ORIGINAL MAKER////////////
  Jenna deBoisblanc
  http://jdeboi.com
  start date: January 2014
- Instructable:
- GitHub repo:
+
+ //UPDATED MAKER////////////
+ David Cool
+ http://davidcool.com
+ http://generactive.net
+ http://mystic.codes
+ December 2015
+
+ Updates:
+ - Added rainbow loop when no serial data is detected
+ - Changed initialization to R / G / B color wipe
+ - Added a button reset to loop (fixes buttons left on when exiting processing)
+
+ TODO:
+ - Figure out big lag when "waking" from rainbow loop when serial is detected
 
  //DESCRIPTION//////
  My objective for this project was to build a monome- http://monome.org/ -
@@ -59,7 +72,7 @@
 #define NUM_BUTTONS      NUM_ROWS * NUM_COLUMNS    // 64 buttons
 #define TARGET_LOOP_TIME 744  // (1/56 seconds) / 24 samples = 744 microseconds per sample 
 
-#define SERIAL9600
+#define SERIAL57600
 #include "settings.h"
 
 /////////////////////////
@@ -111,6 +124,7 @@ int pressThreshold;
 int releaseThreshold;
 int triggerThresh = 200;
 boolean inputChanged;
+int count = 0;
 
 
 /*
@@ -180,9 +194,9 @@ void updateNeopixels();
 //////////////////////
 void setup() 
 {
+  initializeNeopixels();
   initializeArduino();
   initializeInputs();
-  initializeNeopixels();
   delay(100);
 }
 
@@ -191,21 +205,31 @@ void setup()
 ////////////////////
 void loop() 
 { 
+  if (Serial) {
   checkSerialInput();
   updateMeasurementBuffers();
   updateBufferSums();
   updateBufferIndex();
   updateInputStates();
   updateOutLED();
   addDelay();
+  count = 1;
+  } else {
+    if (count == 1) {
+      clearMonome();
+      count = 0;
+    }
+    rainbow(100);
+  }
 }
 
 //////////////////////////
 // INITIALIZE ARDUINO
 //////////////////////////
 void initializeArduino() {
-  Serial.begin(9600);  
+  Serial.begin(57600);  
   while (!Serial) {
+    rainbow(100);
     ; // wait for serial port to connect. Needed for Leonardo only
   }
   /* Set up input pins 
@@ -262,7 +286,7 @@ void initializeInputs() {
   }
 }
 
-void checkSerialInput() {
+int checkSerialInput() {
   /*
     here is what the incoming serial data means
     0 => no incoming serial data
@@ -301,9 +325,12 @@ void checkSerialInput() {
 void initializeNeopixels() {
   strip.begin();
   strip.show(); // Initialize all pixels to 'off'
-  rainbow(20);
+  colorWipe(strip.Color(255, 0, 0), 20); // Red
+  colorWipe(strip.Color(0, 255, 0), 20); // Green
+  colorWipe(strip.Color(0, 0, 255), 20); // Blue
   clearNeopixels();
   setColors();
+  delay(1000);
 }
 
 
@@ -425,7 +452,7 @@ void updateMonome() {
             if(!buttons[index].state) { 
               buttons[index].state = true;
               updateNeopixels();
-#ifdef SERIAL9600 
+#ifdef SERIAL57600 
               // add 1 to differentiate index from 0 bytes of serial data
               Serial.write(index+1);
 #endif              
@@ -438,7 +465,7 @@ void updateMonome() {
             else {
               buttons[index].state = false;
               updateNeopixels();
-#ifdef SERIAL9600              
+#ifdef SERIAL57600              
               Serial.write(index+1+NUM_BUTTONS);
 #endif  
 #ifdef DEBUG_MONOME
@@ -601,10 +628,19 @@ void rainbow(uint8_t wait) {
   }
 }
 
+// Fill the dots one after the other with a color
+void colorWipe(uint32_t c, uint8_t wait) {
+  for(uint16_t i=0; i<strip.numPixels(); i++) {
+    strip.setPixelColor(i, c);
+    strip.show();
+    delay(wait);
+  }
+}
+
 void setColors() {
-  ledColor = strip.Color(10, 255, 79);
-  ledHighlightColor = strip.Color(23, 114, 255);
-  ledHighlightOnColor = strip.Color(10, 255, 79);
+  ledColor = strip.Color(255, 0, 191);
+  ledHighlightColor = strip.Color(0, 0, 255);
+  ledHighlightOnColor = strip.Color(0, 255, 213);
 }
 
 

Processing/monome/Button.pde

@@ -4,10 +4,10 @@ class Button {
   boolean pressed;
   boolean state;
   boolean highlight;
-  color onColor = #A5FF31;
-  color offColor = #31FFB2;
-  color highlightColor = #2BD6C9;
-  color highlightOnColor = #8ED62B;
+  color onColor = #ff00bf;
+  color offColor = #808080;
+  color highlightColor = #0000ff;
+  color highlightOnColor = #00FFD5;
 
   Button(int num, int xpos, int ypos, int wd, int ht) {
     n = num;
@@ -64,4 +64,4 @@ class Button {
   }
 }
 
-
+

Processing/monome/MenuButton.pde

@@ -56,4 +56,4 @@ class MenuButton {
   }
 
 }
-
+

Processing/monome/files/file1.txt

@@ -1,2 +1,31 @@
-14306	120
-1882	122
+11362	120
+5398	10
+7976	12
+22028	21
+26567	39
+31556	46
+39403	64
+43962	58
+50201	52
+58899	5
+61542	69
+65483	3
+85855	32
+88181	26
+93389	90
+97289	8
+99583	72
+100516	16
+104626	24
+115435	88
+116746	85
+122829	116
+129688	80
+132732	128
+134800	122
+138329	103
+140453	110
+144227	96
+145975	76
+147338	67
+148255	74

Processing/monome/files/file2.txt

@@ -1,5 +1,13 @@
-514170	121
-0	43
-0	45
-0	50
-0	57
+434611	231
+0	67
+1	70
+1	73
+1	76
+1	87
+1	112
+1	115
+1	118
+1	57
+1	122
+1	124
+1	126

Processing/monome/files/file7.txt

@@ -1,22 +1,7 @@
-698929	121
+698929	115
 0	1
 0	3
-0	7
-0	8
-0	21
-0	23
-0	30
-0	32
-0	33
-0	35
-0	37
-0	39
-0	40
-0	43
-0	45
-0	50
-0	51
-0	52
-0	55
-0	56
-0	57
+3456	7
+4769	8
+6789	21
+10293	23