Merge pull request #4 from WebPlatformForEmbedded/timer

minor corrections (alignment, magic value, redundant check)

Author: HaseenaSainul

Launcher.cpp

@@ -116,8 +116,9 @@ SERVICE_REGISTRATION(Launcher, 1, 0);
                 if (timeMode == RELATIVE) { //Schedule Job at relative timing
                     scheduledTime = Core::Time::Now();
 
-                    uint64_t timeValueToTrigger = ((((time.Hours() != (uint8_t)(~0)) ? time.Hours(): 0) * MinutesPerHour +
-                                                    ((time.Minutes() != (uint8_t)(~0)) ? time.Minutes(): 0)) * SecondsPerMinute + time.Seconds()) * MilliSecondsPerSecond;
+
+                    uint64_t timeValueToTrigger = (((time.Hours() ? time.Hours(): 0) * MinutesPerHour +
+                                                    (time.Minutes() ? time.Minutes(): 0)) * SecondsPerMinute + time.Seconds()) * MilliSecondsPerSecond;
                     scheduledTime.Add(timeValueToTrigger);
 
                 }
@@ -214,14 +215,16 @@ Core::Time Launcher::FindAbsoluteTimeForSchedule(const Time& absoluteTime, const
 
     if (interval.IsValid() == false) {
         if (slotTime < startTime) {
-            uint32_t jump (absoluteTime.HasHours() ? HoursPerDay * MinutesPerHour * SecondsPerMinute : (absoluteTime.HasMinutes() ? MinutesPerHour * SecondsPerMinute : SecondsPerMinute));
-            slotTime.Add(jump * 100);
+            uint32_t jump ((absoluteTime.HasHours() ? HoursPerDay * MinutesPerHour * SecondsPerMinute :
+                           (absoluteTime.HasMinutes() ? MinutesPerHour * SecondsPerMinute : SecondsPerMinute)) * MilliSecondsPerSecond);
+
+            slotTime.Add(jump);
         }
     }
     else {
-        uint32_t intervalJump = ( (interval.HasHours()   ? interval.Hours() * MinutesPerHour * SecondsPerMinute : 0) +
+        uint32_t intervalJump = ( (interval.HasHours() ? interval.Hours() * MinutesPerHour * SecondsPerMinute : 0) +
                                   (interval.HasMinutes() ? interval.Minutes() * SecondsPerMinute : 0) +
-                                   interval.Seconds() ) * 100;
+                                   interval.Seconds() ) * MilliSecondsPerSecond;
 
         ASSERT (intervalJump != 0);
         if (slotTime >= startTime) {

Launcher.h

@@ -537,8 +537,8 @@ class Launcher : public PluginHost::IPlugin {
             if (_interval.IsValid() == true) {
                 // Reschedule our next launch point...
                 Core::Time scheduledTime(Core::Time::Now());
-                uint64_t intervalTime = ((((_interval.Hours() != (uint8_t)(~0)) ? _interval.Hours(): 0) * MinutesPerHour +
-                                          ((_interval.Minutes() != (uint8_t)(~0)) ? _interval.Minutes():0)) * SecondsPerMinute + _interval.Seconds()) * MilliSecondsPerSecond;
+                uint64_t intervalTime = (((_interval.Hours() ? _interval.Hours(): 0) * MinutesPerHour +
+                                          (_interval.Minutes() ? _interval.Minutes():0)) * SecondsPerMinute + _interval.Seconds()) * MilliSecondsPerSecond;
                 scheduledTime.Add(intervalTime);
                 PluginHost::WorkerPool::Instance().Schedule(scheduledTime,Core::ProxyType<Core::IDispatch>(*this));
             }