From a602e900c758202ea806170842243cfa208d8f94 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Sun, 7 Jan 2018 09:33:40 +0100 Subject: Fix example_countdown --- assignment-13/uFPL.icl | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/assignment-13/uFPL.icl b/assignment-13/uFPL.icl index 4f15e55..b8efab7 100644 --- a/assignment-13/uFPL.icl +++ b/assignment-13/uFPL.icl @@ -302,13 +302,15 @@ example_countdown = Print (lit ':') :. Print seconds )]) :. - seconds ?= lit 0 >>> ( + seconds ?= lit -1 >>> ( minutes <# minutes -. lit 1 :. - seconds <# lit 60 + seconds <# lit 59 ) :. - minutes ?= lit 0 >>> [ - running <# false - ] + minutes ?= lit -1 >>> ( + running <# false :. + minutes <# lit 0 :. + seconds <# lit 0 + ) ||| "setsec" :=: pressed b0 >>> [seconds <# seconds +. lit 1] ||| "setmin" :=: pressed b1 >>> [minutes <# minutes +. lit 1] ||| "on_off" :=: pressed b2 >>> [running <# running ? (false, true)] @@ -318,7 +320,7 @@ example_countdown = ) where running = rwBool "running" False - minutes = rwUInt "minutes" 0 - seconds = rwUInt "seconds" 0 + minutes = rwInt "minutes" 2 + seconds = rwInt "seconds" 0 counter = rwULong "counter" 0 // If set to 0, this will overflow on first iteration DELAY = lit 1000 -- cgit v1.2.3