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

Windows Tweaks #691

Merged
gaisser merged 11 commits from eive/fsfw:windows-tweaks-upstream into development 2022-11-14 14:18:49 +01:00
Conversation 3 Commits 11 Files Changed 13
+90 -58
muellerr commented 2022-09-28 10:01:21 +02:00
Owner
Copy Link
Copy Source
  • Fixes and tweaks so building with Windows GCC works again
- Fixes and tweaks so building with Windows GCC works again
muellerr added 4 commits 2022-09-28 10:01:23 +02:00
tweaks to make windows build again 68ce8b5b08
last windows tweak b0ecf87580
another small windows tweak 876815b1c9
better comment
fsfw/fsfw/pipeline/pr-development This commit looks good
Details
e0c780f21c
muellerr added this to the v6.0.0 milestone 2022-09-28 10:01:30 +02:00
muellerr requested review from gaisser 2022-09-28 10:01:50 +02:00
gaisser requested changes 2022-10-10 13:39:49 +02:00
gaisser left a comment
Owner
Copy Link
Copy Source

Have you executed the unit tests on windows?

Have you executed the unit tests on windows?
src/fsfw/osal/host/Clock.cpp
@@ -8,6 +8,7 @@
#if defined(PLATFORM_WIN)
#include <sysinfoapi.h>
#define timegm _mkgmtime
gaisser commented 2022-10-10 13:38:05 +02:00
Owner
Copy Link
Copy Source

Interesting

Interesting
gaisser marked this conversation as resolved
src/fsfw/timemanager/ClockCommon.cpp
@@ -66,1 +65,4 @@
// Therefore we have to use a Mutex here
MutexGuard helper(timeMutex);
#ifdef PLATFORM_WIN
time_t time;
gaisser commented 2022-10-10 13:31:28 +02:00
Owner
Copy Link
Copy Source

Have you executed the unittests with the windows version?

Have you executed the unittests with the windows version?
muellerr commented 2022-10-10 13:40:18 +02:00
Author
Owner
Copy Link
Copy Source

hmm not sure about the unittests, I definitely compiled and ran it on Windows. Might check again.

hmm not sure about the unittests, I definitely compiled and ran it on Windows. Might check again.
muellerr commented 2022-11-09 17:54:33 +01:00
Author
Owner
Copy Link
Copy Source

Unittests running on Windows with some tweaks

Unittests running on Windows with some tweaks
src/fsfw_hal/common/gpio/gpioDefinitions.h
@@ -8,0 +8,4 @@
#ifdef PLATFORM_WIN
// Defined in Windows header for whatever reason, and leads to nameclash issues with
// class enums which have entries of the same name.
#undef IN
gaisser commented 2022-10-10 13:30:48 +02:00
Owner
Copy Link
Copy Source

I don't understand those but if it works, I'm ok with that.

I don't understand those but if it works, I'm ok with that.
gaisser marked this conversation as resolved
gaisser added the bug label 2022-10-10 13:40:04 +02:00
muellerr added 1 commit 2022-10-10 13:41:13 +02:00
Merge branch 'development' into windows-tweaks-upstream
fsfw/fsfw/pipeline/pr-development This commit looks good
Details
df06064df0
gaisser added 1 commit 2022-10-17 14:20:56 +02:00
Merge branch 'development' into windows-tweaks-upstream
fsfw/fsfw/pipeline/pr-development This commit looks good
Details
3349fc36f8
gaisser commented 2022-10-17 15:19:20 +02:00
Owner
Copy Link
Copy Source

Fixes #603

Fixes #603
gaisser added 1 commit 2022-10-24 17:10:48 +02:00
Merge branch 'development' into windows-tweaks-upstream
fsfw/fsfw/pipeline/pr-development This commit looks good
Details
dc1583c932
muellerr added 1 commit 2022-11-09 17:54:12 +01:00
tweaks
fsfw/fsfw/pipeline/pr-development This commit looks good
Details
c913fe40bf
muellerr added 1 commit 2022-11-14 14:08:27 +01:00
remove leftover debugging code
fsfw/fsfw/pipeline/pr-development This commit looks good
Details
a9c6c088f2
muellerr added 1 commit 2022-11-14 14:12:11 +01:00
reenable setup function call
fsfw/fsfw/pipeline/pr-development This commit looks good
Details
83a6f0b5f8
gaisser added 1 commit 2022-11-14 14:14:01 +01:00
Merge branch 'development' into windows-tweaks-upstream
fsfw/fsfw/pipeline/pr-development This commit looks good
Details
6021d897b8
gaisser approved these changes 2022-11-14 14:18:42 +01:00
gaisser left a comment
Owner
Copy Link
Copy Source

Unittest work on windows

Unittest work on windows
gaisser merged commit d7e16a67a7 into development 2022-11-14 14:18:49 +01:00
gaisser deleted branch windows-tweaks-upstream 2022-11-14 14:19:03 +01:00
Sign in to join this conversation.
Reviewers
No Reviewers
gaisser
Labels
Clear labels
API Change
Changes the API, so Users need to adapted
 Breaking API Change
Changes the API in a non backwards compatible way
 bug
Something is not working
 build
Issues related to the buildsystem, including CI
 cosmetics
Small change most users won't notice
 Documentation
Improvement of code documentation
 duplicate
This issue or pull request already exists
 feature
New feature
 help wanted
Need some help
 hotfix
Quick or important fix that is merged directly into master, causing a new revision
 invalid
#worksforme
 question
More information is needed
 Refactor
Contains a refactoring of some code
 Tests
Issues related to testing code
 wontfix
This won't be fixed
No labels bug
Milestone
No items
No Milestone v6.0.0
Assignees
Clear assignees
ahinkel (Andy Hinkel) gaisser (Steffen Gaisser) jenkins_buildfix meierj (Jakob Meier) mohr (Ulrich Mohr) mspahr muellerr (Robin Müller) tbaumgartl (Tobias Baumgartl)
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: fsfw/fsfw#691