renamed wiring_serial to serial to reflect its complete remake

This commit is contained in:
Simen Svale Skogsrud 2011-05-31 22:45:38 +02:00
parent 33a940cdf8
commit defabc80ed
11 changed files with 13 additions and 15 deletions

View File

@ -30,7 +30,7 @@
DEVICE = atmega328p DEVICE = atmega328p
CLOCK = 16000000 CLOCK = 16000000
PROGRAMMER = -c avrisp2 -P usb 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 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:0xd9:m -U lfuse:w:0x24:m
FUSES = -U hfuse:w:0xd2:m -U lfuse:w:0xff:m FUSES = -U hfuse:w:0xd2:m -U lfuse:w:0xff:m

View File

@ -36,4 +36,4 @@ Supporting files:
'nuts_bolts.h' : A tiny collection of useful constants and macros used everywhere '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 'serial' : Low level serial communications

2
main.c
View File

@ -31,7 +31,7 @@
#include "limits.h" #include "limits.h"
#include "settings.h" #include "settings.h"
#include "wiring_serial.h" #include "serial.h"
// #ifndef __AVR_ATmega328P__ // #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')" // # 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')"

View File

@ -27,7 +27,7 @@
#include "nuts_bolts.h" #include "nuts_bolts.h"
#include "stepper.h" #include "stepper.h"
#include "planner.h" #include "planner.h"
#include "wiring_serial.h" #include "serial.h"
void mc_dwell(uint32_t milliseconds) void mc_dwell(uint32_t milliseconds)

View File

@ -29,7 +29,7 @@
#include "stepper.h" #include "stepper.h"
#include "settings.h" #include "settings.h"
#include "config.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 // The number of linear motions that can be in the plan at any give time
#ifdef __AVR_ATmega328P__ #ifdef __AVR_ATmega328P__

View File

@ -21,7 +21,7 @@
#include <avr/io.h> #include <avr/io.h>
#include "protocol.h" #include "protocol.h"
#include "gcode.h" #include "gcode.h"
#include "wiring_serial.h" #include "serial.h"
#include "settings.h" #include "settings.h"
#include "config.h" #include "config.h"
#include <math.h> #include <math.h>

View File

@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with Grbl. If not, see <http://www.gnu.org/licenses/>. along with Grbl. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef serial_h #ifndef protocol_h
#define serial_h #define protocol_h
#define STATUS_OK 0 #define STATUS_OK 0
#define STATUS_BAD_NUMBER_FORMAT 1 #define STATUS_BAD_NUMBER_FORMAT 1

View File

@ -1,5 +1,5 @@
/* /*
wiring_serial.c - serial functions. serial.c - serial functions.
Part of Arduino - http://www.arduino.cc/ Part of Arduino - http://www.arduino.cc/
Copyright (c) 2005-2006 David A. Mellis Copyright (c) 2005-2006 David A. Mellis
@ -19,10 +19,8 @@
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA Boston, MA 02111-1307 USA
$Id: wiring.c 248 2007-02-03 15:36:30Z mellis $
*/ */
//#include "wiring_private.h"
#include <math.h> #include <math.h>
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>

View File

@ -22,8 +22,8 @@
$Id: wiring.h 387 2008-03-08 21:30:00Z mellis $ $Id: wiring.h 387 2008-03-08 21:30:00Z mellis $
*/ */
#ifndef wiring_h #ifndef serial_h
#define wiring_h #define serial_h
void beginSerial(long); void beginSerial(long);
void serialWrite(unsigned char); void serialWrite(unsigned char);

View File

@ -23,7 +23,7 @@
#include "nuts_bolts.h" #include "nuts_bolts.h"
#include "settings.h" #include "settings.h"
#include "eeprom.h" #include "eeprom.h"
#include "wiring_serial.h" #include "serial.h"
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
#include "protocol.h" #include "protocol.h"
#include "config.h" #include "config.h"

View File

@ -30,7 +30,7 @@
#include "nuts_bolts.h" #include "nuts_bolts.h"
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include "planner.h" #include "planner.h"
#include "wiring_serial.h" #include "serial.h"
#include "limits.h" #include "limits.h"
// Some useful constants // Some useful constants