Diff: RadarDemo/RadarDemo.h

Revision:

3:732f7144ec81

Parent:

2:8db224cc1fcb

Child:

4:66f13188c26b

--- a/RadarDemo/RadarDemo.h	Fri Nov 04 23:07:04 2016 +0000
+++ b/RadarDemo/RadarDemo.h	Sat Nov 05 15:36:59 2016 +0000
@@ -41,6 +41,7 @@
 
 #include "TS_DISCO_F746NG.h"
 #include "Radar.h"
+#include "RadarTimer.h"
 
 /// <summary>
 /// Radar display demo class.
@@ -49,10 +50,6 @@
 class RadarDemo : public Radar
 {
 public:
-    /// <summary>
-    /// The radar scan period in milisecons.
-    /// </summary>
-    uint32_t scanPeriod;
 
     /// <summary>
     /// Duration time of the demo in milisecons.
@@ -113,14 +110,11 @@
     /// </summary>
     /// <param name="screen">The screen window coordinates.</param>
     bool DetectTouch(Window screen);
-
-#ifndef _SDL_timer_h
-    Timer t;
-#endif
+    
+    RadarTimer timer;
 
 private:
-    uint32_t lastScanTime;
-    uint32_t runningTime;
+
     float currentBeamAngle;
     float lastBeamAngle;