Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
57483ff
Bump geekyeggo/delete-artifact from 1 to 2
dependabot[bot] Oct 13, 2022
f25e8cf
Merge pull request #57 from arduino-libraries/dependabot/github_actio…
per1234 Oct 13, 2022
4c15daf
Update Readme.md
g-castronovo Oct 14, 2022
2eaa5e8
Merge pull request #59 from arduino-libraries/g-castronovo-product-name
g-castronovo Oct 14, 2022
a68dd1b
initial release for rev4
Rocketct Oct 13, 2022
bcbd106
added new qtouch management for new release
Rocketct Oct 13, 2022
75a5ff2
added new relay management for new release
Rocketct Oct 13, 2022
6d9721b
added new enviroment sensor management and added support for bme68x o…
Rocketct Oct 13, 2022
bb07eb2
added new IMU library support for new revision
Rocketct Oct 13, 2022
42675ba
added new pressure sensor library for new revision
Rocketct Oct 13, 2022
e66ce54
added new dependancies and modified the compile example actions
Rocketct Oct 13, 2022
d8e0105
Merge pull request #58 from Rocketct/master
facchinm Oct 19, 2022
b92e561
added imperial quantities support
Rocketct Oct 19, 2022
c166d6f
added support for air sensor api
Rocketct Oct 19, 2022
04c6050
Properly commented the IMU's selection on IMUClass
Rocketct Oct 20, 2022
7192461
Merge pull request #60 from Rocketct/master
facchinm Oct 20, 2022
4bbbaf1
Publish 2.0.0 (#61)
Rocketct Oct 20, 2022
fab9797
Bump carlosperate/download-file-action from 1 to 2
dependabot[bot] Oct 25, 2022
747580b
Merge pull request #62 from arduino-libraries/dependabot/github_actio…
per1234 Oct 25, 2022
232b7b2
Properly handle AirQuality sensor on rev1 hardware
facchinm Oct 26, 2022
404ecf2
Publish 2.0.1
Rocketct Oct 26, 2022
88e33eb
Add BME examples
marqdevx Nov 16, 2022
e9adfbb
Typos
marqdevx Nov 16, 2022
a7f3bf2
Testing and adjusting examples
Hannes7eicher Jan 31, 2023
3d67602
Pin "BSEC Software Library" dependency at working version
per1234 Feb 4, 2023
b0021b2
Merge pull request #70 from per1234/pin-bsec
per1234 Feb 7, 2023
a0e6a56
Bump version to 2.0.2
alranel Feb 21, 2023
6b413b0
Fix language in API docs
alranel Mar 6, 2023
2892936
Embed the BSEC library @ v1.6.1480 as a temporary workaround until th…
alranel Mar 3, 2023
e5915f2
Create .codespellrc
alranel Mar 6, 2023
e862448
Merge pull request #71 from arduino-libraries/embed-bsec
alranel Mar 6, 2023
687533f
Merge pull request #66 from arduino-libraries/marqdevx/BME-examples
alranel Mar 6, 2023
b8b931e
Bump version number
alranel Mar 8, 2023
72076fa
Rename example folders for sensors
karlsoderby Apr 28, 2023
d6e81ef
Merge pull request #72 from arduino-libraries/karlsoderby/update-exam…
karlsoderby Apr 28, 2023
c6e414a
updated bme sensors management to allows Sensor's calibration
Rocketct Jun 28, 2023
82872d3
Bump actions/checkout from 3 to 4
dependabot[bot] Sep 5, 2023
15ebfde
Merge pull request #75 from arduino-libraries/dependabot/github_actio…
per1234 Sep 5, 2023
f45e36e
Update AirQualityClass.cpp
phant0mias Sep 23, 2023
202640d
Merge pull request #76 from phant0mias/master
alranel Nov 14, 2023
dfaacef
Merge branch 'master' into master
alranel Nov 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .codespellrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/spell-check/.codespellrc
# See: https://github.com/codespell-project/codespell#using-a-config-file
[codespell]
# In the event of a false positive, add the problematic word, in all lowercase, to a comma-separated list here:
ignore-words-list = ,
skip = ./.git,./.licenses,__pycache__,node_modules,./go.mod,./go.sum,./package-lock.json,./poetry.lock,./yarn.lock,./src/bsec
builtin = clear,informal,en-GB_to_en-US
check-filenames =
check-hidden =
4 changes: 3 additions & 1 deletion .github/workflows/Compile Examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Compile examples
uses: arduino/compile-sketches@main
Expand All @@ -57,6 +57,8 @@ jobs:
- name: Adafruit GFX Library
- name: Adafruit ST7735 and ST7789 Library
- name: Arduino_MCHPTouch
- name: BSEC Software Library
- name: Arduino_LSM6DSOX
- name: TFT_eSPI
sketch-paths: |
# Ignoring Display/AnimatedGif compiling the rest of them
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-arduino.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Arduino Lint
uses: arduino/arduino-lint-action@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spell-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Spell check
uses: codespell-project/actions-codespell@master
10 changes: 5 additions & 5 deletions .github/workflows/sync-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download JSON schema for labels configuration file
id: download-schema
uses: carlosperate/download-file-action@v1
uses: carlosperate/download-file-action@v2
with:
file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/arduino-tooling-gh-label-configuration-schema.json
location: ${{ runner.temp }}/label-configuration-schema
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:

steps:
- name: Download
uses: carlosperate/download-file-action@v1
uses: carlosperate/download-file-action@v2
with:
file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/${{ matrix.filename }}

Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
echo "::set-output name=flag::--dry-run"

- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download configuration files artifact
uses: actions/download-artifact@v3
Expand All @@ -114,7 +114,7 @@ jobs:
path: ${{ env.CONFIGURATIONS_FOLDER }}

- name: Remove unneeded artifact
uses: geekyeggo/delete-artifact@v1
uses: geekyeggo/delete-artifact@v2
with:
name: ${{ env.CONFIGURATIONS_ARTIFACT }}

Expand Down
36 changes: 36 additions & 0 deletions LICENSE.bsec
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
The binaries and includes for the core BSEC library in this repository are licensed
under the Software license agreement described in the link
https://www.bosch-sensortec.com/media/boschsensortec/downloads/bsec/2017-07-17_clickthrough_license_terms_environmentalib_sw_clean.pdf

The Arduino wrapper and BME680 Sensor API are licensed under the following license.

Copyright (c) 2020 Bosch Sensortec GmbH. All rights reserved.

BSD-3-Clause

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
6 changes: 2 additions & 4 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@ This library enables the MKR family to use the MKR IoT Carrier
Get the carrier:
* [Standalone Board](https://store.arduino.cc/mkr-iot-carrier)
* Kits:
* [Explore IoT Kit](https://store.arduino.cc/explore-iot-kit)
* [Oplà IoT Kit](https://store.arduino.cc/opla-iot-kit)
* [Arduino Explore IoT Kit](https://store.arduino.cc/explore-iot-kit)
* [Arduino Oplà IoT Kit](https://store.arduino.cc/opla-iot-kit)



For more information about this library please visit us at
https://www.arduino.cc/reference/en/libraries/arduino_mkriotcarrier/

Expand Down
2 changes: 1 addition & 1 deletion docs/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ Saves the selected color to print the text until the color is changed again
```cpp
display.setTextSize(size)
```
Sets the size of the text that is gonna be printed
Sets the size of the text that is going to be printed

```cpp
display.setTextWrap(True/False)
Expand Down
20 changes: 1 addition & 19 deletions examples/Display/Compose_images/Compose_images.ino
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,13 @@ void loop() {
carrier.display.fillScreen(ST77XX_BLACK);
drawArduino(0x04B3);
fadeLoop();
carrier.display.fillScreen(ST77XX_BLACK);
drawEIoT();
fadeLoop();

carrier.display.fillScreen(ST77XX_WHITE);
drawArduino(0x0000);
fadeLoop();

drawArduino(0xF324);
fadeLoop();
drawArduino(0x04B3);
fadeLoop();

carrier.display.fillScreen(ST77XX_WHITE);
drawEIoT();
fadeLoop();
}

//Fading Orange loop
Expand All @@ -72,17 +63,8 @@ void fadeLoop() {

}

//Compose the differentn parts of the image
void drawEIoT() {
carrier.display.drawBitmap(44, 25, ArduinoLogo, 152, 72, 0x04B3);
carrier.display.drawBitmap(48, 110, ArduinoText, 144, 23, 0x04B3);
carrier.display.drawBitmap(0, 150, ExploreFrame, 240, 75, 0xF324);
carrier.display.drawBitmap(0, 150, ExplreIoTKittext, 240, 75, 0x04B3);
carrier.display.drawBitmap(0, 150, ExploreIoTtext, 240, 75, 0xFFFF);
}

//Same with the Arduino Logo and the text
void drawArduino(uint16_t color) {
carrier.display.drawBitmap(44, 60, ArduinoLogo, 152, 72, color);
carrier.display.drawBitmap(48, 145, ArduinoText, 144, 23, color);
}
}
93 changes: 31 additions & 62 deletions examples/Display/Graphics/Graphics.ino
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ void setup(void) {

// large block of text
carrier.display.fillScreen(ST77XX_BLACK);
testdrawtext("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur adipiscing ante sed nibh tincidunt feugiat. Maecenas enim massa, fringilla sed malesuada et, malesuada sit amet turpis. Sed porttitor neque ut ante pretium vitae malesuada nunc bibendum. Nullam aliquet ultrices massa eu hendrerit. Ut sed nisi lorem. In vestibulum purus a tortor imperdiet posuere. ", ST77XX_WHITE);
testdrawtext("Lorem ipsum dolor sit amet...", ST77XX_WHITE);
delay(1000);

// tft print function!
tftPrintTest();
delay(4000);
delay(500);

// a single pixel
carrier.display.drawPixel(carrier.display.width() / 2, carrier.display.height() / 2, ST77XX_GREEN);
Expand All @@ -45,20 +45,11 @@ void setup(void) {
testdrawrects(ST77XX_GREEN);
delay(500);

testfillrects(ST77XX_YELLOW, ST77XX_MAGENTA);
delay(500);

carrier.display.fillScreen(ST77XX_BLACK);
testfillcircles(10, ST77XX_BLUE);
testdrawcircles(10, ST77XX_WHITE);
delay(500);

testroundrects();
delay(500);

testtriangles();
delay(500);

mediabuttons();
delay(500);

Expand All @@ -67,10 +58,8 @@ void setup(void) {
}

void loop() {
carrier.display.invertDisplay(true);
delay(500);
carrier.display.invertDisplay(false);
delay(500);
testtriangles();
delay(2000);
}

void testlines(uint16_t color) {
Expand Down Expand Up @@ -116,7 +105,7 @@ void testlines(uint16_t color) {
}

void testdrawtext(char *text, uint16_t color) {
carrier.display.setCursor(0, 0);
carrier.display.setCursor(40, 100);
carrier.display.setTextColor(color);
carrier.display.setTextWrap(true);
carrier.display.print(text);
Expand All @@ -139,14 +128,6 @@ void testdrawrects(uint16_t color) {
}
}

void testfillrects(uint16_t color1, uint16_t color2) {
carrier.display.fillScreen(ST77XX_BLACK);
for (int16_t x = carrier.display.width() - 1; x > 6; x -= 6) {
carrier.display.fillRect(carrier.display.width() / 2 - x / 2, carrier.display.height() / 2 - x / 2 , x, x, color1);
carrier.display.drawRect(carrier.display.width() / 2 - x / 2, carrier.display.height() / 2 - x / 2 , x, x, color2);
}
}

void testfillcircles(uint8_t radius, uint16_t color) {
for (int16_t x = radius; x < carrier.display.width(); x += radius * 2) {
for (int16_t y = radius; y < carrier.display.height(); y += radius * 2) {
Expand All @@ -167,74 +148,62 @@ void testtriangles() {
carrier.display.fillScreen(ST77XX_BLACK);
uint16_t color = 0xF800;
int t;
int w = carrier.display.width() / 2;
int x = carrier.display.height() - 1;
int w = 120;
int x = 200;
int y = 0;
int z = carrier.display.width();
int h = 40;
int z = 200;
for (t = 0 ; t <= 15; t++) {
carrier.display.drawTriangle(w, y, y, x, z, x, color);
carrier.display.drawTriangle(w, y, h, x, z, x, color);
x -= 4;
y += 4;
z -= 4;
color += 100;
}
}

void testroundrects() {
carrier.display.fillScreen(ST77XX_BLACK);
uint16_t color = 100;
int i;
int t;
for (t = 0 ; t <= 4; t += 1) {
int x = 0;
int y = 0;
int w = carrier.display.width() - 2;
int h = carrier.display.height() - 2;
for (i = 0 ; i <= 16; i += 1) {
carrier.display.drawRoundRect(x, y, w, h, 5, color);
x += 2;
y += 3;
w -= 4;
h -= 6;
color += 1100;
}
h += 4;
color += 100;
}
}

void tftPrintTest() {
carrier.display.setTextWrap(false);
carrier.display.fillScreen(ST77XX_BLACK);
carrier.display.setCursor(0, 30);
carrier.display.setCursor(20, 80);
carrier.display.setTextColor(ST77XX_RED);
carrier.display.setTextSize(1);
carrier.display.println("Hello World!");
carrier.display.setCursor(20, 90);
carrier.display.setTextColor(ST77XX_YELLOW);
carrier.display.setTextSize(2);
carrier.display.println("Hello World!");
carrier.display.setCursor(20, 110);
carrier.display.setTextColor(ST77XX_GREEN);
carrier.display.setTextSize(3);
carrier.display.println("Hello World!");
carrier.display.setCursor(20, 140);
carrier.display.setTextColor(ST77XX_BLUE);
carrier.display.setTextSize(4);
carrier.display.print(1234.567);
delay(1500);
carrier.display.setCursor(0, 0);
carrier.display.setCursor(20, 80);
carrier.display.fillScreen(ST77XX_BLACK);
carrier.display.setTextColor(ST77XX_WHITE);
carrier.display.setTextSize(0);
carrier.display.println("Hello World!");
carrier.display.setCursor(20, 90);
carrier.display.setTextSize(1);
carrier.display.setTextColor(ST77XX_GREEN);
carrier.display.print(p, 6);
carrier.display.println(" Want pi?");
carrier.display.println(" ");
carrier.display.setCursor(20, 100);
carrier.display.print(8675309, HEX); // print 8,675,309 out in HEX!
carrier.display.println(" Print HEX!");
carrier.display.println(" ");
carrier.display.setTextColor(ST77XX_WHITE);
carrier.display.setCursor(20, 110);
carrier.display.println("Sketch has been");
carrier.display.setCursor(20, 120);
carrier.display.println("running for: ");
carrier.display.setCursor(20, 130);
carrier.display.setTextColor(ST77XX_MAGENTA);
carrier.display.print(millis() / 1000);
carrier.display.setTextColor(ST77XX_WHITE);
Expand All @@ -244,20 +213,20 @@ void tftPrintTest() {
void mediabuttons() {
// play
carrier.display.fillScreen(ST77XX_BLACK);
carrier.display.fillRoundRect(25, 10, 78, 60, 8, ST77XX_WHITE);
carrier.display.fillTriangle(42, 20, 42, 60, 90, 40, ST77XX_RED);
carrier.display.fillRoundRect(75, 60, 78, 60, 8, ST77XX_WHITE);
carrier.display.fillTriangle(92, 70, 92, 110, 140, 90, ST77XX_RED);
delay(500);
// pause
carrier.display.fillRoundRect(25, 90, 78, 60, 8, ST77XX_WHITE);
carrier.display.fillRoundRect(39, 98, 20, 45, 5, ST77XX_GREEN);
carrier.display.fillRoundRect(69, 98, 20, 45, 5, ST77XX_GREEN);
carrier.display.fillRoundRect(75, 140, 78, 60, 8, ST77XX_WHITE);
carrier.display.fillRoundRect(89, 148, 20, 45, 5, ST77XX_GREEN);
carrier.display.fillRoundRect(119, 148, 20, 45, 5, ST77XX_GREEN);
delay(500);
// play color
carrier.display.fillTriangle(42, 20, 42, 60, 90, 40, ST77XX_BLUE);
carrier.display.fillTriangle(92, 70, 92, 110, 140, 90, ST77XX_BLUE);
delay(50);
// pause color
carrier.display.fillRoundRect(39, 98, 20, 45, 5, ST77XX_RED);
carrier.display.fillRoundRect(69, 98, 20, 45, 5, ST77XX_RED);
carrier.display.fillRoundRect(89, 148, 20, 45, 5, ST77XX_RED);
carrier.display.fillRoundRect(119, 148, 20, 45, 5, ST77XX_RED);
// play color
carrier.display.fillTriangle(42, 20, 42, 60, 90, 40, ST77XX_GREEN);
}
carrier.display.fillTriangle(92, 70, 92, 110, 140, 90, ST77XX_GREEN);
}
Loading