Skip to content

Commit

Permalink
Fix style issues in IAR exporter
Browse files Browse the repository at this point in the history
  • Loading branch information
theotherjimmy committed Jun 22, 2017
1 parent 226af54 commit 14a0fb7
Showing 1 changed file with 25 additions and 22 deletions.
47 changes: 25 additions & 22 deletions tools/export/iar/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,33 @@
from tools.utils import NotSupportedException
from multiprocessing import cpu_count


def _supported(mcu, iar_targets):
if "IAR" not in mcu.supported_toolchains:
return False
if hasattr(mcu, 'device_name') and mcu.device_name in iar_targets:
return True
if mcu.name in iar_targets:
return True
return False


_iar_defs = os.path.join(
os.path.dirname(os.path.abspath(__file__)), 'iar_definitions.json')

with open(_iar_defs, 'r') as f:
_GUI_OPTIONS = json.load(f)

_IAR_TARGETS = [target for target, obj in TARGET_MAP.iteritems() if
_supported(obj, _GUI_OPTIONS.keys())]


class IAR(Exporter):
NAME = 'iar'
TOOLCHAIN = 'IAR'

#iar_definitions.json location
def_loc = os.path.join(
os.path.dirname(os.path.abspath(__file__)), '..', '..', '..',
'tools','export', 'iar', 'iar_definitions.json')

#create a dictionary of the definitions
with open(def_loc, 'r') as f:
IAR_DEFS = json.load(f)

def _iar_support(tgt, iar_targets):
if "IAR" not in tgt.supported_toolchains:
return False
if hasattr(tgt, 'device_name') and tgt.device_name in iar_targets:
return True
if tgt.name in iar_targets:
return True
return False
TARGETS = _IAR_TARGETS

#supported targets have a name or device_name which maps to a definition
#in iar_definitions.json
TARGETS = [target for target, obj in TARGET_MAP.iteritems() if
_iar_support(obj, IAR_DEFS.keys())]

def iar_groups(self, grouped_src):
"""Return a namedtuple of group info
Expand Down Expand Up @@ -68,7 +69,7 @@ def iar_device(self):
tgt = TARGET_MAP[self.target]
device_name = (tgt.device_name if hasattr(tgt, "device_name") else
tgt.name)
device_info = self.IAR_DEFS[device_name]
device_info = _GUI_OPTIONS[device_name]
iar_defaults ={
"OGChipSelectEditMenu": "",
"CoreVariant": '',
Expand Down Expand Up @@ -192,3 +193,5 @@ def build(project_name, log_name="build_log.txt", cleanup=True):
return -1
else:
return 0


0 comments on commit 14a0fb7

Please sign in to comment.