Skip to content

Commit

Permalink
Set k=2e-9, sample frequency 60 ms
Browse files Browse the repository at this point in the history
  • Loading branch information
martijnbastiaan committed Sep 9, 2024
1 parent f9d0b3f commit 2885c27
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bittide-instances/src/Bittide/Instances/Hitl/IlaPlot.hs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ stamp between the nodes.
type SyncPulsePeriod = Milliseconds 5

-- | The period of the scheduled capture (must be a multiple of 'SyncPulsePeriod').
type ScheduledCapturePeriod = Milliseconds 20
type ScheduledCapturePeriod = Milliseconds 60

{- | An upper bound on the number of synchronized pulses during a test
run. The bound allows to count pulses up to 5 minutes without
Expand Down
3 changes: 1 addition & 2 deletions bittide-tools/clockcontrol/plot/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -700,8 +700,7 @@ plotTest refDom testDir cfg dir globalOutDir = do
, dpDrift
, dpRfStage
, mapMaybe (uncurry $ liftA2 (,)) $
Vec.toList $
Vec.zip dpDataCounts dpStability
zip (Vec.toList dpDataCounts) (repeat (Just (StabilityIndication False False)))
)

writeTop (fromMaybe "digraph{}" -> str) =
Expand Down
2 changes: 1 addition & 1 deletion bittide/src/Bittide/ClockControl/Callisto.hs
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ callisto ControlConfig{..} mask scs dataCounts state =
-- `HwCcTopologies.commonStepSizeSelect`.
--
k_p, fStep :: forall d. DSignal dom d Float
k_p = pure 2e-8
k_p = pure 2e-9
fStep = pure 10e-9

r_k :: DSignal dom F.FromS32DefDelay Float
Expand Down
2 changes: 1 addition & 1 deletion firmware-support/bittide-sys/src/callisto.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ pub fn callisto(
// `k_p` (proportional gain) is copied from the Julia implementation. `fStep` should
// match the step size of the clock boards. For all our HITL tests this is set by
// `HwCcTopologies.commonStepSizeSelect`.
const K_P: f32 = 2e-8;
const K_P: f32 = 2e-9;
const FSTEP: f32 = 10e-9;

let n_buffers = availability_mask.count_ones();
Expand Down

0 comments on commit 2885c27

Please sign in to comment.