Skip to content

Commit cd39620

Browse files
committed
doc: change to main branch
Signed-off-by: Frederic Pillon <[email protected]>
1 parent fa3ff24 commit cd39620

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

Diff for: CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ When different people are working on the Arduino project simultaneously, pull re
9494

9595
Most often pull requests become stale when merge conflicts occur. This happens when two pull requests both modify similar lines in the same file and one gets merged, the unmerged request will now have a merge conflict and needs updating.
9696

97-
When your pull request is stale, you will need to rebase your branch on the current master branch before you can merge it without conflicts.
97+
When your pull request is stale, you will need to rebase your branch on the current main branch before you can merge it without conflicts.
9898

9999
More information about rebasing can be found at the repository of [edX](https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request).
100100

Diff for: README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Arduino core support for STM32 based boards
22
[![forums](https://img.shields.io/badge/join-the%20forums-blue.svg)](https://www.stm32duino.com/)
33
[![wiki](https://img.shields.io/badge/browse-the%20wiki-orange.svg)](https://github.com/stm32duino/wiki/wiki)
4-
[![STM32 Core Continuous Integration](https://github.com/stm32duino/Arduino_Core_STM32/workflows/STM32%20Core%20Continuous%20Integration/badge.svg?branch=master)](https://github.com/stm32duino/Arduino_Core_STM32/actions)
4+
[![STM32 Core Continuous Integration](https://github.com/stm32duino/Arduino_Core_STM32/workflows/STM32%20Core%20Continuous%20Integration/badge.svg?branch=main)](https://github.com/stm32duino/Arduino_Core_STM32/actions)
55

66

77

88
[![GitHub release](https://img.shields.io/github/release/stm32duino/Arduino_Core_STM32.svg)](https://github.com/stm32duino/Arduino_Core_STM32/releases/latest)
99
![GitHub All Releases](https://img.shields.io/github/downloads/stm32duino/Arduino_Core_STM32/total.svg?label=downloads%20since%201.4.0)
10-
[![GitHub commits](https://img.shields.io/github/commits-since/stm32duino/Arduino_Core_STM32/2.1.0.svg)](https://github.com/stm32duino/Arduino_Core_STM32/compare/2.1.0...master)
10+
[![GitHub commits](https://img.shields.io/github/commits-since/stm32duino/Arduino_Core_STM32/2.1.0.svg)](https://github.com/stm32duino/Arduino_Core_STM32/compare/2.1.0...main)
1111

1212

1313
* [Introduction](https://github.com/stm32duino/Arduino_Core_STM32#Introduction)<br>
@@ -36,7 +36,7 @@ Add this link in the "*Additional Boards Managers URLs*" field:
3636

3737
https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json
3838

39-
**Warning**:
39+
**Warning**:
4040
* Default branch has changed to *main*.
4141
* Since core release 2.0.0 this link has changed.
4242

@@ -167,8 +167,8 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
167167

168168
| Status | Device(s) | Name | Release | Notes |
169169
| :----: | :-------: | ---- | :-----: | :---- |
170-
| :green_heart: | STM32MP157A | [STM32MP157A-DK1](https://www.st.com/en/evaluation-tools/stm32mp157a-dk1.html) | *1.8.0* | See [the documentation](https://github.com/stm32duino/Arduino_Core_STM32/tree/master/variants/STM32MP157_DK/README.md) to use this board|
171-
| :green_heart: | STM32MP157C | [STM32MP157C-DK2](https://www.st.com/en/evaluation-tools/stm32mp157c-dk2.html) | *1.8.0* | See [the documentation](https://github.com/stm32duino/Arduino_Core_STM32/tree/master/variants/STM32MP157_DK/README.md) to use this board|
170+
| :green_heart: | STM32MP157A | [STM32MP157A-DK1](https://www.st.com/en/evaluation-tools/stm32mp157a-dk1.html) | *1.8.0* | See [the documentation](https://github.com/stm32duino/Arduino_Core_STM32/tree/main/variants/STM32MP157_DK/README.md) to use this board|
171+
| :green_heart: | STM32MP157C | [STM32MP157C-DK2](https://www.st.com/en/evaluation-tools/stm32mp157c-dk2.html) | *1.8.0* | See [the documentation](https://github.com/stm32duino/Arduino_Core_STM32/tree/main/variants/STM32MP157_DK/README.md) to use this board|
172172

173173
### Generic STM32F0 boards
174174

Diff for: libraries/RGB_LED_TLC59731/library.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ maintainer=stm32duino
55
sentence=Allows to control one RGB LED driven by TLC59731 PWM LED Driver
66
paragraph=Control one RGB LED driven by TLC59731 PWM LED Driver
77
category=Signal Input/Output
8-
url=https://github.com/stm32duino/Arduino_Core_STM32/tree/master/libraries/RGB_LED_TLC59731
8+
url=https://github.com/stm32duino/Arduino_Core_STM32/tree/main/libraries/RGB_LED_TLC59731
99
architectures=stm32

Diff for: variants/STM32MP1xx/MP153AAC_MP153CAC_MP153DAC_MP153FAC_MP157AAC_MP157CAC_MP157DAC_MP157FAC/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ After Verify and Upload, you will see a message similar to the following in Ardu
2626
This file should be uploaded manually by SCP, SFTP, Kermit, or etc.
2727
Then run "sh ./run_arduino_<sketch name>.sh start" command in the board's console.
2828
For detailed instructions, please visit:
29-
https://github.com/stm32duino/Arduino_Core_STM32/tree/master/variants/STM32MP1xx/MP153AAC_MP153CAC_MP153DAC_MP153FAC_MP157AAC_MP157CAC_MP157DAC_MP157FAC
29+
https://github.com/stm32duino/Arduino_Core_STM32/tree/main/variants/STM32MP1xx/MP153AAC_MP153CAC_MP153DAC_MP153FAC_MP157AAC_MP157CAC_MP157DAC_MP157FAC
3030

3131
`<Arduino build output path>/run_arduino_<sketch name>.sh` looks like this for *Blink* example:
3232

@@ -38,7 +38,7 @@ After Verify and Upload, you will see a message similar to the following in Ardu
3838

3939
`/tmp/arduino_build_668148/run_arduino_Blink.sh`
4040

41-
In this example, the user **must** upload `<Arduino build output path>/run_arduino_<sketch name>.sh` file manually. Uploading instruction is described later in the [Uploading](#Uploading) section.
41+
In this example, the user **must** upload `<Arduino build output path>/run_arduino_<sketch name>.sh` file manually. Uploading instruction is described later in the [Uploading](#Uploading) section.
4242

4343
After uploading the user can use `sh run_arduino_<sketch name>.sh start` in the console of host Linux via either SSH or Serial Console, to run the Arduino firmware.
4444

@@ -249,7 +249,7 @@ As mentioned above `run_arduino_<sketch name>.sh` file have to be uploaded manua
249249
### Over Network
250250

251251
* **SCP** and **SFTP** are good options to upload the file, since STM32MP1 board runs SSH server by default. There are a lot of online resources on how to use them on the internet. Here is the default SSH access information:
252-
```
252+
```
253253
host: (Varies. Search online to learn how to figure it out.)
254254
username: root
255255
password: (none by default)
@@ -299,7 +299,7 @@ And then the Device Tree should enable TIM1 for the coprocessor, although this d
299299
[Balena OS]: https://github.com/kbumsik/balena-st-stm32mp
300300
[ST Wiki page on boot mode]: https://wiki.st.com/stm32mpu/wiki/STM32CubeMP1_Package#Getting_started_with_STM32CubeMP1_Package
301301

302-
[run_arduino_gen.sh]: https://github.com/stm32duino/Arduino_Tools/blob/master/run_arduino_gen.sh
302+
[run_arduino_gen.sh]: https://github.com/stm32duino/Arduino_Tools/blob/main/run_arduino_gen.sh
303303

304304
[OpenAMP]: https://github.com/OpenAMP/open-amp/wiki/OpenAMP-Overview
305305
[Linux RPMsg]: https://wiki.st.com/stm32mpu/wiki/Linux_RPMsg_framework_overview

0 commit comments

Comments
 (0)