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

diff --git a/Shares/mTaskShare.icl b/Shares/mTaskShare.icl
index a9ebf56..2133f0b 100644 (file)
--- a/Shares/mTaskShare.icl
+++ b/Shares/mTaskShare.icl
@@ -15,10 +15,10 @@ from StdFunc import flip
 derive class iTask MTaskShare
 
 manageShares :: Task [MTaskDevice]
-manageShares = viewInformation "" [] []//whileUnchanged deviceStoreNP
-//     $ \devs->case devs of
-//             [] = viewInformation "No devices yet" [] []
-//             _ = allTasks (map manageSharesOnDevice devs)
+manageShares = whileUnchanged deviceStoreNP
+       $ \devs->case devs of
+               [] = viewInformation "No devices yet" [] []
+               _ = allTasks (map manageSharesOnDevice devs)
 
 manageSharesOnDevice :: MTaskDevice -> Task MTaskDevice
 manageSharesOnDevice dev = (case dev.deviceShares of

diff --git a/Utils/SDS.icl b/Utils/SDS.icl
index f90c029..e23e767 100644 (file)
--- a/Utils/SDS.icl
+++ b/Utils/SDS.icl
@@ -63,10 +63,8 @@ where
        notifyPred (Just (d1, i1)) (Just (d2, i2)) = d1 == d2 && i1 == i2
 
 realDeviceStore :: Shared [MTaskDevice]
-realDeviceStore = memoryShare "mTaskDevices" []
-
-bcStateStore :: Shared BCState
-bcStateStore = memoryShare "mTaskBCState" zero
+realDeviceStore = sharedStore "mTaskDevices" []
+//realDeviceStore = memoryShare "mTaskDevices" []
 
 mTaskTaskStore :: Shared [String]
 mTaskTaskStore = memoryShare "mTaskTasks" $ 'DM'.keys allmTasks

diff --git a/client/task.h b/client/task.h
index 253558e..41ff04a 100644 (file)
--- a/client/task.h
+++ b/client/task.h
@@ -12,7 +12,6 @@ struct task {
        uint16_t interval;
        unsigned long lastrun;
        uint8_t taskid;
-       struct task *next;
        uint8_t *bc;
        char type;
        int value;