Skip to content

Align master with develop #54

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

Jump to bottom
Merged
zurdala merged 28 commits into from
Apr 8, 2025
Merged

Align master with develop #54

zurdala merged 28 commits into from
Apr 8, 2025

Conversation

@zurdala
Copy link
Collaborator

@zurdala zurdala commented Mar 4, 2025 •
edited
Loading

The conflicts are minor:

  • data files (so overwrite)
  • lines of build.sh that had || exit twice and were modified in develop too

conflicts fixed

Some I/O changes:

  • Input now accepts output step with non-integers (so with fractions of seconds)
  • Output now displays time steps in ISOT with microsecond information

ckebschull and others added 27 commits June 2, 2023 16:32
@ckebschull
Make cmake find dll files for installing
09e5730
@ckebschull
Enable building in MSYS2 environment
278a2f2
@ckebschull
Update build instructions for MSYS2
1333cce
@ckebschull
Fix typo in build.sh
e8accd0
@ckebschull
Update to latest libslam version
47586fd
@ckebschull
Remove old lib and include libraries
d77fe03
@jwy-1997
remove integer time-step limitation
5420101
@jwy-1997
updates for the rdinp
a195824
@jwy-1997
adjust according to comment
67ca277
@jwy-1997
update according to comment again for some fixs that I forgot
116b699
@jwy-1997
add new time updates
16996b6
@jwy-1997
update time-stamp fix
0a28d81
@jwy-1997
update src to remove test code and update the time-stamp label
02b8654
@ckebschull
Add value to error message for better debugging.
c62fc35
@ckebschull
Merge branch 'develop' into chk/build-on-windows
0722a32
@ckebschull
Copy dll files to work dir after build
7e0b6ab
@ckebschull
Use MSYS Makefiles instead of Ninja as CMake generator
5dd720a
@zurdala
Add extra packages for windows compilation
13fd7b3
@ckebschull
Merge pull request #49 from Space-Systems/chk/build-on-windows
9129b72 
Chk/build on windows
@zurdala
Merge branch 'jwy/time_showing' of https://github.com/B05208038/neptune…
4aee0c9 
… into owen-time-fix
@zurdala
Set the original times in the work/neptune.inp file
4920e43
@zurdala
Make script executable
35fd9ef
@ckebschull
Change step size from int to dp everywhere
5f54da4
@ckebschull
Update to latest libslam with date2longstring fix
4b73f52
@zurdala
Init start epoch of propagation
671075e
@zurdala
Update work data files
f64aea2
@zurdala
Merge pull request #52 from Space-Systems/owen-time-fix
e1328a9 
Time fix
@zurdala zurdala requested a review from ckebschull March 4, 2025 11:41
@zurdala zurdala self-assigned this Mar 4, 2025
@zurdala zurdala requested a review from danlueck March 27, 2025 09:55
@zurdala zurdala merged commit e202a65 into master Apr 8, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@danlueck danlueck danlueck approved these changes

@ckebschull ckebschull Awaiting requested review from ckebschull

Assignees

@zurdala zurdala

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@zurdala @danlueck @ckebschull @jwy-1997