Arturs Kozlovskis / Mbed 2 deprecated ELEC2645_Project_el18ak

Dependencies:   mbed

Revision:
9:4b11ee1155ad
Parent:
8:09eb8fe2bb20
Child:
10:f5b920a6a71a
--- a/main.cpp	Fri Apr 03 07:29:16 2020 +0000
+++ b/main.cpp	Fri Apr 10 08:24:48 2020 +0000
@@ -36,17 +36,24 @@
         objects.draw_base(lcd);
         objects.cannon_position(pad);
         objects.draw_cannon(lcd);
+        //functions.ball_position_linear(lcd, objects,1);
+        functions.ball_position_parabolic(lcd, objects,5);
+        functions.ball_position_linear(lcd, objects,8);
         objects.draw_shots(lcd);
+        functions.collision_checker(lcd,objects);
+        lcd.refresh();
+        wait(0.135);
+        
+        //functions.ball_position_parabolic(lcd, objects,5);
+        
+        objects.cannon_position(pad);
+        objects.draw_cannon(lcd);
+        //objects.draw_shots(lcd);
+        //functions.collision_checker(lcd,objects);
+        
         lcd.refresh();
         wait(0.005);
-        
-        functions.ball_position_parabolic(lcd, objects,9);
-
-        //functions.ball_position_linear(lcd, objects,1);
-        objects.cannon_position(pad);
-        objects.draw_cannon(lcd);
-        lcd.refresh();
-        wait(0.5);
+        //printf("|%f\n|",pad.read_pot1());
 
     }
 }