Diff: tetris/tetris.cpp

Revision:

23:214c0c828d98

Parent:

22:601e6f9077e4

Child:

26:163d7ca8c42d

--- a/tetris/tetris.cpp	Tue Dec 06 22:48:35 2022 +0000
+++ b/tetris/tetris.cpp	Wed Dec 07 23:12:12 2022 +0000
@@ -1,10 +1,11 @@
 #include "mbed.h"
-#include "uLCD_4DGL.h"
+//#include "uLCD_4DGL.h"
 #include "Game.h"
-#include "Nav_Switch.h"
+#include "globals.h"
+//#include "Nav_Switch.h"
 
-uLCD_4DGL uLCD(p13, p14, p30);
-Nav_Switch myNav(p19, p16, p17, p15, p18); // pins(up, down, left, right, fire)
+//uLCD_4DGL uLCD(p13, p14, p30);
+//Nav_Switch myNav(p20, p16, p17, p15, p19); // pins(up, down, left, right, fire)
 
 int SinglePiecePoints = 50;
 int LineClearPoints = 200;
@@ -77,13 +78,19 @@
 
 void tetrisGame()
 {
+    PRINTF("POINT 1");
+    while (game1 == false) {
+           
+        PRINTF("[TETRIS] Idle\r\n");
+        Thread::wait(500);
+    }
+    
     /*while(1){
         uLCD.printf("test");
     }*/
     
     
     
-    
     /*if (myNav.up()) input_rotate();
     if (myNav.down()) input_down();;
     if (myNav.left()) input_left();
@@ -110,10 +117,6 @@
     pc.gets(buffer,4);*/
     
     
-    
-    
-    
-    
     bool isGameOver = false;
     int mScreenHeight = 128;
     Pieces mPieces;
@@ -137,7 +140,6 @@
     uLCD.cls();
     
     
-    
     int piece = 0;
     int rotate = 0;
     
@@ -145,11 +147,18 @@
     
     while (1)
     {
+        PRINTF("POINT 2");
+        // Wait until the game starts
+        while (game1 == false) {
+           
+            PRINTF("[TETRIS] Idle\r\n");
+            Thread::wait(500);
+        }
+        
         if (myNav.up()) input_rotate();
         if (myNav.down()) input_down();;
         if (myNav.left()) input_left();
         if (myNav.right()) input_right();;
-        //check mouse left button click   // FIXQ
         //if (myNav.fire()) input_down; // FIX, CAN ADD MENU FUNCTIONALITY
         
         if(isGameOver)