Browse Source

BARICUDA valve pressure consistently uint8_t

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

+ 1
- 2
Marlin/Marlin.h View File

@@ -362,8 +362,7 @@ extern float soft_endstop_min[XYZ], soft_endstop_max[XYZ];
362 362
 #endif
363 363
 
364 364
 #if ENABLED(BARICUDA)
365
-  extern int baricuda_valve_pressure;
366
-  extern int baricuda_e_to_p_pressure;
365
+  extern uint8_t baricuda_valve_pressure, baricuda_e_to_p_pressure;
367 366
 #endif
368 367
 
369 368
 #if ENABLED(FILAMENT_WIDTH_SENSOR)

+ 2
- 2
Marlin/Marlin_main.cpp View File

@@ -561,8 +561,8 @@ static uint8_t target_extruder;
561 561
 #endif
562 562
 
563 563
 #if ENABLED(BARICUDA)
564
-  int baricuda_valve_pressure = 0;
565
-  int baricuda_e_to_p_pressure = 0;
564
+  uint8_t baricuda_valve_pressure = 0,
565
+          baricuda_e_to_p_pressure = 0;
566 566
 #endif
567 567
 
568 568
 #if ENABLED(FWRETRACT)

+ 2
- 2
Marlin/planner.cpp View File

@@ -409,10 +409,10 @@ void Planner::check_axes_activity() {
409 409
 
410 410
   #if ENABLED(BARICUDA)
411 411
     #if HAS_HEATER_1
412
-      unsigned char tail_valve_pressure = baricuda_valve_pressure;
412
+      uint8_t tail_valve_pressure = baricuda_valve_pressure;
413 413
     #endif
414 414
     #if HAS_HEATER_2
415
-      unsigned char tail_e_to_p_pressure = baricuda_e_to_p_pressure;
415
+      uint8_t tail_e_to_p_pressure = baricuda_e_to_p_pressure;
416 416
     #endif
417 417
   #endif
418 418
 

+ 1
- 1
Marlin/planner.h View File

@@ -121,7 +121,7 @@ typedef struct {
121 121
   #endif
122 122
 
123 123
   #if ENABLED(BARICUDA)
124
-    uint32_t valve_pressure, e_to_p_pressure;
124
+    uint8_t valve_pressure, e_to_p_pressure;
125 125
   #endif
126 126
 
127 127
   uint32_t segment_time;

Loading…
Cancel
Save