From d00947a23aaee7c816dcd4a087b6410aa3639ae2 Mon Sep 17 00:00:00 2001
From: Simen Svale Skogsrud <simen@bengler.no>
Date: Sat, 5 Feb 2011 00:45:41 +0100
Subject: [PATCH] renamed config.* to settings.*

---
 Makefile               | 2 +-
 gcode.c                | 2 +-
 main.c                 | 4 ++--
 motion_control.c       | 2 +-
 serial_protocol.c      | 2 +-
 config.c => settings.c | 6 +++---
 config.h => settings.h | 8 ++++----
 spindle_control.c      | 2 +-
 stepper.c              | 2 +-
 stepper_plan.c         | 2 +-
 10 files changed, 16 insertions(+), 16 deletions(-)
 rename config.c => settings.c (97%)
 rename config.h => settings.h (96%)

diff --git a/Makefile b/Makefile
index a742a98..f27ad8a 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ DEVICE     = atmega328p
 CLOCK      = 16000000
 PROGRAMMER = -c avrisp2 -P usb
 OBJECTS    = main.o motion_control.o gcode.o spindle_control.o wiring_serial.o serial_protocol.o stepper.o \
-             eeprom.o config.o stepper_plan.o
+             eeprom.o settings.o stepper_plan.o
 # FUSES      = -U hfuse:w:0xd9:m -U lfuse:w:0x24:m
 FUSES      = -U hfuse:w:0xd2:m -U lfuse:w:0xff:m
 # update that line with this when programmer is back up: 
diff --git a/gcode.c b/gcode.c
index 9649a0c..29b9b80 100644
--- a/gcode.c
+++ b/gcode.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include "nuts_bolts.h"
 #include <math.h>
-#include "config.h"
+#include "settings.h"
 #include "motion_control.h"
 #include "spindle_control.h"
 #include "errno.h"
diff --git a/main.c b/main.c
index 8d67998..5b050a7 100644
--- a/main.c
+++ b/main.c
@@ -28,13 +28,13 @@
 #include "gcode.h"
 #include "serial_protocol.h"
 
-#include "config.h"
+#include "settings.h"
 #include "wiring_serial.h"
 
 int main(void)
 {
   sp_init(); // initialize the serial protocol
-  config_init();
+  settings_init();
   plan_init(); // initialize the stepper plan subsystem
   st_init(); // initialize the stepper subsystem
   mc_init(); // initialize motion control subsystem
diff --git a/motion_control.c b/motion_control.c
index 838799c..7890ad9 100644
--- a/motion_control.c
+++ b/motion_control.c
@@ -19,7 +19,7 @@
 */
 
 #include <avr/io.h>
-#include "config.h"
+#include "settings.h"
 #include "motion_control.h"
 #include <util/delay.h>
 #include <math.h>
diff --git a/serial_protocol.c b/serial_protocol.c
index 319d8bf..665ea41 100644
--- a/serial_protocol.c
+++ b/serial_protocol.c
@@ -22,7 +22,7 @@
 #include "serial_protocol.h"
 #include "gcode.h"
 #include "wiring_serial.h"
-#include "config.h"
+#include "settings.h"
 #include <math.h>
 #include "nuts_bolts.h"
 #include <avr/pgmspace.h>
diff --git a/config.c b/settings.c
similarity index 97%
rename from config.c
rename to settings.c
index 7a26cfd..a8095ae 100644
--- a/config.c
+++ b/settings.c
@@ -1,5 +1,5 @@
 /*
-  config.c - eeprom and compile time configuration handling 
+  settings.c - eeprom and compile time configuration handling 
   Part of Grbl
 
   Copyright (c) 2009-2011 Simen Svale Skogsrud
@@ -21,7 +21,7 @@
 #include <avr/io.h>
 #include <math.h>
 #include "nuts_bolts.h"
-#include "config.h"
+#include "settings.h"
 #include "eeprom.h"
 #include "wiring_serial.h"
 #include <avr/pgmspace.h>
@@ -116,7 +116,7 @@ void store_setting(int parameter, double value) {
 }
 
 // Initialize the config subsystem
-void config_init() {
+void settings_init() {
   if(read_settings()) {
     printPgmString(PSTR("'$' to dump current settings\r\n"));
   } else {
diff --git a/config.h b/settings.h
similarity index 96%
rename from config.h
rename to settings.h
index 3a7d180..218faab 100644
--- a/config.h
+++ b/settings.h
@@ -1,5 +1,5 @@
 /*
-  config.h - eeprom and compile time configuration handling 
+  settings.h - eeprom and compile time configuration handling 
   Part of Grbl
 
   Copyright (c) 2009-2011 Simen Svale Skogsrud
@@ -18,8 +18,8 @@
   along with Grbl.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef config_h
-#define config_h
+#ifndef settings_h
+#define settings_h
 
 #define VERSION "0.6b"
 #include <math.h>
@@ -111,7 +111,7 @@ typedef struct {
 extern settings_t settings;
 
 // Initialize the configuration subsystem (load settings from EEPROM)
-void config_init();
+void settings_init();
 
 // Print current settings
 void dump_settings();
diff --git a/spindle_control.c b/spindle_control.c
index 4d58b34..509ee83 100644
--- a/spindle_control.c
+++ b/spindle_control.c
@@ -19,7 +19,7 @@
 */
 
 #include "spindle_control.h"
-#include "config.h"
+#include "settings.h"
 
 #include <avr/io.h>
 
diff --git a/stepper.c b/stepper.c
index 6da3b24..fa70a34 100644
--- a/stepper.c
+++ b/stepper.c
@@ -23,7 +23,7 @@
    by David A. Mellis */
 
 #include "stepper.h"
-#include "config.h"
+#include "settings.h"
 #include <math.h>
 #include <stdlib.h>
 #include <util/delay.h>
diff --git a/stepper_plan.c b/stepper_plan.c
index ecc1923..3e56513 100644
--- a/stepper_plan.c
+++ b/stepper_plan.c
@@ -57,7 +57,7 @@
 #include "stepper_plan.h"
 #include "nuts_bolts.h"
 #include "stepper.h"
-#include "config.h"
+#include "settings.h"
 #include "wiring_serial.h"
 
 block_t block_buffer[BLOCK_BUFFER_SIZE];  // A ring buffer for motion instructions