Skip to content

Commit 8756aa3

Browse files
ivankravetsivankravets
committed
Merge branch 'release/v1.11.0'
2 parents 949a804 + 1d370f7 commit 8756aa3

File tree

54 files changed

+992
-352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+992
-352
lines changed

‎boards/circuitplay_classic.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"build": {
3+
"core": "arduino",
4+
"extra_flags": "-DARDUINO_AVR_CIRCUIT_PLAYGROUND_CLASSIC",
5+
"f_cpu": "8000000L",
6+
"hwids": [
7+
[
8+
"0x239A",
9+
"0x8011"
10+
]
11+
],
12+
"mcu": "atmega32u4",
13+
"usb_product": "Adafruit",
14+
"variant": "circuitplay32u4"
15+
},
16+
"frameworks": [
17+
"arduino"
18+
],
19+
"name": "Adafruit Circuit Playground Classic",
20+
"upload": {
21+
"disable_flushing": true,
22+
"maximum_ram_size": 2560,
23+
"maximum_size": 28672,
24+
"protocol": "avr109",
25+
"require_upload_port": true,
26+
"speed": 57600,
27+
"use_1200bps_touch": true,
28+
"wait_for_upload_port": true
29+
},
30+
"url": "http://www.adafruit.com/product/3000",
31+
"vendor": "Adafruit"
32+
}

‎boards/ftduino.json‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"build": {
3+
"core": "arduino",
4+
"extra_flags": "-DARDUINO_AVR_FTDUINO",
5+
"f_cpu": "16000000L",
6+
"hwids": [
7+
[
8+
"0x1c40",
9+
"0x0537"
10+
],
11+
[
12+
"0x1c40",
13+
"0x0538"
14+
]
15+
],
16+
"mcu": "atmega32u4",
17+
"usb_product": "ftDuino",
18+
"variant": "ftduino"
19+
},
20+
"frameworks": [
21+
"arduino"
22+
],
23+
"fuses": {
24+
"efuse": "0xcb",
25+
"hfuse": "0xd8",
26+
"lfuse": "0xff",
27+
"lock": "0x2F"
28+
},
29+
"name": "ftDuino",
30+
"upload": {
31+
"disable_flushing": true,
32+
"maximum_ram_size": 2560,
33+
"maximum_size": 28672,
34+
"protocol": "avr109",
35+
"require_upload_port": true,
36+
"speed": 57600,
37+
"use_1200bps_touch": true,
38+
"wait_for_upload_port": true
39+
},
40+
"url": "https://harbaum.github.io/ftduino/www/de/",
41+
"vendor": "Till Harbaum"
42+
}

‎boards/mightycore8535.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"core": "MightyCore",
44
"extra_flags": "-DARDUINO_AVR_ATmega8535",
55
"f_cpu": "16000000L",
6-
"mcu": "atmega16",
6+
"mcu": "atmega8535",
77
"variant": "mightycore"
88
},
99
"frameworks": [

‎boards/whispernode.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"build": {
3+
"core": "arduino",
4+
"extra_flags": "-DARDUINO_AVR_UNO",
5+
"f_cpu": "16000000L",
6+
"mcu": "atmega328p",
7+
"variant": "eightanaloginputs"
8+
},
9+
"frameworks": [
10+
"arduino"
11+
],
12+
"fuses": {
13+
"efuse": "0x05",
14+
"hfuse": "0xDA",
15+
"lfuse": "0xEF",
16+
"lock": "0x2F"
17+
},
18+
"name": "Talk2 Whisper Node",
19+
"upload": {
20+
"maximum_ram_size": 2048,
21+
"maximum_size": 32256,
22+
"protocol": "arduino",
23+
"require_upload_port": true,
24+
"speed": 115200
25+
},
26+
"url": "https://wisen.com.au/store/products/whisper-node-avr/",
27+
"vendor": "Wisen"
28+
}

‎builder/frameworks/_bare.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
],
4040

