Browse Source

header file simplification

Bernhard 12 years ago
parent
commit
3c1a4aac2b

+ 0
- 1
Marlin/EEPROMwrite.h View File

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

+ 7
- 1
Marlin/Marlin.h View File

6
 #define  HardwareSerial_h // trick to disable the standard HWserial
6
 #define  HardwareSerial_h // trick to disable the standard HWserial
7
 #include <stdio.h>
7
 #include <stdio.h>
8
 #include <math.h>
8
 #include <math.h>
9
+#include <util/delay.h>
10
+#include <avr/pgmspace.h>
11
+
12
+
9
 #if ARDUINO >= 100
13
 #if ARDUINO >= 100
10
   #include "Arduino.h"
14
   #include "Arduino.h"
11
 #else
15
 #else
12
    #include "WProgram.h"
16
    #include "WProgram.h"
13
 #endif
17
 #endif
18
+#include <EEPROM.h>
19
+
14
 
20
 
15
 #include "fastio.h"
21
 #include "fastio.h"
16
-#include <avr/pgmspace.h>
17
 #include "Configuration.h"
22
 #include "Configuration.h"
23
+#include "pins.h"
18
 #include "MarlinSerial.h"
24
 #include "MarlinSerial.h"
19
 
25
 
20
 #define  FORCE_INLINE __attribute__((always_inline)) inline
26
 #define  FORCE_INLINE __attribute__((always_inline)) inline

+ 4
- 3
Marlin/Marlin.pde View File

25
     http://reprap.org/pipermail/reprap-dev/2011-May/003323.html
25
     http://reprap.org/pipermail/reprap-dev/2011-May/003323.html
26
  */
26
  */
27
 
27
 
28
-#include <math.h>
28
+
29
+#include "Marlin.h"
29
 #include <EEPROM.h>
30
 #include <EEPROM.h>
30
 #include <stdio.h>
31
 #include <stdio.h>
31
 
32
 
33
 #include "fastio.h"
34
 #include "fastio.h"
34
 #include "Configuration.h"
35
 #include "Configuration.h"
35
 #include "pins.h"
36
 #include "pins.h"
36
-#include "Marlin.h"
37
+
37
 #include "ultralcd.h"
38
 #include "ultralcd.h"
38
 #include "planner.h"
39
 #include "planner.h"
39
 #include "stepper.h"
40
 #include "stepper.h"
41
 #include "motion_control.h"
42
 #include "motion_control.h"
42
 #include "cardreader.h"
43
 #include "cardreader.h"
43
 #include "watchdog.h"
44
 #include "watchdog.h"
44
-#include <util/delay.h>
45
+
45
 
46
 
46
 
47
 
47
 
48
 

+ 1
- 2
Marlin/cardreader.pde View File

1
 #include "cardreader.h"
1
 #include "cardreader.h"
2
-//#include <unistd.h>
3
 #ifdef SDSUPPORT
2
 #ifdef SDSUPPORT
4
 
3
 
5
-#include "Configuration.h"
4
+#include "Marlin.h"
6
 
5
 
7
 CardReader::CardReader()
6
 CardReader::CardReader()
