Skip to content

Fix issues with inconsistent order of includes across source files #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pelrun wants to merge 1 commit into from
Closed

Fix issues with inconsistent order of includes across source files #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Marlin/EEPROMwrite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#ifndef __EEPROMH
#define __EEPROMH

#include <EEPROM.h>

#include "Marlin.h"
#include "planner.h"
#include "temperature.h"
#include <EEPROM.h>

template <class T> int EEPROM_writeAnything(int &ee, const T& value)
{
Expand Down
4 changes: 3 additions & 1 deletion Marlin/Marlin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
// Tonokip RepRap firmware rewrite based off of Hydra-mmm firmware.
// Licence: GPL
#include <WProgram.h>
#include "fastio.h"
#include <avr/pgmspace.h>

#include "fastio.h"
#include "Configuration.h"
#include "pins.h"

//#define SERIAL_ECHO(x) Serial << "echo: " << x;
//#define SERIAL_ECHOLN(x) Serial << "echo: "<<x<<endl;
Expand Down
4 changes: 2 additions & 2 deletions Marlin/Marlin.pde
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@

#include <EEPROM.h>

#include "EEPROMwrite.h"
#include "fastio.h"
#include "Configuration.h"
#include "pins.h"
#include "Marlin.h"
#include "ultralcd.h"
#include "planner.h"
#include "stepper.h"
#include "temperature.h"
#include "EEPROMwrite.h"
#include "ultralcd.h"
#include "motion_control.h"
#include "cardreader.h"
#include "watchdog.h"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/motion_control.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

#include "Configuration.h"
#include "Marlin.h"
#include "stepper.h"
#include "planner.h"
#include "stepper.h"

// The arc is approximated by generating a huge number of tiny, linear segments. The length of each
// segment is configured in settings.mm_per_arc_segment.
Expand Down
4 changes: 2 additions & 2 deletions Marlin/planner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
//#include <math.h>
//#include <stdlib.h>

#include "Marlin.h"
#include "fastio.h"
#include "Configuration.h"
#include "pins.h"
#include "fastio.h"
#include "Marlin.h"
#include "planner.h"
#include "stepper.h"
#include "temperature.h"
Expand Down
6 changes: 3 additions & 3 deletions Marlin/stepper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
/* The timer calculations of this module informed by the 'RepRap cartesian firmware' by Zack Smith
and Philipp Tiefenbacher. */

#include "stepper.h"
#include "fastio.h"
#include "Configuration.h"
#include "pins.h"
#include "Marlin.h"
#include "planner.h"
#include "pins.h"
#include "fastio.h"
#include "stepper.h"
#include "temperature.h"
#include "ultralcd.h"

Expand Down
2 changes: 1 addition & 1 deletion Marlin/temperature.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#ifndef temperature_h
#define temperature_h

#include "Marlin.h"
#include "fastio.h"
#include "Marlin.h"
#ifdef PID_ADD_EXTRUSION_RATE
#include "stepper.h"
#endif
Expand Down