renamed config.* to settings.*
This commit is contained in:
		
							
								
								
									
										2
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								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: 
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								gcode.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								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"
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								main.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								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
 | 
			
		||||
 
 | 
			
		||||
@@ -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>
 | 
			
		||||
 
 | 
			
		||||
@@ -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>
 | 
			
		||||
 
 | 
			
		||||
@@ -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 {
 | 
			
		||||
@@ -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();
 | 
			
		||||
@@ -19,7 +19,7 @@
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
#include "spindle_control.h"
 | 
			
		||||
#include "config.h"
 | 
			
		||||
#include "settings.h"
 | 
			
		||||
 | 
			
		||||
#include <avr/io.h>
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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>
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user