浏览代码

HAL folder organization (#14763)

Scott Lahteine 5 年前
父节点
当前提交
e5d73f68c8
没有帐户链接到提交者的电子邮件
共有 66 个文件被更改,包括 865 次插入107 次删除
  1. 1
    29
      Marlin/src/HAL/HAL.h
  2. 1
    1
      Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h
  3. 1
    1
      Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h
  4. 1
    1
      Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h
  5. 1
    1
      Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h
  6. 1
    1
      Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h
  7. 9
    7
      Marlin/src/HAL/HAL_AVR/fastio_AVR.h
  8. 22
    0
      Marlin/src/HAL/HAL_AVR/inc/Conditionals_LCD.h
  9. 22
    0
      Marlin/src/HAL/HAL_AVR/inc/Conditionals_adv.h
  10. 22
    0
      Marlin/src/HAL/HAL_AVR/inc/Conditionals_post.h
  11. 0
    0
      Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h
  12. 37
    38
      Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
  13. 4
    4
      Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
  14. 3
    3
      Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
  15. 2
    2
      Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
  16. 2
    2
      Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
  17. 1
    1
      Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.cpp
  18. 2
    2
      Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.h
  19. 0
    0
      Marlin/src/HAL/HAL_DUE/fastio/G2_pins.h
  20. 1
    1
      Marlin/src/HAL/HAL_DUE/fastio_Due.h
  21. 22
    0
      Marlin/src/HAL/HAL_DUE/inc/Conditionals_LCD.h
  22. 22
    0
      Marlin/src/HAL/HAL_DUE/inc/Conditionals_adv.h
  23. 22
    0
      Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h
  24. 0
    0
      Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h
  25. 22
    0
      Marlin/src/HAL/HAL_ESP32/inc/Conditionals_LCD.h
  26. 22
    0
      Marlin/src/HAL/HAL_ESP32/inc/Conditionals_adv.h
  27. 22
    0
      Marlin/src/HAL/HAL_ESP32/inc/Conditionals_post.h
  28. 0
    0
      Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h
  29. 22
    0
      Marlin/src/HAL/HAL_LINUX/inc/Conditionals_LCD.h
  30. 22
    0
      Marlin/src/HAL/HAL_LINUX/inc/Conditionals_adv.h
  31. 22
    0
      Marlin/src/HAL/HAL_LINUX/inc/Conditionals_post.h
  32. 0
    0
      Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h
  33. 22
    0
      Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_LCD.h
  34. 22
    0
      Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_adv.h
  35. 22
    0
      Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_post.h
  36. 0
    0
      Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h
  37. 22
    0
      Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_LCD.h
  38. 22
    0
      Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_adv.h
  39. 22
    0
      Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_post.h
  40. 0
    0
      Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h
  41. 22
    0
      Marlin/src/HAL/HAL_STM32/inc/Conditionals_LCD.h
  42. 22
    0
      Marlin/src/HAL/HAL_STM32/inc/Conditionals_adv.h
  43. 22
    0
      Marlin/src/HAL/HAL_STM32/inc/Conditionals_post.h
  44. 0
    0
      Marlin/src/HAL/HAL_STM32/inc/SanityCheck.h
  45. 2
    2
      Marlin/src/HAL/HAL_STM32F1/HAL_sdio_STM32F1.h
  46. 6
    6
      Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp
  47. 2
    2
      Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
  48. 22
    0
      Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_LCD.h
  49. 22
    0
      Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_adv.h
  50. 22
    0
      Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_post.h
  51. 0
    0
      Marlin/src/HAL/HAL_STM32F1/inc/SanityCheck.h
  52. 22
    0
      Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_LCD.h
  53. 22
    0
      Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_adv.h
  54. 22
    0
      Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_post.h
  55. 0
    0
      Marlin/src/HAL/HAL_STM32_F4_F7/inc/SanityCheck.h
  56. 22
    0
      Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_LCD.h
  57. 22
    0
      Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_adv.h
  58. 22
    0
      Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_post.h
  59. 0
    0
      Marlin/src/HAL/HAL_TEENSY31_32/inc/SanityCheck.h
  60. 22
    0
      Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_LCD.h
  61. 22
    0
      Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_adv.h
  62. 22
    0
      Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_post.h
  63. 0
    0
      Marlin/src/HAL/HAL_TEENSY35_36/inc/SanityCheck.h
  64. 52
    0
      Marlin/src/HAL/platforms.h
  65. 3
    3
      Marlin/src/inc/MarlinConfig.h
  66. 7
    0
      Marlin/src/inc/MarlinConfigPre.h

+ 1
- 29
Marlin/src/HAL/HAL.h 查看文件

@@ -21,34 +21,6 @@
21 21
  */
22 22
 #pragma once
23 23
 
24
-#ifdef __AVR__
25
-  #define HAL_PLATFORM HAL_AVR
26
-#elif defined(ARDUINO_ARCH_SAM)
27
-  #define HAL_PLATFORM HAL_DUE
28
-#elif defined(__MK20DX256__)
29
-  #define HAL_PLATFORM HAL_TEENSY31_32
30
-#elif defined(__MK64FX512__) || defined(__MK66FX1M0__)
31
-  #define HAL_PLATFORM HAL_TEENSY35_36
32
-#elif defined(TARGET_LPC1768)
33
-  #define HAL_PLATFORM HAL_LPC1768
34
-#elif defined(__STM32F1__) || defined(TARGET_STM32F1)
35
-  #define HAL_PLATFORM HAL_STM32F1
36
-#elif defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F7))
37
-  #define HAL_PLATFORM HAL_STM32_F4_F7
38
-#elif defined(ARDUINO_ARCH_STM32)
39
-  #define HAL_PLATFORM HAL_STM32
40
-#elif defined(ARDUINO_ARCH_ESP32)
41
-  #define HAL_PLATFORM HAL_ESP32
42
-#elif defined(__PLAT_LINUX__)
43
-  #define HAL_PLATFORM HAL_LINUX
44
-#elif defined(__SAMD51__)
45
-  #define HAL_PLATFORM HAL_SAMD51
46
-#else
47
-  #error "Unsupported Platform!"
48
-#endif
49
-
50
-#define XSTR_(M) #M
51
-#define XSTR(M) XSTR_(M)
52
-#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL_PLATFORM/NAME)
24
+#include "platforms.h"
53 25
 
54 26
 #include HAL_PATH(.,HAL.h)

Marlin/src/HAL/HAL_AVR/fastio_1280.h → Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h 查看文件

@@ -29,7 +29,7 @@
29 29
  *   Logical Pin   : 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | 78 79 80 xx xx 84 85 71 70 xx xx xx xx xx 81 82 83 xx xx 72 72 75 76 77 74 xx xx xx xx xx
30 30
  */
31 31
 
32
-#include "fastio_AVR.h"
32
+#include "../fastio_AVR.h"
33 33
 
34 34
 // change for your board
35 35
 #define DEBUG_LED   DIO21

Marlin/src/HAL/HAL_AVR/fastio_1281.h → Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h 查看文件

@@ -28,7 +28,7 @@
28 28
  *   Port:        A0 A1 A2 A3 A4 A5 A6 A7 B0 B1 B2 B3 B4 B5 B6 B7 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7 E0 E1 E2 E3 E4 E5 E6 E7 F0 F1 F2 F3 F4 F5 F6 F7 G0 G1 G2 G3 G4 G5
29 29
  */
30 30
 
31
-#include "fastio_AVR.h"
31
+#include "../fastio_AVR.h"
32 32
 
33 33
 // change for your board
34 34
 #define DEBUG_LED   DIO46

Marlin/src/HAL/HAL_AVR/fastio_168.h → Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h 查看文件

@@ -28,7 +28,7 @@
28 28
  *   Port:        B0 B1 B2 B3 B4 B5 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7
29 29
  */
30 30
 
31
-#include "fastio_AVR.h"
31
+#include "../fastio_AVR.h"
32 32
 
33 33
 #define DEBUG_LED   AIO5
34 34
 

Marlin/src/HAL/HAL_AVR/fastio_644.h → Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h 查看文件

@@ -54,7 +54,7 @@
54 54
  *                        +--------+
55 55
  */
56 56
 
57
-#include "fastio_AVR.h"
57
+#include "../fastio_AVR.h"
58 58
 
59 59
 #define DEBUG_LED   DIO0
60 60
 

Marlin/src/HAL/HAL_AVR/fastio_AT90USB.h → Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h 查看文件

@@ -29,7 +29,7 @@
29 29
  *            The logical pins 46 and 47 are not supported by Teensyduino, but are supported below as E2 and E3
30 30
  */
31 31
 
32
-#include "fastio_AVR.h"
32
+#include "../fastio_AVR.h"
33 33
 
34 34
 // change for your board
35 35
 #define DEBUG_LED   DIO31 /* led D5 red */

+ 9
- 7
Marlin/src/HAL/HAL_AVR/fastio_AVR.h 查看文件

@@ -27,8 +27,6 @@
27 27
  * Contributed by Triffid_Hunter and modified by Kliment, thinkyhead, Bob-the-Kuhn, et.al.
28 28
  */
29 29
 
30
-#include "../../core/macros.h"
31
-
32 30
 #include <avr/io.h>
33 31
 
34 32
 #define AVR_AT90USB1286_FAMILY (defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1286P__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB646P__) || defined(__AVR_AT90USB647__))
@@ -41,15 +39,15 @@
41 39
  * Include Ports and Functions
42 40
  */
43 41
 #if AVR_ATmega328_FAMILY
44
-  #include "fastio_168.h"
42
+  #include "fastio/fastio_168.h"
45 43
 #elif AVR_ATmega1284_FAMILY
46
-  #include "fastio_644.h"
44
+  #include "fastio/fastio_644.h"
47 45
 #elif AVR_ATmega2560_FAMILY
48
-  #include "fastio_1280.h"
46
+  #include "fastio/fastio_1280.h"
49 47
 #elif AVR_AT90USB1286_FAMILY
50
-  #include "fastio_AT90USB.h"
48
+  #include "fastio/fastio_AT90USB.h"
51 49
 #elif AVR_ATmega2561_FAMILY
52
-  #include "fastio_1281.h"
50
+  #include "fastio/fastio_1281.h"
53 51
 #else
54 52
   #error "No FastIO definition for the selected AVR Board."
55 53
 #endif
@@ -274,6 +272,8 @@ enum ClockSource2 : char {
274 272
 #define SET_FOCB(T,V) SET_FOC(T,B,V)
275 273
 #define SET_FOCC(T,V) SET_FOC(T,C,V)
276 274
 
275
+#if 0
276
+
277 277
 /**
278 278
  * PWM availability macros
279 279
  */
@@ -337,6 +337,8 @@ enum ClockSource2 : char {
337 337
 
338 338
 #define PWM_CHK(P) (PWM_CHK_HEATER(P) || PWM_CHK_SERVO(P) || PWM_CHK_MOTOR_CURRENT(P) || PWM_CHK_FAN_A(P) || PWM_CHK_FAN_B(P))
339 339
 
340
+#endif // PWM_CHK is not used in Marlin
341
+
340 342
 // define which hardware PWMs are available for the current CPU
341 343
 // all timer 1 PWMS deleted from this list because they are never available
342 344
 #if AVR_ATmega2560_FAMILY

+ 22
- 0
Marlin/src/HAL/HAL_AVR/inc/Conditionals_LCD.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_AVR/inc/Conditionals_adv.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_AVR/inc/Conditionals_post.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

Marlin/src/HAL/HAL_AVR/SanityCheck.h → Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h 查看文件


Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_shared_hw_spi.cpp → Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp 查看文件

@@ -21,58 +21,57 @@
21 21
  */
22 22
 
23 23
 
24
-/*
25
-
26
-  based on u8g_com_msp430_hw_spi.c
27
-
28
-  Universal 8bit Graphics Library
29
-
30
-  Copyright (c) 2012, olikraus@gmail.com
31
-  All rights reserved.
32
-
33
-  Redistribution and use in source and binary forms, with or without modification,
34
-  are permitted provided that the following conditions are met:
35
-
36
-  * Redistributions of source code must retain the above copyright notice, this list
37
-  of conditions and the following disclaimer.
38
-
39
-  * Redistributions in binary form must reproduce the above copyright notice, this
40
-  list of conditions and the following disclaimer in the documentation and/or other
41
-  materials provided with the distribution.
42
-
43
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
44
-  CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
45
-  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
46
-  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
47
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
48
-  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
49
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
50
-  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
51
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
52
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
53
-  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
54
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
55
-  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
56
-
57
-*/
24
+/**
25
+ * Based on u8g_com_msp430_hw_spi.c
26
+ *
27
+ * Universal 8bit Graphics Library
28
+ *
29
+ * Copyright (c) 2012, olikraus@gmail.com
30
+ * All rights reserved.
31
+ *
32
+ * Redistribution and use in source and binary forms, with or without modification,
33
+ * are permitted provided that the following conditions are met:
34
+ *
35
+ * * Redistributions of source code must retain the above copyright notice, this list
36
+ * of conditions and the following disclaimer.
37
+ *
38
+ * * Redistributions in binary form must reproduce the above copyright notice, this
39
+ * list of conditions and the following disclaimer in the documentation and/or other
40
+ * materials provided with the distribution.
41
+ *
42
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
43
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
44
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
45
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
46
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
47
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
48
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
49
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
50
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
51
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
52
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
53
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
54
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
+ *
56
+ */
58 57
 
59 58
 #ifdef __SAM3X8E__
60 59
 
61
-#include "../../inc/MarlinConfigPre.h"
60
+#include "../../../inc/MarlinConfigPre.h"
62 61
 
63 62
 #if HAS_GRAPHICAL_LCD
64 63
 
65 64
 #include <U8glib.h>
66 65
 
67
-#include "../../Marlin.h"
66
+#include "../../../Marlin.h"
68 67
 
69 68
 void spiBegin();
70 69
 void spiInit(uint8_t spiRate);
71 70
 void spiSend(uint8_t b);
72 71
 void spiSend(const uint8_t* buf, size_t n);
73 72
 
74
-#include "../shared/Marduino.h"
75
-#include "fastio_Due.h"
73
+#include "../../shared/Marduino.h"
74
+#include "../fastio_Due.h"
76 75
 
77 76
 void u8g_SetPIOutput_DUE_hw_spi(u8g_t *u8g, uint8_t pin_index) {
78 77
    PIO_Configure(g_APinDescription[u8g->pin_list[pin_index]].pPort, PIO_OUTPUT_1,

Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp → Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp 查看文件

@@ -55,11 +55,11 @@
55 55
 
56 56
 #ifdef ARDUINO_ARCH_SAM
57 57
 
58
-#include "../../inc/MarlinConfigPre.h"
58
+#include "../../../inc/MarlinConfigPre.h"
59 59
 
60 60
 #if ENABLED(U8GLIB_ST7920)
61 61
 
62
-#include "../shared/Delay.h"
62
+#include "../../shared/Delay.h"
63 63
 
64 64
 #include <U8glib.h>
65 65
 
@@ -145,8 +145,8 @@ uint8_t u8g_com_HAL_DUE_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_va
145 145
 }
146 146
 
147 147
 #if ENABLED(LIGHTWEIGHT_UI)
148
-  #include "../../lcd/ultralcd.h"
149
-  #include "../shared/HAL_ST7920.h"
148
+  #include "../../../lcd/ultralcd.h"
149
+  #include "../../shared/HAL_ST7920.h"
150 150
 
151 151
   #define ST7920_CS_PIN LCD_PINS_RS
152 152
 

Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_sw_spi.cpp → Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp 查看文件

@@ -55,7 +55,7 @@
55 55
 
56 56
 #ifdef ARDUINO_ARCH_SAM
57 57
 
58
-#include "../../inc/MarlinConfigPre.h"
58
+#include "../../../inc/MarlinConfigPre.h"
59 59
 
60 60
 #if HAS_GRAPHICAL_LCD && DISABLED(U8GLIB_ST7920)
61 61
 
@@ -64,8 +64,8 @@
64 64
 
65 65
 #include "u8g_com_HAL_DUE_sw_spi_shared.h"
66 66
 
67
-#include "../shared/Marduino.h"
68
-#include "../shared/Delay.h"
67
+#include "../../shared/Marduino.h"
68
+#include "../../shared/Delay.h"
69 69
 
70 70
 #include <U8glib.h>
71 71
 

Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_sw_spi_shared.cpp → Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp 查看文件

@@ -55,11 +55,11 @@
55 55
 
56 56
 #ifdef ARDUINO_ARCH_SAM
57 57
 
58
-#include "../../inc/MarlinConfigPre.h"
58
+#include "../../../inc/MarlinConfigPre.h"
59 59
 
60 60
 #if HAS_GRAPHICAL_LCD
61 61
 
62
-#include "../shared/Delay.h"
62
+#include "../../shared/Delay.h"
63 63
 
64 64
 #include <U8glib.h>
65 65
 

Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_sw_spi_shared.h → Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h 查看文件

@@ -21,8 +21,8 @@
21 21
  */
22 22
 #pragma once
23 23
 
24
-#include "../../inc/MarlinConfigPre.h"
25
-#include "../shared/Marduino.h"
24
+#include "../../../inc/MarlinConfigPre.h"
25
+#include "../../shared/Marduino.h"
26 26
 
27 27
 void u8g_SetPIOutput_DUE(u8g_t *u8g, uint8_t pin_index);
28 28
 void u8g_SetPILevel_DUE(u8g_t *u8g, uint8_t pin_index, uint8_t level);

Marlin/src/HAL/HAL_DUE/G2_PWM.cpp → Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.cpp 查看文件

@@ -40,7 +40,7 @@
40 40
  * Some jitter in the Vref signal is OK so the interrupt priority is left at its default value.
41 41
  */
42 42
 
43
-#include "../../inc/MarlinConfig.h"
43
+#include "../../../inc/MarlinConfig.h"
44 44
 
45 45
 #if MB(PRINTRBOARD_G2)
46 46
 

Marlin/src/HAL/HAL_DUE/G2_PWM.h → Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.h 查看文件

@@ -26,8 +26,8 @@
26 26
  * PR #7500. It is hardwired for the PRINTRBOARD_G2 Motor Current needs.
27 27
  */
28 28
 
29
-#include "../../inc/MarlinConfigPre.h"
30
-#include "../../module/stepper.h"
29
+#include "../../../inc/MarlinConfigPre.h"
30
+#include "../../../module/stepper.h"
31 31
 //C:\Users\bobku\Documents\GitHub\Marlin-Bob-2\Marlin\src\module\stepper.h
32 32
 //C:\Users\bobku\Documents\GitHub\Marlin-Bob-2\Marlin\src\HAL\HAL_DUE\G2_PWM.h
33 33
 

Marlin/src/HAL/HAL_DUE/G2_pins.h → Marlin/src/HAL/HAL_DUE/fastio/G2_pins.h 查看文件


+ 1
- 1
Marlin/src/HAL/HAL_DUE/fastio_Due.h 查看文件

@@ -77,7 +77,7 @@
77 77
 
78 78
 #if MB(PRINTRBOARD_G2)
79 79
 
80
-  #include "G2_pins.h"
80
+  #include "fastio/G2_pins.h"
81 81
 
82 82
   // Set pin as input
83 83
   #define _SET_INPUT(IO) do{ \

+ 22
- 0
Marlin/src/HAL/HAL_DUE/inc/Conditionals_LCD.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_DUE/inc/Conditionals_adv.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

Marlin/src/HAL/HAL_DUE/SanityCheck.h → Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h 查看文件


+ 22
- 0
Marlin/src/HAL/HAL_ESP32/inc/Conditionals_LCD.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_ESP32/inc/Conditionals_adv.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_ESP32/inc/Conditionals_post.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

Marlin/src/HAL/HAL_ESP32/SanityCheck.h → Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h 查看文件


+ 22
- 0
Marlin/src/HAL/HAL_LINUX/inc/Conditionals_LCD.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_LINUX/inc/Conditionals_adv.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_LINUX/inc/Conditionals_post.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

Marlin/src/HAL/HAL_LINUX/SanityCheck.h → Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h 查看文件


+ 22
- 0
Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_LCD.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_adv.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_LPC1768/inc/Conditionals_post.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

Marlin/src/HAL/HAL_LPC1768/SanityCheck.h → Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h 查看文件


+ 22
- 0
Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_LCD.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_adv.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_SAMD51/inc/Conditionals_post.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

Marlin/src/HAL/HAL_SAMD51/SanityCheck.h → Marlin/src/HAL/HAL_SAMD51/inc/SanityCheck.h 查看文件


+ 22
- 0
Marlin/src/HAL/HAL_STM32/inc/Conditionals_LCD.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_STM32/inc/Conditionals_adv.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_STM32/inc/Conditionals_post.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

Marlin/src/HAL/HAL_STM32/SanityCheck.h → Marlin/src/HAL/HAL_STM32/inc/SanityCheck.h 查看文件


+ 2
- 2
Marlin/src/HAL/HAL_STM32F1/HAL_sdio_STM32F1.h 查看文件

@@ -23,8 +23,8 @@
23 23
 
24 24
 #include "../shared/Marduino.h"
25 25
 
26
-#include "libmaple/sdio.h"
27
-#include "libmaple/dma.h"
26
+#include <libmaple/sdio.h>
27
+#include <libmaple/dma.h>
28 28
 
29 29
 // ------------------------
30 30
 // Defines

Marlin/src/HAL/HAL_STM32F1/u8g_com_stm32duino_fsmc.cpp → Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp 查看文件

@@ -26,17 +26,17 @@
26 26
  * Communication interface for FSMC
27 27
  */
28 28
 
29
-#include "../../inc/MarlinConfig.h"
29
+#include "../../../inc/MarlinConfig.h"
30 30
 
31 31
 #if defined(ARDUINO_ARCH_STM32F1) && PIN_EXISTS(FSMC_CS) // FSMC on 100/144 pins SoCs
32 32
 
33 33
 #if HAS_GRAPHICAL_LCD
34 34
 
35
-#include "U8glib.h"
36
-#include "libmaple/fsmc.h"
37
-#include "libmaple/gpio.h"
38
-#include "libmaple/dma.h"
39
-#include "boards.h"
35
+#include <U8glib.h>
36
+#include <libmaple/fsmc.h>
37
+#include <libmaple/gpio.h>
38
+#include <libmaple/dma.h>
39
+#include <boards.h>
40 40
 
41 41
 #ifndef LCD_READ_ID
42 42
   #define LCD_READ_ID 0x04   // Read display identification information (0xD3 on ILI9341)

Marlin/src/HAL/HAL_STM32F1/u8g_com_stm32duino_swspi.cpp → Marlin/src/HAL/HAL_STM32F1/dogm/u8g_com_stm32duino_swspi.cpp 查看文件

@@ -18,11 +18,11 @@
18 18
  */
19 19
 #ifdef __STM32F1__
20 20
 
21
-#include "../../inc/MarlinConfig.h"
21
+#include "../../../inc/MarlinConfig.h"
22 22
 
23 23
 #if HAS_GRAPHICAL_LCD && ENABLED(FORCE_SOFT_SPI)
24 24
 
25
-#include "HAL.h"
25
+#include "../HAL.h"
26 26
 #include <U8glib.h>
27 27
 
28 28
 #undef SPI_SPEED

+ 22
- 0
Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_LCD.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_adv.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_STM32F1/inc/Conditionals_post.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

Marlin/src/HAL/HAL_STM32F1/SanityCheck.h → Marlin/src/HAL/HAL_STM32F1/inc/SanityCheck.h 查看文件


+ 22
- 0
Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_LCD.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_adv.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_STM32_F4_F7/inc/Conditionals_post.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

Marlin/src/HAL/HAL_STM32_F4_F7/SanityCheck.h → Marlin/src/HAL/HAL_STM32_F4_F7/inc/SanityCheck.h 查看文件


+ 22
- 0
Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_LCD.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_adv.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_TEENSY31_32/inc/Conditionals_post.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

Marlin/src/HAL/HAL_TEENSY31_32/SanityCheck.h → Marlin/src/HAL/HAL_TEENSY31_32/inc/SanityCheck.h 查看文件


+ 22
- 0
Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_LCD.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_adv.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

+ 22
- 0
Marlin/src/HAL/HAL_TEENSY35_36/inc/Conditionals_post.h 查看文件

@@ -0,0 +1,22 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once

Marlin/src/HAL/HAL_TEENSY35_36/SanityCheck.h → Marlin/src/HAL/HAL_TEENSY35_36/inc/SanityCheck.h 查看文件


+ 52
- 0
Marlin/src/HAL/platforms.h 查看文件

@@ -0,0 +1,52 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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
+#pragma once
23
+
24
+#ifdef __AVR__
25
+  #define HAL_PLATFORM HAL_AVR
26
+#elif defined(ARDUINO_ARCH_SAM)
27
+  #define HAL_PLATFORM HAL_DUE
28
+#elif defined(__MK20DX256__)
29
+  #define HAL_PLATFORM HAL_TEENSY31_32
30
+#elif defined(__MK64FX512__) || defined(__MK66FX1M0__)
31
+  #define HAL_PLATFORM HAL_TEENSY35_36
32
+#elif defined(TARGET_LPC1768)
33
+  #define HAL_PLATFORM HAL_LPC1768
34
+#elif defined(__STM32F1__) || defined(TARGET_STM32F1)
35
+  #define HAL_PLATFORM HAL_STM32F1
36
+#elif defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F7))
37
+  #define HAL_PLATFORM HAL_STM32_F4_F7
38
+#elif defined(ARDUINO_ARCH_STM32)
39
+  #define HAL_PLATFORM HAL_STM32
40
+#elif defined(ARDUINO_ARCH_ESP32)
41
+  #define HAL_PLATFORM HAL_ESP32
42
+#elif defined(__PLAT_LINUX__)
43
+  #define HAL_PLATFORM HAL_LINUX
44
+#elif defined(__SAMD51__)
45
+  #define HAL_PLATFORM HAL_SAMD51
46
+#else
47
+  #error "Unsupported Platform!"
48
+#endif
49
+
50
+#define XSTR_(M) #M
51
+#define XSTR(M) XSTR_(M)
52
+#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL_PLATFORM/NAME)

+ 3
- 3
Marlin/src/inc/MarlinConfig.h 查看文件

@@ -30,13 +30,13 @@
30 30
 #include "../HAL/HAL.h"
31 31
 
32 32
 #include "../pins/pins.h"
33
-
34 33
 #include HAL_PATH(../HAL, spi_pins.h)
35 34
 
36 35
 #include "Conditionals_post.h"
37
-#include "SanityCheck.h"
36
+#include HAL_PATH(../HAL, inc/Conditionals_post.h)
38 37
 
39
-#include HAL_PATH(../HAL, SanityCheck.h)
38
+#include "SanityCheck.h"
39
+#include HAL_PATH(../HAL, inc/SanityCheck.h)
40 40
 
41 41
 // Include all core headers
42 42
 #include "../core/enum.h"

+ 7
- 0
Marlin/src/inc/MarlinConfigPre.h 查看文件

@@ -27,12 +27,19 @@
27 27
 // Prefix header to acquire configurations
28 28
 //
29 29
 
30
+#include "../HAL/platforms.h"
31
+
30 32
 #include "../core/boards.h"
31 33
 #include "../core/macros.h"
32 34
 #include "../core/millis_t.h"
33 35
 #include "Version.h"
34 36
 #include "../../Configuration.h"
37
+
35 38
 #include "Conditionals_LCD.h"
39
+#include HAL_PATH(../HAL, inc/Conditionals_LCD.h)
40
+
36 41
 #include "../core/drivers.h"
37 42
 #include "../../Configuration_adv.h"
43
+
38 44
 #include "Conditionals_adv.h"
45
+#include HAL_PATH(../HAL, inc/Conditionals_adv.h)

正在加载...
取消
保存