Merge pull request #346 from arduino/jacobhylen/micripython-conflict-resolution

Addresses Micropython changes and some othe small fixes

Author: jacobhylen

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

@@ -2,55 +2,49 @@
 
 The GIGA R1 WiFi comes with a USB-C connector for programming, communication and HID functionality, a USB-A connector for connecting devices such as USB sticks and keyboards. It features a 3.5 mm audio jack for connecting speakers, microphones etc. Dedicated camera & display connectors are located at the top of the board, which can also be connected from underneath. 
 
-With a fast dual core microcontroller (480MHz / 240MHz), 75 GPIOs, several communication buses, you can build large projects using the GIGA R1 Wi-Fi as a base. The GIGA R1 WiFi also comes equipped with a radio module, crypto chip and an antenna.
+With a fast dual core microcontroller (480MHz / 240MHz), 76 GPIOs, several communication buses, you can build large projects using the GIGA R1 WiFi as a base. The GIGA R1 WiFi also comes equipped with a radio module, crypto chip and an antenna.
 
 </FeatureDescription>
 
 <FeatureList>
 
 <Feature title="Cheat Sheet" image="mega-form-factor">
 A reference to all technical features on this board, with pointers to additional documents.
-<FeatureLink title="Cheat Sheet" url="/tutorials/giga-r1/cheat-sheet"/>
+<FeatureLink title="Cheat Sheet" url="/tutorials/giga-r1-wifi/cheat-sheet"/>
 </Feature>
 
 <Feature title="Advanced ADC/DAC" image="microphone">
 Learn more about the ADC/DAC features of the GIGA R1 Wi-Fi board, and discover examples for Audio projects.
-<FeatureLink title="ADC/DAC Guide" url="/tutorials/giga-r1/giga-audio"/>
+<FeatureLink title="ADC/DAC Guide" url="/tutorials/giga-r1-wifi/giga-audio"/>
 </Feature>
 
 <Feature title="Dual Core" image="mcu">
 The STM32H747XI has two cores that can be programmed separately (M4/M7). You can for example run MicroPython and Arduino code simultaneously and communicate via an RPC.
 
-<FeatureLink title="RPC GUIDE" url="/tutorials/giga-r1/giga-dual-core"/>
+<FeatureLink title="DUAL CORE GUIDE" url="/tutorials/giga-r1-wifi/giga-dual-core"/>
 </Feature>
 
 <Feature title="Wi-Fi/Bluetooth®" image="connection">
 The GIGA R1 WiFi comes with a Murata LBEE5KL1DX-883 radio module for Wi-Fi/Bluetooth® communication.
 
-<FeatureLink title="Wi-Fi/BLUETOOTH®" url="/tutorials/giga-r1/cheat-sheet#wi-fi--bluetooth-le"/>
+<FeatureLink title="See Documentation" url="/tutorials/giga-r1-wifi/cheat-sheet#wi-fi--bluetooth-le"/>
 </Feature>
 
 <Feature title="MicroPython" image="python">
 The GIGA R1 has support for MicroPython, which can be setup in just minutes.
 
-<FeatureLink title="MicroPython Documentation" url="/tutorials/giga-r1/giga-micropython"/>
+<FeatureLink title="Install MicroPython" url="/tutorials/giga-r1-wifi/giga-micropython"/>
 </Feature>
 
 <Feature title="USB" image="usb">
 This board has USB-C for power/programming/communication line, and a USB-A for connecting USB devices (keyboards, mass storage).
 
-<FeatureLink title="USB Guide" url="/tutorials/giga-r1/giga-usb"/>
+<FeatureLink title="USB Guide" url="/tutorials/giga-r1-wifi/giga-usb"/>
 </Feature>
 
 <Feature title="Camera Support" image="camera">
 Learn how to connect a camera via the dedicated connector.
