Revision 9:770effc3af2d, committed 2020-04-09

Comitter:

nnguyen99

Date:

Thu Apr 09 16:24:28 2020 +0000

Parent:

8:a618687c7b19

Child:

10:f10105ec435f

Commit message:

Switched to keyboard inputs

Changed in this revision

--- a/main.cpp	Tue Apr 07 16:13:28 2020 +0000
+++ b/main.cpp	Thu Apr 09 16:24:28 2020 +0000
@@ -4,13 +4,9 @@
 #include "PinDetect.h"
 #include "uLCD_4DGL.h"
 DigitalOut myled(LED1);
+Serial pc(USBTX,USBRX);
 // LCD init
-uLCD_4DGL guLCD(p28, p27, p29); // serial tx, serial rx, reset pin;
 // Push buttons init
-PinDetect pb1(p16); 
-PinDetect pb2(p17);  
-PinDetect pb3(p18); 
-PinDetect pb4(p19); 
 // States 
 #define sRESET 1
 #define sSTOP 2
@@ -72,49 +68,13 @@
     */
 }
 
-void hardware_init(){ 
-    // Push buttons init
-    pb1.mode(PullUp); 
-    pb2.mode(PullUp); 
-    pb3.mode(PullUp);
-    pb4.mode(PullUp);
-    pb1.attach_deasserted(&pb1_hit_callback);
-    pb2.attach_deasserted(&pb2_hit_callback); 
-    pb3.attach_deasserted(&pb3_hit_callback);
-    pb4.attach_deasserted(&pb4_hit_callback);
-    pb1.setSampleFrequency(); 
-    pb2.setSampleFrequency(); 
-    pb3.setSampleFrequency();
-    pb4.setSampleFrequency();
-}
 
-void pb1_hit_callback (void) 
-{
-    X = 1;
-    guLCD.printf("REEST");
-}
 
-void pb2_hit_callback (void)
-{
-    P = 1;
-    guLCD.printf("STOP");
-}
-
-void pb3_hit_callback (void) 
-{
-    S = 1; 
-    guLCD.printf("RECORD");
-}
-
-void pb4_hit_callback (void) 
-{
-    R = 1; 
-    guLCD.printf("PLAY");
-}
 
 void state_machine_mgr(){
     sm_state curr_state =  sRESET;
     while(1) {
+        curr_state = pc.getc();
         switch(curr_state){
             case sRESET:
                 S = 0;