Skip to content

Commit f9fd2e2

Browse files
committed
Merge branch 'release/v1.3.0'
2 parents 81b694a + 25a9bc7 commit f9fd2e2

5 files changed

Lines changed: 22 additions & 5 deletions

File tree

boards/artik_1020.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"name": "Samsung ARTIK 1020",
1111
"upload": {
1212
"maximum_ram_size": 2147483648,
13-
"maximum_size": 2147483648
13+
"maximum_size": 17179869184
1414
},
1515
"url": "https://www.artik.io",
1616
"vendor": "Samsung"

boards/artik_520.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"name": "Samsung ARTIK 520",
1111
"upload": {
1212
"maximum_ram_size": 536870912,
13-
"maximum_size": 536870912
13+
"maximum_size": 4294967296
1414
},
1515
"url": "https://www.artik.io",
1616
"vendor": "Samsung"

boards/artik_530.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"build": {
3+
"extra_flags": "",
4+
"f_cpu": "1200000000L",
5+
"mcu": "s5p4418"
6+
},
7+
"frameworks": [
8+
"artik-sdk"
9+
],
10+
"name": "Samsung ARTIK 530",
11+
"upload": {
12+
"maximum_ram_size": 536870912,
13+
"maximum_size": 4294967296
14+
},
15+
"url": "https://www.artik.io",
16+
"vendor": "Samsung"
17+
}

boards/artik_710.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"name": "Samsung ARTIK 710",
1111
"upload": {
1212
"maximum_ram_size": 1073741824,
13-
"maximum_size": 1073741824
13+
"maximum_size": 4294967296
1414
},
1515
"url": "https://www.artik.io",
1616
"vendor": "Samsung"

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-linux_arm.git"
1414
},
15-
"version": "1.2.0",
15+
"version": "1.3.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",
@@ -42,7 +42,7 @@
4242
"framework-artik-sdk": {
4343
"type": "framework",
4444
"optional": true,
45-
"version": "~1.0.0"
45+
"version": "~1.1.0"
4646
}
4747
}
4848
}

0 commit comments

Comments
 (0)