Skip to content

Commit cf6ada5

Browse files
committed
Merge branch 'release/v1.12.3'
2 parents 5d1fb4d + b1a7549 commit cf6ada5

File tree

7 files changed

+40
-6
lines changed

7 files changed

+40
-6
lines changed

boards/alorium_hinj.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"build": {
3+
"core": "arduino",
4+
"extra_flags": "-DARDUINO_ARCH_XLR8 -DARDUINO_XLR8",
5+
"f_cpu": "16000000L",
6+
"mcu": "atmega328p",
7+
"variant": "standard"
8+
},
9+
"frameworks": [
10+
"arduino"
11+
],
12+
"name": "Alorium Hinj",
13+
"upload": {
14+
"maximum_ram_size": 2048,
15+
"maximum_size": 32256,
16+
"protocol": "arduino",
17+
"require_upload_port": true,
18+
"speed": 115200
19+
},
20+
"url": "https://www.aloriumtech.com/hinj/",
21+
"vendor": "Alorium Technology"
22+
}

boards/controllino_maxi.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"build": {
3-
"core": "controllino",
3+
"core": "arduino",
44
"extra_flags": "-DARDUINO_AVR_MEGA2560",
55
"f_cpu": "16000000L",
66
"hwids": [

boards/controllino_maxi_automation.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"build": {
3-
"core": "controllino",
3+
"core": "arduino",
44
"extra_flags": "-DARDUINO_AVR_MEGA2560",
55
"f_cpu": "16000000L",
66
"hwids": [

boards/controllino_mega.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"build": {
3-
"core": "controllino",
3+
"core": "arduino",
44
"extra_flags": "-DARDUINO_AVR_MEGA2560",
55
"f_cpu": "16000000L",
66
"hwids": [

boards/controllino_mini.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"build": {
3-
"core": "controllino",
3+
"core": "arduino",
44
"extra_flags": "-DARDUINO_AVR_UNO",
55
"f_cpu": "16000000L",
66
"hwids": [

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.12.2",
15+
"version": "1.12.3",
1616
"packageRepositories": [
1717
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1818
"http://dl.platformio.org/packages/manifest.json",
@@ -36,7 +36,7 @@
3636
"framework-arduinoavr": {
3737
"type": "framework",
3838
"optional": true,
39-
"version": "~1.10623.2"
39+
"version": "~2.10623.190129"
4040
},
4141
"framework-simba": {
4242
"type": "framework",

platform.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,23 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
from os import getenv
16+
1517
from platformio.managers.platform import PlatformBase
1618

1719

1820
class AtmelavrPlatform(PlatformBase):
1921

22+
@property
23+
def package_repositories(self):
24+
repositories = super(AtmelavrPlatform, self).package_repositories or []
25+
if getenv("CI", "false").lower() == "true":
26+
repositories = [
27+
"https://sourceforge.net/projects/platformio-storage/"
28+
"files/packages/manifest.json"
29+
] + repositories
30+
return repositories
31+
2032
def configure_default_packages(self, variables, targets):
2133
if not variables.get("board"):
2234
return super(AtmelavrPlatform, self).configure_default_packages(

0 commit comments

Comments
 (0)