From 72de280c1e4581534f47df8cd1fe062589c983ad Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 17 Jul 2017 22:01:20 -0500 Subject: [PATCH] BARICUDA valve pressure consistently uint8_t --- Marlin/Marlin.h | 3 +-- Marlin/Marlin_main.cpp | 4 ++-- Marlin/planner.cpp | 4 ++-- Marlin/planner.h | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index 307dd370d..543fbcc5e 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -362,8 +362,7 @@ extern float soft_endstop_min[XYZ], soft_endstop_max[XYZ]; #endif #if ENABLED(BARICUDA) - extern int baricuda_valve_pressure; - extern int baricuda_e_to_p_pressure; + extern uint8_t baricuda_valve_pressure, baricuda_e_to_p_pressure; #endif #if ENABLED(FILAMENT_WIDTH_SENSOR) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index cec1293a1..5f46090b9 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -561,8 +561,8 @@ static uint8_t target_extruder; #endif #if ENABLED(BARICUDA) - int baricuda_valve_pressure = 0; - int baricuda_e_to_p_pressure = 0; + uint8_t baricuda_valve_pressure = 0, + baricuda_e_to_p_pressure = 0; #endif #if ENABLED(FWRETRACT) diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp index 1e84ae208..c84ce9bae 100644 --- a/Marlin/planner.cpp +++ b/Marlin/planner.cpp @@ -409,10 +409,10 @@ void Planner::check_axes_activity() { #if ENABLED(BARICUDA) #if HAS_HEATER_1 - unsigned char tail_valve_pressure = baricuda_valve_pressure; + uint8_t tail_valve_pressure = baricuda_valve_pressure; #endif #if HAS_HEATER_2 - unsigned char tail_e_to_p_pressure = baricuda_e_to_p_pressure; + uint8_t tail_e_to_p_pressure = baricuda_e_to_p_pressure; #endif #endif diff --git a/Marlin/planner.h b/Marlin/planner.h index 90593816e..9abcf10b2 100644 --- a/Marlin/planner.h +++ b/Marlin/planner.h @@ -121,7 +121,7 @@ typedef struct { #endif #if ENABLED(BARICUDA) - uint32_t valve_pressure, e_to_p_pressure; + uint8_t valve_pressure, e_to_p_pressure; #endif uint32_t segment_time;