From a4062a47acfc96906b0dc822b1ba31a0baea8f9c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Sun, 17 Apr 2016 23:12:15 -0700
Subject: [PATCH] Rename baricuda variables
---
Marlin/Marlin.h | 4 ++--
Marlin/Marlin_main.cpp | 12 ++++++------
Marlin/planner.cpp | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index dc73e8e746..353cf50a44 100644
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -340,8 +340,8 @@ extern bool axis_homed[3]; // axis[n].is_homed
#endif
#if ENABLED(BARICUDA)
- extern int ValvePressure;
- extern int EtoPPressure;
+ extern int baricuda_valve_pressure;
+ extern int baricuda_e_to_p_pressure;
#endif
#if ENABLED(FILAMENT_WIDTH_SENSOR)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 3bb393c7cc..ba352eee3c 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -346,8 +346,8 @@ static uint8_t target_extruder;
#endif
#if ENABLED(BARICUDA)
- int ValvePressure = 0;
- int EtoPPressure = 0;
+ int baricuda_valve_pressure = 0;
+ int baricuda_e_to_p_pressure = 0;
#endif
#if ENABLED(FWRETRACT)
@@ -4622,22 +4622,22 @@ inline void gcode_M112() { kill(PSTR(MSG_KILLED)); }
/**
* M126: Heater 1 valve open
*/
- inline void gcode_M126() { ValvePressure = code_seen('S') ? constrain(code_value(), 0, 255) : 255; }
+ inline void gcode_M126() { baricuda_valve_pressure = code_seen('S') ? constrain(code_value(), 0, 255) : 255; }
/**
* M127: Heater 1 valve close
*/
- inline void gcode_M127() { ValvePressure = 0; }
+ inline void gcode_M127() { baricuda_valve_pressure = 0; }
#endif
#if HAS_HEATER_2
/**
* M128: Heater 2 valve open
*/
- inline void gcode_M128() { EtoPPressure = code_seen('S') ? constrain(code_value(), 0, 255) : 255; }
+ inline void gcode_M128() { baricuda_e_to_p_pressure = code_seen('S') ? constrain(code_value(), 0, 255) : 255; }
/**
* M129: Heater 2 valve close
*/
- inline void gcode_M129() { EtoPPressure = 0; }
+ inline void gcode_M129() { baricuda_e_to_p_pressure = 0; }
#endif
#endif //BARICUDA
diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp
index ae2b66d00c..ed3cd3047f 100644
--- a/Marlin/planner.cpp
+++ b/Marlin/planner.cpp
@@ -428,8 +428,8 @@ void check_axes_activity() {
#endif
#if ENABLED(BARICUDA)
- unsigned char tail_valve_pressure = ValvePressure,
- tail_e_to_p_pressure = EtoPPressure;
+ unsigned char tail_valve_pressure = baricuda_valve_pressure,
+ tail_e_to_p_pressure = baricuda_e_to_p_pressure;
#endif
block_t* block;
@@ -650,8 +650,8 @@ float junction_deviation = 0.1;
#endif
#if ENABLED(BARICUDA)
- block->valve_pressure = ValvePressure;
- block->e_to_p_pressure = EtoPPressure;
+ block->valve_pressure = baricuda_valve_pressure;
+ block->e_to_p_pressure = baricuda_e_to_p_pressure;
#endif
// Compute direction bits for this block
--
GitLab