Skip to content

Commit 2a49e2e

Browse files
committed
Merge branch 'release/v5.2.0'
2 parents f4fe4c4 + 76f3774 commit 2a49e2e

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

examples/assembly-blink/src/main.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ blink:
2020
delay_ms:
2121
; Delay about (r25:r24)*ms. Clobbers r30, and r31.
2222
; One millisecond is about 16000 cycles at 16MHz.
23-
; The inner loop takes 4 cycles, so we repeat it 3000 times
23+
; The inner loop takes 4 cycles, so we repeat it 4000 times
2424
ldi r31, hi8(4000)
2525
ldi r30, lo8(4000)
2626
1:
2727
sbiw r30, 1
2828
brne 1b
2929
sbiw r24, 1
3030
brne delay_ms
31-
ret
31+
ret

platform.json

Lines changed: 8 additions & 8 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": "5.1.0",
21+
"version": "5.2.0",
2222
"frameworks": {
2323
"arduino": {
2424
"package": "framework-arduino-avr",
@@ -35,7 +35,7 @@
3535
"type": "framework",
3636
"optional": true,
3737
"owner": "platformio",
38-
"version": "~5.2.0"
38+
"version": "~5.3.0"
3939
},
4040
"framework-arduino-avr-attiny": {
4141
"type": "framework",
@@ -71,31 +71,31 @@
7171
"type": "framework",
7272
"optional": true,
7373
"owner": "platformio",
74-
"version": "~3.0.2"
74+
"version": "~3.1.0"
7575
},
7676
"framework-arduino-avr-mightycore": {
7777
"type": "framework",
7878
"optional": true,
7979
"owner": "platformio",
80-
"version": "~3.0.2"
80+
"version": "~3.1.0"
8181
},
8282
"framework-arduino-avr-minicore": {
8383
"type": "framework",
8484
"optional": true,
8585
"owner": "platformio",
86-
"version": "~3.0.2"
86+
"version": "~3.1.0"
8787
},
8888
"framework-arduino-avr-majorcore": {
8989
"type": "framework",
9090
"optional": true,
9191
"owner": "platformio",
92-
"version": "~3.0.2"
92+
"version": "~3.1.0"
9393
},
9494
"framework-arduino-avr-microcore": {
9595
"type": "framework",
9696
"optional": true,
9797
"owner": "platformio",
98-
"version": "~2.4.0"
98+
"version": "~2.5.0"
9999
},
100100
"framework-arduino-avr-nicai": {
101101
"type": "framework",
@@ -120,7 +120,7 @@
120120
"optional": true,
121121
"owner": "platformio",
122122
"version": "~1.60300.0",
123-
"optionalVersions": ["~1.70200.0"]
123+
"optionalVersions": ["~1.80100.0"]
124124
},
125125
"tool-micronucleus": {
126126
"type": "uploader",

platform.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def configure_default_packages(self, variables, targets):
4141
"MajorCore",
4242
"MicroCore",
4343
):
44-
self.packages["tool-avrdude"]["version"] = "~1.70200.0"
44+
self.packages["tool-avrdude"]["version"] = "~1.80100.0"
4545

4646
self.frameworks["arduino"]["package"] = framework_package
4747
self.packages[framework_package]["optional"] = False

0 commit comments

Comments
 (0)