From 592df2c73ffe19178f53a04cd384ca9f44cda599 Mon Sep 17 00:00:00 2001 From: Phil Hord Date: Mon, 27 Jul 2015 15:50:49 -0400 Subject: [PATCH] Drop redundant "simulator.h" includes. simulator.h is already included in config.h/arduino.h, so it doesn't need to be included again most of the time. In some cases it was included twice on purpose to undo some intervening include file, but these intervening includes were unnecessary. Remove some related include file redundancy by re-ordering the include files and relocating some nested includes up to the parent .c file. --- gcode_parse.c | 3 --- heater.h | 1 - mendel.c | 1 - serial.h | 2 +- usb_serial.c | 1 - 5 files changed, 1 insertion(+), 7 deletions(-) diff --git a/gcode_parse.c b/gcode_parse.c index 56c38e2..c2781c1 100644 --- a/gcode_parse.c +++ b/gcode_parse.c @@ -14,9 +14,6 @@ #include "sersendf.h" #include "gcode_process.h" -#ifdef SIMULATOR - #include "simulator.h" -#endif /** Bitfield for available sources of G-code. diff --git a/heater.h b/heater.h index 4330371..92e81ca 100644 --- a/heater.h +++ b/heater.h @@ -3,7 +3,6 @@ #include "config_wrapper.h" #include -#include "simulator.h" #include "temp.h" /// Default scaled P factor, equivalent to 8.0 counts/qC or 32 counts/C. diff --git a/mendel.c b/mendel.c index 6e3cc7c..bfad5ca 100644 --- a/mendel.c +++ b/mendel.c @@ -46,7 +46,6 @@ #include "spi.h" #include "sd.h" #include "display.h" -#include "simulator.h" #ifdef SIMINFO #include "../simulavr/src/simulavr_info.h" diff --git a/serial.h b/serial.h index 663ad67..1afd86b 100644 --- a/serial.h +++ b/serial.h @@ -3,7 +3,7 @@ #include "config_wrapper.h" #include -#include "simulator.h" + #ifdef USB_SERIAL #include "usb_serial.h" diff --git a/usb_serial.c b/usb_serial.c index 1b0b713..dcfe5da 100644 --- a/usb_serial.c +++ b/usb_serial.c @@ -32,7 +32,6 @@ // 2012-10-17: Import to Teacup firmware #include "config_wrapper.h" -#include "simulator.h" /* protect this file from Arduino IDE */ #ifdef USB_SERIAL