Merge pull request #1 from sudar/master
Merge from original sudar repository
This commit is contained in:
commit
adf09c1164
2 changed files with 3 additions and 3 deletions
|
@ -57,8 +57,8 @@ else
|
||||||
endif
|
endif
|
||||||
ifeq ($(UNAME_S),Darwin)
|
ifeq ($(UNAME_S),Darwin)
|
||||||
CURRENT_OS = MAC
|
CURRENT_OS = MAC
|
||||||
ifeq (, $(shell which ggrep))
|
ifeq (, $(shell which gggrep))
|
||||||
echo $(info Using macOS BSD grep, please install GNU grep to avoid warnings)
|
$(info Using macOS BSD grep, please install GNU grep to avoid warnings)
|
||||||
GREP_CMD = grep
|
GREP_CMD = grep
|
||||||
else
|
else
|
||||||
GREP_CMD = ggrep
|
GREP_CMD = ggrep
|
||||||
|
|
|
@ -298,7 +298,7 @@ The makefile can autodetect the libraries that are included from your sketch and
|
||||||
|
|
||||||
## avrdude
|
## avrdude
|
||||||
|
|
||||||
To upload compiled files, `avrdude` is used. This Makefile tries to find `avrdude` and it's config (`avrdude.conf`) below `ARDUINO_DIR`. If you like to use the one installed on your system instead of the one which came with Arduino, you can try to set the variables `AVRDUDE` and `AVRDUDE_CONF`. On a typical Linux system these could be set to
|
To upload compiled files, `avrdude` is used. This Makefile tries to find `avrdude` and its config (`avrdude.conf`) below `ARDUINO_DIR`. If you like to use the one installed on your system instead of the one which came with Arduino, you can try to set the variables `AVRDUDE` and `AVRDUDE_CONF`. On a typical Linux system these could be set to
|
||||||
|
|
||||||
```make
|
```make
|
||||||
AVRDUDE = /usr/bin/avrdude
|
AVRDUDE = /usr/bin/avrdude
|
||||||
|
|
Loading…
Reference in a new issue