From 0966e8e5f3df8cfd2d96c470fcfca6095f23a4b1 Mon Sep 17 00:00:00 2001 From: Sudar Date: Sun, 23 Dec 2012 15:42:30 +0530 Subject: [PATCH 1/4] Auto detect sketchbook location even in MAC --- arduino-mk/Arduino.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index b915445..ec5a758 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -478,6 +478,14 @@ ifndef ARDUINO_SKETCHBOOK $(HOME)/.arduino/preferences.txt | \ sed -e 's/sketchbook.path=//' ) endif + + # on mac + ifneq ($(wildcard $(HOME)/Library/Arduino/preferences.txt),) + ARDUINO_SKETCHBOOK = $(shell grep --max-count=1 --regexp="sketchbook.path=" \ + $(HOME)/Library/Arduino/preferences.txt | \ + sed -e 's/sketchbook.path=//' ) + endif + ifneq ($(ARDUINO_SKETCHBOOK),) $(call show_config_variable,ARDUINO_SKETCHBOOK,[AUTODETECTED],(in arduino preferences file)) else From e9f5897d19aa3b7396b00d35667897d931aedc5b Mon Sep 17 00:00:00 2001 From: Sudar Date: Thu, 3 Jan 2013 22:31:24 +0530 Subject: [PATCH 2/4] Fixed the automatic baudrate detection script that was broken if the line already had the tab character --- arduino-mk/Arduino.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index ec5a758..96f2e1b 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -511,8 +511,8 @@ endif # for more information (search for 'character special device'). # ifndef MONITOR_BAUDRATE - #This works only in linux. TODO: Port it to MAC OS also - SPEED = $(shell grep --max-count=1 --regexp="Serial.begin" $$(ls -1 *.ino) | sed -e 's/\/\/.*$$//g' -e 's/(/\t/' -e 's/)/\t/' | awk -F '\t' '{print $$2}' ) + #This works only in linux. TODO: Port it to MAC OS also + SPEED = $(shell grep --max-count=1 --regexp="Serial.begin" $$(ls -1 *.ino) | sed -e 's/\t//g' -e 's/\/\/.*$$//g' -e 's/(/\t/' -e 's/)/\t/' | awk -F '\t' '{print $$2}' ) MONITOR_BAUDRATE = $(findstring $(SPEED),300 1200 2400 4800 9600 14400 19200 28800 38400 57600 115200) ifeq ($(MONITOR_BAUDRATE),) From c8253f60ce5ad3eca55bc42b6999a6c0bfd7d8f5 Mon Sep 17 00:00:00 2001 From: fr0sty1 Date: Mon, 21 Jan 2013 00:01:09 -0600 Subject: [PATCH 3/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0d949ae..1d090f8 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ need the YAML library to run ard-parse-boards. On Debian or Ubuntu: - apt-get install libdevice-serial-perl + apt-get install libdevice-serialport-perl apt-get install libyaml-perl On Fedora: From cd36eb6abb43fe2a9286f4762dd9cdf4d3ad9b28 Mon Sep 17 00:00:00 2001 From: Sudar Date: Mon, 21 Jan 2013 21:17:39 +0530 Subject: [PATCH 4/4] Updated Readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7035afd..244b038 100644 --- a/README.md +++ b/README.md @@ -129,6 +129,7 @@ The following are the list of changes that I have made or merged in this fork. H - Removed -w from CPPFLAGS to show warnings (https://github.com/gaftech) - Changed shebang to use /usr/bin/env (https://github.com/anm) - set USB_VID and USB_PID only for leonardo boards(https://github.com/alohr) +- Updated Readme (https://github.com/fr0sty1/) ## Know Issues - Because of the way the makefile is structured, the configuration parameters gets printed twice.