Skip to content

Commit 6bae5a5

Browse files
committed
Merge branch 'verify-properties-default-values' of https://github.com/per1234/Arduino
2 parents 67f7039 + 80f51f4 commit 6bae5a5

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

Diff for: build/shared/revisions.txt

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ARDUINO 1.6.13
77
didn't use it straight away (this caused issues mainly on CI environments)
88

99
[core]
10+
* avr: set default values for "upload.verify" and "program.verify" (allows compatibility with older IDE). Thanks @per1234
1011

1112
ARDUINO 1.6.12 - 2016.09.21
1213

Diff for: hardware/arduino/avr/platform.txt

+4
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,15 @@ tools.avrdude.config.path={path}/etc/avrdude.conf
9797

9898
tools.avrdude.upload.params.verbose=-v
9999
tools.avrdude.upload.params.quiet=-q -q
100+
# tools.avrdude.upload.verify is needed for backwards compatibility with IDE 1.6.8 or older, IDE 1.6.9 or newer overrides this value
101+
tools.avrdude.upload.verify=
100102
tools.avrdude.upload.params.noverify=-V
101103
tools.avrdude.upload.pattern="{cmd.path}" "-C{config.path}" {upload.verbose} {upload.verify} -p{build.mcu} -c{upload.protocol} -P{serial.port} -b{upload.speed} -D "-Uflash:w:{build.path}/{build.project_name}.hex:i"
102104

103105
tools.avrdude.program.params.verbose=-v
104106
tools.avrdude.program.params.quiet=-q -q
107+
# tools.avrdude.program.verify is needed for backwards compatibility with IDE 1.6.8 or older, IDE 1.6.9 or newer overrides this value
108+
tools.avrdude.program.verify=
105109
tools.avrdude.program.params.noverify=-V
106110
tools.avrdude.program.pattern="{cmd.path}" "-C{config.path}" {program.verbose} {program.verify} -p{build.mcu} -c{protocol} {program.extra_params} "-Uflash:w:{build.path}/{build.project_name}.hex:i"
107111

0 commit comments

Comments
 (0)