Преглед изворни кода

Preliminary cleanup of #include structure (#9763)

Scott Lahteine пре 7 година
родитељ
комит
90fa423737
No account linked to committer's email address
36 измењених фајлова са 52 додато и 106 уклоњено
  1. 1
    1
      Marlin/src/HAL/HAL.h
  2. 1
    1
      Marlin/src/HAL/HAL_DUE/HAL_pinsDebug_Due.h
  3. 0
    43
      Marlin/src/HAL/HAL_LCD_defines.h
  4. 2
    2
      Marlin/src/HAL/HAL_LPC1768/HAL.h
  5. 3
    5
      Marlin/src/HAL/HAL_LPC1768/HAL_spi.cpp
  6. 1
    1
      Marlin/src/HAL/HAL_LPC1768/LPC1768_PWM.cpp
  7. 1
    1
      Marlin/src/HAL/HAL_LPC1768/LPC1768_PWM.h
  8. 1
    1
      Marlin/src/HAL/HAL_LPC1768/SanityCheck.h
  9. 1
    1
      Marlin/src/HAL/HAL_LPC1768/SoftwareSPI.h
  10. 2
    2
      Marlin/src/HAL/HAL_LPC1768/SoftwareSerial.cpp
  11. 1
    1
      Marlin/src/HAL/HAL_LPC1768/SoftwareSerial.h
  12. 2
    2
      Marlin/src/HAL/HAL_LPC1768/WInterrupts.cpp
  13. 0
    0
      Marlin/src/HAL/HAL_LPC1768/digipot_mcp4451_I2C_routines.c
  14. 2
    2
      Marlin/src/HAL/HAL_LPC1768/fastio.h
  15. 1
    1
      Marlin/src/HAL/HAL_LPC1768/include/Arduino.h
  16. 3
    2
      Marlin/src/HAL/HAL_LPC1768/include/SPI.h
  17. 1
    1
      Marlin/src/HAL/HAL_LPC1768/include/Wire.cpp
  18. 2
    2
      Marlin/src/HAL/HAL_LPC1768/include/pinmapping.cpp
  19. 1
    1
      Marlin/src/HAL/HAL_LPC1768/include/pinmapping.h
  20. 0
    0
      Marlin/src/HAL/HAL_LPC1768/include/serial.h
  21. 4
    1
      Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py
  22. 1
    1
      Marlin/src/HAL/HAL_LPC1768/main.cpp
  23. 0
    0
      Marlin/src/HAL/HAL_LPC1768/u8g/HAL_LCD_I2C_routines.c
  24. 0
    0
      Marlin/src/HAL/HAL_LPC1768/u8g/HAL_LCD_I2C_routines.h
  25. 0
    6
      Marlin/src/HAL/HAL_LPC1768/u8g/HAL_LCD_defines.h
  26. 0
    0
      Marlin/src/HAL/HAL_LPC1768/u8g/HAL_LCD_delay.h
  27. 2
    2
      Marlin/src/HAL/HAL_LPC1768/u8g/HAL_LCD_pin_routines.c
  28. 0
    0
      Marlin/src/HAL/HAL_LPC1768/u8g/HAL_LCD_pin_routines.h
  29. 3
    4
      Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
  30. 4
    8
      Marlin/src/HAL/HAL_SPI.h
  31. 1
    1
      Marlin/src/HAL/HAL_STM32F1/HAL_spi_Stm32f1.cpp
  32. 1
    3
      Marlin/src/HAL/HAL_STM32F7/HAL_spi_STM32F7.cpp
  33. 1
    1
      Marlin/src/HAL/HAL_SanityCheck.h
  34. 1
    1
      frameworks/CMSIS/LPC1768/lib/LiquidCrystal.h
  35. 1
    1
      frameworks/CMSIS/LPC1768/lib/usb/cdcuser.cpp
  36. 7
    7
      platformio.ini

+ 1
- 1
Marlin/src/HAL/HAL.h Прегледај датотеку

29
 #ifndef _HAL_H
29
 #ifndef _HAL_H
30
 #define _HAL_H
30
 #define _HAL_H
31
 
31
 
32
-#include "SPI.h"
32
+#include "HAL_SPI.h"
33
 
