sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

examples/watchdog/watchdog_main.c: Elapsed var is now being updated through clock

Browse Source
This commit is contained in:
saramonteiro 2020-10-30 15:39:26 -03:00 committed by Xiang Xiao
parent c431c25d14
commit 2e8f068a61
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
examples/watchdog/watchdog_main.c
View File

@ -57,7 +57,9 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#define DEVNAME_SIZE 16 #define DEVNAME_SIZE 16
/* Number of timeout expirations to change mode to reset the chip */
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
@ -230,9 +232,13 @@ int main(int argc, FAR char *argv[])
#ifdef CONFIG_DEBUG_WATCHDOG #ifdef CONFIG_DEBUG_WATCHDOG
struct watchdog_status_s status; struct watchdog_status_s status;
#endif #endif
long elapsed;
int fd; int fd;
int ret; int ret;
uint64_t elapsed;
uint64_t start_ms;
uint64_t current_time_ms;
struct timespec tstart;
struct timespec tnow;
/* Parse the command line */ /* Parse the command line */
@ -266,13 +272,19 @@ int main(int argc, FAR char *argv[])
goto errout_with_dev; goto errout_with_dev;
} }
/* Get the starting time */
clock_gettime(CLOCK_REALTIME, &tstart);
start_ms = (tstart.tv_sec * 1000) + (tstart.tv_nsec / 1000000);
/* Then ping */ /* Then ping */
for (elapsed = 0; elapsed < wdog.pingtime; elapsed += wdog.pingdelay) for (elapsed = 0; elapsed < wdog.pingtime;
elapsed = current_time_ms - start_ms)
{ {
/* Sleep for the requested amount of time */ /* Sleep for the requested amount of time */
usleep(wdog.pingdelay * 1000); usleep((wdog.pingdelay * 1000) - CONFIG_USEC_PER_TICK);
/* Show watchdog status. Only if debug is enabled because this /* Show watchdog status. Only if debug is enabled because this
* could interfere with the timer. * could interfere with the timer.
@ -299,17 +311,23 @@ int main(int argc, FAR char *argv[])
goto errout_with_dev; goto errout_with_dev;
} }
printf(" ping elapsed=%ld\n", elapsed); printf(" ping elapsed=%" PRIu64 "\n", elapsed);
fflush(stdout); fflush(stdout);
/* Get current time to calculate the elapsed time */
clock_gettime(CLOCK_REALTIME, &tnow);
current_time_ms = (uint64_t)((tnow.tv_sec * 1000)
+ (tnow.tv_nsec / 1000000));
} }
/* Then stop pinging */ /* Then stop pinging */
for (; ; elapsed += wdog.pingdelay) for (; ; elapsed = current_time_ms - start_ms)
{ {
/* Sleep for the requested amount of time */ /* Sleep for the requested amount of time */
usleep(wdog.pingdelay * 1000); usleep((wdog.pingdelay * 1000) - CONFIG_USEC_PER_TICK);
/* Show watchdog status. Only if debug is enabled because this /* Show watchdog status. Only if debug is enabled because this
* could interfere with the timer. * could interfere with the timer.
@ -327,8 +345,14 @@ int main(int argc, FAR char *argv[])
status.flags, status.timeout, status.timeleft); status.flags, status.timeout, status.timeleft);
#endif #endif
printf(" NO ping elapsed=%ld\n", elapsed); printf(" NO ping elapsed=%" PRIu64 "\n", elapsed);
fflush(stdout); fflush(stdout);
/* Get current time to calculate the elapsed time */
clock_gettime(CLOCK_REALTIME, &tnow);
current_time_ms = (uint64_t)((tnow.tv_sec * 1000)
+ (tnow.tv_nsec / 1000000));
} }
/* We should not get here */ /* We should not get here */