Skip to content
This repository was archived by the owner on Aug 9, 2022. It is now read-only.

Overhaul of GPIO module & adjusted Serial module accordingly. #36

Merged
merged 35 commits into from
Jun 24, 2020
Merged

Overhaul of GPIO module & adjusted Serial module accordingly. #36

merged 35 commits into from
Jun 24, 2020

Conversation

arjanmels
Copy link
Contributor

@arjanmels arjanmels commented Jun 14, 2020 •
edited
Loading

  • Renamed GPIO and RTC_IO register field to strip common prefix.
  • Fixed bugs in GPIO
  • Simplified GPIO code

TODO:

  • Add support for routing
  • Add support for additional configuration (e.g. pullup/down, drive strength, etc.)

This depends on esp-rs/esp32#34 and it builds on #34.

Addresses issue #35 and #19

@arjanmels arjanmels mentioned this pull request Jun 14, 2020
Closed
6 tasks
@arjanmels
Copy link
Contributor Author

Changed this to WIP so I can include more changes in one go.

@arjanmels arjanmels changed the title Renamed GPIO and RTC_IO register field to strip common prefix. Overhaul of GPIO module & adjusted Serial module accordingly. Jun 22, 2020
arjanmels added 27 commits June 22, 2020 16:55
@arjanmels
Ignore accidental core files
9658b79
@arjanmels
Corrected multithreaded safety for park/unpark/start
52d8af6
@arjanmels
Added retrieval of rtc_tick_count
cd43221 
Changed interrupt free/mtulithreaded to be handled in ClockControlConfig
@arjanmels
Moved config to seperate file
306556a
@arjanmels
Updated examples to latest changes in xtensa_lx6
9f2fcd8
@arjanmels
Updated prelude & timer example
12630be
@arjanmels
Changed all to CriticalSectionSpinLockMutex
26284c3
@arjanmels
Corrected multithreaded safety for park/unpark/start
929d617
@arjanmels
Added retrieval of rtc_tick_count
0d820b5 
Changed interrupt free/mtulithreaded to be handled in ClockControlConfig
@arjanmels
Renamed rtc_io_ fields
5c2e3f2
@arjanmels
Renamed GPIO fields
5c0031b
@arjanmels
Simplified GPIO macros
abca882
@arjanmels
Corrected setting open drain mode
cb96589 
Put shared code for outputs in common function
@arjanmels
Move common code for input to common function
041e7c7
@arjanmels
Added soem configuration functions
d6b2174
@arjanmels
Added iomux enums
7de0643
@arjanmels
Simplified gpio by using register arrays
612cfe8
@arjanmels
Generalized traits
b687d41 
Implemented extra configuration methods
@arjanmels
Improve dgpio functionality
4b119a7
@arjanmels
Corrected enable_wt1c to w1ts
c06cb5e
@arjanmels
Automatic use of Alternate Function
8c5292e
@arjanmels
Adjusted serial example to new gpio
e3151cf
@arjanmels
Remove usage of macro
20d5144
@arjanmels
Fixed enable/rset for all 3 uart
727fc78
@arjanmels
Added pin initialization & refactor rx/tx
0ec9e00
@arjanmels
Update example
460fc7e
@arjanmels
Minor cleanup
c198a60
@arjanmels arjanmels force-pushed the feature-gpio-rename branch from 6adcf06 to d014035 Compare June 22, 2020 15:24
@arjanmels arjanmels mentioned this pull request Jun 22, 2020
Closed
@arjanmels
Copy link
Contributor Author

arjanmels commented Jun 22, 2020 •
edited
Loading

@MabezDev and @Chocol4te I think this is in pretty good shape now. Your review and feedback is most welcome. (Todo's are intterrupt handling and perhaps some more functionality on the RTC_MUX.)

(I also updated the i2c to teh latest version: https://github.com/arjanmels/esp32-hal/tree/feature-i2c-am

fmckeogh
fmckeogh suggested changes Jun 23, 2020
View reviewed changes
Copy link
Contributor

@fmckeogh fmckeogh left a comment

Choose a reason for hiding this comment

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

Just some really small comment/formatting changes suggested, looks really solid and can't think of anything to change in the implementation!

@arjanmels
Copy link
Contributor Author

Just some really small comment/formatting changes suggested, looks really solid and can't think of anything to change in the implementation!

Thanks, always nice to put the dots on the i's and cross the t's. :-)

@arjanmels
Copy link
Contributor Author

In principle, I think this is ready for merge: esp-rs/esp32#34 has been merged as well as #34. Also the problems @Chocol4te was having are solved (#26 (comment)).

However, I could still add interrupt support and more extensive support for the RTC IO mux. I will be working on this over the next day/weekend; I can merge it in this PR or can make a new one.

@fmckeogh
Copy link
Contributor

@arjanmels imho it might be slightly easier to merge this and have separate PRs for the additional functionality, but I’m also happy to just rebase against this branch when I finish up the I2C work :)

MabezDev
MabezDev suggested changes Jun 24, 2020
View reviewed changes
Copy link
Member

@MabezDev MabezDev left a comment

Choose a reason for hiding this comment

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

Great work @arjanmels ! I think it's best to merge this as is, as if the diffs get much bigger I'll need 1 hour to read through ;), but in all seriousness this is a well needed change! I also believe this approach is novel among Rust HAL designs so it will be interesting to see how it plays out!

@MabezDev MabezDev merged commit 1d57619 into esp-rs:master Jun 24, 2020
@MabezDev MabezDev mentioned this pull request Jun 24, 2020
Closed
@arjanmels arjanmels mentioned this pull request Jun 24, 2020
Open
18 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@MabezDev MabezDev MabezDev requested changes

@fmckeogh fmckeogh fmckeogh requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@arjanmels @fmckeogh @MabezDev