Scott Lahteine 5 年之前
父節點
當前提交
67bee06e43

+ 0
- 2
Marlin/src/HAL/HAL_AVR/fastio_AVR.h 查看文件

@@ -94,8 +94,6 @@
94 94
   #define extDigitalRead(IO)    digitalRead(IO)
95 95
 #endif
96 96
 
97
-#define ANALOG_WRITE(IO,V)    analogWrite(IO,V)
98
-
99 97
 #define READ(IO)              _READ(IO)
100 98
 #define WRITE(IO,V)           _WRITE(IO,V)
101 99
 #define TOGGLE(IO)            _TOGGLE(IO)

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

@@ -190,8 +190,6 @@
190 190
 #define extDigitalRead(IO)    digitalRead(IO)
191 191
 #define extDigitalWrite(IO,V) digitalWrite(IO,V)
192 192
 
193
-#define ANALOG_WRITE(IO,V)    analogWrite(IO,V)
194
-
195 193
 /**
196 194
  * Ports and functions
197 195
  * Added as necessary or if I feel like it- not a comprehensive list!

+ 0
- 2
Marlin/src/HAL/HAL_ESP32/fastio_ESP32.h 查看文件

@@ -61,8 +61,6 @@
61 61
 #define extDigitalRead(IO)      digitalRead(IO)
62 62
 #define extDigitalWrite(IO,V)   digitalWrite(IO,V)
63 63
 
64
-#define ANALOG_WRITE(IO,V)      analogWrite(IO,V)
65
-
66 64
 #define PWM_PIN(P)              true
67 65
 #define USEABLE_HARDWARE_PWM(P) PWM_PIN(P)
68 66
 

+ 0
- 2
Marlin/src/HAL/HAL_LINUX/fastio.h 查看文件

@@ -126,6 +126,4 @@
126 126
 #define extDigitalRead(IO)    digitalRead(IO)
127 127
 #define extDigitalWrite(IO,V) digitalWrite(IO,V)
128 128
 
129
-#define ANALOG_WRITE(IO,V)    analogWrite(IO,V)
130
-
131 129
 #define USEABLE_HARDWARE_PWM(P) PWM_PIN(P)

+ 0
- 2
Marlin/src/HAL/HAL_LPC1768/fastio.h 查看文件

@@ -128,5 +128,3 @@
128 128
 // digitalRead/Write wrappers
129 129
 #define extDigitalRead(IO)    digitalRead(IO)
130 130
 #define extDigitalWrite(IO,V) digitalWrite(IO,V)
131
-
132
-#define ANALOG_WRITE(IO,V)    analogWrite(IO,V)

+ 0
- 2
Marlin/src/HAL/HAL_STM32/fastio_STM32.h 查看文件

@@ -84,5 +84,3 @@ void FastIO_init(); // Must be called before using fast io macros
84 84
 // digitalRead/Write wrappers
85 85
 #define extDigitalRead(IO)    digitalRead(IO)
86 86
 #define extDigitalWrite(IO,V) digitalWrite(IO,V)
87
-
88
-#define ANALOG_WRITE(IO,V)    analogWrite(IO,V)

+ 0
- 1
Marlin/src/HAL/HAL_STM32F1/fastio_STM32F1.h 查看文件

@@ -56,4 +56,3 @@
56 56
 #define extDigitalRead(IO)    digitalRead(IO)
57 57
 #define extDigitalWrite(IO,V) digitalWrite(IO,V)
58 58
 
59
-#define ANALOG_WRITE(IO,V)    analogWrite(IO,(V)*65535/255)

+ 0
- 2
Marlin/src/HAL/HAL_STM32F4/fastio_STM32F4.h 查看文件

@@ -59,8 +59,6 @@
59 59
 #define extDigitalRead(IO)    digitalRead(IO)
60 60
 #define extDigitalWrite(IO,V) digitalWrite(IO,V)
61 61
 
62
-#define ANALOG_WRITE(IO,V)    analogWrite(IO,(V)*65535/255)
63
-
64 62
 //
65 63
 // Pins Definitions
66 64
 //

+ 0
- 2
Marlin/src/HAL/HAL_STM32F7/fastio_STM32F7.h 查看文件

@@ -58,8 +58,6 @@
58 58
 #define extDigitalRead(IO)    digitalRead(IO)
59 59
 #define extDigitalWrite(IO,V) digitalWrite(IO,V)
60 60
 
61
-#define ANALOG_WRITE(IO,V)    analogWrite(IO,(V)*65535/255)
62
-
63 61
 //
64 62
 // Pins Definitions
65 63
 //

+ 0
- 2
Marlin/src/HAL/HAL_TEENSY31_32/fastio_Teensy.h 查看文件

@@ -90,8 +90,6 @@
90 90
 #define extDigitalRead(IO)    digitalRead(IO)
91 91
 #define extDigitalWrite(IO,V) digitalWrite(IO,V)
92 92
 
93
-#define ANALOG_WRITE(IO,V)    analogWrite(IO,V)
94
-
95 93
 #define PWM_PIN(P)            digitalPinHasPWM(P)
96 94
 #define USEABLE_HARDWARE_PWM(P) PWM_PIN(P)
97 95
 

+ 0
- 2
Marlin/src/HAL/HAL_TEENSY35_36/fastio_Teensy.h 查看文件

@@ -89,8 +89,6 @@
89 89
 #define extDigitalRead(IO)    digitalRead(IO)
90 90
 #define extDigitalWrite(IO,V) digitalWrite(IO,V)
91 91
 
92
-#define ANALOG_WRITE(IO,V)    analogWrite(IO,V)
93
-
94 92
 #define PWM_PIN(P)            digitalPinHasPWM(P)
95 93
 #define USEABLE_HARDWARE_PWM(P) PWM_PIN(P)
96 94
 

+ 1
- 1
Marlin/src/Marlin.cpp 查看文件

@@ -976,7 +976,7 @@ void setup() {
976 976
     #endif
977 977
     #if ENABLED(SPINDLE_LASER_PWM) && defined(SPINDLE_LASER_PWM_PIN) && SPINDLE_LASER_PWM_PIN >= 0
978 978
       SET_PWM(SPINDLE_LASER_PWM_PIN);
979
-      ANALOG_WRITE(SPINDLE_LASER_PWM_PIN, SPINDLE_LASER_PWM_INVERT ? 255 : 0);  // set to lowest speed
979
+      analogWrite(SPINDLE_LASER_PWM_PIN, SPINDLE_LASER_PWM_INVERT ? 255 : 0);  // set to lowest speed
980 980
     #endif
981 981
   #endif
982 982
 

+ 1
- 1
Marlin/src/feature/caselight.cpp 查看文件

@@ -70,7 +70,7 @@ void update_case_light() {
70 70
   #else // !CASE_LIGHT_USE_NEOPIXEL
71 71
 
72 72
     if (PWM_PIN(CASE_LIGHT_PIN))
73
-      ANALOG_WRITE(CASE_LIGHT_PIN, n10ct);
73
+      analogWrite(CASE_LIGHT_PIN, n10ct);
74 74
     else {
75 75
       const bool s = case_light_on ? !INVERT_CASE_LIGHT : INVERT_CASE_LIGHT;
76 76
       WRITE(CASE_LIGHT_PIN, s ? HIGH : LOW);

+ 1
- 1
Marlin/src/feature/controllerfan.cpp 查看文件

@@ -81,7 +81,7 @@ void controllerfan_update() {
81 81
 
82 82
     // allows digital or PWM fan output to be used (see M42 handling)
83 83
     WRITE(CONTROLLER_FAN_PIN, speed);
84
-    ANALOG_WRITE(CONTROLLER_FAN_PIN, speed);
84
+    analogWrite(CONTROLLER_FAN_PIN, speed);
85 85
   }
86 86
 }
87 87
 

+ 1
- 1
Marlin/src/feature/leds/leds.cpp 查看文件

@@ -112,7 +112,7 @@ void LEDLights::set_color(const LEDColor &incol
112 112
 
113 113
     // This variant uses 3-4 separate pins for the RGB(W) components.
114 114
     // If the pins can do PWM then their intensity will be set.
115
-    #define UPDATE_RGBW(C,c) do{ if (PWM_PIN(RGB_LED_##C##_PIN)) ANALOG_WRITE(RGB_LED_##C##_PIN, incol.r); else WRITE(RGB_LED_##C##_PIN, incol.c ? HIGH : LOW); }while(0)
115
+    #define UPDATE_RGBW(C,c) do{ if (PWM_PIN(RGB_LED_##C##_PIN)) analogWrite(RGB_LED_##C##_PIN, incol.r); else WRITE(RGB_LED_##C##_PIN, incol.c ? HIGH : LOW); }while(0)
116 116
     UPDATE_RGBW(R,r);
117 117
     UPDATE_RGBW(G,g);
118 118
     UPDATE_RGBW(B,b);

+ 2
- 2
Marlin/src/gcode/control/M3-M5.cpp 查看文件

@@ -74,7 +74,7 @@ inline void delay_for_power_down() { safe_delay(SPINDLE_LASER_POWERDOWN_DELAY);
74 74
 
75 75
 inline void set_spindle_laser_ocr(const uint8_t ocr) {
76 76
   WRITE(SPINDLE_LASER_ENABLE_PIN, SPINDLE_LASER_ENABLE_INVERT); // turn spindle on (active low)
77
-  ANALOG_WRITE(SPINDLE_LASER_PWM_PIN, (SPINDLE_LASER_PWM_INVERT) ? 255 - ocr : ocr);
77
+  analogWrite(SPINDLE_LASER_PWM_PIN, (SPINDLE_LASER_PWM_INVERT) ? 255 - ocr : ocr);
78 78
 }
79 79
 
80 80
 #if ENABLED(SPINDLE_LASER_PWM)
@@ -82,7 +82,7 @@ inline void set_spindle_laser_ocr(const uint8_t ocr) {
82 82
   void update_spindle_laser_power() {
83 83
     if (spindle_laser_power == 0) {
84 84
       WRITE(SPINDLE_LASER_ENABLE_PIN, !SPINDLE_LASER_ENABLE_INVERT);                      // turn spindle off (active low)
85
-      ANALOG_WRITE(SPINDLE_LASER_PWM_PIN, SPINDLE_LASER_PWM_INVERT ? 255 : 0);             // only write low byte
85
+      analogWrite(SPINDLE_LASER_PWM_PIN, SPINDLE_LASER_PWM_INVERT ? 255 : 0);             // only write low byte
86 86
       delay_for_power_down();
87 87
     }
88 88
     else {                                                                                // Convert RPM to PWM duty cycle

+ 1
- 1
Marlin/src/gcode/control/M42.cpp 查看文件

@@ -51,7 +51,7 @@ void GcodeSuite::M42() {
51 51
 
52 52
   pinMode(pin, OUTPUT);
53 53
   extDigitalWrite(pin, pin_status);
54
-  ANALOG_WRITE(pin, pin_status);
54
+  analogWrite(pin, pin_status);
55 55
 
56 56
   #if FAN_COUNT > 0
57 57
     switch (pin) {

+ 1
- 1
Marlin/src/module/endstops.cpp 查看文件

@@ -886,7 +886,7 @@ void Endstops::update() {
886 886
         ES_REPORT_CHANGE(Z3_MAX);
887 887
       #endif
888 888
       SERIAL_ECHOLNPGM("\n");
889
-      ANALOG_WRITE(LED_PIN, local_LED_status);
889
+      analogWrite(LED_PIN, local_LED_status);
890 890
       local_LED_status ^= 255;
891 891
       old_live_state_local = live_state_local;
892 892
     }

+ 5
- 5
Marlin/src/module/planner.cpp 查看文件

@@ -1290,13 +1290,13 @@ void Planner::check_axes_activity() {
1290 1290
     #else
1291 1291
 
1292 1292
       #if HAS_FAN0
1293
-        ANALOG_WRITE(FAN_PIN, CALC_FAN_SPEED(0));
1293
+        analogWrite(FAN_PIN, CALC_FAN_SPEED(0));
1294 1294
       #endif
1295 1295
       #if HAS_FAN1
1296
-        ANALOG_WRITE(FAN1_PIN, CALC_FAN_SPEED(1));
1296
+        analogWrite(FAN1_PIN, CALC_FAN_SPEED(1));
1297 1297
       #endif
1298 1298
       #if HAS_FAN2
1299
-        ANALOG_WRITE(FAN2_PIN, CALC_FAN_SPEED(2));
1299
+        analogWrite(FAN2_PIN, CALC_FAN_SPEED(2));
1300 1300
       #endif
1301 1301
     #endif
1302 1302
 
@@ -1308,10 +1308,10 @@ void Planner::check_axes_activity() {
1308 1308
 
1309 1309
   #if ENABLED(BARICUDA)
1310 1310
     #if HAS_HEATER_1
1311
-      ANALOG_WRITE(HEATER_1_PIN, tail_valve_pressure);
1311
+      analogWrite(HEATER_1_PIN, tail_valve_pressure);
1312 1312
     #endif
1313 1313
     #if HAS_HEATER_2
1314
-      ANALOG_WRITE(HEATER_2_PIN, tail_e_to_p_pressure);
1314
+      analogWrite(HEATER_2_PIN, tail_e_to_p_pressure);
1315 1315
     #endif
1316 1316
   #endif
1317 1317
 }

+ 1
- 1
Marlin/src/module/stepper.cpp 查看文件

@@ -2510,7 +2510,7 @@ void Stepper::report_positions() {
2510 2510
         if (WITHIN(driver, 0, COUNT(motor_current_setting) - 1))
2511 2511
           motor_current_setting[driver] = current; // update motor_current_setting
2512 2512
 
2513
-        #define _WRITE_CURRENT_PWM(P) ANALOG_WRITE(MOTOR_CURRENT_PWM_## P ##_PIN, 255L * current / (MOTOR_CURRENT_PWM_RANGE))
2513
+        #define _WRITE_CURRENT_PWM(P) analogWrite(MOTOR_CURRENT_PWM_## P ##_PIN, 255L * current / (MOTOR_CURRENT_PWM_RANGE))
2514 2514
         switch (driver) {
2515 2515
           case 0:
2516 2516
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_X)

+ 1
- 1
Marlin/src/module/temperature.cpp 查看文件

@@ -657,7 +657,7 @@ int Temperature::getHeaterPower(const int heater) {
657 657
 
658 658
     #define _UPDATE_AUTO_FAN(P,D,A) do{                               \
659 659
       if (PWM_PIN(P##_AUTO_FAN_PIN) && EXTRUDER_AUTO_FAN_SPEED < 255) \
660
-        ANALOG_WRITE(P##_AUTO_FAN_PIN, A);                            \
660
+        analogWrite(P##_AUTO_FAN_PIN, A);                             \
661 661
       else                                                            \
662 662
         WRITE(P##_AUTO_FAN_PIN, D);                                   \
663 663
     }while(0)

Loading…
取消
儲存