From defabc80ed8c42ba9ec57417dd83f736564cfab8 Mon Sep 17 00:00:00 2001
From: Simen Svale Skogsrud <simen@bengler.no>
Date: Tue, 31 May 2011 22:45:38 +0200
Subject: [PATCH] renamed wiring_serial to serial to reflect its complete
 remake

---
 Makefile                    | 2 +-
 doc/structure.txt           | 2 +-
 main.c                      | 2 +-
 motion_control.c            | 2 +-
 planner.c                   | 2 +-
 protocol.c                  | 2 +-
 protocol.h                  | 4 ++--
 wiring_serial.c => serial.c | 4 +---
 wiring_serial.h => serial.h | 4 ++--
 settings.c                  | 2 +-
 stepper.c                   | 2 +-
 11 files changed, 13 insertions(+), 15 deletions(-)
 rename wiring_serial.c => serial.c (98%)
 rename wiring_serial.h => serial.h (97%)

diff --git a/Makefile b/Makefile
index 65a33c2..e9c2c99 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@
 DEVICE     = atmega328p
 CLOCK      = 16000000
 PROGRAMMER = -c avrisp2 -P usb
-OBJECTS    = main.o motion_control.o gcode.o spindle_control.o wiring_serial.o protocol.o stepper.o \
+OBJECTS    = main.o motion_control.o gcode.o spindle_control.o serial.o protocol.o stepper.o \
              eeprom.o settings.o planner.o nuts_bolts.o limits.o
 # FUSES      = -U hfuse:w:0xd9:m -U lfuse:w:0x24:m
 FUSES      = -U hfuse:w:0xd2:m -U lfuse:w:0xff:m
diff --git a/doc/structure.txt b/doc/structure.txt
index f87feb3..51e8dee 100644
--- a/doc/structure.txt
+++ b/doc/structure.txt
@@ -36,4 +36,4 @@ Supporting files:
                     
 'nuts_bolts.h'    : A tiny collection of useful constants and macros used everywhere
 
-'wiring_serial'   : Low level serial library initially from an old version of the Arduino software
\ No newline at end of file
+'serial'          : Low level serial communications
\ No newline at end of file
diff --git a/main.c b/main.c
index e156a14..1951171 100644
--- a/main.c
+++ b/main.c
@@ -31,7 +31,7 @@
 #include "limits.h"
 
 #include "settings.h"
-#include "wiring_serial.h"
+#include "serial.h"
 
 // #ifndef __AVR_ATmega328P__
 // #  error "As of version 0.6 Grbl only supports atmega328p. If you want to run Grbl on an 168 check out 0.51 ('git co v0_51')"
diff --git a/motion_control.c b/motion_control.c
index e51d519..170499e 100644
--- a/motion_control.c
+++ b/motion_control.c
@@ -27,7 +27,7 @@
 #include "nuts_bolts.h"
 #include "stepper.h"
 #include "planner.h"
-#include "wiring_serial.h"
+#include "serial.h"
 
 
 void mc_dwell(uint32_t milliseconds) 
diff --git a/planner.c b/planner.c
index e49cd72..d7504cb 100644
--- a/planner.c
+++ b/planner.c
@@ -29,7 +29,7 @@
 #include "stepper.h"
 #include "settings.h"
 #include "config.h"
-#include "wiring_serial.h"
+#include "serial.h"
 
 // The number of linear motions that can be in the plan at any give time
 #ifdef __AVR_ATmega328P__
diff --git a/protocol.c b/protocol.c
index 611ec51..c64280e 100644
--- a/protocol.c
+++ b/protocol.c
@@ -21,7 +21,7 @@
 #include <avr/io.h>
 #include "protocol.h"
 #include "gcode.h"
-#include "wiring_serial.h"
+#include "serial.h"
 #include "settings.h"
 #include "config.h"
 #include <math.h>
diff --git a/protocol.h b/protocol.h
index 7fa7704..3ad6597 100644
--- a/protocol.h
+++ b/protocol.h
@@ -17,8 +17,8 @@
   You should have received a copy of the GNU General Public License
   along with Grbl.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef serial_h
-#define serial_h
+#ifndef protocol_h
+#define protocol_h
 
 #define STATUS_OK 0
 #define STATUS_BAD_NUMBER_FORMAT 1
diff --git a/wiring_serial.c b/serial.c
similarity index 98%
rename from wiring_serial.c
rename to serial.c
index 9a8cb32..c10d4ad 100644
--- a/wiring_serial.c
+++ b/serial.c
@@ -1,5 +1,5 @@
 /*
-  wiring_serial.c - serial functions.
+  serial.c - serial functions.
   Part of Arduino - http://www.arduino.cc/
 
   Copyright (c) 2005-2006 David A. Mellis
@@ -19,10 +19,8 @@
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
 
-  $Id: wiring.c 248 2007-02-03 15:36:30Z mellis $
 */
 
-//#include "wiring_private.h"
 #include <math.h>
 #include <avr/pgmspace.h>
 #include <avr/interrupt.h>
diff --git a/wiring_serial.h b/serial.h
similarity index 97%
rename from wiring_serial.h
rename to serial.h
index 516a0ea..ac64387 100644
--- a/wiring_serial.h
+++ b/serial.h
@@ -22,8 +22,8 @@
   $Id: wiring.h 387 2008-03-08 21:30:00Z mellis $
 */
 
-#ifndef wiring_h
-#define wiring_h
+#ifndef serial_h
+#define serial_h
 
 void beginSerial(long);
 void serialWrite(unsigned char);
diff --git a/settings.c b/settings.c
index 78bdec2..7782627 100644
--- a/settings.c
+++ b/settings.c
@@ -23,7 +23,7 @@
 #include "nuts_bolts.h"
 #include "settings.h"
 #include "eeprom.h"
-#include "wiring_serial.h"
+#include "serial.h"
 #include <avr/pgmspace.h>
 #include "protocol.h"
 #include "config.h"
diff --git a/stepper.c b/stepper.c
index 802f8ac..a145475 100644
--- a/stepper.c
+++ b/stepper.c
@@ -30,7 +30,7 @@
 #include "nuts_bolts.h"
 #include <avr/interrupt.h>
 #include "planner.h"
-#include "wiring_serial.h"
+#include "serial.h"
 #include "limits.h"
 
 // Some useful constants