Fix #1483

jypelle · deadprogram · commit db27541b1a44 · 2020-11-08T09:32:13.000+01:00
diff --git a/src/machine/machine_atsamd51.go b/src/machine/machine_atsamd51.go
@@ -1331,12 +1331,13 @@ func (spi SPI) Configure(config SPIConfig) error {
 
 	// Determine the input pinout (for SDI).
 	var dataInPinout uint32
-	SDIPinMode, SDIPad, ok := findPinPadMapping(spi.SERCOM, config.SDI)
+	var SDIPinMode PinMode
 	if config.SDI != NoPin {
+		var ok bool
+		SDIPinMode, dataInPinout, ok = findPinPadMapping(spi.SERCOM, config.SDI)
 		if !ok {
 			return ErrInvalidInputPin
 		}
-		dataInPinout = SDIPad // mapped directly
 	}
 
 	// Determine the output pinout (for SDO/SCK).

Original file line number	Diff line number	Diff line change
`@@ -1331,12 +1331,13 @@ func (spi SPI) Configure(config SPIConfig) error {`
`1331`	`1331`
`1332`	`1332`	`// Determine the input pinout (for SDI).`
`1333`	`1333`	`var dataInPinout uint32`
`1334`		`- SDIPinMode, SDIPad, ok := findPinPadMapping(spi.SERCOM, config.SDI)`
	`1334`	`+ var SDIPinMode PinMode`
`1335`	`1335`	`if config.SDI != NoPin {`
	`1336`	`+ var ok bool`
	`1337`	`+ SDIPinMode, dataInPinout, ok = findPinPadMapping(spi.SERCOM, config.SDI)`
`1336`	`1338`	`if !ok {`
`1337`	`1339`	`return ErrInvalidInputPin`
`1338`	`1340`	`}`
`1339`		`- dataInPinout = SDIPad // mapped directly`
`1340`	`1341`	`}`
`1341`	`1342`
`1342`	`1343`	`// Determine the output pinout (for SDO/SCK).`