-
Notifications
You must be signed in to change notification settings - Fork 1
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
Align model with template #1
Conversation
Signed-off-by: ClemensLinnhoff <[email protected]>
Signed-off-by: ClemensLinnhoff <[email protected]>
Signed-off-by: ClemensLinnhoff <[email protected]>
Signed-off-by: ClemensLinnhoff <[email protected]>
Signed-off-by: ClemensLinnhoff <[email protected]>
Signed-off-by: ClemensLinnhoff <[email protected]>
Signed-off-by: ClemensLinnhoff <[email protected]>
…hlich die doCalc Funktion und alle Funktionen, die daraus aufgerufen werden. Dabei am besten den Code direkt auch etwas aufräumen. Da ist recht viel auskommentiert und die Funktionen sind teilweise etwas lang. • Dateinamen anpassen (Aktuell HelloWorldSensor.cpp und HelloWorldSensor.h) • Die modelDescription.in.xml rüberkopieren und ggf. anpassen • Die CMakeLists.txt ggf. anpassen (Wenn keine neue Code-Dateien von euch dazukommen müsste das eigentlich nur der Modellname und die Dateinamen sein. Alle Libraries (FMI, OSI etc. sind schon richtig eingebunden.) • Die Teile aus der alten Readme in die neue Readme Struktur kopieren. • Die zur Readme gehörigen Bilder in den doc Ordner ziehen und in der Readme richitg verlinken (Das Video könntet ihr dabei in ein gif umwandeln und dann direkt in die Readme integrieren. • Den Namen der Modell FMU in der build.yml anpassen, wie ganz oben im Readme Template beschrieben. Dann sollte die Testpipeline auch schon durchlaufen können.
Signed-off-by: ClemensLinnhoff <[email protected]>
Done !
Mit freundlichen Grüßen / Best regards
Dr. Marzena Franek
(CR/AEL2)
Robert Bosch GmbH | Renningen | 70465 Stuttgart | GERMANY | www.bosch.com<http://www.bosch.com/>
Tel. +49 711 811-17691 | Mobil +49 1522 9403572 | Telefax +49 711 811 | ***@***.******@***.***>
Sitz: Stuttgart, Registergericht: Amtsgericht Stuttgart, HRB 14000;
Aufsichtsratsvorsitzender: Prof. Dr. Stefan Asenkerschbaumer; Geschäftsführung: Dr. Stefan Hartung,
Dr. Christian Fischer, Dr. Markus Forschner, Stefan Grosch, Dr. Markus Heyn, Dr. Tanja Rückert
Von: Clemens Linnhoff ***@***.***>
Gesendet: Freitag, 14. April 2023 13:38
An: openMSL/sl-1-4-object-based-camera-object-model ***@***.***>
Cc: Franek Marzena (CR/AEL2) ***@***.***>; Mention ***@***.***>
Betreff: Re: [openMSL/sl-1-4-object-based-camera-object-model] Align model with template (PR #1)
Corresponding to your email @MarzenaFranek<https://github.com/MarzenaFranek>, I fixed the integer conversion remark from clang-tidy. I think this concludes working on the clang-tidy remarks. The remaining ones are fine by me.
While I was fixing that, I found several unused parameters in the Lamda functions, e.g. &mpos_x, &mpos_y, &mpos_z, &origin_rot_x, &origin_rot_y, &origin_rot_z, &mpos_rot_x, &mpos_rot_y, &mpos_rot_z, and actual_range in the for_each loop in line 1087 and similarly in line 1307, line 1448 and line 1607.
Could you fix those? Then I think the C++ code would be finished.
I also removed the image from the readme, since you added the video as a gif.
While I was doing that, I noticed the following section in the modeling approach:
The actual logic of the model is packed in a so called strategy.
The apply function of the strategy is called by the do_calc function of the OSMPFramework.
The strategy itself is structured into four modules as shown in the image below.
I think this is a copy-paste-error, since strategies are only used in the FZD OSMP Framework, which is not used in this model. I could also not find the modules described in the block diagram, such as clustering, in the code. Also some of the interfaces seem odd. To my knowledge there is no "osi3::VideoDetection" in OSI.
Could you go over the readme and check these sections?
—
Reply to this email directly, view it on GitHub<#1 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/A4ROATHG6DNRBTDFOMBSJWTXBEZI5ANCNFSM6AAAAAAWGKA4N4>.
You are receiving this because you were mentioned.Message ID: ***@***.***>
|
Signed-off-by: ClemensLinnhoff <[email protected]>
Signed-off-by: ClemensLinnhoff <[email protected]>
Signed-off-by: ClemensLinnhoff <[email protected]>
Signed-off-by: ClemensLinnhoff <[email protected]>
Looks very good! I tried to fix the last clang-format remarks, but in my opinion the formatting is fine. The DCO sign-off check fails, as not all commit are signed off. But since your last ones are, and we are doing a squash merge anyways, I am fine with ignoring it. Therefore, I give my approval to the PR. |
workflow_call: | ||
|
||
env: | ||
FMU_FILE_NAME: OSMPCameraSensor.fmu #TODO: Adjust to file name of your FMU |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ClemensLinnhoff this is outdated now, as we use the repo name as FMU name, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, but let's merge this PR first, then adapt to naming the FMU according to the repo. This requirement did not exist, when @MarzenaFranek startet, so I would like to keep it separate.
if(EXISTS "${CMAKE_SOURCE_DIR}/../.git") | ||
set(default_build_type "Debug") | ||
endif() | ||
project(OSMPCameraSensor) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ClemensLinnhoff would this also need to be adapted to the repo name?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not necessarily, but as above, I would adapt this in a separate PR.
For the sake of showing the use of the MPL 2.0 OSMP sensor packaging in combination with a model implementation and looking at the weak copy left of MPL, shouldn't we split the function into a different file? In this case the function will also be MPL but we had the diuscussion about how this could be used in combination with other licenses? @ClemensLinnhoff |
Yes, I think this would generally be a good idea! Would it be possible for you @MarzenaFranek to do this? So put the model contents (pretty much everything in the doCalc function) into a separate file? Then we would have a clean separation between model and OSMP. |
I can try this in KW19, currently I am full with other tasks,.
Mit freundlichen Grüßen / Best regards
Dr. Marzena Franek
(CR/AEL2)
Robert Bosch GmbH | Renningen | 70465 Stuttgart | GERMANY | www.bosch.com<http://www.bosch.com/>
Tel. +49 711 811-17691 | Mobil +49 1522 9403572 | Telefax +49 711 811 | ***@***.******@***.***>
Sitz: Stuttgart, Registergericht: Amtsgericht Stuttgart, HRB 14000;
Aufsichtsratsvorsitzender: Prof. Dr. Stefan Asenkerschbaumer; Geschäftsführung: Dr. Stefan Hartung,
Dr. Christian Fischer, Dr. Markus Forschner, Stefan Grosch, Dr. Markus Heyn, Dr. Tanja Rückert
Von: Clemens Linnhoff ***@***.***>
Gesendet: Montag, 17. April 2023 17:43
An: openMSL/sl-1-4-object-based-camera-object-model ***@***.***>
Cc: Franek Marzena (CR/AEL2) ***@***.***>; Mention ***@***.***>
Betreff: Re: [openMSL/sl-1-4-object-based-camera-object-model] Align model with template (PR #1)
For the sake of showing the use of the MPL 2.0 OSMP sensor packaging in combination with a model implementation and looking at the weak copy left of MPL, shouldn't we split the function into a different file? In this case the function will also be MPL but we had the diuscussion about how this could be used in combination with other licenses? @ClemensLinnhoff<https://github.com/ClemensLinnhoff>
Yes, I think this would generally be a good idea! Would it be possible for you @MarzenaFranek<https://github.com/MarzenaFranek> to do this? So put the model contents (pretty much everything in the doCalc function) into a separate file? Then we would have a clean separation between model and OSMP.
—
Reply to this email directly, view it on GitHub<#1 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/A4ROATFUHKDNIOS6ERMW3MTXBVQHZANCNFSM6AAAAAAWGKA4N4>.
You are receiving this because you were mentioned.Message ID: ***@***.***>
|
I just added the separation to the sl-1-0-sensor-model-repository-template. Now there is an OSMP.cpp file with the packaging and a MySensorModel.cpp file with the actual model in the src directory. |
…in combination with a model implementation and looking at the weak copy left of MPL, we split the function into a different file
Signed-off-by: Marzena Franek <[email protected]>
Signed-off-by: Marzena Franek <[email protected]>
Signed-off-by: Marzena Franek <[email protected]>
Signed-off-by: ClemensLinnhoff <[email protected]>
Signed-off-by: ClemensLinnhoff <[email protected]>
Signed-off-by: ClemensLinnhoff <[email protected]>
Signed-off-by: ClemensLinnhoff <[email protected]>
Signed-off-by: ClemensLinnhoff <[email protected]>
Signed-off-by: ClemensLinnhoff <[email protected]>
Signed-off-by: Marzena Franek <[email protected]>
Signed-off-by: ClemensLinnhoff <[email protected]>
Signed-off-by: ClemensLinnhoff <[email protected]>
Cpp-Linter Report
|
Data Cluster Maintainer Decision: Merge as is, update CI pipeline according to template in new PR. |
Add a description
This PR aligns the camera model with the template inkl. documentation structure and CI test pipeline.
Take this checklist as orientation for yourself, if this PR is ready for Maintainer Review