Skip to content

Commit d1c4ed6

Browse files
deadprogramaykevl
authored andcommitted
all: changeover to eliminate all direct use of master/slave terminology
Signed-off-by: deadprogram <[email protected]>
1 parent fdaddf6 commit d1c4ed6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+577
-577
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Microcontrollers have lots of peripherals (I2C, SPI, ADC, etc.) and many don't h
3232

3333
## How to use our Github repository
3434

35-
The `master` branch of this repo will always have the latest released version of TinyGo. All of the active development work for the next release will take place in the `dev` branch. TinyGo will use semantic versioning and will create a tag/release for each release.
35+
The `release` branch of this repo will always have the latest released version of TinyGo. All of the active development work for the next release will take place in the `dev` branch. TinyGo will use semantic versioning and will create a tag/release for each release.
3636

3737
Here is how to contribute back some code or documentation:
3838

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Avoid lengthy LLVM rebuilds on each newly pushed branch. Pull requests will
22
# be built anyway.
33
trigger:
4-
- master
4+
- release
55
- dev
66

77
jobs:

src/machine/board_arduino_nano33.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ const (
6666

6767
// SPI pins
6868
const (
69-
SPI0_SCK_PIN Pin = D13 // SCK: SERCOM1/PAD[1]
70-
SPI0_MOSI_PIN Pin = D11 // MOSI: SERCOM1/PAD[0]
71-
SPI0_MISO_PIN Pin = D12 // MISO: SERCOM1/PAD[3]
69+
SPI0_SCK_PIN Pin = D13 // SCK: SERCOM1/PAD[1]
70+
SPI0_SDO_PIN Pin = D11 // SDO: SERCOM1/PAD[0]
71+
SPI0_SDI_PIN Pin = D12 // SDI: SERCOM1/PAD[3]
7272
)
7373

7474
// NINA-W102 Pins
7575
const (
76-
NINA_MOSI Pin = PA12
77-
NINA_MISO Pin = PA13
76+
NINA_SDO Pin = PA12
77+
NINA_SDI Pin = PA13
7878
NINA_CS Pin = PA14
7979
NINA_SCK Pin = PA15
8080
NINA_GPIO0 Pin = PA27

src/machine/board_bluepill.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ func init() {
7474

7575
// SPI pins
7676
const (
77-
SPI0_SCK_PIN = PA5
78-
SPI0_MOSI_PIN = PA7
79-
SPI0_MISO_PIN = PA6
77+
SPI0_SCK_PIN = PA5
78+
SPI0_SDO_PIN = PA7
79+
SPI0_SDI_PIN = PA6
8080
)
8181

8282
// I2C pins

src/machine/board_circuitplay_bluefruit.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ const (
7272

7373
// SPI pins (internal flash)
7474
const (
75-
SPI0_SCK_PIN = P0_19 // SCK
76-
SPI0_MOSI_PIN = P0_21 // MOSI
77-
SPI0_MISO_PIN = P0_23 // MISO
75+
SPI0_SCK_PIN = P0_19 // SCK
76+
SPI0_SDO_PIN = P0_21 // SDO
77+
SPI0_SDI_PIN = P0_23 // SDI
7878
)
7979

8080
// USB CDC identifiers

src/machine/board_circuitplay_express.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ const (
7777

7878
// SPI pins (internal flash)
7979
const (
80-
SPI0_SCK_PIN = PA21 // SCK: SERCOM3/PAD[3]
81-
SPI0_MOSI_PIN = PA20 // MOSI: SERCOM3/PAD[2]
82-
SPI0_MISO_PIN = PA16 // MISO: SERCOM3/PAD[0]
80+
SPI0_SCK_PIN = PA21 // SCK: SERCOM3/PAD[3]
81+
SPI0_SDO_PIN = PA20 // SDO: SERCOM3/PAD[2]
82+
SPI0_SDI_PIN = PA16 // SDI: SERCOM3/PAD[0]
8383
)
8484

8585
// I2S pins

src/machine/board_clue_alpha.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ const (
7878

7979
// 240x240 ST7789 display is connected to these pins (use RowOffset = 80)
8080
TFT_SCK = D29
81-
TFT_MOSI = D30
81+
TFT_SDO = D30
8282
TFT_CS = D31
8383
TFT_DC = D32
8484
TFT_RESET = D33
@@ -116,9 +116,9 @@ const (
116116

117117
// SPI pins
118118
const (
119-
SPI0_SCK_PIN = D13 // SCK
120-
SPI0_MOSI_PIN = D15 // MOSI
121-
SPI0_MISO_PIN = D14 // MISO
119+
SPI0_SCK_PIN = D13 // SCK
120+
SPI0_SDO_PIN = D15 // SDO
121+
SPI0_SDI_PIN = D14 // SDI
122122
)
123123

124124
// USB CDC identifiers

src/machine/board_feather-m0.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ var (
8383

8484
// SPI pins
8585
const (
86-
SPI0_SCK_PIN = PB11 // SCK: SERCOM4/PAD[3]
87-
SPI0_MOSI_PIN = PB10 // MOSI: SERCOM4/PAD[2]
88-
SPI0_MISO_PIN = PA12 // MISO: SERCOM4/PAD[0]
86+
SPI0_SCK_PIN = PB11 // SCK: SERCOM4/PAD[3]
87+
SPI0_SDO_PIN = PB10 // SDO: SERCOM4/PAD[2]
88+
SPI0_SDI_PIN = PA12 // SDI: SERCOM4/PAD[0]
8989
)
9090

9191
// SPI on the Feather M0.

src/machine/board_feather-m4.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ const (
6363

6464
// SPI pins
6565
const (
66-
SPI0_SCK_PIN = D25 // SCK: SERCOM1/PAD[1]
67-
SPI0_MOSI_PIN = D24 // MOSI: SERCOM1/PAD[3]
68-
SPI0_MISO_PIN = D23 // MISO: SERCOM1/PAD[2]
66+
SPI0_SCK_PIN = D25 // SCK: SERCOM1/PAD[1]
67+
SPI0_SDO_PIN = D24 // SDO: SERCOM1/PAD[3]
68+
SPI0_SDI_PIN = D23 // SDI: SERCOM1/PAD[2]
6969
)
7070

7171
// USB CDC identifiers

src/machine/board_feather-nrf52840.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ const (
8888

8989
// SPI pins
9090
const (
91-
SPI0_SCK_PIN = D26 // SCK
92-
SPI0_MOSI_PIN = D25 // MOSI
93-
SPI0_MISO_PIN = D24 // MISO
91+
SPI0_SCK_PIN = D26 // SCK
92+
SPI0_SDO_PIN = D25 // SDO
93+
SPI0_SDI_PIN = D24 // SDI
9494
)
9595

9696
// USB CDC identifiers

0 commit comments

Comments
 (0)