Browse Source

Missed some variable declarations

Integrated fixes from henrikbrixandersen pull request #504
Gord Christmas 11 years ago
parent
commit
a733537ddd
3 changed files with 8 additions and 2 deletions
  1. 4
    0
      Marlin/Marlin_main.cpp
  2. 2
    0
      Marlin/Servo.cpp
  3. 2
    2
      Marlin/pins.h

+ 4
- 0
Marlin/Marlin_main.cpp View File

177
 #endif
177
 #endif
178
 uint8_t active_extruder = 0;
178
 uint8_t active_extruder = 0;
179
 int fanSpeed=0;
179
 int fanSpeed=0;
180
+#ifdef SERVO_ENDSTOPS
181
+  int servo_endstops[] = SERVO_ENDSTOPS;
182
+  int servo_endstop_angles[] = SERVO_ENDSTOP_ANGLES;
183
+#endif
180
 #ifdef BARICUDA
184
 #ifdef BARICUDA
181
 int ValvePressure=0;
185
 int ValvePressure=0;
182
 int EtoPPressure=0;
186
 int EtoPPressure=0;

+ 2
- 0
Marlin/Servo.cpp View File

41
  detach()    - Stops an attached servos from pulsing its i/o pin.
41
  detach()    - Stops an attached servos from pulsing its i/o pin.
42
 
42
 
43
 */
43
 */
44
+#include "Configuration.h" 
45
+
44
 #ifdef NUM_SERVOS
46
 #ifdef NUM_SERVOS
45
 #include <avr/interrupt.h>
47
 #include <avr/interrupt.h>
46
 #include <Arduino.h>
48
 #include <Arduino.h>

+ 2
- 2
Marlin/pins.h View File

391
       #define SERVO2_PIN         5
391
       #define SERVO2_PIN         5
392
     #endif
392
     #endif
393
 
393
 
394
-    #if NUM_SERVOS > 2
394
+    #if NUM_SERVOS > 3
395
       #define SERVO3_PIN         4
395
       #define SERVO3_PIN         4
396
     #endif
396
     #endif
397
   #endif
397
   #endif
1846
                         HEATER_BED_PIN, FAN_PIN,                  \
1846
                         HEATER_BED_PIN, FAN_PIN,                  \
1847
                         _E0_PINS _E1_PINS _E2_PINS             \
1847
                         _E0_PINS _E1_PINS _E2_PINS             \
1848
                         analogInputToDigitalPin(TEMP_0_PIN), analogInputToDigitalPin(TEMP_1_PIN), analogInputToDigitalPin(TEMP_2_PIN), analogInputToDigitalPin(TEMP_BED_PIN) }
1848
                         analogInputToDigitalPin(TEMP_0_PIN), analogInputToDigitalPin(TEMP_1_PIN), analogInputToDigitalPin(TEMP_2_PIN), analogInputToDigitalPin(TEMP_BED_PIN) }
1849
-#endif
1849
+#endif

Loading…
Cancel
Save