From 39d28ca13d3d987cef95021b328dcf8f0e8e0c6e Mon Sep 17 00:00:00 2001
From: Roger Clark <synergie7@gmail.com>
Date: Tue, 20 Jan 2015 21:30:38 +1100
Subject: [PATCH] Added gitignore to prevent osx system files being included,
 and fixed issues in serial_upload for osx

---
 .gitignore                 | 1 +
 tools/macosx/serial_upload | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 .gitignore
 mode change 100644 => 100755 tools/macosx/serial_upload

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..63123fb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_store
diff --git a/tools/macosx/serial_upload b/tools/macosx/serial_upload
old mode 100644
new mode 100755
index 79c4772..05d17c6
--- a/tools/macosx/serial_upload
+++ b/tools/macosx/serial_upload
@@ -1,2 +1,2 @@
 #!/bin/bash
-stm32flash/stm32flash -g 0x8000000 -b 230400 -w "$4" "$1" 
+$(dirname $0)/stm32flash/stm32flash -g 0x8000000 -b 230400 -w "$4" /dev/"$1"