From 5be07b5db24069097f6a08f6341c55bb3160062f Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 6 Sep 2017 06:28:30 -0500 Subject: [PATCH] Move 'inc' files --- Marlin/Conditionals.h | 27 ------------------------ Marlin/{ => src/inc}/Conditionals_LCD.h | 0 Marlin/{ => src/inc}/Conditionals_post.h | 0 Marlin/{ => src/inc}/MarlinConfig.h | 0 Marlin/{ => src/inc}/SanityCheck.h | 0 Marlin/{ => src/inc}/Version.h | 0 6 files changed, 27 deletions(-) delete mode 100644 Marlin/Conditionals.h rename Marlin/{ => src/inc}/Conditionals_LCD.h (100%) rename Marlin/{ => src/inc}/Conditionals_post.h (100%) rename Marlin/{ => src/inc}/MarlinConfig.h (100%) rename Marlin/{ => src/inc}/SanityCheck.h (100%) rename Marlin/{ => src/inc}/Version.h (100%) diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h deleted file mode 100644 index ff6c6b187f..0000000000 --- a/Marlin/Conditionals.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Marlin 3D Printer Firmware - * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] - * - * Based on Sprinter and grbl. - * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * Conditionals.h - * OBSOLETE: Replaced by Conditionals_LCD.h and Conditionals_post.h - */ -#error "Old configurations? Please delete all #include lines from Configuration.h and Configuration_adv.h." diff --git a/Marlin/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h similarity index 100% rename from Marlin/Conditionals_LCD.h rename to Marlin/src/inc/Conditionals_LCD.h diff --git a/Marlin/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h similarity index 100% rename from Marlin/Conditionals_post.h rename to Marlin/src/inc/Conditionals_post.h diff --git a/Marlin/MarlinConfig.h b/Marlin/src/inc/MarlinConfig.h similarity index 100% rename from Marlin/MarlinConfig.h rename to Marlin/src/inc/MarlinConfig.h diff --git a/Marlin/SanityCheck.h b/Marlin/src/inc/SanityCheck.h similarity index 100% rename from Marlin/SanityCheck.h rename to Marlin/src/inc/SanityCheck.h diff --git a/Marlin/Version.h b/Marlin/src/inc/Version.h similarity index 100% rename from Marlin/Version.h rename to Marlin/src/inc/Version.h