4141
CXXFLAGS=[
42+
"-Wno-error=narrowing",
4243
"-fno-exceptions",
4344
"-fno-threadsafe-statics",
4445
"-fpermissive",

‎examples/arduino-blink/.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
.pioenvs
2-
.clang_complete
3-
.gcc-flags.json
2+
.piolibdeps

‎examples/arduino-blink/.travis.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# Continuous Integration (CI) is the practice, in software
22
# engineering, of merging all developer working copies with a shared mainline
3-
# several times a day < http://docs.platformio.org/page/ci/index.html >
3+
# several times a day < https://docs.platformio.org/page/ci/index.html >
44
#
55
# Documentation:
66
#
77
# * Travis CI Embedded Builds with PlatformIO
88
# < https://docs.travis-ci.com/user/integration/platformio/ >
99
#
1010
# * PlatformIO integration with Travis CI
11-
# < http://docs.platformio.org/page/ci/travis.html >
11+
# < https://docs.platformio.org/page/ci/travis.html >
1212
#
1313
# * User Guide for `platformio ci` command
14-
# < http://docs.platformio.org/page/userguide/cmd_ci.html >
14+
# < https://docs.platformio.org/page/userguide/cmd_ci.html >
1515
#
1616
#
1717
# Please choose one of the following templates (proposed below) and uncomment
@@ -35,13 +35,14 @@
3535
#
3636
# install:
3737
# - pip install -U platformio
38+
# - platformio update
3839
#
3940
# script:
4041
# - platformio run
4142

4243

4344
#
44-
# Template #2: The project is intended to by used as a library with examples
45+
# Template #2: The project is intended to be used as a library with examples.
4546
#
4647

4748
# language: python
@@ -60,6 +61,7 @@
6061
#
6162
# install:
6263
# - pip install -U platformio
64+
# - platformio update
6365
#
6466
# script:
6567
# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N

‎examples/arduino-blink/include/README‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
2+
This directory is intended for project header files.
3+
4+
A header file is a file containing C declarations and macro definitions
5+
to be shared between several project source files. You request the use of a
6+
header file in your project source file (C, C++, etc) located in `src` folder
7+
by including it, with the C preprocessing directive `#include'.
8+
9+
```src/main.c
10+
11+
#include "header.h"
12+
13+
int main (void)
14+
{
15+
...
16+
}
17+
```
18+
19+
Including a header file produces the same results as copying the header file
20+
into each source file that needs it. Such copying would be time-consuming
21+
and error-prone. With a header file, the related declarations appear
22+
in only one place. If they need to be changed, they can be changed in one
23+
place, and programs that include the header file will automatically use the
24+
new version when next recompiled. The header file eliminates the labor of
25+
finding and changing all the copies as well as the risk that a failure to
26+
find one copy will result in inconsistencies within a program.
27+
28+
In C, the usual convention is to give header files names that end with `.h'.
29+
It is most portable to use only letters, digits, dashes, and underscores in
30+
header file names, and at most one dot.
31+
32+
Read more about using header files in official GCC documentation:
33+
34+
* Include Syntax
35+
* Include Operation
36+
* Once-Only Headers
37+
* Computed Includes
38+
39+
https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html

‎examples/arduino-blink/lib/README‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
2+
This directory is intended for project specific (private) libraries.
3+
PlatformIO will compile them to static libraries and link into executable file.
4+
5+
The source code of each library should be placed in a an own separate directory
6+
("lib/your_library_name/[here are source files]").
7+
8+
For example, see a structure of the following two libraries `Foo` and `Bar`:
9+
10+
|--lib
11+
| |
12+
| |--Bar
13+
| | |--docs
14+
| | |--examples
15+
| | |--src
16+
| | |- Bar.c
17+
| | |- Bar.h
18+
| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
19+
| |
20+
| |--Foo
21+
| | |- Foo.c
22+
| | |- Foo.h
23+
| |
24+
| |- README --> THIS FILE
25+
|
26+
|- platformio.ini
27+
|--src
28+
|- main.c
29+
30+
and a contents of `src/main.c`:
31+
```
32+
#include <Foo.h>
33+
#include <Bar.h>
34+
35+
int main (void)
36+
{
37+
...
38+
}
39+
40+
```
41+
42+
PlatformIO Library Dependency Finder will find automatically dependent
43+
libraries scanning project source files.
44+
45+
More information about PlatformIO Library Dependency Finder
46+
- https://docs.platformio.org/page/librarymanager/ldf.html

‎examples/arduino-blink/lib/readme.txt‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)