From 9d1961ebe378c1906bb4e1db514cc420d059c47b Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 20 May 2015 21:33:23 -0700 Subject: [PATCH] Witbox and Hephestos are just RAMPS_13_EFB --- Marlin/boards.h | 2 -- .../Hephestos/Configuration.h | 7 +++++-- .../WITBOX/Configuration.h | 7 +++++-- Marlin/language.h | 17 ++--------------- Marlin/pins.h | 4 ---- Marlin/pins_HEPHESTOS.h | 11 ----------- Marlin/pins_WITBOX.h | 11 ----------- 7 files changed, 12 insertions(+), 47 deletions(-) delete mode 100644 Marlin/pins_HEPHESTOS.h delete mode 100644 Marlin/pins_WITBOX.h diff --git a/Marlin/boards.h b/Marlin/boards.h index 5ccf0f82e..4e0241f87 100644 --- a/Marlin/boards.h +++ b/Marlin/boards.h @@ -51,8 +51,6 @@ #define BOARD_5DPRINT 88 // 5DPrint D8 Driver Board #define BOARD_LEAPFROG 999 // Leapfrog #define BOARD_MKS_BASE 40 // MKS BASE 1.0 -#define BOARD_WITBOX 41 // bq WITBOX -#define BOARD_HEPHESTOS 42 // bq Prusa i3 Hephestos #define BOARD_BAM_DICE 401 // 2PrintBeta BAM&DICE with STK drivers #define BOARD_BAM_DICE_DUE 402 // 2PrintBeta BAM&DICE Due with STK drivers diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 4e8503aa6..535033599 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -57,11 +57,14 @@ Here are some standard links for getting your machine calibrated: // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup -#define MOTHERBOARD BOARD_HEPHESTOS +#define MOTHERBOARD BOARD_RAMPS_13_EFB // Optional custom name for your RepStrap or other custom machine // Displayed in the LCD "Ready" message -// #define CUSTOM_MACHINE_NAME "3D Printer" +#define CUSTOM_MACHINE_NAME "HEPHESTOS" + +// Added for BQ +#define FIRMWARE_URL "http://www.bq.com/gb/downloads-prusa-i3-hephestos.html" // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index f9543b0c4..142d163a8 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -57,11 +57,14 @@ Here are some standard links for getting your machine calibrated: // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup -#define MOTHERBOARD BOARD_WITBOX +#define MOTHERBOARD BOARD_RAMPS_13_EFB // Optional custom name for your RepStrap or other custom machine // Displayed in the LCD "Ready" message -// #define CUSTOM_MACHINE_NAME "3D Printer" +#define CUSTOM_MACHINE_NAME "WITBOX" + +// Added for BQ +#define FIRMWARE_URL "http://www.bq.com/gb/downloads-witbox.html" // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) diff --git a/Marlin/language.h b/Marlin/language.h index 6e078d1db..856bd58db 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -59,21 +59,8 @@ #elif MB(SAV_MKI) #define MACHINE_NAME "SAV MkI" #define FIRMWARE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config" -#elif MB(WITBOX) - #define MACHINE_NAME "WITBOX" - #define FIRMWARE_URL "http://www.bq.com/gb/downloads-witbox.html" -#elif MB(HEPHESTOS) - #define MACHINE_NAME "HEPHESTOS" - #define FIRMWARE_URL "http://www.bq.com/gb/downloads-prusa-i3-hephestos.html" -#elif MB(BRAINWAVE_PRO) - #define MACHINE_NAME "Kossel Pro" - #ifndef FIRMWARE_URL - #define FIRMWARE_URL "https://github.com/OpenBeamUSA/Marlin/" - #endif -#else - #ifndef MACHINE_NAME - #define MACHINE_NAME "3D Printer" - #endif +#elif !defined(MACHINE_NAME) + #define MACHINE_NAME "3D Printer" #endif #ifdef CUSTOM_MENDEL_NAME diff --git a/Marlin/pins.h b/Marlin/pins.h index abffe2c93..d53f22592 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -104,10 +104,6 @@ #include "pins_5DPRINT.h" #elif MB(LEAPFROG) #include "pins_LEAPFROG.h" -#elif MB(WITBOX) - #include "pins_WITBOX.h" -#elif MB(HEPHESTOS) - #include "pins_HEPHESTOS.h" #elif MB(BAM_DICE) #include "pins_RAMPS_13.h" #elif MB(BAM_DICE_DUE) diff --git a/Marlin/pins_HEPHESTOS.h b/Marlin/pins_HEPHESTOS.h deleted file mode 100644 index ec8d3fab2..000000000 --- a/Marlin/pins_HEPHESTOS.h +++ /dev/null @@ -1,11 +0,0 @@ -/** - * bq Prusa i3 Hephestos – Arduino Mega with RAMPS v1.3/1.4 pin assignments - */ - -#include "pins_RAMPS_13.h" - -#undef FAN_PIN -#define FAN_PIN 9 // (Sprinter config) - -#undef HEATER_1_PIN -#define HEATER_1_PIN -1 diff --git a/Marlin/pins_WITBOX.h b/Marlin/pins_WITBOX.h deleted file mode 100644 index 037b38de8..000000000 --- a/Marlin/pins_WITBOX.h +++ /dev/null @@ -1,11 +0,0 @@ -/** - * bq WITBOX Arduino Mega with RAMPS v1.3/1.4 pin assignments - */ - -#include "pins_RAMPS_13.h" - -#undef FAN_PIN -#define FAN_PIN 9 // (Sprinter config) - -#undef HEATER_1_PIN -#define HEATER_1_PIN -1