Skip to content
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.

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

Develop to main #50

Merged
merged 12 commits into from
Feb 3, 2025
Merged

Develop to main #50

merged 12 commits into from
Feb 3, 2025

Conversation

TimoHinsemann
Copy link
Collaborator

Transferring the newest changes, that have been discussed and tested in the develop-branch, into the main-branch.

TimoHinsemann and others added 8 commits December 4, 2023 16:54
…ode-in-order-to-find-the-node-via-search-bar-1

41 new.including of tags per node in order to find the node via search bar 1
Signed-off-by: ClemensLinnhoff <[email protected]>
* Added new src to branch

Signed-off-by: TimoHinsemann <[email protected]>

* Adding FMCW-Nodes to develop-branch as seperate tree-structure (overlapping nodes not regarded yet, redundancy of nodes possible for now). Also tags are added for each FMCW-Node.

Signed-off-by: TimoHinsemann <[email protected]>

* Fusion of FMCW-branch and develop-branch.

* Unnecessary line breaks removed.

* IDs changed to be consecutive and empty lines removed.

* Source directory change.

---------

Signed-off-by: TimoHinsemann <[email protected]>
Co-authored-by: TimoHinsemann <[email protected]>
@TimoHinsemann TimoHinsemann requested review from ClemensLinnhoff and ChristophPopp and removed request for ClemensLinnhoff and ChristophPopp January 30, 2025 11:10
@ClemensLinnhoff ClemensLinnhoff self-requested a review February 3, 2025 08:22
Copy link
Member

@ClemensLinnhoff ClemensLinnhoff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TimoHinsemann Please resolve merge conflicts.

@ClemensLinnhoff ClemensLinnhoff self-requested a review February 3, 2025 10:23
@ClemensLinnhoff ClemensLinnhoff merged commit 280c942 into main Feb 3, 2025
2 checks passed
@ClemensLinnhoff ClemensLinnhoff deleted the develop branch February 3, 2025 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants