From 0dcff35d3ac0b6c48c247e14ae5b0f9e25b8dae7 Mon Sep 17 00:00:00 2001 From: Quentin Smith Date: Tue, 5 Jan 2021 20:06:03 -0500 Subject: [PATCH] machine/p1am-100: rename MISO/MOSI This makes p1am-100 work again after commit d1c4ed6. --- Makefile | 2 ++ src/machine/board_p1am-100.go | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index ac9284bac..3e334245d 100644 --- a/Makefile +++ b/Makefile @@ -323,6 +323,8 @@ smoketest: @$(MD5SUM) test.hex $(TINYGO) build -size short -o test.hex -target=nucleo-f722ze examples/blinky1 @$(MD5SUM) test.hex + $(TINYGO) build -size short -o test.hex -target=p1am-100 examples/blinky1 + @$(MD5SUM) test.hex # test pwm $(TINYGO) build -size short -o test.hex -target=itsybitsy-m0 examples/pwm @$(MD5SUM) test.hex diff --git a/src/machine/board_p1am-100.go b/src/machine/board_p1am-100.go index 9cb3864bc..1f492fe5f 100644 --- a/src/machine/board_p1am-100.go +++ b/src/machine/board_p1am-100.go @@ -87,18 +87,18 @@ const ( // SPI pins const ( - SPI0_SCK_PIN Pin = D9 // SCK: SERCOM1/PAD[1] - SPI0_MOSI_PIN Pin = D8 // MOSI: SERCOM1/PAD[0] - SPI0_MISO_PIN Pin = D10 // MISO: SERCOM1/PAD[3] + SPI0_SCK_PIN Pin = D9 // SCK: SERCOM1/PAD[1] + SPI0_SDO_PIN Pin = D8 // SDO: SERCOM1/PAD[0] + SPI0_SDI_PIN Pin = D10 // SDI: SERCOM1/PAD[3] ) // SD card pins const ( - SDCARD_MISO_PIN Pin = PA15 // MISO: SERCOM2/PAD[3] - SDCARD_MOSI_PIN Pin = PA12 // MOSI: SERCOM2/PAD[0] - SDCARD_SCK_PIN Pin = PA13 // SCK: SERCOM2/PAD[1] - SDCARD_SS_PIN Pin = PA14 // SS: as GPIO - SDCARD_CD_PIN Pin = PA27 + SDCARD_SDI_PIN Pin = PA15 // SDI: SERCOM2/PAD[3] + SDCARD_SDO_PIN Pin = PA12 // SDO: SERCOM2/PAD[0] + SDCARD_SCK_PIN Pin = PA13 // SCK: SERCOM2/PAD[1] + SDCARD_SS_PIN Pin = PA14 // SS: as GPIO + SDCARD_CD_PIN Pin = PA27 ) // I2S pins