Browse Source

Rename baricuda variables

Scott Lahteine 8 years ago
parent
commit
a4062a47ac
3 changed files with 12 additions and 12 deletions
  1. 2
    2
      Marlin/Marlin.h
  2. 6
    6
      Marlin/Marlin_main.cpp
  3. 4
    4
      Marlin/planner.cpp

+ 2
- 2
Marlin/Marlin.h View File

340
 #endif
340
 #endif
341
 
341
 
342
 #if ENABLED(BARICUDA)
342
 #if ENABLED(BARICUDA)
343
-  extern int ValvePressure;
344
-  extern int EtoPPressure;
343
+  extern int baricuda_valve_pressure;
344
+  extern int baricuda_e_to_p_pressure;
345
 #endif
345
 #endif
346
 
346
 
347
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
347
 #if ENABLED(FILAMENT_WIDTH_SENSOR)

+ 6
- 6
Marlin/Marlin_main.cpp View File

346
 #endif
346
 #endif
347
 
347
 
348
 #if ENABLED(BARICUDA)
348
 #if ENABLED(BARICUDA)
349
-  int ValvePressure = 0;
350
-  int EtoPPressure = 0;
349
+  int baricuda_valve_pressure = 0;
350
+  int baricuda_e_to_p_pressure = 0;
351
 #endif
351
 #endif
352
 
352
 
353
 #if ENABLED(FWRETRACT)
353
 #if ENABLED(FWRETRACT)
4622
     /**
4622
     /**
4623
      * M126: Heater 1 valve open
4623
      * M126: Heater 1 valve open
4624
      */
4624
      */
4625
-    inline void gcode_M126() { ValvePressure = code_seen('S') ? constrain(code_value(), 0, 255) : 255; }
4625
+    inline void gcode_M126() { baricuda_valve_pressure = code_seen('S') ? constrain(code_value(), 0, 255) : 255; }
4626
     /**
4626
     /**
4627
      * M127: Heater 1 valve close
4627
      * M127: Heater 1 valve close
4628
      */
4628
      */
4629
-    inline void gcode_M127() { ValvePressure = 0; }
4629
+    inline void gcode_M127() { baricuda_valve_pressure = 0; }
4630
   #endif
4630
   #endif
4631
 
4631
 
4632
   #if HAS_HEATER_2
4632
   #if HAS_HEATER_2
4633
     /**
4633
     /**
4634
      * M128: Heater 2 valve open
4634
      * M128: Heater 2 valve open
4635
      */
4635
      */
4636
-    inline void gcode_M128() { EtoPPressure = code_seen('S') ? constrain(code_value(), 0, 255) : 255; }
4636
+    inline void gcode_M128() { baricuda_e_to_p_pressure = code_seen('S') ? constrain(code_value(), 0, 255) : 255; }
4637
     /**
4637
     /**
4638
      * M129: Heater 2 valve close
4638
      * M129: Heater 2 valve close
4639
      */
4639
      */
4640
-    inline void gcode_M129() { EtoPPressure = 0; }
4640
+    inline void gcode_M129() { baricuda_e_to_p_pressure = 0; }
4641
   #endif
4641
   #endif
4642
 
4642
 
4643
 #endif //BARICUDA
4643
 #endif //BARICUDA

+ 4
- 4
Marlin/planner.cpp View File

428
   #endif
428
   #endif
429
 
429
 
430
   #if ENABLED(BARICUDA)
430
   #if ENABLED(BARICUDA)
431
-    unsigned char tail_valve_pressure = ValvePressure,
432
-                  tail_e_to_p_pressure = EtoPPressure;
431
+    unsigned char tail_valve_pressure = baricuda_valve_pressure,
432
+                  tail_e_to_p_pressure = baricuda_e_to_p_pressure;
433
   #endif
433
   #endif
434
 
434
 
435
   block_t* block;
435
   block_t* block;
650
   #endif
650
   #endif
651
 
651
 
652
   #if ENABLED(BARICUDA)
652
   #if ENABLED(BARICUDA)
653
-    block->valve_pressure = ValvePressure;
654
-    block->e_to_p_pressure = EtoPPressure;
653
+    block->valve_pressure = baricuda_valve_pressure;
654
+    block->e_to_p_pressure = baricuda_e_to_p_pressure;
655
   #endif
655
   #endif
656
 
656
 
657
   // Compute direction bits for this block
657
   // Compute direction bits for this block

Loading…
Cancel
Save