Skip to content

factory-setup: Remove C implementation of RTT#1391

Merged
benma merged 1 commit intoBitBoxSwiss:masterfrom
NickeZ:nickez/remove-rtt-c-impl
Jun 4, 2025
Merged

factory-setup: Remove C implementation of RTT#1391
benma merged 1 commit intoBitBoxSwiss:masterfrom
NickeZ:nickez/remove-rtt-c-impl

Conversation

@NickeZ
Copy link
Copy Markdown
Collaborator

@NickeZ NickeZ commented Apr 1, 2025

The debug builds use the rust implementation of RTT. The two implementations cannot coexist. To be able to build debug builds of the factory-setup the C imeplementation is therefore removed.

The factory-setup image is changed to use the second channel for API calls, since the first is used for debug console.

@NickeZ NickeZ requested a review from benma April 1, 2025 09:35
@NickeZ NickeZ force-pushed the nickez/remove-rtt-c-impl branch from bf2bac6 to f7d22dc Compare April 2, 2025 08:29
Comment thread src/factorysetup.c Outdated
@benma
Copy link
Copy Markdown
Collaborator

benma commented Apr 2, 2025

target_link_libraries(factory-setup.elf PRIVATE rtt) in CMakeLists needs to be removed I think.

@NickeZ NickeZ force-pushed the nickez/remove-rtt-c-impl branch from f7d22dc to e0c5d2f Compare April 2, 2025 11:50
@NickeZ
Copy link
Copy Markdown
Collaborator Author

NickeZ commented Apr 2, 2025

target_link_libraries(factory-setup.elf PRIVATE rtt) in CMakeLists needs to be removed I think.

Yeah, fixed

@NickeZ NickeZ force-pushed the nickez/remove-rtt-c-impl branch 2 times, most recently from 4440f12 to 6daf875 Compare April 9, 2025 09:18
@NickeZ
Copy link
Copy Markdown
Collaborator Author

NickeZ commented Apr 9, 2025

rebased

@NickeZ NickeZ force-pushed the nickez/remove-rtt-c-impl branch 4 times, most recently from 87d2ca9 to da9046d Compare April 22, 2025 16:57
@NickeZ
Copy link
Copy Markdown
Collaborator Author

NickeZ commented Apr 22, 2025

rebased and fixed an issue with non-debug builds

@NickeZ NickeZ force-pushed the nickez/remove-rtt-c-impl branch 2 times, most recently from a6278e8 to 1123663 Compare April 22, 2025 18:57
@NickeZ NickeZ force-pushed the nickez/remove-rtt-c-impl branch 2 times, most recently from 75c3adc to 01dcd17 Compare June 2, 2025 08:08
@NickeZ
Copy link
Copy Markdown
Collaborator Author

NickeZ commented Jun 2, 2025

@benma found the bug in non-debug builds, fixed, rebased and pushed, ready for testing again

@NickeZ NickeZ requested a review from benma June 2, 2025 08:26
Copy link
Copy Markdown
Collaborator

@benma benma left a comment

Choose a reason for hiding this comment

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

tACK 🎉

The debug builds use the rust implementation of RTT. The two
implementations cannot coexist. To be able to build debug builds of the
factory-setup the C imeplementation is therefore removed.

The factory-setup image is changed to use the second channel for API
calls, since the first is used for debug console.
@benma benma force-pushed the nickez/remove-rtt-c-impl branch from 01dcd17 to dff5254 Compare June 4, 2025 10:17
@benma
Copy link
Copy Markdown
Collaborator

benma commented Jun 4, 2025

I rebased this resolving two small conflicts.

@benma benma merged commit 5a87133 into BitBoxSwiss:master Jun 4, 2025
3 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