Skip to content
This repository has been archived by the owner on Aug 27, 2021. It is now read-only.

Fix finding boards.txt (#42) on newer OSX #259

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix finding boards.txt (#42) on newer OSX #259

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ino/environment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ class Environment(dict):

if platform.system() == 'Darwin':
arduino_dist_dir_guesses.insert(0, '/Applications/Arduino.app/Contents/Resources/Java')
arduino_dist_dir_guesses.insert(0, '/Applications/Arduino.app/Contents/Java')

default_board_model = 'uno'
ino = sys.argv[0]
Expand Down Expand Up @@ -214,7 +215,7 @@ def board_models(self):

# boards.txt can be placed in following places
# - hardware/arduino/boards.txt (Arduino IDE 0.xx, 1.0.x)
# - hardware/arduino/{chipset}/boards.txt (Arduino 1.5.x, chipset like `avr`, `sam`)
# - hardware/arduino/{chipset}/boards.txt (Arduino 1.5.x-1.6.x, chipset like `avr`, `sam`)
# - hardware/{platform}/boards.txt (MPIDE 0.xx, platform like `arduino`, `pic32`)
# we should find and merge them all
boards_txts = self.find_arduino_file('boards.txt', ['hardware', '**'],
Expand Down