platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 10:07:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve "uploadlazy" target for @SmartAnthill Project

Browse Source
This commit is contained in:
Ivan Kravets
2015-07-13 12:43:45 +03:00
parent 21b01c8949
commit 4b93ec0b0b
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformio/__init__.py
View File

@ -1,7 +1,7 @@
# Copyright (C) Ivan Kravets <me@ikravets.com> # Copyright (C) Ivan Kravets <me@ikravets.com>
# See LICENSE for details. # See LICENSE for details.
VERSION = (2, 2, "1.dev0") VERSION = (2, 2, "1.dev1")
__version__ = ".".join([str(s) for s in VERSION]) __version__ = ".".join([str(s) for s in VERSION])
__title__ = "platformio" __title__ = "platformio"

5
platformio/builder/tools/platformio.py
View File

@ -6,7 +6,8 @@ from glob import glob
from os import getenv, listdir, sep, walk from os import getenv, listdir, sep, walk
from os.path import basename, dirname, isdir, isfile, join, normpath from os.path import basename, dirname, isdir, isfile, join, normpath
from SCons.Script import DefaultEnvironment, Exit, SConscript from SCons.Script import (COMMAND_LINE_TARGETS, DefaultEnvironment, Exit,
SConscript)
from SCons.Util import case_sensitive_suffixes from SCons.Util import case_sensitive_suffixes
from platformio.util import pioversion_to_intstr from platformio.util import pioversion_to_intstr
@ -155,7 +156,7 @@ def LookupSources(env, variant_dir, src_dir, duplicate=True, src_filter=None):
def BuildFramework(env): def BuildFramework(env):
if "FRAMEWORK" not in env: if "FRAMEWORK" not in env or "uploadlazy" in COMMAND_LINE_TARGETS:
return return
if env['FRAMEWORK'].lower() in ("arduino", "energia"): if env['FRAMEWORK'].lower() in ("arduino", "energia"):

8
platformio/platforms/atmelavr.py
View File

@ -25,10 +25,12 @@ class AtmelavrPlatform(BasePlatform):
}, },
"tool-avrdude": { "tool-avrdude": {
"alias": "uploader",
"default": True "default": True
}, },
"tool-micronucleus": { "tool-micronucleus": {
"alias": "uploader",
"default": True "default": True
}, },
@ -51,11 +53,11 @@ class AtmelavrPlatform(BasePlatform):
for v in variables: for v in variables:
if "BOARD=" not in v: if "BOARD=" not in v:
continue continue
tuploader = "tool-avrdude" disable_tool = "tool-micronucleus"
_, board = v.split("=") _, board = v.split("=")
bdata = get_boards(board) bdata = get_boards(board)
if "digispark" in bdata['build']['core']: if "digispark" in bdata['build']['core']:
tuploader = "tool-micronucleus" disable_tool = "tool-avrdude"
self.PACKAGES[tuploader]['alias'] = "uploader" del self.PACKAGES[disable_tool]['alias']
break break
return BasePlatform.run(self, variables, targets, verbose) return BasePlatform.run(self, variables, targets, verbose)