From 254ac18eb7f75836b526a9341dcc02364cc6d6db Mon Sep 17 00:00:00 2001
From: Michiel Cottaar <MichielCottaar@protonmail.com>
Date: Sat, 25 May 2024 16:48:09 +0100
Subject: [PATCH] Add missing `variables.`
---
src/containers/building_blocks.jl | 4 ++--
src/plot.jl | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/containers/building_blocks.jl b/src/containers/building_blocks.jl
index cc456f3..5a65bef 100644
--- a/src/containers/building_blocks.jl
+++ b/src/containers/building_blocks.jl
@@ -107,11 +107,11 @@ function waveform(bb::BaseBuildingBlock)
@assert all(abs.(prev_grad) .<= 1e-12) "$(typeof(bb)) inserts NoGradient before the gradient is zero. This is probably caused by an improper implementation of this BuildingBlock."
push!(result, (new_time, prev_grad))
elseif block isa ConstantGradient
- @assert all(isapprox.(gradient_strength(block), prev_grad, atol=tol, rtol=tol)) "$(typeof(bb)) inserts ConstantGradient that does not match previous gradient strength. This is probably caused by an improper implementation of this BuildingBlock."
+ @assert all(isapprox.(variables.gradient_strength(block), prev_grad, atol=tol, rtol=tol)) "$(typeof(bb)) inserts ConstantGradient that does not match previous gradient strength. This is probably caused by an improper implementation of this BuildingBlock."
push!(result, (new_time, prev_grad))
elseif block isa ChangingGradient
@assert all(isapprox.(block.gradient_strength_start, prev_grad, atol=tol, rtol=tol)) "$(typeof(bb)) inserts ChangingGradient that does not match previous gradient strength. This is probably caused by an improper implementation of this BuildingBlock."
- push!(result, (new_time, prev_grad .+ slew_rate(block) .* duration(block)))
+ push!(result, (new_time, prev_grad .+ variables.slew_rate(block) .* variables.duration(block)))
else
error("Unrecognised block type in BuildingBlock: $(typeof(bb)).")
end
diff --git a/src/plot.jl b/src/plot.jl
index b9215fb..c50c0d9 100644
--- a/src/plot.jl
+++ b/src/plot.jl
@@ -103,7 +103,7 @@ struct SequenceDiagram
end
function SequenceDiagram(actual_duration; kwargs...)
- durations = duration.([values(kwargs)...])
+ durations = duration_line.([values(kwargs)...])
@assert all(isapprox.(actual_duration, durations, rtol=1e-3))
res = SinglePlotLine[]
for symbol in (:RFx, :RFy, :G, :Gx, :Gy, :Gz, :ADC)
--
GitLab