Skip to content

Commit ea3e72b

Browse files
authored
Merge pull request #2647 from arduino/sync/jhansson-ard/trademark-updates
Updating trademarks [PXCT-1459]
2 parents e206f32 + 60ffaec commit ea3e72b

File tree

39 files changed

+73
-73
lines changed

39 files changed

+73
-73
lines changed

content/built-in-examples/06.sensors/ADXL3xx/ADXL3xx.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ tags:
1111

1212
This tutorial shows you how to read from the ADXL3xx series (e.g. ADXL320, ADXL321, ADXL322, ADXL330) [**accelerometer**](http://en.wikipedia.org/wiki/Accelerometer) and receive the values in the serial monitor of the Arduino Software (IDE) or another application that receives data over the serial port.
1313

14-
This tutorial was built using the [breakout boards from Sparkfun](http://www.sparkfun.com/commerce/categories.php?c=80). The [adafruit accelerometer breakout board](http://www.adafruit.com/index.php?main_page=product_info&cPath=35&products_id=163&zenid=48f2b4f461fed55c1d7f9fb38644fd9f) also works, though it must be wired differently.
14+
This tutorial was built using the [breakout boards from Sparkfun](http://www.sparkfun.com/commerce/categories.php?c=80). The [Adafruit® accelerometer breakout board](http://www.adafruit.com/index.php?main_page=product_info&cPath=35&products_id=163&zenid=48f2b4f461fed55c1d7f9fb38644fd9f) also works, though it must be wired differently.
1515

1616
The ADXL3xx outputs the acceleration on each axis as an analog voltage between 0 and 5 volts. To read this, all you need is the `analogRead()` function.
1717

content/hardware/01.mkr/01.boards/mkr-fox-1200/tutorials/mkr-fox-1200-movement-trigger/mkr-fox-1200-movement-trigger.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ source: "https://create.arduino.cc/projecthub/45374/mkr-fox-1200-movement-trigge
1414
- [Jumper wires (generic)](https://www.newark.com/88W2571?COM=ref_hackster)
1515
- [AA Batteries](http://www.amazon.com/dp/B00451SSBI/?tag=octopart00-20)
1616
- 2 x AA battery holder
17-
- [Adafruit MMA8451 3 Axis accelerometer](https://www.adafruit.com/product/2019)
17+
- [Adafruit® MMA8451 3 Axis accelerometer](https://www.adafruit.com/product/2019)
1818

1919
## About This Project
2020

content/hardware/01.mkr/01.boards/mkr-gsm-1400/tutorials/arduino-mkr-gsm-1400-and-dtmf/arduino-mkr-gsm-1400-and-dtmf.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ source: "https://create.arduino.cc/projecthub/Arduino_Genuino/arduino-mkr-gsm-14
1212

1313
- [Arduino MKR GSM 1400](https://www.newark.com/55AC1187?COM=ref_hackster)
1414
- 3.7 V LiPo Battery
15-
- [Adafruit NeoPixel Ring: WS2812 5050 RGB LED](http://www.newark.com/26Y8458?COM=ref_hackster)
15+
- [Adafruit® NeoPixel Ring: WS2812 5050 RGB LED](http://www.newark.com/26Y8458?COM=ref_hackster)
1616
- [Resistor 10k ohm](https://www.newark.com/multicomp/mccfr0w4j0103a50/carbon-film-resistor-10kohm-250mw/dp/58K5002?COM=ref_hackster)
1717
- [ON Semiconductor 2N7000](https://www.mouser.it/ProductDetail/ON-Semiconductor-Fairchild/2N7000/?qs=sGAEpiMZZMshyDBzk1%2fWi9bHELEahoDnY1fyKF6A6Ko%3d)
1818
- [Breadboard (generic)](https://www.newark.com/99W1759?COM=ref_hackster)

content/hardware/01.mkr/01.boards/mkr-wifi-1010/tutorials/oled-display/oled-display.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ tags:
88
- Serial
99
author: 'Karl Söderby'
1010
libraries:
11-
- name: Adafruit GFX
11+
- name: Adafruit® GFX
1212
url: https://github.com/adafruit/Adafruit-GFX-Library
1313
- name: SSD1306
1414
url: https://github.com/adafruit/Adafruit_SSD1306
@@ -25,7 +25,7 @@ featuredImage: 'light'
2525

2626
## Introduction
2727

28-
In this tutorial, we will go through a basic setup that allows us to write messages from the Serial Monitor to an SSD1306 OLED screen. We will be using the [Adafruit GFX library](https://github.com/adafruit/Adafruit-GFX-Library) and the [SSD1306 library](https://github.com/adafruit/Adafruit_SSD1306), where the text size adjusts according to the length of the message.
28+
In this tutorial, we will go through a basic setup that allows us to write messages from the Serial Monitor to an SSD1306 OLED screen. We will be using the [Adafruit® GFX library](https://github.com/adafruit/Adafruit-GFX-Library) and the [SSD1306 library](https://github.com/adafruit/Adafruit_SSD1306), where the text size adjusts according to the length of the message.
2929

3030
## Goals
3131

@@ -38,7 +38,7 @@ The goals of this tutorial are:
3838
## Hardware & Software Needed
3939

4040
- Arduino IDE ([online](https://create.arduino.cc/) or [offline](https://www.arduino.cc/en/main/software))
41-
- [Adafruit GFX](https://github.com/adafruit/Adafruit-GFX-Library) and [SSD1306 library](https://github.com/adafruit/Adafruit_SSD1306)
41+
- [Adafruit® GFX](https://github.com/adafruit/Adafruit-GFX-Library) and [SSD1306 library](https://github.com/adafruit/Adafruit_SSD1306)
4242
- Arduino MKR WiFi 1010 ([link to store](https://store.arduino.cc/mkr-wifi-1010))
4343
- SSD1306 128x32 OLED Screen (other dimensions works but requires some adjusting)
4444

content/hardware/01.mkr/01.boards/mkr-wifi-1010/tutorials/rtc-clock/rtc-clock.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ tags:
88
- RTC
99
author: 'Karl Söderby'
1010
libraries:
11-
- name: Adafruit GFX
11+
- name: Adafruit® GFX
1212
url: https://github.com/adafruit/Adafruit-GFX-Library
1313
- name: SSD1306
1414
url: https://github.com/adafruit/Adafruit_SSD1306
@@ -41,7 +41,7 @@ The goals of this project are:
4141
## Hardware & Software Needed
4242

4343
- Arduino IDE ([online](https://create.arduino.cc/) or [offline](https://www.arduino.cc/en/main/software)).
44-
- [Adafruit GFX](https://github.com/adafruit/Adafruit-GFX-Library) and [SSD1306](https://github.com/adafruit/Adafruit_SSD1306) library.
44+
- [Adafruit® GFX](https://github.com/adafruit/Adafruit-GFX-Library) and [SSD1306](https://github.com/adafruit/Adafruit_SSD1306) library.
4545
- [RTCZero](https://www.arduino.cc/reference/en/libraries/rtczero/) library.
4646
- Arduino MKR WiFi 1010 ([link to store](https://store.arduino.cc/mkr-wifi-1010)).
4747
- SSD1306 128x32 OLED Screen (other dimensions works but requires some adjusting).

content/hardware/01.mkr/01.boards/mkr-zero/tutorials/mkr-zero-rtc-clock/mkr-zero-rtc-clock.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ tags:
88
- OLED
99
author: 'Karl Söderby'
1010
libraries:
11-
- name: Adafruit GFX
11+
- name: Adafruit® GFX
1212
url: https://github.com/adafruit/Adafruit-GFX-Library
1313
- name: SSD1306
1414
url: https://github.com/adafruit/Adafruit_SSD1306
@@ -38,7 +38,7 @@ The goals of this project are:
3838
## Hardware & Software Needed
3939

4040
- Arduino IDE ([online](https://create.arduino.cc/) or [offline](https://www.arduino.cc/en/main/software)).
41-
- [Adafruit GFX](https://github.com/adafruit/Adafruit-GFX-Library) and [SSD1306](https://github.com/adafruit/Adafruit_SSD1306) library.
41+
- [Adafruit® GFX](https://github.com/adafruit/Adafruit-GFX-Library) and [SSD1306](https://github.com/adafruit/Adafruit_SSD1306) library.
4242
- [RTCZero](https://www.arduino.cc/reference/en/libraries/rtczero/) library.
4343
- Arduino Zero ([link to store](https://store.arduino.cc/arduino-mkr-zero-i2s-bus-sd-for-sound-music-digital-audio-data)).
4444
- SSD1306 128x32 OLED Screen (other dimensions works but requires some adjusting).

content/hardware/01.mkr/01.boards/mkr-zero/tutorials/mkr-zero-weather-data-logger/mkr-zero-weather-data-logger.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ With this project, you will be able to create in a few minutes a temperature and
3333

3434
In order to build the weather data logger we will use an Arduino MKR Zero board. The small form factor and built-in SD card reader makes it a perfect choice for this project.
3535

36-
Second we will need a DHT22 temperature and humidity sensor. This sensor is easily available and very versatile. It can be powered from 3.3V to 6V. We will connect the power pin of the DHT22 to the VCC (3.3V) pin in our MKRZero. We will also need a 4k7ohm pull up resistor for the data line and a 100nF capacitor to clean the noise in the power line. For more info on DHT22, see[ Adafruit's DHT tutoria](https://learn.adafruit.com/dht/connecting-to-a-dhtxx-sensor)l.
36+
Second we will need a DHT22 temperature and humidity sensor. This sensor is easily available and very versatile. It can be powered from 3.3V to 6V. We will connect the power pin of the DHT22 to the VCC (3.3V) pin in our MKRZero. We will also need a 4k7ohm pull up resistor for the data line and a 100nF capacitor to clean the noise in the power line. For more info on DHT22, see the [Adafruit® DHT tutorial](https://learn.adafruit.com/dht/connecting-to-a-dhtxx-sensor).
3737

3838
We will use a small breadboard with 3 jumper wires to connect everything together, a SD card to store the information and a 3.7V LiPo battery to make our data logger portable.
3939

content/hardware/01.mkr/03.carriers/mkr-iot-carrier-rev2/tutorials/cheat-sheet/cheat-sheet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ The MKR IoT Carrier Rev2 comes with 5 **digital RGB LEDs** placed on the top sid
431431

432432
#### Code
433433

434-
The LEDs are controlled with the Adafruit’s DotStar library, which is included in the `MKRIoTCarrier` library.
434+
The LEDs are controlled with the Adafruit® DotStar library, which is included in the `MKRIoTCarrier` library.
435435

436436
The `carrier.leds.show();` method is necessary for updating the new state of the LEDs and needs to be called after any change of the state of the LEDs (turning on & off or change of color).
437437

content/hardware/01.mkr/03.carriers/mkr-iot-carrier/tutorials/mkr-iot-carrier-01-technical-reference/mkr-iot-carrier-01-technical-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ The MKR IoT Carrier comes with 5 **digital RGB LEDs** placed on the top side of
435435

436436
#### Code
437437

438-
The LEDs are controlled with the Adafruit’s DotStar library, which is included in the `MKRIoTCarrier` library.
438+
The LEDs are controlled with the Adafruit® DotStar library, which is included in the `MKRIoTCarrier` library.
439439

440440
The `carrier.leds.show();` method is necessary for updating the new state of the LEDs and needs to be called after any change of the state of the LEDs (turning on & off or change of color).
441441

content/hardware/02.hero/boards/micro/features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<FeatureDescription>
22

3-
The Micro is a microcontroller board based on the ATmega32U4, developed in conjunction with Adafruit. It has 20 digital input/output pins (of which 7 can be used as PWM outputs and 12 as analog inputs), a 16 MHz crystal oscillator, a micro USB connection, an ICSP header, and a reset button. It contains everything needed to support the microcontroller; simply connect it to a computer with a micro USB cable to get started. It has a form factor that enables it to be easily placed on a breadboard. The Micro board is similar to the Arduino Leonardo in that the ATmega32U4 has built-in USB communication, eliminating the need for a secondary processor. This allows the Micro to appear to a connected computer as a mouse and keyboard, in addition to a virtual (CDC) serial / COM port.
3+
The Micro is a microcontroller board based on the ATmega32U4, developed in conjunction with Adafruit®. It has 20 digital input/output pins (of which 7 can be used as PWM outputs and 12 as analog inputs), a 16 MHz crystal oscillator, a micro USB connection, an ICSP header, and a reset button. It contains everything needed to support the microcontroller; simply connect it to a computer with a micro USB cable to get started. It has a form factor that enables it to be easily placed on a breadboard. The Micro board is similar to the Arduino Leonardo in that the ATmega32U4 has built-in USB communication, eliminating the need for a secondary processor. This allows the Micro to appear to a connected computer as a mouse and keyboard, in addition to a virtual (CDC) serial / COM port.
44

55
</FeatureDescription>
66

0 commit comments

Comments
 (0)