Diff: main.cpp

Revision:

23:214c0c828d98

Parent:

21:df9e8f45e14c

Child:

24:3b29ae4d6171

--- a/main.cpp	Tue Dec 06 22:48:35 2022 +0000
+++ b/main.cpp	Wed Dec 07 23:12:12 2022 +0000
@@ -23,11 +23,12 @@
 Mutex pc_mutex;
 
 //uLCD_4DGL uLCD(p28, p27, p29);
-uLCD_4DGL uLCD(p9,p10,p30);
+uLCD_4DGL uLCD(p13,p14,p30);
 Mutex uLCD_mutex;
 
-BluefruitController blue(p13,p14);
-BusIn navSwitch(p15, p16, p17, p19, p20);
+BluefruitController blue(p28,p27);
+//BusIn navSwitch(p15, p16, p17, p19, p20);
+Nav_Switch myNav(p20, p16, p17, p15, p19); // pins(up, down, left, right, fire)
 
 SDFileSystem sd(p5, p6, p7, p8, "sd");
 PwmOut Rgb(p23);
@@ -110,7 +111,7 @@
     // Launch four threads
     Thread thread1(tetrisGame, osPriorityHigh);
     Thread thread2(hockeyGame, osPriorityHigh);
-    Thread thread3(audioThread, osPriorityLow);
+    //Thread thread3(audioThread, osPriorityLow);
     Thread thread4(ledThread, osPriorityLow);
 
     // The main thread goes on to blink LEDs
@@ -123,10 +124,10 @@
         PRINTF("[MAIN] Thread stacks: %lu %lu %lu %lu\r\n",
             thread1.used_stack(),
             thread2.used_stack(),
-            thread3.used_stack(),
+            //thread3.used_stack(),
             thread4.used_stack());
         
         // Launch into the air hockey game
-        if (game2 != true) game2 = true;
+        if (game1 != true) game1 = true;
     }
 }