Merge branch 'master' of github.com:sarfata/kbox-firmware

sarfata · Jan 31, 2017 · 419164e · 419164e
2 parents 2362ec5 + c18aefe
commit 419164e
Show file tree

Hide file tree

Showing 11 changed files with 648 additions and 92 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,5 @@
 *.dSYM
 *.pyc
 *.o
+*.d
 tags
diff --git a/Makefile b/Makefile
@@ -1,4 +1,12 @@
+UNAME := $(shell uname)
+
+ifeq ($(UNAME), Linux)
 PORT=/dev/ttyACM0
+endif
+ifeq ($(UNAME), Darwin)
+PORT=/dev/tty.usbmodem1411
+endif
+
 
 all:
 	platformio -f -c vim run --target upload

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # KBox Firmware
 
 [![Travis
-status](https://api.travis-ci.org/sarfata/kbox-firmware.svg)](https://travis-ci.org/sarfata/kbox-firmware) - [Buy KBox on
+status](https://api.travis-ci.org/sarfata/kbox-firmware.svg?branch=master)](https://travis-ci.org/sarfata/kbox-firmware) - [Buy KBox on
 Tindie!](https://www.tindie.com/products/sarfata/kbox-open-source-boat-gateway/)
 
 ## What is KBox?