33
 
34
 #define CPU_32_BIT
34
 #define CPU_32_BIT
35
 
35
 

+ 1
- 1
Marlin/src/HAL/HAL_DUE/HAL_pinsDebug_Due.h Прегледај датотеку

28
  * Translation of routines & variables used by pinsDebug.h
28
  * Translation of routines & variables used by pinsDebug.h
29
  */
29
  */
30
 
30
 
31
-#include "Arduino.h"
31
+#include <Arduino.h>
32
 
32
 
33
 /**
33
 /**
34
  * Due/Marlin quirks
34
  * Due/Marlin quirks

+ 0
- 43
Marlin/src/HAL/HAL_LCD_defines.h Прегледај датотеку

1
-/**
2
- * Marlin 3D Printer Firmware
3
- * Copyright (C) 2016, 2017 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
-
24
-#ifndef HAL_LCD_DEFINES_H_
25
-#define HAL_LCD_DEFINES_H_
26
-
27
-#ifdef ARDUINO_ARCH_SAM
28
-//  #include "HAL_DUE/HAL_DUE_LCD_defines.h"
29
-
30
-#elif defined(IS_32BIT_TEENSY)
31
-//  #include "HAL_TEENSY35_36/HAL_TEENSY_LCD_defines.h"
32
-
33
-#elif defined(ARDUINO_ARCH_AVR)
34
-//  #include "HAL_AVR/HAL_ARDUINO_LCD_defines.h"
35
-
36
-#elif defined(TARGET_LPC1768)
37
-  #include "HAL_LPC1768/HAL_LPC1768_LCD_defines.h"
38
-
39
-#else
40
-  #error "Unsupported Platform!"
41
-#endif
42
-
43
-#endif // HAL_LCD_DEFINES_H_

+ 2
- 2
Marlin/src/HAL/HAL_LPC1768/HAL.h Прегледај датотеку

55
 #define B01 1
55
 #define B01 1
56
 #define B10 2
56
 #define B10 2
57
 
57
 
58
-#include "include/Arduino.h"
58
+#include <Arduino.h>
59
+#include <pinmapping.h>
59
 
60
 
60
-#include "pinmapping.h"
61
 #include "fastio.h"
61
 #include "fastio.h"
62
 #include "watchdog.h"
62
 #include "watchdog.h"
63
 #include "serial.h"
63
 #include "serial.h"

+ 3
- 5
Marlin/src/HAL/HAL_LPC1768/HAL_spi.cpp Прегледај датотеку

26
  */
26
  */
27
 
27
 
28
 /**
28
 /**
29
- *
30
  * For TARGET_LPC1768
29
  * For TARGET_LPC1768
31
  */
30
  */
32
 
31
 
47
  * https://github.com/MarlinFirmware/Marlin/tree/071c7a78f27078fd4aee9a3ef365fcf5e143531e
46
  * https://github.com/MarlinFirmware/Marlin/tree/071c7a78f27078fd4aee9a3ef365fcf5e143531e
48
  */
47
  */
49
 
48
 
50
-#include "../../inc/MarlinConfig.h"
51
-
52
 #ifdef TARGET_LPC1768
49
 #ifdef TARGET_LPC1768
53
 
50
 
51
+#include "../../inc/MarlinConfig.h"
52
+
54
 // --------------------------------------------------------------------------
53
 // --------------------------------------------------------------------------
55
 // Includes
54
 // Includes
56
 // --------------------------------------------------------------------------
55
 // --------------------------------------------------------------------------
57
 
56
 
58
-#include "LPC_SPI.h"
59
-#include "../SPI.h"
57
+#include <SPI.h>
60
 
58
 
61
 // --------------------------------------------------------------------------
59
 // --------------------------------------------------------------------------
62
 // Public functions
60
 // Public functions

+ 1
- 1
Marlin/src/HAL/HAL_LPC1768/LPC1768_PWM.cpp Прегледај датотеку

74
 #include "../../inc/MarlinConfig.h"
74
 #include "../../inc/MarlinConfig.h"
75
 #include <lpc17xx_pinsel.h>
75
 #include <lpc17xx_pinsel.h>
76
 #include "LPC1768_PWM.h"
