Bladeren bron

Remove the additional pin variable in Servo.cpp

as sugested by @c-born
inhttps://github.com/MarlinFirmware/Marlin/issues/1885#issuecomment-92618240
AnHardt 9 jaren geleden
bovenliggende
commit
8504992e9f
2 gewijzigde bestanden met toevoegingen van 3 en 6 verwijderingen
  1. 2
    3
      Marlin/servo.cpp
  2. 1
    3
      Marlin/servo.h

+ 2
- 3
Marlin/servo.cpp Bestand weergeven

@@ -244,9 +244,8 @@ uint8_t Servo::attach(int pin) {
244 244
 
245 245
 uint8_t Servo::attach(int pin, int min, int max) {
246 246
   if (this->servoIndex < MAX_SERVOS ) {
247
-  #if defined(ENABLE_AUTO_BED_LEVELING) && (PROBE_SERVO_DEACTIVATION_DELAY > 0)
248
-    if (pin > 0) this->pin = pin; else pin = this->pin;
249
-  #endif
247
+    if(pin == 0)
248
+      pin = servos[this->servoIndex].Pin.nbr;
250 249
     pinMode(pin, OUTPUT);                                   // set servo pin to output
251 250
     servos[this->servoIndex].Pin.nbr = pin;
252 251
     // todo min/max check: abs(min - MIN_PULSE_WIDTH) /4 < 128

+ 1
- 3
Marlin/servo.h Bestand weergeven

@@ -128,9 +128,7 @@ class Servo {
128 128
     int read();                        // returns current pulse width as an angle between 0 and 180 degrees
129 129
     int readMicroseconds();            // returns current pulse width in microseconds for this servo (was read_us() in first release)
130 130
     bool attached();                   // return true if this servo is attached, otherwise false
131
-    #if defined(ENABLE_AUTO_BED_LEVELING) && PROBE_SERVO_DEACTIVATION_DELAY > 0
132
-      int pin;                           // store the hardware pin of the servo
133
-    #endif
131
+
134 132
   private:
135 133
     uint8_t servoIndex;               // index into the channel data for this servo
136 134
     int8_t min;                       // minimum is this value times 4 added to MIN_PULSE_WIDTH

Laden…
Annuleren
Opslaan