Commit graph

12 commits

Author SHA1 Message Date
Simon John
866b2e9100 Simplified package vs. git detection, fixes #147
Removed ARDMK_FILE as it was in the wrong case and a bit pointless anyway.

Fixed ChipKIT.mk which wouldn't work when packaged and had a lot of
duplicated code (needs checking this still works!)

Removed the git vs. package detection of the arduino-mk subdirectory -
ARDMK_DIR is now calculated based on where the *.mk files are.

Removed ARDMK_PATH as we now check for ard-reset-arduino in the $PATH
when packaged or fall back to it being one level above the *.mk files
in bin/ when checked out of git.

Merged Common.mk back into Arduino.mk as it meant nasty workarounds for
missing routines e.g. dir_if_exists and show_config_variable which
meant that AUTO_ARDUINO_DIR was broken.

So now all you need to set is BOARD_TAG (plus MONITOR_PORT or ISP_PROG
for upload/reset).
2014-01-11 13:24:36 +00:00
Christopher Peplin
bc03025596 Adjust path to avrdude/avrdude.conf for MPIDE in Linux. 2013-12-08 15:07:36 -05:00
Christopher Peplin
ef521d284a Include assembly vector table in chipKIT build.
* Added build step for assembly files in CORE
* Removed duplicate flags from AS build step
2013-12-03 11:24:19 -05:00
Christopher Peplin
58f1cb249c Add common linker script for MPIDE version 0023-*-20130817-test. 2013-12-03 10:27:44 -05:00
Sudar
65b426e4ad Remove unnecessary checks for ARDMK_DIR
If `ARDMK_DIR` is not defined, then it is assumed to be the directory
where `Arduino.mk` or `chipKIT.mk` is present.

Since this assumption is made, `ARDMK_DIR` will always be set, whether
the user has explicitly set it or not. Therefore checking whether
`ARDMK_DIR` is not set is unnecessary. This commit removes these
unnecessary checks.
2013-07-28 11:42:20 +05:30
Sudar
290a4986d6 Make ARDMK_PATH and ARDMK_DIR backward compatible
When support for ChipKit was added recently (issue #98) it broke the way
ARDMK_PATH and ARDMK_DIR were handled, if the package was installed
through package. It was only working if you have done a git checkout.

This commit fixes it, but searching for `Common.mk` both in
`ARDMK_DIR/arduino-mk` and `ARDMK_DIR/` directories.

Fix #110
2013-07-12 16:07:49 +05:30
Sudar
b76d6bd783 Merge pull request #107 from openxc/chipkit-avrdude
Fix path to avrdude for chipKIT's MPIDE installation.
2013-07-09 20:08:47 -07:00
Sudar
4165bad7d6 Merge pull request #108 from openxc/no-preferences-required
Don't require an IDE preferences file, fallback to default sketchbook.
2013-07-09 19:51:11 -07:00
Christopher Peplin
3c00739165 Don't require an IDE preferences file, fallback to default sketchbook.
It should be possible to use the Makefile without ever running the
Arduino or chipKIT IDE. This change only looks for the preferences file
if the sketchbook path is not defined, and even then, will use the
default skethbook path if the preferences file is unavailable.
2013-07-09 17:03:02 -04:00
Christopher Peplin
18548b4890 Fix path to avrdude for chipKIT's MPIDE installation. 2013-07-09 16:40:27 -04:00
Christopher Peplin
9200fe3d4d Update a call to PARSE_BOARD to Makefile-style in chipKIT file. 2013-07-09 16:29:25 -04:00
Christopher Peplin
df88db2cfb Add support for the Digilent chipKIT platform
This commit modifies a few things in Arduino.mk to be able to support
overriding the necessary configuration options to support the chipKIT build,
and also includes an example sketch configured to build for the Max32 platform.

In addition the following changes were done as well

- Control C standard with a CFLAGS_STD flag, GNU99 by default.
- Duplicate show_config_variable in each sub-makefile.
- Remove redundant output of ARDUINO_PREFERENCES_PATH from config table.
- Defer Priting ARDMK_DIR until Arduino.mk.
- Define names of compiler tools earlier to use for path checking.

Duplicating show_config_variable is unfortunate because the code is duplicated,
but I don't see a good way around it since we need to dupliacate the check
for ARDMK_DIR before we can find Common.mk.

Fix #98
2013-07-09 21:42:05 +05:30