Skip to content

Commit da85d5c

Browse files
committed
Merge branch 'release/v3.4.0'
2 parents 245e5b1 + 28cd4eb commit da85d5c

File tree

6 files changed

+22
-10
lines changed

6 files changed

+22
-10
lines changed

boards/attiny167.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"build": {
33
"core": "tiny",
4-
"extra_flags": "-DARDUINO_AVR_ATTINYX7",
4+
"extra_flags": "-DARDUINO_AVR_ATTINYX7 -DCLOCK_SOURCE=17",
55
"f_cpu": "8000000L",
66
"mcu": "attiny167",
77
"variant": "tinyX7_New"

boards/attiny85.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"build": {
33
"core": "tiny",
4-
"extra_flags": "-DARDUINO_AVR_ATTINYX5 -DNEOPIXELPORT=PORTB",
4+
"extra_flags": "-DARDUINO_AVR_ATTINYX5 -DNEOPIXELPORT=PORTB -DCLOCK_SOURCE=6",
55
"f_cpu": "8000000L",
66
"mcu": "attiny85",
77
"variant": "tinyX5"

boards/attiny88.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"build": {
33
"core": "tiny",
4-
"extra_flags": "-DARDUINO_AVR_ATTINYX8",
4+
"extra_flags": "-DARDUINO_AVR_ATTINYX8 -DCLOCK_SOURCE=18",
55
"f_cpu": "8000000L",
66
"mcu": "attiny88",
77
"variant": "tinyX8"

boards/sparkfun_satmega128rfa1.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
],
1515
"name": "SparkFun ATmega128RFA1 Dev Board",
1616
"upload": {
17-
"maximum_ram_size": 126976,
18-
"maximum_size": 16384,
17+
"maximum_ram_size": 16384,
18+
"maximum_size": 126976,
1919
"protocol": "arduino",
2020
"require_upload_port": true,
2121
"speed": 57600

builder/frameworks/arduino.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ def get_bootloader_size():
8888
CXXFLAGS=[
8989
"-fno-exceptions",
9090
"-fno-threadsafe-statics",
91-
"-fpermissive",
92-
"-std=gnu++11"
91+
"-fpermissive"
9392
],
9493

9594
LINKFLAGS=[
@@ -113,6 +112,19 @@ def get_bootloader_size():
113112
]
114113
)
115114

115+
if build_core in ("MiniCore", "MegaCore", "MightyCore", "MajorCore"):
116+
env.Append(
117+
CXXFLAGS=[
118+
"-std=gnu++17"
119+
],
120+
)
121+
else:
122+
env.Append(
123+
CXXFLAGS=[
124+
"-std=gnu++11"
125+
],
126+
)
127+
116128
#
117129
# Take into account bootloader size
118130
#

platform.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"type": "git",
1919
"url": "https://github.com/platformio/platform-atmelavr.git"
2020
},
21-
"version": "3.3.0",
21+
"version": "3.4.0",
2222
"frameworks": {
2323
"arduino": {
2424
"package": "framework-arduino-avr",
@@ -99,7 +99,7 @@
9999
"type": "framework",
100100
"optional": true,
101101
"owner": "platformio",
102-
"version": "~2.0.3"
102+
"version": "~2.1.0"
103103
},
104104
"framework-arduino-avr-nicai": {
105105
"type": "framework",
@@ -141,7 +141,7 @@
141141
"type": "debugger",
142142
"optional": true,
143143
"owner": "platformio",
144-
"version": "~1.10600.200511"
144+
"version": "~1.10700.0"
145145
}
146146
}
147147
}

0 commit comments

Comments
 (0)