Develop to main #50
Merged
Develop to main #50
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…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 <clemens.linnhoff@persival.de>
* Added new src to branch Signed-off-by: TimoHinsemann <timo.hinsemann@persival.de> * 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 <timo.hinsemann@persival.de> * 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 <timo.hinsemann@persival.de> Co-authored-by: TimoHinsemann <timo.hinsemann@persival.de>
TimoHinsemann
requested review from
ChristophPopp and
ClemensLinnhoff
and removed request for
ChristophPopp and
ClemensLinnhoff
ChristophPopp
approved these changes
Jan 31, 2025
ClemensLinnhoff
approved these changes
Feb 3, 2025
ClemensLinnhoff
requested changes
Feb 3, 2025
Member
ClemensLinnhoff
left a comment
ClemensLinnhoff
left a comment
There was a problem hiding this comment.
@TimoHinsemann Please resolve merge conflicts.
ClemensLinnhoff
approved these changes
Feb 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Transferring the newest changes, that have been discussed and tested in the develop-branch, into the main-branch.