Merge branch 'release/v5.1.0'

platformio · Sep 26, 2024 · f4fe4c4 · f4fe4c4
2 parents 63258c3 + 4eec9c4
commit f4fe4c4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/boards/controllino_maxi.json b/boards/controllino_maxi.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "arduino",
-    "extra_flags": "-DARDUINO_AVR_MEGA2560",
+    "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",
     "f_cpu": "16000000L",
     "hwids": [
       [

diff --git a/boards/controllino_mega.json b/boards/controllino_mega.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "arduino",
-    "extra_flags": "-DARDUINO_AVR_MEGA2560",
+    "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",
     "f_cpu": "16000000L",
     "hwids": [
       [

diff --git a/platform.json b/platform.json
@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-atmelavr.git"
   },
-  "version": "5.0.0",
+  "version": "5.1.0",
   "frameworks": {
     "arduino": {
       "package": "framework-arduino-avr",
@@ -71,31 +71,31 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~3.0.0"
+      "version": "~3.0.2"
     },
     "framework-arduino-avr-mightycore": {
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~3.0.0"
+      "version": "~3.0.2"
     },
     "framework-arduino-avr-minicore": {
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~3.0.0"
+      "version": "~3.0.2"
     },
     "framework-arduino-avr-majorcore": {
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~3.0.0"
+      "version": "~3.0.2"
     },
     "framework-arduino-avr-microcore": {
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~2.3.0"
+      "version": "~2.4.0"
     },
     "framework-arduino-avr-nicai": {
       "type": "framework",