Commit #5

diff --git a/ContactSensor/Contacting.groovy b/ContactSensor/Contacting.groovy
index 1fa6c4775ac3e905eda1226f0ff8999065051e6c..022b44aae2deb034e7e3cde6d40b08067826b5ca 100644 (file)
--- a/ContactSensor/Contacting.groovy
+++ b/ContactSensor/Contacting.groovy
@@ -5,17 +5,18 @@ public class Contacting{
        private int deviceNumbers
        private List contacts
        def sendEvent
-       
-       
-       
+               
        Contacting(Closure sendEvent, int deviceNumbers) {
                this.sendEvent = sendEvent              
                this.deviceNumbers = deviceNumbers
                this.contacts = []
-               int id = 0
-               for (int i = 0;i < deviceNumbers;i++) {
-                       contacts.add(new Contacts(id, "contact"+id.toString(), "closed", "closed"))//By default closed
-                       id = id+1
+               if (deviceNumbers == 1) {
+                       contacts = [new Contacts(sendEvent, 0, "contact0", "closed", "closed")]
+               } else if (deviceNumbers == 2) {
+                       contacts = [new Contacts(sendEvent, 0, "contact0", "closed", "closed"), new Contacts(sendEvent, 1, "contact1", "closed", "closed")]
+               } else if (deviceNumbers == 3) {
+                       contacts = [new Contacts(sendEvent, 0, "contact0", "closed", "closed"), new Contacts(sendEvent, 1, "contact1", "closed", "closed")
+                                  ,new Contacts(sendEvent, 2, "contact2", "closed", "closed")]
                }
        }
 

diff --git a/Extractor/extractedObjects.groovy b/Extractor/extractedObjects.groovy
index ccd3d3af9a0ad621ff67af95cb79be5085049d22..c9786148622ce9a62224fac6a30b7b95a57254fd 100644 (file)
--- a/Extractor/extractedObjects.groovy
+++ b/Extractor/extractedObjects.groovy
@@ -3,7 +3,7 @@
 //Global Object for class switch!
 @Field def switcheson = new Switching(sendEvent, 1)
 //Global Object for class lock!
-@Field def lock1 = new Locking(sendEvent, 2)
+@Field def lock1 = new Locking(sendEvent, 1)
 //Global variable for mode!
 @Field def newMode = "away"
 //Global variable for number!

diff --git a/Lock/Locking.groovy b/Lock/Locking.groovy
index 20b0a1114c1aa222b4483279f8ca1b6759c86619..9d43ae099ab838ae569fbc01da54600659910c61 100644 (file)
--- a/Lock/Locking.groovy
+++ b/Lock/Locking.groovy
@@ -10,12 +10,16 @@ public class Locking{
        Locking(Closure sendEvent, int deviceNumbers) {
                this.sendEvent = sendEvent
                this.timers = new Timer()
+               timers.cancel() //Timer is ready to use
                this.deviceNumbers = deviceNumbers
                this.locks = []
-               int id = 0
-               for (int i = 0;i < deviceNumbers;i++) {
-                       locks.add(new Locks(sendEvent, id, "lock"+id, "locked", "locked"))//By default locked
-                       id = id+1
+               if (deviceNumbers == 1) {
+                       locks = [new Locks(sendEvent, 0, "lock0", "locked", "locked")]
+               } else if (deviceNumbers == 2) {
+                       locks = [new Locks(sendEvent, 0, "lock0", "locked", "locked"), new Locks(sendEvent, 1, "lock1", "locked", "locked")]
+               } else if (deviceNumbers == 3) {
+                       locks = [new Locks(sendEvent, 0, "lock0", "locked", "locked"), new Locks(sendEvent, 1, "lock1", "locked", "locked")
+                               ,new Locks(sendEvent, 2, "lock2", "locked", "locked")]
                }
        }
 

diff --git a/Lock/Locks.groovy b/Lock/Locks.groovy
index 752f50925a7118e895d404dda0ffd0e7ac97e7b6..42e0fc4371af032a02a8189c039086a971aeb167 100644 (file)
--- a/Lock/Locks.groovy
+++ b/Lock/Locks.groovy
@@ -17,6 +17,7 @@ public class Locks {
                this.lockCurrentValue = lockCurrentValue
                this.lockLatestValue = lockLatestValue
                this.timers = new Timer()
+               timers.cancel() //Timer is ready to use
        }
 
        //By Apps

diff --git a/Switch/Switches.groovy b/Switch/Switches.groovy
index dcf981fb51c9a5bd116b0aba04b28a1218422730..65cac120517b7e4ac1b99ade9ac7df7029fb8eee 100644 (file)
--- a/Switch/Switches.groovy
+++ b/Switch/Switches.groovy
@@ -13,6 +13,7 @@ public class Switches {
        Switches(Closure sendEvent, int id, String displayName, String switchCurrentValue, String switchLatestValue) {
                this.sendEvent = sendEvent
                this.timers = new Timer()
+               timers.cancel() //Timer is ready to use
                this.id = id
                this.displayName = displayName
                this.switchCurrentValue = switchCurrentValue

diff --git a/Switch/Switching.groovy b/Switch/Switching.groovy
index 1364d41be180dceb7e6f9482b72bc439e8e95697..c9a0efbd5e9bdd12a020ad6c05c44cc0b6f45098 100644 (file)
--- a/Switch/Switching.groovy
+++ b/Switch/Switching.groovy
@@ -10,13 +10,18 @@ public class Switching{
        Switching(Closure sendEvent, int deviceNumbers) {
                this.sendEvent = sendEvent
                this.timers = new Timer()
+               timers.cancel() //Timer is ready to use
                this.deviceNumbers = deviceNumbers
                this.switches = []
-               int id = 0
-               for (int i = 0;i < deviceNumbers;i++) {
-                       switches.add(new Switches(sendEvent, id, "switch"+id.toString(), "off", "off"))
-                       id = id+1
+               if (deviceNumbers == 1) {
+                       switches = [new Switches(sendEvent, 0, "switch0", "off", "off")]
+               } else if (deviceNumbers == 2) {
+                       switches = [new Switches(sendEvent, 0, "switch0", "off", "off"), new Switches(sendEvent, 1, "switch1", "off", "off")]
+               } else if (deviceNumbers == 3) {
+                       switches = [new Switches(sendEvent, 0, "switch0", "off", "off"), new Switches(sendEvent, 1, "switch1", "off", "off")
+                                  ,new Switches(sendEvent, 2, "switch2", "off", "off")]
                }
+               println("salam")
        }
 
        //By Apps

diff --git a/main.groovy b/main.groovy
index ac7aa3bebe71d2fef39b354df74ac7d0f60aba57..2e249bd4c0d6c64d10f650e9b3455795e653d410 100644 (file)
--- a/main.groovy
+++ b/main.groovy
@@ -48,7 +48,7 @@ import Event.Event
 //Global Object for class switch!
 @Field def switcheson = new Switching(sendEvent, 1)
 //Global Object for class lock!
-@Field def lock1 = new Locking(sendEvent, 2)
+@Field def lock1 = new Locking(sendEvent, 1)
 //Global variable for mode!
 @Field def newMode = "away"
 //Global variable for number!