Browse Source

Fix servo count define conflict

`MAX_SERVOS` => `NUM_SERVO_PLUGS`
Scott Lahteine 7 years ago
parent
commit
8584d3697d

+ 1
- 1
Marlin/src/inc/SanityCheck.h View File

756
 /**
756
 /**
757
  * Limited number of servos
757
  * Limited number of servos
758
  */
758
  */
759
-#if NUM_SERVOS > MAX_SERVOS
759
+#if NUM_SERVOS > NUM_SERVO_PLUGS
760
   #error "The selected board doesn't support enough servos for your configuration. Reduce NUM_SERVOS."
760
   #error "The selected board doesn't support enough servos for your configuration. Reduce NUM_SERVOS."
761
 #endif
761
 #endif
762
 
762
 

+ 3
- 3
Marlin/src/module/configuration_store.cpp View File

181
   //
181
   //
182
   // SERVO_ANGLES
182
   // SERVO_ANGLES
183
   //
183
   //
184
-  uint16_t servo_angles[MAX_SERVOS][2];                 // M281 P L U
184
+  uint16_t servo_angles[NUM_SERVO_PLUGS][2];                 // M281 P L U
185
 
185
 
186
   //
186
   //
187
   // DELTA / [XYZ]_DUAL_ENDSTOPS
187
   // DELTA / [XYZ]_DUAL_ENDSTOPS
545
       #if ENABLED(SWITCHING_EXTRUDER)
545
       #if ENABLED(SWITCHING_EXTRUDER)
546
         constexpr uint16_t sesa[][2] = SWITCHING_EXTRUDER_SERVO_ANGLES;
546
         constexpr uint16_t sesa[][2] = SWITCHING_EXTRUDER_SERVO_ANGLES;
547
       #endif
547
       #endif
548
-      constexpr uint16_t servo_angles[MAX_SERVOS][2] = {
548
+      constexpr uint16_t servo_angles[NUM_SERVO_PLUGS][2] = {
549
         #if ENABLED(SWITCHING_EXTRUDER)
549
         #if ENABLED(SWITCHING_EXTRUDER)
550
           [SWITCHING_EXTRUDER_SERVO_NR] = { sesa[0], sesa[1] }
550
           [SWITCHING_EXTRUDER_SERVO_NR] = { sesa[0], sesa[1] }
551
           #if EXTRUDERS > 3
551
           #if EXTRUDERS > 3
1167
       // SERVO_ANGLES
1167
       // SERVO_ANGLES
1168
       //
1168
       //
1169
       #if !HAS_SERVOS || DISABLED(EDITABLE_SERVO_ANGLES)
1169
       #if !HAS_SERVOS || DISABLED(EDITABLE_SERVO_ANGLES)
1170
-        uint16_t servo_angles[MAX_SERVOS][2];
1170
+        uint16_t servo_angles[NUM_SERVO_PLUGS][2];
1171
       #endif
1171
       #endif
1172
       EEPROM_READ(servo_angles);
1172
       EEPROM_READ(servo_angles);
1173
 
1173
 

+ 2
- 2
Marlin/src/pins/pins.h View File

627
   #define MAX_EXTRUDERS 5
627
   #define MAX_EXTRUDERS 5
628
 #endif
628
 #endif
629
 
629
 
630
-#ifndef MAX_SERVOS
631
-  #define MAX_SERVOS 4
630
+#ifndef NUM_SERVO_PLUGS
631
+  #define NUM_SERVO_PLUGS 4
632
 #endif
632
 #endif
633
 
633
 
634
 //
634
 //

Loading…
Cancel
Save