76
 #include "LPC1768_PWM.h"
77
-#include "Arduino.h"
77
+#include <Arduino.h>
78
 
78
 
79
 #define NUM_ISR_PWMS 20
79
 #define NUM_ISR_PWMS 20
80
 
80
 

+ 1
- 1
Marlin/src/HAL/HAL_LPC1768/LPC1768_PWM.h Прегледај датотеку

63
 #ifndef _LPC1768_PWM_H_
63
 #ifndef _LPC1768_PWM_H_
64
 #define _LPC1768_PWM_H_
64
 #define _LPC1768_PWM_H_
65
 
65
 
66
-#include "pinmapping.h"
66
+#include <pinmapping.h>
67
 #include <lpc17xx_clkpwr.h>
67
 #include <lpc17xx_clkpwr.h>
68
 
68
 
69
 #define LPC_PWM1_MR0 19999  // base repetition rate minus one count - 20mS
69
 #define LPC_PWM1_MR0 19999  // base repetition rate minus one count - 20mS

Marlin/src/HAL/HAL_LPC1768/SanityCheck_Re_ARM.h → Marlin/src/HAL/HAL_LPC1768/SanityCheck.h Прегледај датотеку

68
       #error "SPINDLE_LASER_PWM_PIN is used by CONTROLLERFAN_PIN."
68
       #error "SPINDLE_LASER_PWM_PIN is used by CONTROLLERFAN_PIN."
69
     #endif
69
     #endif
70
   #endif
70
   #endif
71
-#endif // SPINDLE_LASER_ENABLE
71
+#endif // SPINDLE_LASER_ENABLE

+ 1
- 1
Marlin/src/HAL/HAL_LPC1768/SoftwareSPI.h Прегледај датотеку

23
 #ifndef _SOFTWARE_SPI_H_
23
 #ifndef _SOFTWARE_SPI_H_
24
 #define _SOFTWARE_SPI_H_
24
 #define _SOFTWARE_SPI_H_
25
 
25
 
26
-#include "pinmapping.h"
26
+#include <pinmapping.h>
27
 
27
 
28
 // --------------------------------------------------------------------------
28
 // --------------------------------------------------------------------------
29
 // Software SPI
29
 // Software SPI

+ 2
- 2
Marlin/src/HAL/HAL_LPC1768/SoftwareSerial.cpp Прегледај датотеку

39
 #include "../../inc/MarlinConfig.h"
39
 #include "../../inc/MarlinConfig.h"
40
 #include <stdint.h>
40
 #include <stdint.h>
41
 #include <stdarg.h>
41
 #include <stdarg.h>
42
-#include "include/Arduino.h"
43
-#include "pinmapping.h"
42
+#include <Arduino.h>
43
+#include <pinmapping.h>
44
 #include "fastio.h"
44
 #include "fastio.h"
45
 #include "SoftwareSerial.h"
45
 #include "SoftwareSerial.h"
46
 
46
 

+ 1
- 1
Marlin/src/HAL/HAL_LPC1768/SoftwareSerial.h Прегледај датотеку

33
 #ifndef SOFTWARESERIAL_H
33
 #ifndef SOFTWARESERIAL_H
34
 #define SOFTWARESERIAL_H
34
 #define SOFTWARESERIAL_H
35
 
35
 
36
-#include "include/Arduino.h"
36
+#include <Arduino.h>
37
 #include <stdint.h>
37
 #include <stdint.h>
38
 //#include "serial.h"
38
 //#include "serial.h"
39
 #include <Stream.h>
39
 #include <Stream.h>

+ 2
- 2
Marlin/src/HAL/HAL_LPC1768/WInterrupts.cpp Прегледај датотеку

19
 #ifdef TARGET_LPC1768
19
 #ifdef TARGET_LPC1768
20
 
20
 
21
 #include "../../inc/MarlinConfig.h"
21
 #include "../../inc/MarlinConfig.h"
22
-#include "include/Arduino.h"
23
-#include "pinmapping.h"
22
+#include <Arduino.h>
23
+#include <pinmapping.h>
24
 //#include "HAL_timers.h"
24
 //#include "HAL_timers.h"
25
 #include "fastio.h"
