CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

header file simplification

Browse Source
This commit is contained in:
Bernhard 2011-12-22 12:38:50 +01:00
parent 212515148e
commit 3c1a4aac2b
13 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/EEPROMwrite.h
View File

@ -5,7 +5,6 @@
#include "planner.h" #include "planner.h"
#include "temperature.h" #include "temperature.h"
#include <EEPROM.h>
template <class T> int EEPROM_writeAnything(int &ee, const T& value) template <class T> int EEPROM_writeAnything(int &ee, const T& value)
{ {

8
Marlin/Marlin.h
View File

@ -6,15 +6,21 @@
#define HardwareSerial_h // trick to disable the standard HWserial #define HardwareSerial_h // trick to disable the standard HWserial
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include <util/delay.h>
#include <avr/pgmspace.h>
#if ARDUINO >= 100 #if ARDUINO >= 100
#include "Arduino.h" #include "Arduino.h"
#else #else
#include "WProgram.h" #include "WProgram.h"
#endif #endif
#include <EEPROM.h>
#include "fastio.h" #include "fastio.h"
#include <avr/pgmspace.h>
#include "Configuration.h" #include "Configuration.h"
#include "pins.h"
#include "MarlinSerial.h" #include "MarlinSerial.h"
#define FORCE_INLINE __attribute__((always_inline)) inline #define FORCE_INLINE __attribute__((always_inline)) inline

7
Marlin/Marlin.pde
View File

@ -25,7 +25,8 @@
http://reprap.org/pipermail/reprap-dev/2011-May/003323.html http://reprap.org/pipermail/reprap-dev/2011-May/003323.html
*/ */
#include <math.h>
#include "Marlin.h"
#include <EEPROM.h> #include <EEPROM.h>
#include <stdio.h> #include <stdio.h>
@ -33,7 +34,7 @@
#include "fastio.h" #include "fastio.h"
#include "Configuration.h" #include "Configuration.h"
#include "pins.h" #include "pins.h"
#include "Marlin.h"
#include "ultralcd.h" #include "ultralcd.h"
#include "planner.h" #include "planner.h"
#include "stepper.h" #include "stepper.h"
@ -41,7 +42,7 @@
#include "motion_control.h" #include "motion_control.h"
#include "cardreader.h" #include "cardreader.h"
#include "watchdog.h" #include "watchdog.h"
#include <util/delay.h>

3
Marlin/cardreader.pde
View File

@ -1,8 +1,7 @@
#include "cardreader.h" #include "cardreader.h"
//#include <unistd.h>
#ifdef SDSUPPORT #ifdef SDSUPPORT
#include "Configuration.h" #include "Marlin.h"
CardReader::CardReader() CardReader::CardReader()
{ {

1
Marlin/motion_control.cpp
View File

@ -19,7 +19,6 @@
along with Grbl. If not, see <http://www.gnu.org/licenses/>. along with Grbl. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "Configuration.h"
#include "Marlin.h" #include "Marlin.h"
#include "stepper.h" #include "stepper.h"
#include "planner.h" #include "planner.h"

7
Marlin/planner.cpp
View File

@ -52,14 +52,9 @@
*/ */
//#include <inttypes.h>
//#include <math.h>
//#include <stdlib.h>
#include "Configuration.h"
#include "pins.h"
#include "Marlin.h" #include "Marlin.h"
#include "fastio.h"
#include "planner.h" #include "planner.h"
#include "stepper.h" #include "stepper.h"
#include "temperature.h" #include "temperature.h"

3
Marlin/planner.h
View File

@ -23,8 +23,7 @@
#ifndef planner_h #ifndef planner_h
#define planner_h #define planner_h
#include <math.h>
#include "Configuration.h"
#include "Marlin.h" #include "Marlin.h"
// This struct is used when buffering the setup for each linear movement "nominal" values are as specified in // This struct is used when buffering the setup for each linear movement "nominal" values are as specified in

4
Marlin/stepper.cpp
View File

@ -23,11 +23,9 @@
#include "stepper.h" #include "stepper.h"
#include "Configuration.h"
#include "pins.h"
#include "Marlin.h" #include "Marlin.h"
#include "planner.h" #include "planner.h"
#include "fastio.h"
#include "temperature.h" #include "temperature.h"
#include "ultralcd.h" #include "ultralcd.h"

5
Marlin/temperature.cpp
View File

@ -27,11 +27,8 @@
http://reprap.org/pipermail/reprap-dev/2011-May/003323.html http://reprap.org/pipermail/reprap-dev/2011-May/003323.html
*/ */
#include <avr/pgmspace.h>
#include "fastio.h"
#include "Configuration.h"
#include "pins.h"
#include "Marlin.h" #include "Marlin.h"
#include "ultralcd.h" #include "ultralcd.h"
#include "temperature.h" #include "temperature.h"

1
Marlin/temperature.h
View File

@ -22,7 +22,6 @@
#define temperature_h #define temperature_h
#include "Marlin.h" #include "Marlin.h"
#include "fastio.h"
#include "planner.h" #include "planner.h"
#ifdef PID_ADD_EXTRUSION_RATE #ifdef PID_ADD_EXTRUSION_RATE
#include "stepper.h" #include "stepper.h"

5
Marlin/ultralcd.h
View File

@ -1,9 +1,8 @@
#ifndef __ULTRALCDH #ifndef __ULTRALCDH
#define __ULTRALCDH #define __ULTRALCDH
#include "Configuration.h"
#include "Marlin.h" #include "Marlin.h"
#ifdef ULTRA_LCD #ifdef ULTRA_LCD
#include <LiquidCrystal.h>
void lcd_status(); void lcd_status();
void lcd_init(); void lcd_init();
void lcd_status(const char* message); void lcd_status(const char* message);
@ -15,7 +14,7 @@
#define STATUSTIMEOUT 15000 #define STATUSTIMEOUT 15000
#include <LiquidCrystal.h>
extern LiquidCrystal lcd; extern LiquidCrystal lcd;

4
Marlin/ultralcd.pde
View File

@ -1,6 +1,6 @@
#include "ultralcd.h" #include "ultralcd.h"
#ifdef ULTRA_LCD #ifdef ULTRA_LCD
#include <LiquidCrystal.h>
//=========================================================================== //===========================================================================
//=============================imported variables============================ //=============================imported variables============================
//=========================================================================== //===========================================================================
@ -27,7 +27,6 @@ static char messagetext[LCD_WIDTH]="";
//return for string conversion routines //return for string conversion routines
static char conv[8]; static char conv[8];
#include <LiquidCrystal.h>
LiquidCrystal lcd(LCD_PINS_RS, LCD_PINS_ENABLE, LCD_PINS_D4, LCD_PINS_D5,LCD_PINS_D6,LCD_PINS_D7); //RS,Enable,D4,D5,D6,D7 LiquidCrystal lcd(LCD_PINS_RS, LCD_PINS_ENABLE, LCD_PINS_D4, LCD_PINS_D5,LCD_PINS_D6,LCD_PINS_D7); //RS,Enable,D4,D5,D6,D7
static unsigned long previous_millis_lcd=0; static unsigned long previous_millis_lcd=0;
@ -42,7 +41,6 @@ static long previous_millis_buttons=0;
static MainMenu menu; static MainMenu menu;
#include <avr/pgmspace.h>
void lcdProgMemprint(const char *str) void lcdProgMemprint(const char *str)
{ {

2
Marlin/watchdog.h
View File

@ -1,6 +1,6 @@
#ifndef __WATCHDOGH #ifndef __WATCHDOGH
#define __WATCHDOGH #define __WATCHDOGH
#include "Configuration.h" #include "Marlin.h"
#ifdef USE_WATCHDOG #ifdef USE_WATCHDOG
// intialise watch dog with a 1 sec interrupt time // intialise watch dog with a 1 sec interrupt time