SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4350 from jbrazio/followup-a875861

Browse source 
Adds utility.h
This commit is contained in:
Scott Lahteine 2016-07-19 13:40:52 -07:00 committed by GitHub
commit ef0a22871e
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Marlin/Marlin.h
View file

@ -39,11 +39,12 @@
#include <avr/eeprom.h> #include <avr/eeprom.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include "fastio.h" #include "fastio.h"
#include "Configuration.h" #include "Configuration.h"
#include "pins.h" #include "pins.h"
#include "utility.h"
#ifndef SANITYCHECK_H #ifndef SANITYCHECK_H
#error "Your Configuration.h and Configuration_adv.h files are outdated!" #error "Your Configuration.h and Configuration_adv.h files are outdated!"
#endif #endif
@ -403,6 +404,4 @@ void calculate_volumetric_multipliers();
#endif #endif
#endif #endif
void safe_delay(uint16_t del);
#endif //MARLIN_H #endif //MARLIN_H

23
Marlin/utility.h Normal file
View file

@ -0,0 +1,23 @@
/**
* 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 <http://www.gnu.org/licenses/>.
*
*/
void safe_delay(uint16_t ms);