-<FeatureLink title="Camera Guide" url="/tutorials/giga-r1/giga-camera"/>
-</Feature>
-
-<Feature title="24V Input Voltage" image="connection">
-The onboard voltage regulator can handle up to 24V of input voltage. 
-
-<FeatureLink title="GIGA Power Supply" url="/tutorials/giga-r1/cheat-sheet#power-supply"/>
+<FeatureLink title="Camera Guide" url="/tutorials/giga-r1-wifi/giga-camera"/>
 </Feature>
 
 

content/hardware/08.mega/boards/giga-r1-wifi/tutorials/giga-camera/giga-camera.md

@@ -1,6 +1,6 @@
 ---
 title: GIGA R1 Camera Guide
-description: Learn about the GIGA R1 & GIGA R1 WiFi's camera connector, and how to use existing examples.
+description: Learn about the GIGA R1 WiFi's camera connector, and how to use existing examples.
 tags: [ArduCAM, Camera, Processing]
 author: Karl Söderby
 ---

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

@@ -5,7 +5,9 @@ author: Karl Söderby
 tags: [MicroPython, dfu-util]
 ---
 
-***Arduino Docs now have a dedicated page for MicroPython related documentation. Please visit [MicroPython with Arduino](/micropython) to learn more. This article is specific only to the GIGA R1 / GIGA R1 WiFi boards.***
+***Please note that MicroPython support for the GIGA R1 are currently in an experimental phase.***
+
+***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.***
 
 [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.
 
@@ -20,13 +22,13 @@ To follow along with this guide, you will need an [Arduino GIGA R1 WiFi](/hardwa
 You will need the following software/tools installed:
 - [dfu-util](https://dfu-util.sourceforge.net/)\*
 - An editor with support for MicroPython (such as [Arduino Lab for MicroPython](https://labs.arduino.cc/en/labs/micropython) or [Thonny](https://thonny.org/))
-- `firmware.dfu` file, available for download at [MicroPython downloads](/micropython).
+- This specific [GIGAR1_MP_FW.dfu](/resources/firmware/GIGAR1_MP_FW.dfu) firmware.
 
 ***\*The installation for `dfu-util` varies between operation systems. For installation using [brew.sh](https://formulae.brew.sh/formula/dfu-util) simply use `brew install dfu-util`.***
 
 ## Installation
 
-**1.** Download the `firmware.dfu` file from the [MicroPython downloads](/micropython) page.
+**1.** Download the [GIGAR1_MP_FW.dfu](/resources/firmware/GIGAR1_MP_FW.dfu) firmware.
 
 **2.** Download the [dfu-util](https://dfu-util.sourceforge.net/) tool, or install via Brew (or other package managers). Make sure it is in your PATH.
 
@@ -36,14 +38,12 @@ $ brew install dfu-util
 
 **3.** Double tap the reset button on the GIGA R1 board. The green LED should now be pulsing. This means it is in bootloader mode.
 
-**4.** Open a terminal, and navigate to the directory of your `firmware.dfu` file. Run the following command:
+**4.** Open a terminal, and navigate to the directory of your `GIGAR1_MP_FW.dfu` file. Run the following command:
 
 ```
-$ dfu-util -w -a 0 -d 2341:0366 -D <firmware>.dfu 
+$ dfu-util -w -a 0 -d 2341:0366 -D GIGAR1_MP_FW.dfu 
 ```
 
->Replace `<firmware>` with the name of the file.
-
 At the end of the process, you will see the following message on success:
 
 ```
@@ -70,7 +70,7 @@ print("Hello world!")
 
 If it is printed in the REPL, it means it works, and you're ready to take on bigger challenges!
 
-To find out examples and more fundamental knowledge, please visit the [MicroPython with Arduino documentation](/micropython). Here you will find an introduction to this environment and useful examples to get started.
+To find out examples and more fundamental knowledge, please visit the [MicroPython with Arduino documentation](/learn/programming/arduino-and-python). Here you will find an introduction to this environment and useful examples to get started.
 
 ***It is important to note that different Arduino boards have different implementations. This is mainly due to what microcontroller the board is based on. For example, to access digital pin 2, on the GIGA R1, you will need to use `'PA3'` (with the quotation marks). See more in [GIGA R1 Pin Map](#pin-map)***