Diff: main.cpp

Revision:

10:766bb1c03153

Parent:

8:b9745dd296c2

Child:

11:d07c9f451088

--- a/main.cpp	Tue Mar 28 00:26:05 2017 +0000
+++ b/main.cpp	Sun Apr 09 17:20:27 2017 +0000
@@ -9,24 +9,33 @@
 {
     printf("Start TargetManager manual test\r\n");
     printf("Instruction:\r\n");
-    printf("\tNerfusTicker works if a target miss is printed every second\r\n");
+    printf("\tNerfusTicker works if target #0 is missed before target #1\r\n");
     printf("\tBumper works if a target hit is printed when you click the limit switch\r\n");
     printf("\t\tLimit switch connections: C(p5), NO(VCC), NC(GND)\r\n");
     
     PinName bumper_pin = p5;
     
-    NerfusTicker target_timeout_ticker;
-    TestTargetManager target_manager(target_timeout_ticker);
+    //Tickers
+    NerfusTicker target_timeout_ticker_0;
+    NerfusTicker target_timeout_ticker_1;
+    std::vector<NerfusTickerInterface*> tickers;
+    tickers.push_back(&target_timeout_ticker_0);
+    tickers.push_back(&target_timeout_ticker_1);
+
+    TestTargetManager target_manager(tickers);
     
-    TargetHitCallback target_hit_callback(target_manager, 42);
-    TargetMissedCallback target_missed_callback(target_manager, 42);
-    target_timeout_ticker.init(&target_missed_callback);
+    TargetMissedCallback target_missed_callback_0(target_manager, 0);
+    TargetMissedCallback target_missed_callback_1(target_manager, 1);
+    target_timeout_ticker_0.init(&target_missed_callback_0);
+    target_timeout_ticker_1.init(&target_missed_callback_1);
     
+    TargetHitCallback target_hit_callback(target_manager, 0);
     Bumper bumper(bumper_pin, target_hit_callback);
     
     while(true)
     {
-        target_timeout_ticker.start(500);
-        wait_ms(1000);
+        target_timeout_ticker_0.start(500);
+        target_timeout_ticker_1.start(1000);
+        wait_ms(1500);
     }
 }