Arturs Kozlovskis / Mbed 2 deprecated ELEC2645_Project_el18ak

Dependencies:   mbed

Revision:
7:82079de8bcd6
Parent:
6:33bdb54c2c88
Child:
8:09eb8fe2bb20
diff -r 33bdb54c2c88 -r 82079de8bcd6 main.cpp
--- a/main.cpp	Wed Apr 01 11:20:24 2020 +0000
+++ b/main.cpp	Thu Apr 02 11:51:44 2020 +0000
@@ -30,16 +30,22 @@
 int main()
 {
     initialise();
-
+    
     while(1) {
         lcd.clear();
         objects.draw_base(lcd);
+        objects.cannon_position(pad);
         objects.draw_cannon(lcd);
-        objects.cannon_position(pad);
         objects.draw_shots(lcd);
-        functions.ball_position(lcd, objects);
         lcd.refresh();
-        wait(0.2);
+        wait(0.005);
+        functions.ball_position_parabolic(lcd, objects,0);
+        functions.ball_position_parabolic(lcd, objects,1);
+        functions.ball_position_linear(lcd, objects,1);
+        objects.cannon_position(pad);
+        objects.draw_cannon(lcd);
+        lcd.refresh();
+        wait(0.035);
 
     }
 }