AnHardt преди 10 години
родител
ревизия
8504992e9f
променени са 2 файла, в които са добавени 3 реда и са изтрити 6 реда
  1. 2
    3
      Marlin/servo.cpp
  2. 1
    3
      Marlin/servo.h

+ 2
- 3
Marlin/servo.cpp Целия файл

244
 
244
 
245
 uint8_t Servo::attach(int pin, int min, int max) {
245
 uint8_t Servo::attach(int pin, int min, int max) {
246
   if (this->servoIndex < MAX_SERVOS ) {
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
     pinMode(pin, OUTPUT);                                   // set servo pin to output
249
     pinMode(pin, OUTPUT);                                   // set servo pin to output
251
     servos[this->servoIndex].Pin.nbr = pin;
250
     servos[this->servoIndex].Pin.nbr = pin;
252
     // todo min/max check: abs(min - MIN_PULSE_WIDTH) /4 < 128
251
     // todo min/max check: abs(min - MIN_PULSE_WIDTH) /4 < 128

+ 1
- 3
Marlin/servo.h Целия файл

128
     int read();                        // returns current pulse width as an angle between 0 and 180 degrees
128
     int read();                        // returns current pulse width as an angle between 0 and 180 degrees
129
     int readMicroseconds();            // returns current pulse width in microseconds for this servo (was read_us() in first release)
129
     int readMicroseconds();            // returns current pulse width in microseconds for this servo (was read_us() in first release)
130
     bool attached();                   // return true if this servo is attached, otherwise false
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
   private:
132
   private:
135
     uint8_t servoIndex;               // index into the channel data for this servo
133
     uint8_t servoIndex;               // index into the channel data for this servo
136
     int8_t min;                       // minimum is this value times 4 added to MIN_PULSE_WIDTH
134
     int8_t min;                       // minimum is this value times 4 added to MIN_PULSE_WIDTH

Loading…
Отказ
Запис