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

[Firmware][STM32CubeIDE] remove conflicted flie main.c from the project configuration file #657

Merged
merged 1 commit into from
Jan 16, 2025

Conversation

tongtybj
Copy link
Collaborator

What is this

Remove the conflicted main.c from the project config file .project

Detail

The file main.c causes confliction, since the build rule is based on main.cpp .
In the past, STM32CubeIDE generated build error if there were both main.cpp and main.c, but becomes warning message recently.
However, it is still better to remove it from the config file.

@tongtybj
Copy link
Collaborator Author

@sugihara-16

Please check this PR which is a patch for #630 .

@tongtybj tongtybj requested a review from sugihara-16 January 16, 2025 09:20
Copy link
Collaborator

@sugihara-16 sugihara-16 left a comment

Choose a reason for hiding this comment

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

LGTM!
I confirmed that these project files work well in STM32CubeIDE1.8.0.

@tongtybj tongtybj merged commit 5a1c14e into jsk-ros-pkg:master Jan 16, 2025
7 checks passed
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.

2 participants