Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

graph_extruder: Add in older pa algorithms for reference 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-02-03 16:41:14 -05:00
parent 2336d2d6ab
commit b3a180ea77
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/graph_extruder.py
View File

@ -62,11 +62,30 @@ def time_to_index(t):
PA_HALF_SMOOTH_T = .040 / 2. PA_HALF_SMOOTH_T = .040 / 2.
PRESSURE_ADVANCE = .045 PRESSURE_ADVANCE = .045
# Calculate raw pressure advance positions
def calc_pa_raw(t, positions): def calc_pa_raw(t, positions):
pa = PRESSURE_ADVANCE * INV_SEG_TIME pa = PRESSURE_ADVANCE * INV_SEG_TIME
i = time_to_index(t) i = time_to_index(t)
return positions[i] + pa * (positions[i+1] - positions[i]) return positions[i] + pa * (positions[i+1] - positions[i])
# Pressure advance smoothed using average velocity (for reference only)
def calc_pa_average(t, positions):
pa_factor = PRESSURE_ADVANCE / (2. * PA_HALF_SMOOTH_T)
base_pos = positions[time_to_index(t)]
start_pos = positions[time_to_index(t - PA_HALF_SMOOTH_T)]
end_pos = positions[time_to_index(t + PA_HALF_SMOOTH_T)]
return base_pos + (end_pos - start_pos) * pa_factor
# Pressure advance with simple time smoothing (for reference only)
def calc_pa_smooth(t, positions):
start_index = time_to_index(t - PA_HALF_SMOOTH_T) + 1
end_index = time_to_index(t + PA_HALF_SMOOTH_T)
pa = PRESSURE_ADVANCE * INV_SEG_TIME
pa_data = [positions[i] + pa * (positions[i+1] - positions[i])
for i in range(start_index, end_index)]
return sum(pa_data) / (end_index - start_index)
# Calculate pressure advance smoothed using a "weighted average"
def calc_pa_weighted(t, positions): def calc_pa_weighted(t, positions):
base_index = time_to_index(t) base_index = time_to_index(t)
start_index = time_to_index(t - PA_HALF_SMOOTH_T) + 1 start_index = time_to_index(t - PA_HALF_SMOOTH_T) + 1