fsfw/fsfw
fsfw
/
fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

moved TCScheduling Service to use timeval internally #735

Open
mohr wants to merge 7 commits from mohr/timetag_fix into development
pull from: mohr/timetag_fix
merge into: fsfw:development
Conversation 0 Commits 7 Files Changed 3 +4 -1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cf47d2079f - Show all commits

5
src/fsfw/pus/Service11TelecommandScheduling.tpp
View File

@ -167,7 +167,10 @@ inline ReturnValue_t Service11TelecommandScheduling<MAX_NUM_TCS>::doInsertActivi
Clock::getClock_timeval(&tNow);
timeval timeDifference = scheduledTime - tNow;
// round subseconds up
if (timeDifference.tv_sec + 1 <= RELEASE_TIME_MARGIN_SECONDS) {
if (timeDifference.tv_usec != 0) {
muellerr commented 2023-02-10 13:59:31 +01:00
Outdated
Review
Copy Link

Is timeval guaranteed to be signed?
This also rounds up when subsecond micros are 0, is this intended?

Is timeval guaranteed to be signed? This also rounds up when subsecond micros are 0, is this intended?
mohr commented 2023-02-10 20:55:14 +01:00
Outdated
Review
Copy Link
  1. Yes, timeval is using time_t in unixoides and long in windows.
  2. Admittedly I was lazy, I will change it so that 0 does not round up.
1) Yes, timeval is using time_t in unixoides and long in windows. 2) Admittedly I was lazy, I will change it so that 0 does not round up.
muellerr commented 2023-02-20 18:14:46 +01:00
Outdated
Review
Copy Link

Can we use timestamp <= tNow.tv_sec + RELEASE_TIME_MARGIN_SECONDS compare logic instead?

That is a bit more readable in my opinion.

Can we use `timestamp <= tNow.tv_sec + RELEASE_TIME_MARGIN_SECONDS` compare logic instead? That is a bit more readable in my opinion.
mohr commented 2023-05-08 15:17:31 +02:00
Outdated
Review
Copy Link

Changed rounding to be correct.
The unreadable comparison is removed with this PR.

Changed rounding to be correct. The unreadable comparison is removed with this PR.
timeDifference.tv_sec++;
}
if (timeDifference.tv_sec <= RELEASE_TIME_MARGIN_SECONDS) {
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::warning << "Service11TelecommandScheduling::doInsertActivity: Release time too close to "
"current time"