Diff: Front/Front.cpp

Revision:

27:da783f414f67

Parent:

26:a6033830d01c

Child:

28:eb0f12304a45

diff -r a6033830d01c -r da783f414f67 Front/Front.cpp
--- a/Front/Front.cpp	Sun May 24 17:27:42 2020 +0000
+++ b/Front/Front.cpp	Sun May 24 21:13:36 2020 +0000
@@ -172,11 +172,10 @@
 #endif
         if (noteon==true && g_isr_flag == 1) {
             pad.write_u16(out);
-            envelope_in=(sound.sound_main(false,submenu,frequency)-32767); //value around 0
-            envelope_in=filter.LPF(envelope_in,false);
+            envelope_in=(sound.sound_main(false,submenu,frequency)-32767); //int around 0
+            envelope_in=filter.filter_run(envelope_in,filter_type,false);
             if (release_flag==0) {
-                out=(envelope.env_in(a,d,s,r,envelope_in,false));//value around 32767
-                //out=envelope_in+32767;
+                out=(envelope.env_in(a,d,s,r,envelope_in,false));//Uint around 32767
             }  else {
                 out=envelope.release(s,r,envelope_in,false);
                 if (silent_flag==1) {
@@ -262,6 +261,14 @@
             envelope_in=envelope.release(s,r,envelope_in,true);
             pad.reset_buttons();
         }
+        if ( pad.X_pressed())  { 
+            printf("X\n");
+            pad.reset_buttons();
+        }
+        if ( pad.Y_pressed())  { 
+            printf("Y\n");
+            pad.reset_buttons();
+        }
 
         if (pad.start_pressed())  { //go back menu
             // printf("start pressed\n");
@@ -298,7 +305,9 @@
 void Front::initialise(Gamepad &pad, N5110 &lcd, int submenu)
 {
     out=sound.sound_main(true,submenu,440); //initialises external variables
-    out = filter.LPF(out,true); //initialises LPF Filter
+    out = filter.filter_run(out,1,true); //initialises LPF Filter
+    out = filter.filter_run(out,2,true); //initialises LPF Filter
+    out = filter.filter_run(out,3,true); //initialises LPF Filter
     out=envelope.env_in(17,17,17,17,out,true);
     out=envelope.release(17,17,out,true);
     printsliders(lcd,17,17,17,17,1);  //prints initialsliders