25
 #include "fastio.h"
26
 
26
 

Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.c → Marlin/src/HAL/HAL_LPC1768/digipot_mcp4451_I2C_routines.c Прегледај датотеку


+ 2
- 2
Marlin/src/HAL/HAL_LPC1768/fastio.h Прегледај датотеку

36
 #define _FASTIO_LPC1768_H
36
 #define _FASTIO_LPC1768_H
37
 
37
 
38
 #include <LPC17xx.h>
38
 #include <LPC17xx.h>
39
-#include "include/Arduino.h"
40
-#include "pinmapping.h"
39
+#include <Arduino.h>
40
+#include <pinmapping.h>
41
 
41
 
42
 bool useable_hardware_PWM(pin_t pin);
42
 bool useable_hardware_PWM(pin_t pin);
43
 #define USEABLE_HARDWARE_PWM(pin) useable_hardware_PWM(pin)
43
 #define USEABLE_HARDWARE_PWM(pin) useable_hardware_PWM(pin)

+ 1
- 1
Marlin/src/HAL/HAL_LPC1768/include/Arduino.h Прегледај датотеку

26
 #include <stdint.h>
26
 #include <stdint.h>
27
 #include <math.h>
27
 #include <math.h>
28
 
28
 
29
-#include "../pinmapping.h"
29
+#include <pinmapping.h>
30
 
30
 
31
 #define HIGH         0x01
31
 #define HIGH         0x01
32
 #define LOW          0x00
32
 #define LOW          0x00

Marlin/src/HAL/HAL_LPC1768/LPC_SPI.h → Marlin/src/HAL/HAL_LPC1768/include/SPI.h Прегледај датотеку

21
  */
21
  */
22
 
22
 
23
 #pragma once
23
 #pragma once
24
-#ifdef TARGET_LPC1768
24
+
25
+#include "../../HAL_SPI.h"
26
+
25
 #include <stdint.h>
27
 #include <stdint.h>
26
 
28
 
27
 #define MSBFIRST 1
29
 #define MSBFIRST 1
42
 };
44
 };
43
 
45
 
44
 extern SPIClass SPI;
46
 extern SPIClass SPI;
45
-#endif

Marlin/src/HAL/HAL_LPC1768/Wire.cpp → Marlin/src/HAL/HAL_LPC1768/include/Wire.cpp Прегледај датотеку

28
   #include <lpc17xx_libcfg_default.h>
28
   #include <lpc17xx_libcfg_default.h>
29
 }
29
 }
30
 
30
 
31
-#include "Wire.h"
31
+#include <Wire.h>
32
 
32
 
33
 #define USEDI2CDEV_M 1
33
 #define USEDI2CDEV_M 1
34
 
34
 

Marlin/src/HAL/HAL_LPC1768/pinmapping.cpp → Marlin/src/HAL/HAL_LPC1768/include/pinmapping.cpp Прегледај датотеку

22
 
22
 
23
 #ifdef TARGET_LPC1768
23
 #ifdef TARGET_LPC1768
24
 
24
 
25
-#include "pinmapping.h"
25
+#include <pinmapping.h>
26
 
26
 
27
-#include "../../gcode/parser.h"
27
+#include "../../../gcode/parser.h"
28
 
28
 
29
 // Get the digital pin for an analog index
29
 // Get the digital pin for an analog index
