Skip to content

Commit 3f91ba6

Browse files
authored
Merge pull request #1307 from arduino/karlsoderby/giga-r1-update-sept6
[GIGA R1 WiFi] Docs general maintenance
2 parents f54874b + 6698ff2 commit 3f91ba6

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

content/hardware/10.mega/boards/giga-r1-wifi/features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The GIGA R1 WiFi comes with a Murata LBEE5KL1DX-883 radio module for Wi-Fi/Bluet
3333
<Feature title="MicroPython" image="python">
3434
The GIGA R1 WiFi has support for MicroPython, which can be set up in just minutes.
3535

36-
<FeatureLink title="Install MicroPython" url="/tutorials/giga-r1-wifi/giga-micropython"/>
36+
<FeatureLink title="Install MicroPython" url="/micropython/basics/board-installation"/>
3737
</Feature>
3838

3939
<Feature title="USB" image="usb">
-348 Bytes
Loading

content/hardware/10.mega/boards/giga-r1-wifi/tutorials/cheat-sheet/cheat-sheet.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -639,19 +639,19 @@ void loop() {
639639

640640
The **GIGA R1** features two separate SPI (Serial Peripheral Interface) buses, one is configured on the 6 pin header (ICSP) labelled SPI, and the other is broken out into pin connections on the board.
641641

642-
The first bus (connector), `SPI` uses the following pins:
642+
The first bus (connector), `SPI1` uses the following pins:
643643

644644
- (CIPO) - D89
645645
- (COPI) - D90
646646
- (SCK) - D91
647-
- (CS) - D10
647+
- (CS) - unassigned, use any free GPIO for this.
648648

649-
The second bus (header), `SPI1`, uses the following pins:
649+
The second bus (header), `SPI5`, uses the following pins:
650650

651651
- (CIPO) - D12
652652
- (COPI) - D11
653653
- (SCK) - D13
654-
- (CS) - unassigned, use any free GPIO for this.
654+
- (CS) - D10
655655

656656
For using both SPI buses simultaneously, check out the following example:
657657

content/hardware/10.mega/boards/giga-r1-wifi/tutorials/giga-audio/content.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -463,15 +463,15 @@ The GIGA R1 12-bit DAC channels can also be used to read `.wav` files from a USB
463463
For this example, you will need:
464464
- A speaker, that has a built in amplifier.
465465
- A USB mass storage device (USB stick).\*
466-
- [USBHostMbed5](https://github.com/facchinm/USBHostMbed5) library installed.
466+
- [Arduino_USBHostMbed5](https://github.com/arduino-libraries/Arduino_USBHostMbed5) library installed.
467467

468468
***\*USB mass storage devices connected needs to be formatted with the FAT32 as a file system, using the MBR partitioning scheme. Read more in the [USB Mass Storage](/tutorials/giga-r1-wifi/giga-usb/#usb-mass-storage) section.***
469469

470470
### USB Stick Configuration
471471

472472
The **Arduino_AdvancedAnalog** library contains the necessary functions that enable us to use the advanced capabilities of the GIGA R1 DACs.
473473

474-
To read `.wav` files from the USB stick we are using the **USBHostMbed5** library. It is important that the USB stick is formatted properly, and that we define its name in the sketch. In this case, we name it `USB_DRIVE`, and is defined like this:
474+
To read `.wav` files from the USB stick we are using the **Arduino_USBHostMbed5** library. It is important that the USB stick is formatted properly, and that we define its name in the sketch. In this case, we name it `USB_DRIVE`, and is defined like this:
475475

476476
```arduino
477477
mbed::FATFileSystem usb("USB_DRIVE");
@@ -501,7 +501,7 @@ Note that to start the sketch, you need to open Serial Monitor due to the `while
501501
502502
#include <Arduino_AdvancedAnalog.h>
503503
#include <DigitalOut.h>
504-
#include <USBHostMbed5.h>
504+
#include <Arduino_USBHostMbed5.h>
505505
#include <FATFileSystem.h>
506506
507507
AdvancedDAC dac1(A12);
@@ -675,7 +675,7 @@ You can download them from [this link](/resources/misc/giga_audio_examples.zip).
675675
676676
#include <Arduino_AdvancedAnalog.h>
677677
#include <DigitalOut.h>
678-
#include <USBHostMbed5.h>
678+
#include <Arduino_USBHostMbed5.h>
679679
#include <FATFileSystem.h>
680680
681681
AdvancedDAC dac1(A12);

content/hardware/10.mega/boards/giga-r1-wifi/tutorials/giga-micropython/giga-micropython.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ author: Karl Söderby
55
tags: [MicroPython, dfu-util]
66
---
77

8-
***Please note that MicroPython support for the GIGA R1 is currently in an experimental phase.***
9-
10-
***To learn more about MicroPython, please visit [MicroPython with Arduino](/learn/programming/arduino-and-python). This article is specific only to the GIGA R1 board.***
8+
***Please note: MicroPython documentation for all boards has moved to [MicroPython Docs Page](/micropython). Please refer to that page for the most up to date documentation.***
119

1210
[MicroPython](https://micropython.org/) is an implementation of Python in a *micro* format. It can be installed on the GIGA R1, where instead of compiling and uploading sketches, the board has a built-in interpreter that converts Python code to machine code in runtime.
1311

@@ -28,9 +26,9 @@ You will need the following software/tools installed:
2826

2927
## Installation
3028

31-
Following the steps below will install MicroPython on the **M7** core.
29+
***Note: a new tool has been added that makes it a lot easier to install MicroPython on your board. Visit the [MicroPython installation page](/micropython/basics/board-installation) for more information.***
3230

33-
***Please note that after this installation is complete, your board will no longer be detected as an Arduino device. In order to go back to using the Arduino programming environment, you need to reset the board. This is simply done by double tapping the reset button.***
31+
Following the steps below will install MicroPython on the **M7** core.
3432

3533
**1.** Download the [GIGAR1_MP_FW.dfu](/resources/firmware/GIGAR1_MP_FW.dfu) firmware (latest firmware is always available at the [MicroPython with Arduino](/micropython/) page).
3634

@@ -60,6 +58,8 @@ Done parsing DfuSe file
6058

6159
Congratulations! You have now installed MicroPython on the GIGA R1 board.
6260

61+
***Please note that after this installation is complete, your board will no longer be detected as an Arduino device. In order to go back to using the Arduino programming environment, you need to reset the board. This is simply done by double tapping the reset button.***
62+
6363
## Programming Your Board
6464

6565
To program your GIGA R1 with MicroPython, you will need an editor with support for MicroPython (such as [Arduino Lab for MicroPython](https://labs.arduino.cc/en/labs/micropython) or [Thonny](https://thonny.org/)).

0 commit comments

Comments
 (0)