tinygo-org/drivers
1
0
Fork 0
mirror of https://github.com/tinygo-org/drivers.git synced 2026-08-08 08:53:40 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

sdcard: support thingplus-rp2040

Browse Source 
The instances of SPI interfaces SPI0, SPI1, ... are
pointers to SPI types on rp2040 machines, rather plain
values like other machines.

This needs restructuring the sdcard API to take a pointer
to the SPI interface rather the SPI type itself.

Removed waitserial() since it needs modem control lines
not available on most boards
This commit is contained in:
Olaf Flebbe
2022-04-24 21:06:27 +02:00
committed by Ron Evans
parent ec00fdef9b
commit 9f6783670f
19 changed files with 54 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/sdcard/console/feather-m4.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
)
func init() {
spi = machine.SPI0
spi = &machine.SPI0
sckPin = machine.SPI0_SCK_PIN
sdoPin = machine.SPI0_SDO_PIN
sdiPin = machine.SPI0_SDI_PIN
examples/sdcard/console/grandcentral-m4.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
)
func init() {
spi = machine.SPI1
spi = &machine.SPI1
sckPin = machine.SDCARD_SCK_PIN
sdoPin = machine.SDCARD_SDO_PIN
sdiPin = machine.SDCARD_SDI_PIN
examples/sdcard/console/m0.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
)
func init() {
spi = machine.SPI0
spi = &machine.SPI0
sckPin = machine.SPI0_SCK_PIN
sdoPin = machine.SPI0_SDO_PIN
sdiPin = machine.SPI0_SDI_PIN
examples/sdcard/console/main.go
+1 -9
View File
@@ -9,7 +9,7 @@ import (
)
var (
spi machine.SPI
spi *machine.SPI
sckPin machine.Pin
sdoPin machine.Pin
sdiPin machine.Pin
@@ -18,7 +18,6 @@ var (
)
func main() {
waitSerial()
fmt.Printf("sdcard console\r\n")
led := ledPin
@@ -42,10 +41,3 @@ func main() {
time.Sleep(200 * time.Millisecond)
}
}
// Wait for user to open serial console
func waitSerial() {
for !machine.Serial.DTR() {
time.Sleep(100 * time.Millisecond)
}
}
examples/sdcard/console/p1am-100.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
)
func init() {
spi = machine.SDCARD_SPI
spi = &machine.SDCARD_SPI
sckPin = machine.SDCARD_SCK_PIN
sdoPin = machine.SDCARD_SDO_PIN
sdiPin = machine.SDCARD_SDI_PIN
examples/sdcard/console/pygamer.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
)
func init() {
spi = machine.SPI0
spi = &machine.SPI0
sckPin = machine.SPI0_SCK_PIN
sdoPin = machine.SPI0_SDO_PIN
sdiPin = machine.SPI0_SDI_PIN
examples/sdcard/console/pyportal.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
)
func init() {
spi = machine.SPI0
spi = &machine.SPI0
sckPin = machine.SPI0_SCK_PIN
sdoPin = machine.SPI0_SDO_PIN
sdiPin = machine.SPI0_SDI_PIN
examples/sdcard/console/thingplus-rp2040.go
+18
View File
@@ -0,0 +1,18 @@
//go:build thingplus_rp2040
// +build thingplus_rp2040
package main
import (
"machine"
)
func init() {
spi = machine.SPI1
sckPin = machine.SPI1_SCK_PIN
sdoPin = machine.SPI1_SDO_PIN
sdiPin = machine.SPI1_SDI_PIN
csPin = machine.GPIO9
ledPin = machine.LED
}
examples/sdcard/console/wioterminal.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
)
func init() {
spi = machine.SPI2
spi = &machine.SPI2
sckPin = machine.SCK2
sdoPin = machine.SDO2
sdiPin = machine.SDI2
examples/sdcard/tinyfs/feather-m4.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
)
func init() {
spi = machine.SPI0
spi = &machine.SPI0
sckPin = machine.SPI0_SCK_PIN
sdoPin = machine.SPI0_SDO_PIN
sdiPin = machine.SPI0_SDI_PIN
examples/sdcard/tinyfs/grandcentral-m4.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
)
func init() {
spi = machine.SPI1
spi = &machine.SPI1
sckPin = machine.SDCARD_SCK_PIN
sdoPin = machine.SDCARD_SDO_PIN
sdiPin = machine.SDCARD_SDI_PIN
examples/sdcard/tinyfs/m0.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
)
func init() {
spi = machine.SPI0
spi = &machine.SPI0
sckPin = machine.SPI0_SCK_PIN
sdoPin = machine.SPI0_SDO_PIN
sdiPin = machine.SPI0_SDI_PIN
examples/sdcard/tinyfs/main.go
+1 -10
View File
@@ -11,7 +11,7 @@ import (
)
var (
spi machine.SPI
spi *machine.SPI
sckPin machine.Pin
sdoPin machine.Pin
sdiPin machine.Pin
@@ -20,8 +20,6 @@ var (
)
func main() {
waitSerial()
sd := sdcard.New(spi, sckPin, sdoPin, sdiPin, csPin)
err := sd.Configure()
if err != nil {
@@ -40,10 +38,3 @@ func main() {
console.RunFor(&sd, filesystem)
}
// Wait for user to open serial console
func waitSerial() {
for !machine.Serial.DTR() {
time.Sleep(100 * time.Millisecond)
}
}
examples/sdcard/tinyfs/p1am-100.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
)
func init() {
spi = machine.SDCARD_SPI
spi = &machine.SDCARD_SPI
sckPin = machine.SDCARD_SCK_PIN
sdoPin = machine.SDCARD_SDO_PIN
sdiPin = machine.SDCARD_SDI_PIN
examples/sdcard/tinyfs/pygamer.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
)
func init() {
spi = machine.SPI0
spi = &machine.SPI0
sckPin = machine.SPI0_SCK_PIN
sdoPin = machine.SPI0_SDO_PIN
sdiPin = machine.SPI0_SDI_PIN
examples/sdcard/tinyfs/pyportal.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
)
func init() {
spi = machine.SPI0
spi = &machine.SPI0
sckPin = machine.SPI0_SCK_PIN
sdoPin = machine.SPI0_SDO_PIN
sdiPin = machine.SPI0_SDI_PIN
examples/sdcard/tinyfs/thingplus-rp2040.go
+18
View File
@@ -0,0 +1,18 @@
//go:build thingplus_rp2040
// +build thingplus_rp2040
package main
import (
"machine"
)
func init() {
spi = machine.SPI1
sckPin = machine.SPI1_SCK_PIN
sdoPin = machine.SPI1_SDO_PIN
sdiPin = machine.SPI1_SDI_PIN
csPin = machine.GPIO9
ledPin = machine.LED
}
examples/sdcard/tinyfs/wioterminal.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
)
func init() {
spi = machine.SPI2
spi = &machine.SPI2
sckPin = machine.SCK2
sdoPin = machine.SDO2
sdiPin = machine.SDI2
sdcard/sdcard.go
+2 -2
View File
@@ -28,7 +28,7 @@ var (
)
type Device struct {
bus machine.SPI
bus *machine.SPI
sck machine.Pin
sdo machine.Pin
sdi machine.Pin
@@ -41,7 +41,7 @@ type Device struct {
CSD *CSD
}
func New(b machine.SPI, sck, sdo, sdi, cs machine.Pin) Device {
func New(b *machine.SPI, sck, sdo, sdi, cs machine.Pin) Device {
return Device{
bus: b,
cs: cs,