tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-17 19:23:25 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

rp2: use the correct channel mask for rp2350 ADC; hold lock during read (#4938)

Browse Source
This commit is contained in:
Elias Naur
2025-06-29 20:20:58 +02:00
committed by GitHub
parent 536deaa00a
commit c6b47fe6a0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/machine/machine_rp2_adc.go
+3 -2
View File
@@ -73,14 +73,15 @@ func (c ADCChannel) Configure(config ADCConfig) error {
func (c ADCChannel) getOnce() uint16 { func (c ADCChannel) getOnce() uint16 {
// Make it safe to sample multiple ADC channels in separate go routines. // Make it safe to sample multiple ADC channels in separate go routines.
adcLock.Lock() adcLock.Lock()
rp.ADC.CS.ReplaceBits(uint32(c), 0b111, rp.ADC_CS_AINSEL_Pos) rp.ADC.CS.ReplaceBits(uint32(c)<<rp.ADC_CS_AINSEL_Pos, rp.ADC_CS_AINSEL_Msk, 0)
rp.ADC.CS.SetBits(rp.ADC_CS_START_ONCE) rp.ADC.CS.SetBits(rp.ADC_CS_START_ONCE)
waitForReady() waitForReady()
v := rp.ADC.RESULT.Get()
adcLock.Unlock() adcLock.Unlock()
// rp2040 is a 12-bit ADC, scale raw reading to 16-bits. // rp2040 is a 12-bit ADC, scale raw reading to 16-bits.
return uint16(rp.ADC.RESULT.Get()) << 4 return uint16(v) << 4
} }
// getVoltage does a one-shot sample and returns a millivolts reading. // getVoltage does a one-shot sample and returns a millivolts reading.