8
 {
7
 {

+ 0
- 1
Marlin/motion_control.cpp View File

19
   along with Grbl.  If not, see <http://www.gnu.org/licenses/>.
19
   along with Grbl.  If not, see <http://www.gnu.org/licenses/>.
20
 */
20
 */
21
 
21
 
22
-#include "Configuration.h"
23
 #include "Marlin.h"
22
 #include "Marlin.h"
24
 #include "stepper.h"
23
 #include "stepper.h"
25
 #include "planner.h"
24
 #include "planner.h"

+ 1
- 6
Marlin/planner.cpp View File

52
 */
52
 */
53
                                                                                                             
53
                                                                                                             
54
 
54
 
55
-//#include <inttypes.h>
56
-//#include <math.h>       
57
-//#include <stdlib.h>
58
 
55
 
59
-#include "Configuration.h"
60
-#include "pins.h"
56
+
61
 #include "Marlin.h"
57
 #include "Marlin.h"
62
-#include "fastio.h"
63
 #include "planner.h"
58
 #include "planner.h"
64
 #include "stepper.h"
59
 #include "stepper.h"
65
 #include "temperature.h"
60
 #include "temperature.h"

+ 1
- 2
Marlin/planner.h View File

23
 
23
 
24
 #ifndef planner_h
24
 #ifndef planner_h
25
 #define planner_h
25
 #define planner_h
26
-#include <math.h>
27
-#include "Configuration.h"
26
+
28
 #include "Marlin.h"
27
 #include "Marlin.h"
29
 
28
 
30
 // This struct is used when buffering the setup for each linear movement "nominal" values are as specified in 
29
 // This struct is used when buffering the setup for each linear movement "nominal" values are as specified in 

+ 1
- 3
Marlin/stepper.cpp View File

23
 
23
 
24
 
24
 
25
 #include "stepper.h"
25
 #include "stepper.h"
26
-#include "Configuration.h"
27
-#include "pins.h"
26
+
28
 #include "Marlin.h"
27
 #include "Marlin.h"
29
 #include "planner.h"
28
 #include "planner.h"
30
-#include "fastio.h"
31
 #include "temperature.h"
29
 #include "temperature.h"
32
 #include "ultralcd.h"
30
 #include "ultralcd.h"
33
 
31
 

+ 1
- 4
Marlin/temperature.cpp View File

27
     http://reprap.org/pipermail/reprap-dev/2011-May/003323.html
27
     http://reprap.org/pipermail/reprap-dev/2011-May/003323.html
28
 
28
 
29
  */
29
  */
30
-#include <avr/pgmspace.h>
31
 
30
 
32
-#include "fastio.h"
33
-#include "Configuration.h"
34
-#include "pins.h"
31
+
35
 #include "Marlin.h"
32
 #include "Marlin.h"
36
 #include "ultralcd.h"
33
 #include "ultralcd.h"
37
 #include "temperature.h"
34
 #include "temperature.h"

+ 0
- 1
Marlin/temperature.h View File

22
 #define temperature_h 
22
 #define temperature_h 
23
 
23
 
24
 #include "Marlin.h"
24
 #include "Marlin.h"
25
-#include "fastio.h"
26
 #include "planner.h"
25
 #include "planner.h"
27
 #ifdef PID_ADD_EXTRUSION_RATE
26
 #ifdef PID_ADD_EXTRUSION_RATE
28
   #include "stepper.h"
27
   #include "stepper.h"

+ 2
- 3
Marlin/ultralcd.h View File

1
 #ifndef __ULTRALCDH
1
 #ifndef __ULTRALCDH
2
 #define __ULTRALCDH
2
 #define __ULTRALCDH
3
-#include "Configuration.h"
4
 #include "Marlin.h"
3
 #include "Marlin.h"
5
 #ifdef ULTRA_LCD
4
 #ifdef ULTRA_LCD
6
-
5
+  #include <LiquidCrystal.h>
7
   void lcd_status();
6
   void lcd_status();
8
   void lcd_init();
7
   void lcd_init();
9
   void lcd_status(const char* message);
8
   void lcd_status(const char* message);
15
   #define STATUSTIMEOUT 15000
14
   #define STATUSTIMEOUT 15000
16
 
15
 
17
 
16
 
18
-  #include <LiquidCrystal.h>
17
+  
19
   extern LiquidCrystal lcd;
18
   extern LiquidCrystal lcd;
20
 
19
 
21
 
20
 

+ 1
- 3
Marlin/ultralcd.pde View File

1
 #include "ultralcd.h"
1
 #include "ultralcd.h"
2
 #ifdef ULTRA_LCD
2
 #ifdef ULTRA_LCD
3
-
3
+#include <LiquidCrystal.h>
4
 //===========================================================================
4
 //===========================================================================
5
 //=============================imported variables============================
5
 //=============================imported variables============================
6
 //===========================================================================
6
 //===========================================================================
27
 //return for string conversion routines
27
 //return for string conversion routines
28
 static char conv[8];
28
 static char conv[8];
29
 
29
 
30
-#include <LiquidCrystal.h>
31
 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 
30
 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 
32
 
31
 
33
 static unsigned long previous_millis_lcd=0;
32
 static unsigned long previous_millis_lcd=0;
42
  
41
  
43
 static MainMenu menu;
42
 static MainMenu menu;
44
 
43
 
45
-#include <avr/pgmspace.h>
46
 
44
 
47
 void lcdProgMemprint(const char *str)
45
 void lcdProgMemprint(const char *str)
48
 {
46
 {

+ 1
- 1
Marlin/watchdog.h View File

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

Loading…
Cancel
Save