Skip to content

M
MarlinKimbra
Commit 8b413c82 authored by MagoKimbra's avatar MagoKimbra
Browse files
Options

Merge pull request #19 from simone97/patch-15 

Added support for see the Power Consumption
parents 086a3933 acd17102
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
MarlinKimbra/planner.cpp
View file @ 8b413c82
...@@ -121,7 +121,7 @@ static long x_segment_time[3]={MAX_FREQ_TIME + 1,0,0}; // Segment times (in ...@@ -121,7 +121,7 @@ static long x_segment_time[3]={MAX_FREQ_TIME + 1,0,0}; // Segment times (in
static long y_segment_time[3]={MAX_FREQ_TIME + 1,0,0}; static long y_segment_time[3]={MAX_FREQ_TIME + 1,0,0};
#endif #endif
#ifdef FILAMENT_SENSOR #if (defined(FILAMENT_SENSOR) && defined(FILWIDTH_PIN) && FILWIDTH_PIN >= 0)
static char meas_sample; //temporary variable to hold filament measurement sample static char meas_sample; //temporary variable to hold filament measurement sample
#endif #endif
...@@ -861,7 +861,7 @@ Having the real displacement of the head, we can calculate the total movement le ...@@ -861,7 +861,7 @@ Having the real displacement of the head, we can calculate the total movement le
block->nominal_speed = block->millimeters * inverse_second; // (mm/sec) Always > 0 block->nominal_speed = block->millimeters * inverse_second; // (mm/sec) Always > 0
block->nominal_rate = ceil(block->step_event_count * inverse_second); // (step/sec) Always > 0 block->nominal_rate = ceil(block->step_event_count * inverse_second); // (step/sec) Always > 0
#ifdef FILAMENT_SENSOR #if (defined(FILAMENT_SENSOR) && defined(FILWIDTH_PIN) && FILWIDTH_PIN >= 0)
//FMM update ring buffer used for delay with filament measurements //FMM update ring buffer used for delay with filament measurements
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment