LPC176x Framework update (#15722)

Changes required for compatibility with framework-arduino-lpc176x 0.2.0
2019-11-03 02:34:09 +00:00
parent 15f94e5ee5
commit b9116d4050
30 changed files with 172 additions and 176 deletions
--- a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
+++ b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
@@ -25,7 +25,7 @@
 * AZSMZ MINI pin assignments
 */

-#ifndef TARGET_LPC1768
+#ifndef MCU_LPC1768
  #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
 #endif

@@ -71,9 +71,9 @@
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          0   // A0 (TH1)
-#define TEMP_BED_PIN        1   // A1 (TH2)
-#define TEMP_1_PIN          2   // A2 (TH3)
+#define TEMP_0_PIN          P0_23_A0   // A0 (TH1)
+#define TEMP_BED_PIN        P0_24_A1   // A1 (TH2)
+#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)

 //
 // Heaters / Fans
--- a/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.1.h
+++ b/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.1.h
@@ -21,7 +21,7 @@
 */
 #pragma once

-#ifndef TARGET_LPC1768
+#ifndef MCU_LPC1768
  #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
 #endif

@@ -64,9 +64,9 @@
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_BED_PIN       0   // Analog Input
-#define TEMP_0_PIN         1   // Analog Input
-#define TEMP_1_PIN         2   // Analog Input
+#define TEMP_BED_PIN       P0_23_A0   // Analog Input
+#define TEMP_0_PIN         P0_24_A1   // Analog Input
+#define TEMP_1_PIN         P0_25_A2   // Analog Input

 //
 // Heaters / Fans
--- a/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
+++ b/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
@@ -21,7 +21,7 @@
 */
 #pragma once

-#ifndef TARGET_LPC1768
+#ifndef MCU_LPC1768
  #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
 #endif

@@ -160,9 +160,9 @@
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_BED_PIN       0   // A0 (T0) - (67) - TEMP_BED_PIN
-#define TEMP_0_PIN         1   // A1 (T1) - (68) - TEMP_0_PIN
-#define TEMP_1_PIN         2   // A2 (T2) - (69) - TEMP_1_PIN
+#define TEMP_BED_PIN       P0_23_A0   // A0 (T0) - (67) - TEMP_BED_PIN
+#define TEMP_0_PIN         P0_24_A1   // A1 (T1) - (68) - TEMP_0_PIN
+#define TEMP_1_PIN         P0_25_A2   // A2 (T2) - (69) - TEMP_1_PIN

 //
 // Heaters / Fans
--- a/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
+++ b/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
@@ -30,7 +30,7 @@
 *
 */

-#ifndef TARGET_LPC1768
+#ifndef MCU_LPC1768
  #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
 #endif

@@ -98,8 +98,8 @@
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          1   // A0 (T0)
-#define TEMP_BED_PIN        0   // A1 (T1)
+#define TEMP_0_PIN          P0_24_A1   // A0 (T0)
+#define TEMP_BED_PIN        P0_23_A0   // A1 (T1)

 //
 // Heaters / Fans
--- a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
+++ b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
@@ -30,7 +30,7 @@
 *
 */

-#ifndef TARGET_LPC1768
+#ifndef MCU_LPC1768
  #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
 #endif

@@ -71,8 +71,8 @@
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          0   // A0 (T0)
-#define TEMP_BED_PIN        1   // A1 (T1)
+#define TEMP_0_PIN          P0_23_A0   // A0 (T0)
+#define TEMP_BED_PIN        P0_24_A1   // A1 (T1)


 //
--- a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
+++ b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
@@ -21,7 +21,7 @@
 */
 #pragma once

-#ifndef TARGET_LPC1768
+#ifndef MCU_LPC1768
  #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
 #endif

@@ -103,8 +103,8 @@
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          1   // AD0[0] on P0_23
-#define TEMP_BED_PIN        0   // AD0[1] on P0_24
+#define TEMP_0_PIN          P0_24_A1   // AD0[0] on P0_23
+#define TEMP_BED_PIN        P0_23_A0   // AD0[1] on P0_24

 //
 // Heaters / Fans
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -25,7 +25,7 @@
 * MKS SBASE pin assignments
 */

-#ifndef TARGET_LPC1768
+#ifndef MCU_LPC1768
  #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
 #endif

@@ -90,10 +90,10 @@
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_BED_PIN        0   // A0 (TH1)
-#define TEMP_0_PIN          1   // A1 (TH2)
-#define TEMP_1_PIN          2   // A2 (TH3)
-#define TEMP_2_PIN          3   // A3 (TH4)
+#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
+#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)
+#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)
+#define TEMP_2_PIN          P0_26_A3   // A3 (TH4)

 //
 // Heaters / Fans
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -25,7 +25,7 @@
 * MKS SGEN-L pin assignments
 */

-#ifndef TARGET_LPC1768
+#ifndef MCU_LPC1768
  #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
 #endif

@@ -155,9 +155,9 @@
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN         0   // Analog Input A0 (TH1)
-#define TEMP_BED_PIN       1   // Analog Input A1 (TB)
-#define TEMP_1_PIN         2   // Analog Input A2 (TH2)
+#define TEMP_0_PIN         P0_23_A0   // Analog Input A0 (TH1)
+#define TEMP_BED_PIN       P0_24_A1   // Analog Input A1 (TB)
+#define TEMP_1_PIN         P0_25_A2   // Analog Input A2 (TH2)

 //
 // Heaters / Fans
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -36,7 +36,7 @@

 // Numbers in parentheses () are the corresponding mega2560 pin numbers

-#ifndef TARGET_LPC1768
+#ifndef MCU_LPC1768
  #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
 #endif

@@ -162,14 +162,14 @@
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          0   // A0 (T0) - (67) - TEMP_0_PIN
-#define TEMP_BED_PIN        1   // A1 (T1) - (68) - TEMP_BED_PIN
-#define TEMP_1_PIN          2   // A2 (T2) - (69) - TEMP_1_PIN
-#define TEMP_2_PIN          3   // A3 - (63) - J5-3 & AUX-2
-#define TEMP_3_PIN          4   // A4 - (37) - BUZZER_PIN
-//#define TEMP_4_PIN          5   // A5 - (49) - SD_DETECT_PIN
-//#define ??                  6   // A6 - ( 0)  - RXD0 - J4-4 & AUX-1
-#define FILWIDTH_PIN        7   // A7 - ( 1)  - TXD0 - J4-5 & AUX-1
+#define TEMP_0_PIN          P0_23_A0   // A0 (T0) - (67) - TEMP_0_PIN
+#define TEMP_BED_PIN        P0_24_A1   // A1 (T1) - (68) - TEMP_BED_PIN
+#define TEMP_1_PIN          P0_25_A2   // A2 (T2) - (69) - TEMP_1_PIN
+#define TEMP_2_PIN          P0_26_A3   // A3 - (63) - J5-3 & AUX-2
+#define TEMP_3_PIN          P1_30_A4   // A4 - (37) - BUZZER_PIN
+//#define TEMP_4_PIN          P1_31_A5   // A5 - (49) - SD_DETECT_PIN
+//#define ??                  P0_03_A6   // A6 - ( 0)  - RXD0 - J4-4 & AUX-1
+#define FILWIDTH_PIN        P0_02_A7   // A7 - ( 1)  - TXD0 - J4-5 & AUX-1

 //
 // Augmentation for auto-assigning RAMPS plugs
--- a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
+++ b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
@@ -25,7 +25,7 @@
 * Selena Compact pin assignments
 */

-#ifndef TARGET_LPC1768
+#ifndef MCU_LPC1768
  #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
 #endif

@@ -75,9 +75,9 @@
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_BED_PIN        0   // A0 (TH1)
-#define TEMP_0_PIN          1   // A1 (TH2)
-#define TEMP_1_PIN          2   // A2 (TH3)
+#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
+#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)
+#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)


 //
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
@@ -25,19 +25,13 @@
 * Azteeg X5 GT pin assignments
 */

-#ifndef LPC1769
+#ifndef MCU_LPC1769
  #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 #endif

 #define BOARD_INFO_NAME   "Azteeg X5 GT"
 #define BOARD_WEBSITE_URL "tinyurl.com/yx8tdqa3"

-//
-// Custom CPU Speed 120MHz
-//
-#undef F_CPU
-#define F_CPU 120000000
-
 //
 // Servos
 //
@@ -96,9 +90,9 @@
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_BED_PIN        0   // A0 (TH1)
-#define TEMP_0_PIN          1   // A1 (TH2)
-#define TEMP_1_PIN          2   // A2 (TH3)
+#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
+#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)
+#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)


 //
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
@@ -25,7 +25,7 @@
 * Azteeg X5 MINI pin assignments
 */

-#ifndef LPC1769
+#ifndef MCU_LPC1769
  #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 #endif

@@ -56,7 +56,7 @@
 #endif

 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN         2   // Analog Input (P0_25)
+  #define FILWIDTH_PIN         P0_25_A2   // Analog Input (P0_25)
 #endif

 //
@@ -93,8 +93,8 @@
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_BED_PIN        0   // A0 (TH1)
-#define TEMP_0_PIN          1   // A1 (TH2)
+#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
+#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)

 //
 // Heaters / Fans
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
@@ -25,7 +25,7 @@
 * Azteeg X5 MINI pin assignments
 */

-#ifndef LPC1769
+#ifndef MCU_LPC1769
  #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 #endif

--- a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
+++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
@@ -25,7 +25,7 @@
 * Cohesion3D Mini pin assignments
 */

-#ifndef LPC1769
+#ifndef MCU_LPC1769
  #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 #endif

@@ -88,8 +88,8 @@
 // Analog Inputs
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          0   // P0_23
-#define TEMP_BED_PIN        1   // P0_24
+#define TEMP_0_PIN          P0_23_A0   // P0_23
+#define TEMP_BED_PIN        P0_24_A1   // P0_24

 //
 // Heaters / Fans
--- a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
+++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
@@ -25,7 +25,7 @@
 * Cohesion3D ReMix pin assignments
 */

-#ifndef LPC1769
+#ifndef MCU_LPC1769
  #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 #endif

@@ -98,13 +98,13 @@
 // Analog Inputs
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          0   // P0_23
-#define TEMP_BED_PIN        1   // P0_24
-#define TEMP_1_PIN          2   // P0_25
+#define TEMP_0_PIN          P0_23_A0
+#define TEMP_BED_PIN        P0_24_A1
+#define TEMP_1_PIN          P0_25_A2
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
-  #define FILWIDTH_PIN      3   // P0_26
+  #define FILWIDTH_PIN      P0_26_A3
 #else
-  #define TEMP_2_PIN        3   // P0_26
+  #define TEMP_2_PIN        P0_26_A3
 #endif

 //
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
@@ -25,7 +25,7 @@
 * MKS SGen pin assignments
 */

-#ifndef LPC1769
+#ifndef MCU_LPC1769
  #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 #endif

--- a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
@@ -25,19 +25,13 @@
 * Smoothieboard pin assignments
 */

-#ifndef LPC1769
+#ifndef MCU_LPC1769
  #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 #endif

 #define BOARD_INFO_NAME   "Smoothieboard"
 #define BOARD_WEBSITE_URL "smoothieware.org/smoothieboard"

-//
-// Custom CPU Speed 120MHz
-//
-#undef F_CPU
-#define F_CPU 120000000
-
 //
 // Servos
 //
@@ -80,10 +74,10 @@
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          0   // P0.23 (T1)
-#define TEMP_BED_PIN        1   // P0.24 (T2)
-#define TEMP_1_PIN          2   // P0.25 (T3)
-#define TEMP_2_PIN          3   // P0.26 (T4)
+#define TEMP_0_PIN          P0_23_A0   // (T1)
+#define TEMP_BED_PIN        P0_24_A1   // (T2)
+#define TEMP_1_PIN          P0_25_A2   // (T3)
+#define TEMP_2_PIN          P0_26_A3   // (T4)

 //
 // Heaters / Fans
--- a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
@@ -25,7 +25,7 @@
 * TH3D EZBoard pin assignments
 */

-#ifndef LPC1769
+#ifndef MCU_LPC1769
  #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 #endif

@@ -94,18 +94,18 @@
 //  3.3V max when defined as an Analog Input!
 //
 #if TEMP_SENSOR_0 == 20         // PT100 Adapter
-  #define TEMP_0_PIN        7   // Analog Input
+  #define TEMP_0_PIN        P0_02_A7   // Analog Input
 #else
-  #define TEMP_0_PIN        0   // Analog Input P0_23
+  #define TEMP_0_PIN        P0_23_A0   // Analog Input P0_23
 #endif

-#define TEMP_BED_PIN        1   // Analog Input P0_24
-#define TEMP_1_PIN          2   // Analog Input P0_25
+#define TEMP_BED_PIN        P0_24_A1   // Analog Input P0_24
+#define TEMP_1_PIN          P0_25_A2   // Analog Input P0_25

 #if ENABLED(FILAMENT_WIDTH_SENSOR)
-  #define FILWIDTH_PIN      3   // Analog Input P0_26
+  #define FILWIDTH_PIN      P0_26_A3   // Analog Input P0_26
 #else
-  #define TEMP_2_PIN        3   // Analog Input P0_26
+  #define TEMP_2_PIN        P0_26_A3   // Analog Input P0_26
 #endif

 //