Skip to content

Commit 6c83e62

Browse files
ivankravetsivankravets
committed
Merge branch 'release/v1.6.0'
2 parents 897edbe + 6ed38bd commit 6c83e62

File tree

9 files changed

+196
-7
lines changed

9 files changed

+196
-7
lines changed

‎boards/controllino_maxi.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"build": {
3+
"core": "arduino",
4+
"extra_flags": "-DARDUINO_ARCH_AVR -DARDUINO_AVR_MEGA2560",
5+
"f_cpu": "16000000L",
6+
"hwids": [
7+
[
8+
"0x2341",
9+
"0x0010"
10+
],
11+
[
12+
"0x2341",
13+
"0x0042"
14+
],
15+
[
16+
"0x2A03",
17+
"0x0010"
18+
],
19+
[
20+
"0x2A03",
21+
"0x0042"
22+
]
23+
],
24+
"mcu": "atmega2560",
25+
"variant": "Controllino_maxi"
26+
},
27+
"frameworks": [
28+
"arduino"
29+
],
30+
"fuses": {
31+
"lfuse": "0xFF",
32+
"lock": "0x0F"
33+
},
34+
"name": "Controllino Maxi",
35+
"upload": {
36+
"maximum_ram_size": 8192,
37+
"maximum_size": 253952,
38+
"protocol": "wiring",
39+
"require_upload_port": true,
40+
"speed": 115200
41+
},
42+
"url": "https://controllino.biz/controllino/maxi/",
43+
"vendor": "Controllino"
44+
}

‎boards/controllino_maxi_automation.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"build": {
3+
"core": "arduino",
4+
"extra_flags": "-DARDUINO_ARCH_AVR -DARDUINO_AVR_MEGA2560",
5+
"f_cpu": "16000000L",
6+
"hwids": [
7+
[
8+
"0x2341",
9+
"0x0010"
10+
],
11+
[
12+
"0x2341",
13+
"0x0042"
14+
],
15+
[
16+
"0x2A03",
17+
"0x0010"
18+
],
19+
[
20+
"0x2A03",
21+
"0x0042"
22+
]
23+
],
24+
"mcu": "atmega2560",
25+
"variant": "Controllino_maxi_automation"
26+
},
27+
"frameworks": [
28+
"arduino"
29+
],
30+
"fuses": {
31+
"lfuse": "0xFF",
32+
"lock": "0x0F"
33+
},
34+
"name": "Controllino Maxi Automation",
35+
"upload": {
36+
"maximum_ram_size": 8192,
37+
"maximum_size": 253952,
38+
"protocol": "wiring",
39+
"require_upload_port": true,
40+
"speed": 115200
41+
},
42+
"url": "https://controllino.biz/controllino/maxi-automation/",
43+
"vendor": "Controllino"
44+
}

‎boards/controllino_mega.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"build": {
3+
"core": "arduino",
4+
"extra_flags": "-DARDUINO_ARCH_AVR -DARDUINO_AVR_MEGA2560",
5+
"f_cpu": "16000000L",
6+
"hwids": [
7+
[
8+
"0x2341",
9+
"0x0010"
10+
],
11+
[
12+
"0x2341",
13+
"0x0042"
14+
],
15+
[
16+
"0x2A03",
17+
"0x0010"
18+
],
19+
[
20+
"0x2A03",
21+
"0x0042"
22+
]
23+
],
24+
"mcu": "atmega2560",
25+
"variant": "Controllino_mega"
26+
},
27+
"frameworks": [
28+
"arduino"
29+
],
30+
"fuses": {
31+
"lfuse": "0xFF",
32+
"lock": "0x0F"
33+
},
34+
"name": "Controllino Mega",
35+
"upload": {
36+
"maximum_ram_size": 8192,
37+
"maximum_size": 253952,
38+
"protocol": "wiring",
39+
"require_upload_port": true,
40+
"speed": 115200
41+
},
42+
"url": "https://controllino.biz/controllino/mega/",
43+
"vendor": "Controllino"
44+
}

‎boards/controllino_mini.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_ARCH_AVR -DARDUINO_AVR_UNO",
5+
"f_cpu": "16000000L",
6+
"hwids": [
7+
[
8+
"0x2341",
9+
"0x0043"
10+
],
11+
[
12+
"0x2341",
13+
"0x0001"
14+
],
15+
[
16+
"0x2A03",
17+
"0x0043"
18+
]
19+
],
20+
"mcu": "atmega328p",
21+
"variant": "Controllino_mini"
22+
},
23+
"frameworks": [
24+
"arduino"
25+
],
26+
"fuses": {
27+
"efuse": "0x05",
28+
"hfuse": "0xDE",
29+
"lfuse": "0xFF",
30+
"lock": "0x0F"
31+
},
32+
"name": "Controllino Mini",
33+
"upload": {
34+
"maximum_ram_size": 2048,
35+
"maximum_size": 32256,
36+
"protocol": "arduino",
37+
"require_upload_port": true,
38+
"speed": 115200
39+
},
40+
"url": "https://controllino.biz/controllino/mini/",
41+
"vendor": "Controllino"
42+
}

‎boards/sparkfun_promicro16.json‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,19 @@
66
"hwids": [
77
[
88
"0x1B4F",
9-
"0x9205"
9+
"0x9203"
1010
],
1111
[
1212
"0x1B4F",
13-
"0x9206"
13+
"0x9204"
14+
],
15+
[
16+
"0x2341",
17+
"0x8037"
18+
],
19+
[
20+
"0x2341",
21+
"0x0037"
1422
]
1523
],
1624
"mcu": "atmega32u4",

‎boards/sparkfun_promicro8.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@
1111
[
1212
"0x1B4F",
1313
"0x9204"
14+
],
15+
[
16+
"0x2341",
17+
"0x8037"
18+
],
19+
[
20+
"0x2341",
21+
"0x0037"
1422
]
1523
],
1624
"mcu": "atmega32u4",

‎builder/frameworks/arduino.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@
8585
join(FRAMEWORK_DIR, "variants", env.BoardConfig().get("build.variant"))
8686
))
8787

88-
envsafe = env.Clone()
89-
90-
libs.append(envsafe.BuildLibrary(
88+
libs.append(env.BuildLibrary(
9189
join("$BUILD_DIR", "FrameworkArduino"),
9290
join(FRAMEWORK_DIR, "cores", env.BoardConfig().get("build.core"))
9391
))

‎builder/main.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ def _rpi_sysgpio(path, value):
8484
AR="avr-gcc-ar",
8585
AS="avr-as",
8686
CC="avr-gcc",
87+
GDB="avr-gdb",
8788
CXX="avr-g++",
8889
OBJCOPY="avr-objcopy",
8990
RANLIB="avr-gcc-ranlib",

‎platform.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"type": "git",
1313
"url": "https://github.com/platformio/platform-atmelavr.git"
1414
},
15-
"version": "1.5.0",
15+
"version": "1.6.0",
1616
"packageRepositories": [
1717
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1818
"https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
@@ -37,7 +37,7 @@
3737
"framework-arduinoavr": {
3838
"type": "framework",
3939
"optional": true,
40-
"version": "~1.10618.1"
40+
"version": "~1.10619.0"
4141
},
4242
"framework-simba": {
4343
"type": "framework",

0 commit comments

Comments
 (0)