Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask

[mTask.git] / mTask.dcl

diff --git a/mTask.dcl b/mTask.dcl
index 114012c..e8f62f2 100644 (file)
--- a/mTask.dcl
+++ b/mTask.dcl
@@ -14,12 +14,16 @@ todo:
        imporove setp: >>*.
 */
 
+import GenPrint
+import Generics.gCons
+import Generics.gdynamic
+
 import iTasks
 
 import iTasks._Framework.Generic
 from iTasks._Framework.Task import :: Task
 import StdClass
-import gdynamic, gCons, GenEq, StdMisc, StdArray
+import GenEq, StdMisc, StdArray
 
 import mTaskCode, mTaskSimulation, mTaskInterpret
 import mTaskSerial, mTaskLCD
@@ -209,13 +213,12 @@ instance long Eval Long
 
 // ----- tools ----- //
 
-derive consName DigitalPin, AnalogPin, PinMode
+derive gPrint Pin, Button, UserLED, AnalogPin, DigitalPin, PinMode
+derive class gCons Pin, Button, UserLED, AnalogPin, DigitalPin, PinMode
 
 instance == DigitalPin
 instance == AnalogPin
 
-derive consIndex DigitalPin, AnalogPin
-
 tab =: toString (repeatn tabSize ' ')
 tabSize :== 2