Skip to content

Commit f4fe4c4

Browse files
committed
Merge branch 'release/v5.1.0'
2 parents 63258c3 + 4eec9c4 commit f4fe4c4

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

boards/controllino_maxi.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"build": {
33
"core": "arduino",
4-
"extra_flags": "-DARDUINO_AVR_MEGA2560",
4+
"extra_flags": "-DARDUINO_AVR_MEGA2560 -DRS485_SERIAL_PORT=Serial3 -DRS485_DEFAULT_TX_PIN=14 -DCUSTOM_RS485_DEFAULT_DE_PIN=75 -DCUSTOM_RS485_DEFAULT_RE_PIN=76",
55
"f_cpu": "16000000L",
66
"hwids": [
77
[

boards/controllino_mega.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"build": {
33
"core": "arduino",
4-
"extra_flags": "-DARDUINO_AVR_MEGA2560",
4+
"extra_flags": "-DARDUINO_AVR_MEGA2560 -DRS485_SERIAL_PORT=Serial3 -DRS485_DEFAULT_TX_PIN=14 -DCUSTOM_RS485_DEFAULT_DE_PIN=75 -DCUSTOM_RS485_DEFAULT_RE_PIN=76",
55
"f_cpu": "16000000L",
66
"hwids": [
77
[

platform.json

+6-6
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": "5.0.0",
21+
"version": "5.1.0",
2222
"frameworks": {
2323
"arduino": {
2424
"package": "framework-arduino-avr",
@@ -71,31 +71,31 @@
7171
"type": "framework",
7272
"optional": true,
7373
"owner": "platformio",
74-
"version": "~3.0.0"
74+
"version": "~3.0.2"
7575
},
7676
"framework-arduino-avr-mightycore": {
7777
"type": "framework",
7878
"optional": true,
7979
"owner": "platformio",
80-
"version": "~3.0.0"
80+
"version": "~3.0.2"
8181
},
8282
"framework-arduino-avr-minicore": {
8383
"type": "framework",
8484
"optional": true,
8585
"owner": "platformio",
86-
"version": "~3.0.0"
86+
"version": "~3.0.2"
8787
},
8888
"framework-arduino-avr-majorcore": {
8989
"type": "framework",
9090
"optional": true,
9191
"owner": "platformio",
92-
"version": "~3.0.0"
92+
"version": "~3.0.2"
9393
},
9494
"framework-arduino-avr-microcore": {
9595
"type": "framework",
9696
"optional": true,
9797
"owner": "platformio",
98-
"version": "~2.3.0"
98+
"version": "~2.4.0"
9999
},
100100
"framework-arduino-avr-nicai": {
101101
"type": "framework",

0 commit comments

Comments
 (0)