Skip to content

nOS_Timer improvement #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
git-pgoudreau wants to merge 1 commit into
base: master
Choose a base branch
from
Open

nOS_Timer improvement #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions inc/nOS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1219,6 +1219,7 @@ nOS_TickCounter nOS_GetTickCount (void);
* *
**********************************************************************************************************************/
#define nOS_MsToTicks(MS) (nOS_TickCounter)(((uint32_t)(MS)+((1000UL/(uint32_t)NOS_CONFIG_TICKS_PER_SECOND)-1UL))/(1000UL/(uint32_t)NOS_CONFIG_TICKS_PER_SECOND))
#define nOS_TicksToMs(Tick) (nOS_TickCounter)(((uint32_t)(Tick)*1000UL)+1UL)/NOS_CONFIG_TICKS_PER_SECOND
#endif

#if (NOS_CONFIG_SLEEP_ENABLE > 0)
Expand Down
2 changes: 1 addition & 1 deletion src/nOSTimer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ nOS_Error nOS_TimerRestart (nOS_Timer *timer, nOS_TimerCounter reload)
if (timer == NULL) {
err = NOS_E_INV_OBJ;
}
else if (reload == 0) {
else if ((reload == 0) && (timer->state & NOS_TIMER_FREE_RUNNING) == NOS_TIMER_FREE_RUNNING) {
err = NOS_E_INV_VAL;
} else
#endif
Expand Down