소스 검색

Merge pull request #4350 from jbrazio/followup-a875861

Adds utility.h
Scott Lahteine 8 년 전
부모
커밋
ef0a22871e
2개의 변경된 파일25개의 추가작업 그리고 3개의 파일을 삭제
  1. 2
    3
      Marlin/Marlin.h
  2. 23
    0
      Marlin/utility.h

+ 2
- 3
Marlin/Marlin.h 파일 보기

@@ -39,11 +39,12 @@
39 39
 #include <avr/eeprom.h>
40 40
 #include <avr/interrupt.h>
41 41
 
42
-
43 42
 #include "fastio.h"
44 43
 #include "Configuration.h"
45 44
 #include "pins.h"
46 45
 
46
+#include "utility.h"
47
+
47 48
 #ifndef SANITYCHECK_H
48 49
   #error "Your Configuration.h and Configuration_adv.h files are outdated!"
49 50
 #endif
@@ -403,6 +404,4 @@ void calculate_volumetric_multipliers();
403 404
   #endif
404 405
 #endif
405 406
 
406
-void safe_delay(uint16_t del);
407
-
408 407
 #endif //MARLIN_H

+ 23
- 0
Marlin/utility.h 파일 보기

@@ -0,0 +1,23 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
8
+ * This program is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+
23
+void safe_delay(uint16_t ms);

Loading…
취소
저장