Revision 7:4aec4a6acac2, committed 2014-02-06

Comitter:

tanssisatu

Date:

Thu Feb 06 08:37:47 2014 +0000

Parent:

6:17e0520e346f

Child:

8:7f7c0b94815f

Child:

9:df3bff3a0b76

Commit message:

Rev 2.0002

Changed in this revision

--- a/Touch_tft.lib	Thu Feb 06 07:43:10 2014 +0000
+++ b/Touch_tft.lib	Thu Feb 06 08:37:47 2014 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/Vekotin/code/Touch_tft/#cef5cdc775ea
+http://mbed.org/users/Vekotin/code/Touch_tft/#ef67f9068850

--- a/light_pressed.h	Thu Feb 06 07:43:10 2014 +0000
+++ b/light_pressed.h	Thu Feb 06 08:37:47 2014 +0000
@@ -46,34 +46,44 @@
 
     if (p.x > 3 && p.x < 78) {              //Slider
         if (p.y > 88 && p.y < 111) {        //button 1
-            slider = 100;
+            slider = 16383;
+            
         }
         if (p.y > 111 && p.y < 134) {       //button 2
-            slider = 90;
+            slider = 14742;
+            MIDIMessage::PitchWheel(slider);
         }
         if (p.y > 134 && p.y < 157) {       //button 3
-            slider = 80;
+            slider = 13104;
+            MIDIMessage::PitchWheel(slider);
         }
         if (p.y > 157 && p.y < 180) {       //button 3
-            slider = 70;
+            slider = 11466;
+            MIDIMessage::PitchWheel(slider);
         }
         if (p.y > 180 && p.y < 203) {       //button 3
-            slider = 60;
+            slider = 9828;
+            MIDIMessage::PitchWheel(slider);
         }
         if (p.y > 203&& p.y < 226) {        //button 3
-            slider = 50;
+            slider = 8192;
+            MIDIMessage::PitchWheel(slider);
         }
         if (p.y > 226 && p.y < 249) {       //button 3
-            slider = 40;
+            slider = 4915;
+            MIDIMessage::PitchWheel(slider);
         }
         if (p.y > 249 && p.y < 272) {       //button 3
-            slider = 30;
+            slider = 3277;
+            MIDIMessage::PitchWheel(slider);
         }
         if (p.y > 272 && p.y < 295) {       //button 3
-            slider = 20;
+            slider = 1638;
+            MIDIMessage::PitchWheel(slider);
         }
         if (p.y > 295 && p.y < 318) {       //button 3
-            slider = 10;
+            slider = 0;
+            MIDIMessage::PitchWheel(slider);
         }
     }
     if (p.y > 163 && p.y < 238) {           //ROW B

--- a/main.cpp	Thu Feb 06 07:43:10 2014 +0000
+++ b/main.cpp	Thu Feb 06 08:37:47 2014 +0000
@@ -18,6 +18,7 @@
 DigitalIn  key[9] = {p22, p23, p24, p25, p26, p27, p28, p29, p30};       //inputit
 
 int input = 0;
+int i;
 int painetut_nappaimet[9] = {0};
 
 
@@ -29,10 +30,41 @@
     for (i = 0; i<10; i++) {                                        //draw buttons
         tft.locate(10,50);
         printf("Shift");
+        buttons(i, color);
 
     }
 }
 
+void nine_keys(void)
+{
+
+    // Tallentaa pitchin
+    
+
+    // Tallentaa painallukset
+    for (i = 0; i < 9; i++) {
+        if (input = key[i].read())
+            painetut_nappaimet[i] = 1;
+    }
+    // Lähettään painallusten perusteella midimessagen
+    for (i = 0; i < 9; i++) {
+        if (painetut_nappaimet[i])
+            //midi.write(MIDIMessage::Noteon(48 + i));
+            // Debuggaus puttyyn
+            pc.printf("Digital input %d", i);               //terminal viesti
+            
+            pc.printf(": %d\n\r", key[i].read());
+    }
+    
+    
+    // Lopettaa midimessagen lähettämisen
+    for (i = 0; i < 9; i++) {
+        if (painetut_nappaimet[i])
+            wait(0.000001);//midi.write(MIDIMessage::NoteOff(48 + i));
+    }
+}
+
+
 int main()
 {
 
@@ -89,41 +121,21 @@
             tft.locate(210,12);
             printf("%3d",p.y);
 
+            light_pressed(Red,p);
+            
             tft.locate(160, 0);
             printf("%i", Octave);
             tft.locate(160, 12);
             printf("%i", slider);
-
+            
 
 
-        }
-    }
-
-    while (1) {
-        // Tallentaa pitchin
-
-        // Tallentaa painallukset
-        for (i = 0; i < 9; i++) {
-            if (input = key[i].read())
-                painetut_nappaimet[i] = 1;
+            nine_keys();
         }
-        // Lähettään painallusten perusteella midimessagen
-        for (i = 0; i < 9; i++) {
-            if (painetut_nappaimet[i])
-                //midi.write(MIDIMessage::Noteon(48 + i));
-                // Debuggaus puttyyn
-                pc.printf("Digital input %d", i);               //terminal viesti
-            pc.printf(": %d\n\r", key[i].read());
-        }
-        // Lopettaa midimessagen lähettämisen
-        for (i = 0; i < 9; i++) {
-            if (painetut_nappaimet[i])
-                wait(1);//midi.write(MIDIMessage::NoteOff(48 + i));
-        }
+
+        nine_keys();
+
     }
-
-
-
 }