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

Adjust for r e c #212

Merged
merged 11 commits into from
Jun 24, 2024
Merged

Conversation

sjoerdsimons
Copy link
Contributor

@sjoerdsimons sjoerdsimons commented Jun 16, 2024

Hi! Thank you for helping out with SSD1306 development! Please:

  • Check that you've added documentation to any new methods
  • Rebase from master if you're not already up to date
  • Add or modify an example if there are changes to the public API
  • Add a CHANGELOG.md entry in the Unreleased section under the appropriate heading (Added, Fixed, Changed, etc)
  • Run rustfmt on the project with cargo fmt --all - CI will not pass without this step
  • Check that your branch is up to date with master and that CI is passing once the PR is opened

PR description

Various updates now it's hosted on r-e-c:

  • Switch from circleci to github actions
  • Adjust links to point at r-e-c repository
  • Fix issues point out by newer rustdoc and rustc

Rename config to config.toml as expect by modern cargo and use probe-rs
rather then the deprecated probe-run tool
The STM32F103C8T6 only has 64K of flash; Unsure how 128K could work
before, potentially probe-run didn't check while probe-rs does
rustdoc doesn't like unneeded explicit doc link targets, so drop them
Now that the crate has moved to rust-embedded-community drop the funding
information for James
The circleci runs for this crate seem inaccessible and github actions is
better integrated anyway.
@sjoerdsimons
Copy link
Contributor Author

Successful github actions can be found in my repo :)

Copy link
Member

@eldruin eldruin left a comment

Choose a reason for hiding this comment

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

Nice, thank you!
Could you also update the build badge at the top of the readme?

@@ -1,6 +1,6 @@
/* Linker script for the STM32F103C8T6 */
MEMORY
{
FLASH : ORIGIN = 0x08000000, LENGTH = 128K
FLASH : ORIGIN = 0x08000000, LENGTH = 64K
Copy link
Member

Choose a reason for hiding this comment

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

Is there a reason to change this?

Copy link
Contributor Author

@sjoerdsimons sjoerdsimons Jun 22, 2024

Choose a reason for hiding this comment

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

probe-rs will refuse to flash the chip as the the memory doesn't match the chip memory; as noted in the commit message no idea how this worked previously :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fwiw independantly ran into a note that there are some variants of the stm32f103 on some blue pills that do have 128K ; so i wonder if @jamwaffles has one of those ;) .. the STM32F103C8T6 officially only has 64K though

Copy link
Collaborator

Choose a reason for hiding this comment

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

That's exactly it! I don't think I own a single non-bootleg F103 😁

FWIW this setup is way out of date. I believe these days one doesn't need to provide their own memory.x, so this file could probably be deleted.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

not with stm32f1xx-hal afaik; i'm prepping a follow-up PR that moves the examples to embassy for the pac (as that implements hal 1.x) together with the patches from #207 so that that can be merged hopefully.. That will also drop memory.x

release.toml Outdated Show resolved Hide resolved
sjoerdsimons and others added 2 commits June 22, 2024 14:47
Co-authored-by: Diego Barrios Romero <eldruin@gmail.com>
Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>
Copy link
Member

@eldruin eldruin left a comment

Choose a reason for hiding this comment

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

Looks good to me, thank you!

@eldruin eldruin merged commit 8d00c5e into rust-embedded-community:master Jun 24, 2024
1 check failed
@sjoerdsimons
Copy link
Contributor Author

@eldruin thanks for merging! Looks like someone needs to disable the circleci app such that github declares CI as succeeding (currently it fails because there is no circleci config...)

@sjoerdsimons sjoerdsimons deleted the adjust-for-r-e-c branch July 3, 2024 19:16
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