30
 pin_t analogInputToDigitalPin(const int8_t p) {
30
 pin_t analogInputToDigitalPin(const int8_t p) {

Marlin/src/HAL/HAL_LPC1768/pinmapping.h → Marlin/src/HAL/HAL_LPC1768/include/pinmapping.h Прегледај датотеку

23
 #ifndef _PINMAPPING_H_
23
 #ifndef _PINMAPPING_H_
24
 #define _PINMAPPING_H_
24
 #define _PINMAPPING_H_
25
 
25
 
26
-#include "../../inc/MarlinConfigPre.h"
26
+#include "../../../inc/MarlinConfigPre.h"
27
 
27
 
28
 #include <stdint.h>
28
 #include <stdint.h>
29
 
29
 

Marlin/src/HAL/HAL_LPC1768/serial.h → Marlin/src/HAL/HAL_LPC1768/include/serial.h Прегледај датотеку


+ 4
- 1
Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py Прегледај датотеку

17
                     "--specs=nano.specs",
17
                     "--specs=nano.specs",
18
                     "--specs=nosys.specs",
18
                     "--specs=nosys.specs",
19
 
19
 
20
-                    "-IMarlin/src/HAL",
20
+                    # For external libraries
21
                     "-IMarlin/src/HAL/HAL_LPC1768/include",
21
                     "-IMarlin/src/HAL/HAL_LPC1768/include",
22
 
22
 
23
+                    # For MarlinFirmware/U8glib-HAL
24
+                    "-IMarlin/src/HAL/HAL_LPC1768/u8g",
25
+
23
                     "-MMD",
26
                     "-MMD",
24
                     "-MP",
27
                     "-MP",
25
                     "-DTARGET_LPC1768"
28
                     "-DTARGET_LPC1768"

+ 1
- 1
Marlin/src/HAL/HAL_LPC1768/main.cpp Прегледај датотеку

30
 #include "HAL_timers.h"
30
 #include "HAL_timers.h"
31
 #include <stdio.h>
31
 #include <stdio.h>
32
 #include <stdarg.h>
32
 #include <stdarg.h>
33
-#include "include/Arduino.h"
33
+#include <Arduino.h>
34
 #include "serial.h"
34
 #include "serial.h"
35
 #include "LPC1768_PWM.h"
35
 #include "LPC1768_PWM.h"
36
 
36
 

Marlin/src/HAL/HAL_LPC1768/HAL_LCD_I2C_routines.c → Marlin/src/HAL/HAL_LPC1768/u8g/HAL_LCD_I2C_routines.c Прегледај датотеку


Marlin/src/HAL/HAL_LPC1768/HAL_LCD_I2C_routines.h → Marlin/src/HAL/HAL_LPC1768/u8g/HAL_LCD_I2C_routines.h Прегледај датотеку


Marlin/src/HAL/HAL_LPC1768/HAL_LPC1768_LCD_defines.h → Marlin/src/HAL/HAL_LPC1768/u8g/HAL_LCD_defines.h Прегледај датотеку

24
  * LPC1768 LCD-specific defines
24
  * LPC1768 LCD-specific defines
25
  */
25
  */
26
 
26
 
27
-// pointers to low level routines - must always supply these
28
-//#define U8G_HAL_LINKS
29
-#define HAL_LCD_pin_routines "HAL_LPC1768/HAL_LCD_pin_routines.h"
30
-#define HAL_LCD_I2C_routines  "HAL_LPC1768/HAL_LCD_I2C_routines.h"
31
-#define HAL_LCD_delay "HAL_LPC1768/HAL_LCD_delay.h"
32
-
33
 // The following are optional depending on the platform.
27
 // The following are optional depending on the platform.
34
 
28
 
35
 // definitions of HAL specific com and device drivers.
29
 // definitions of HAL specific com and device drivers.

Marlin/src/HAL/HAL_LPC1768/HAL_LCD_delay.h → Marlin/src/HAL/HAL_LPC1768/u8g/HAL_LCD_delay.h Прегледај датотеку


Marlin/src/HAL/HAL_LPC1768/HAL_LCD_pin_routines.c → Marlin/src/HAL/HAL_LPC1768/u8g/HAL_LCD_pin_routines.c Прегледај датотеку

34
 
34
 
35
 #include <LPC17xx.h>
35
 #include <LPC17xx.h>
36
 #include <lpc17xx_pinsel.h>
36
 #include <lpc17xx_pinsel.h>
37
-#include "../core/macros.h"
38
-//#include "pinmapping.h"
37
+#include "../../../core/macros.h"
38
+//#include <pinmapping.h>
39
 
39
 
40
 #define LPC_PORT_OFFSET         (0x0020)
40
 #define LPC_PORT_OFFSET         (0x0020)
41
 #define LPC_PIN(pin)            (1UL << pin)
41
 #define LPC_PIN(pin)            (1UL << pin)

Marlin/src/HAL/HAL_LPC1768/HAL_LCD_pin_routines.h → Marlin/src/HAL/HAL_LPC1768/u8g/HAL_LCD_pin_routines.h Прегледај датотеку


+ 3
- 4
Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp Прегледај датотеку

57
 
57
 
58
 #ifdef TARGET_LPC1768
58
 #ifdef TARGET_LPC1768
59
 
59
 
60
-//  #include <inttypes.h>
61
-
62
-//  #include "src/core/macros.h"
63
-//  #include "Configuration.h"
60
+  //#include <inttypes.h>
61
+  //#include "src/core/macros.h"
62
+  //#include "Configuration.h"
64
 
63
 
65
   #include <U8glib.h>
64
   #include <U8glib.h>
66
 
65
 

Marlin/src/HAL/SPI.h → Marlin/src/HAL/HAL_SPI.h Прегледај датотеку

21
  */
21
  */
22
 
22
 
23
 /**
23
 /**
24
- * HAL/SPI.h
24
+ * HAL/HAL_SPI.h
25
  * Core Marlin definitions for SPI, implemented in the HALs
25
  * Core Marlin definitions for SPI, implemented in the HALs
26
  */
26
  */
27
 
27
 
28
-#ifndef _SPI_H_
29
-#define _SPI_H_
28
+#ifndef _HAL_SPI_H_
29
+#define _HAL_SPI_H_
30
 
30
 
31
 #include <stdint.h>
31
 #include <stdint.h>
32
 
32
 
79
 /** Begin SPI transaction, set clock, bit order, data mode */
79
 /** Begin SPI transaction, set clock, bit order, data mode */
80
 void spiBeginTransaction(uint32_t spiClock, uint8_t bitOrder, uint8_t dataMode);
80
 void spiBeginTransaction(uint32_t spiClock, uint8_t bitOrder, uint8_t dataMode);
81
 
81
 
82
-#ifdef TARGET_LPC1768
83
-  #include "HAL_LPC1768/LPC_SPI.h"
84
-#endif
85
-
86
-#endif // _SPI_H_
82
+#endif // _HAL_SPI_H_

+ 1
- 1
Marlin/src/HAL/HAL_STM32F1/HAL_spi_Stm32f1.cpp Прегледај датотеку

37
 // --------------------------------------------------------------------------
37
 // --------------------------------------------------------------------------
38
 
38
 
39
 #include "../HAL.h"
39
 #include "../HAL.h"
40
-#include "SPI.h"
40
+#include "../HAL_SPI.h"
41
 #include "pins_arduino.h"
41
 #include "pins_arduino.h"
42
 #include "spi_pins.h"
42
 #include "spi_pins.h"
43
 #include "../../core/macros.h"
43
 #include "../../core/macros.h"

+ 1
- 3
Marlin/src/HAL/HAL_STM32F7/HAL_spi_STM32F7.cpp Прегледај датотеку

37
 // --------------------------------------------------------------------------
37
 // --------------------------------------------------------------------------
38
 
38
 
39
 #include "../HAL.h"
39
 #include "../HAL.h"
40
-//#include "../SPI.h"
41
-#include "SPI.h"
42
-//#include <SPI.h>
40
+#include "../HAL_SPI.h"
43
 #include "pins_arduino.h"
41
 #include "pins_arduino.h"
44
 #include "spi_pins.h"
42
 #include "spi_pins.h"
45
 #include "../../core/macros.h"
43
 #include "../../core/macros.h"

+ 1
- 1
Marlin/src/HAL/HAL_SanityCheck.h Прегледај датотеку

32
   #include "HAL_TEENSY35_36/SanityCheck_Teensy_35_36.h"
32
   #include "HAL_TEENSY35_36/SanityCheck_Teensy_35_36.h"
33
 
33
 
34
   #elif defined(TARGET_LPC1768)
34
   #elif defined(TARGET_LPC1768)
35
-  #include "HAL_LPC1768/SanityCheck_Re_ARM.h"
35
+  #include "HAL_LPC1768/SanityCheck.h"
36
 
36
 
37
   #elif defined(__STM32F1__)
37
   #elif defined(__STM32F1__)
38
     #include "HAL_STM32F1/SanityCheck_Stm32f1.h"
38
     #include "HAL_STM32F1/SanityCheck_Stm32f1.h"

+ 1
- 1
frameworks/CMSIS/LPC1768/lib/LiquidCrystal.h Прегледај датотеку

4
 #include <inttypes.h>
4
 #include <inttypes.h>
5
 #include "binary.h"
5
 #include "binary.h"
6
 #include "Print.h"
6
 #include "Print.h"
7
-#include <HAL_LPC1768/pinmapping.h>
7
+#include <pinmapping.h>
8
 
8
 
9
 // commands
9
 // commands
10
 #define LCD_CLEARDISPLAY 0x01
10
 #define LCD_CLEARDISPLAY 0x01

+ 1
- 1
frameworks/CMSIS/LPC1768/lib/usb/cdcuser.cpp Прегледај датотеку

28
 #include "cdc.h"
28
 #include "cdc.h"
29
 #include "cdcuser.h"
29
 #include "cdcuser.h"
30
 
30
 
31
-#include <HAL_LPC1768/serial.h>
31
+#include <serial.h>
32
 
32
 
33
 unsigned char BulkBufIn[USB_CDC_BUFSIZE];            // Buffer to store USB IN  packet
33
 unsigned char BulkBufIn[USB_CDC_BUFSIZE];            // Buffer to store USB IN  packet
34
 unsigned char BulkBufOut[USB_CDC_BUFSIZE];            // Buffer to store USB OUT packet
34
 unsigned char BulkBufOut[USB_CDC_BUFSIZE];            // Buffer to store USB OUT packet

+ 7
- 7
platformio.ini Прегледај датотеку

24
 
24
 
25
 [common]
25
 [common]
26
 lib_deps =
26
 lib_deps =
27
-  U8glib-HAL
27
+  https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip
28
   LiquidCrystal_I2C@1.1.2
28
   LiquidCrystal_I2C@1.1.2
29
   TMC2130Stepper
29
   TMC2130Stepper
30
-  https://github.com/teemuatlut/TMC2208Stepper.git
30
+  https://github.com/teemuatlut/TMC2208Stepper/archive/v0.0.3.zip
31
   Adafruit NeoPixel@1.1.3
31
   Adafruit NeoPixel@1.1.3
32
-  https://github.com/lincomatic/LiquidTWI2.git
33
-  https://github.com/trinamic/TMC26XStepper.git
34
-  https://github.com/ameyer/Arduino-L6470.git
32
+  https://github.com/lincomatic/LiquidTWI2/archive/master.zip
33
+  https://github.com/trinamic/TMC26XStepper/archive/master.zip
34
+  https://github.com/ameyer/Arduino-L6470/archive/master.zip
35
 
35
 
36
 default_src_filter = +<src/*> -<src/config>
36
 default_src_filter = +<src/*> -<src/config>
37
 
37
 
125
 lib_ldf_mode    = off
125
 lib_ldf_mode    = off
126
 lib_extra_dirs  = frameworks
126
 lib_extra_dirs  = frameworks
127
 lib_deps        = CMSIS-LPC1768
127
 lib_deps        = CMSIS-LPC1768
128
-  U8glib-HAL
128
+  https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip
129
   TMC2130Stepper@>=2.1.1
129
   TMC2130Stepper@>=2.1.1
130
 extra_scripts   = Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py
130
 extra_scripts   = Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py
131
 src_filter      = ${common.default_src_filter}
131
 src_filter      = ${common.default_src_filter}
145
 lib_ldf_mode   = off
145
 lib_ldf_mode   = off
146
 lib_extra_dirs = frameworks
146
 lib_extra_dirs = frameworks
147
 lib_deps       = CMSIS-LPC1768
147
 lib_deps       = CMSIS-LPC1768
148
-  U8glib-HAL
148
+  https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip
149
 src_filter     = ${common.default_src_filter}
149
 src_filter     = ${common.default_src_filter}
150
 extra_scripts  =  Marlin/src/HAL/HAL_LPC1768/debug_extra_script.py, Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py
150
 extra_scripts  =  Marlin/src/HAL/HAL_LPC1768/debug_extra_script.py, Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py
151
 debug_tool     = custom
151
 debug_tool     = custom

Loading…
Откажи
Сачувај