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

cpu/sam0: Remove deprecated muxpos #20525

Merged
merged 1 commit into from
May 7, 2024

Conversation

Teufelchen1
Copy link
Contributor

@Teufelchen1 Teufelchen1 commented Apr 2, 2024

Contribution description

Hello 🪱

This removes the long 5843ff4 deprecated adc_conf_chan_t::muxpos.

Testing procedure

CI should be enough.

links

deprecated in #18688

@github-actions github-actions bot added Platform: ARM Platform: This PR/issue effects ARM-based platforms Area: cpu Area: CPU/MCU ports labels Apr 2, 2024
@Teufelchen1 Teufelchen1 force-pushed the deprecate/muxpos branch 2 times, most recently from f2e4c3b to f0528df Compare April 2, 2024 11:51
@Teufelchen1 Teufelchen1 added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Apr 2, 2024
@miri64
Copy link
Member

miri64 commented Apr 2, 2024

There are still some references to muxpos (mostly comments, but still should be checked) throughout the sam0 codebase:

$ git grep -c "\<muxpos\>" boards/ cpu/
boards/adafruit-grand-central-m4-express/include/periph_conf.h:1
boards/adafruit-itsybitsy-m4/include/periph_conf.h:1
boards/adafruit-pybadge/include/periph_conf.h:1
boards/arduino-nano-33-iot/include/periph_conf.h:1
boards/bastwan/include/periph_conf.h:1
boards/common/arduino-mkr/include/periph_conf_common.h:1
boards/common/arduino-zero/include/periph_conf.h:1
boards/common/saml1x/include/periph_conf.h:1
boards/feather-m0/include/periph_conf.h:1
boards/hamilton/include/periph_conf.h:1
boards/samd10-xmini/include/periph_conf.h:1
boards/samd20-xpro/include/periph_conf.h:1
boards/samd21-xpro/include/periph_conf.h:1
boards/same54-xpro/include/periph_conf.h:1
boards/saml21-xpro/include/periph_conf.h:1
boards/samr21-xpro/include/periph_conf.h:1
boards/samr30-xpro/include/periph_conf.h:1
boards/samr34-xpro/include/periph_conf.h:1
boards/seeeduino_xiao/include/periph_conf.h:1
boards/sensebox_samd21/include/periph_conf.h:1
boards/serpente/include/periph_conf.h:1
boards/sodaq-autonomo/include/periph_conf.h:1
boards/sodaq-explorer/include/periph_conf.h:1
boards/sodaq-one/include/periph_conf.h:1
boards/sodaq-sara-aff/include/periph_conf.h:1
boards/sodaq-sara-sff/include/periph_conf.h:1
boards/yarm/include/periph_conf.h:1
cpu/sam0_common/include/periph_cpu_common.h:1
cpu/sam0_common/periph/adc.c:5

(intentionally masking to cpu/ and boards/ since there is also an occurrence in the release notes, which should obviously not be removed)

@riot-ci
Copy link

riot-ci commented Apr 2, 2024

Murdock results

✔️ PASSED

1cb2d7c cpu/sam0: Remove deprecated muxpos

Success Failures Total Runtime
10027 0 10027 12m:15s

Artifacts

@Teufelchen1
Copy link
Contributor Author

Teufelchen1 commented Apr 3, 2024

@miri64 I stepped through your comments. I do not think they should be changed. The comments are not misleading. What I could do is to rename the defines and then adjust the comments:

#define ADC_INPUTCTRL_MUXPOS_PA02 ADC_INPUTCTRL_MUXPOS_AIN0 /**< Alias for AIN0 */

But again, I do not think that would be a great change...

@dylad
Copy link
Member

dylad commented Apr 4, 2024

following @miri64 's comment. There is a bunch of /* port, pin, muxpos */ that could be cleanup in a lot of periph_conf.h files as they are not relevant anymore. Now we just need the inputctrl to configure the right channel on the right pin.
However, this can be done in a following PR.

@Teufelchen1 Teufelchen1 added this pull request to the merge queue May 7, 2024
Merged via the queue into RIOT-OS:master with commit e2541c8 May 7, 2024
29 checks passed
@mguetschow mguetschow added this to the Release 2024.07 milestone Jul 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: cpu Area: CPU/MCU ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Platform: ARM Platform: This PR/issue effects ARM-based platforms
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants