Diff: Front/Front.cpp

Revision:

30:08cc4ec58d07

Parent:

29:207111ffd6e6

Child:

31:cfdb014ff086

--- a/Front/Front.cpp	Mon May 25 20:00:31 2020 +0000
+++ b/Front/Front.cpp	Tue May 26 10:17:47 2020 +0000
@@ -152,26 +152,23 @@
 
 void Front::frontrun(N5110 &lcd, Gamepad &pad, int submenu)
 {
-    //printf("G_ISR_FLAG= %d\n",g_isr_flag); //DEBUG
     frontsetup(lcd, pad, submenu,0, true);  //Initialises front pannel display
-    initialise(pad,lcd,submenu);
-    frequency=frequency_convert(pad,oct);
-    menuflag=1;  //sets up flags
-    release_flag=silent_flag=0;
-    used=1;  //initialises vairables
+    frequency=frequency_convert(pad,oct); //collects initial frequency
+    release_flag=silent_flag=0; //Flags setup
+    used=menuflag=1;  //initialises vairables
     filter_type=envelope_in=0;
     a=d=s=r=17; //starting adsr values (1->35)
     noteon=false;
-    oct=3;
+    oct=3; //starting octave
 #ifdef CSV
     itterator=0; //sets itterator for CSV OUTPUT
 #endif
 
     while (menuflag==1) {
 #ifdef SLOW_TIME
-        print_SLOWTIME_out(out,noteon,a,d,s,r,release_flag,silent_flag);
+        print_SLOWTIME_out(out,noteon,a,d,s,r,release_flag,silent_flag); //debug terminal print function
 #endif
-        if (noteon==true && g_isr_flag == 1) {
+        if (noteon==true && g_isr_flag == 1) { //isr triggered and note on
             pad.write_u16(out);
             envelope_in=(sound.sound_main(false,submenu,frequency)-32767); //int around 0
             envelope_in=filter.filter_run(envelope_in,filter_type,false);
@@ -195,8 +192,7 @@
         }
         dir=pad.get_direction();
         if (dir!=dir_1) {
-            printf("dir =%d\n",dir); //debug
-            //used=parameter_manager(pad,dir,a,d,s,r);
+            //printf("dir =%d\n",dir); //debug
             if(dir==3) {
                 used++;
                 if (used>5) {
@@ -293,7 +289,7 @@
 {
     if (initial==true) {
         printsliders(lcd,17,17,17,17,1);
-        printf("front setup complete\n\n");
+        initialise(pad,lcd,submenu);
 
     }
     lcd.clear();