projects
/
smartthings-infrastructure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2d26e7a
)
Fixing bugs in infrastructure
author
Seyed Amir Hossein Aqajari
<saqajari@circinus-10.ics.uci.edu>
Wed, 29 Jan 2020 23:27:40 +0000
(15:27 -0800)
committer
Seyed Amir Hossein Aqajari
<saqajari@circinus-10.ics.uci.edu>
Wed, 29 Jan 2020 23:27:40 +0000
(15:27 -0800)
ColorControl/ColorControls.groovy
patch
|
blob
|
history
Location/LocationVar.groovy
patch
|
blob
|
history
Lock/Locks.groovy
patch
|
blob
|
history
MobilePresence/MobilePresences.groovy
patch
|
blob
|
history
MusicPlayer/MusicPlayer.groovy
patch
|
blob
|
history
SmartThing/SmartThing.groovy
patch
|
blob
|
history
SmartThing/SmartThings.groovy
patch
|
blob
|
history
Thermostat/Thermostats.groovy
patch
|
blob
|
history
appLists/device-interaction/locksAppList
patch
|
blob
|
history
diff --git
a/ColorControl/ColorControls.groovy
b/ColorControl/ColorControls.groovy
index 68fd6f0b1eed47095fcd38a8edd0b213be82eafe..d17f9e4333f94e02c8fb85fb361b0b0bee28afea 100644
(file)
--- a/
ColorControl/ColorControls.groovy
+++ b/
ColorControl/ColorControls.groovy
@@
-2,9
+2,6
@@
package ColorControl
import SmartThing.SmartThings
package ColorControl
import SmartThing.SmartThings
-//Importing mutable integer class
-import MutableInteger.MutableInteger
-
public class ColorControls extends SmartThings {
List colorControls = new ArrayList()
public class ColorControls extends SmartThings {
List colorControls = new ArrayList()
diff --git
a/Location/LocationVar.groovy
b/Location/LocationVar.groovy
index 6a8e6d3065d6535e60b39f7402ec9f27977cf187..403055d6b6dc331315d6aa2d7de4491a1d1f415f 100755
(executable)
--- a/
Location/LocationVar.groovy
+++ b/
Location/LocationVar.groovy
@@
-27,6
+27,7
@@
public class LocationVar extends SmartThing {
sendEventSmartThings = sendEvent
// Initialization
sendEventSmartThings = sendEvent
// Initialization
+ String mode
helloHome = new Phrase()
contacts = ['AJ']
phoneNumbers = [9495379373]
helloHome = new Phrase()
contacts = ['AJ']
phoneNumbers = [9495379373]
@@
-35,9
+36,9
@@
public class LocationVar extends SmartThing {
hubs = [[id:0, localIP:"128.195.204.105"]]
if (init)
hubs = [[id:0, localIP:"128.195.204.105"]]
if (init)
- mode
.append("away")
+ mode
= "away"
else
else
- mode
.append("home")
+ mode
= "home"
deviceValuesMap.put("mode", mode)
deviceValuesMap.put("name", "hub0")
deviceValuesMap.put("mode", mode)
deviceValuesMap.put("name", "hub0")
diff --git
a/Lock/Locks.groovy
b/Lock/Locks.groovy
index 37deb0ac2a2b02dc62bfa3a008d0cf0042003ea3..48c2e0bde805896db9ed45b2649c535b3c7dcd28 100644
(file)
--- a/
Lock/Locks.groovy
+++ b/
Lock/Locks.groovy
@@
-25,7
+25,7
@@
public class Locks extends SmartThings {
// Methods to set values
def lock() {
// Methods to set values
def lock() {
- lock[0].lock()
+ lock
s
[0].lock()
}
def lock(LinkedHashMap metaData) {
}
def lock(LinkedHashMap metaData) {
@@
-33,7
+33,7
@@
public class Locks extends SmartThings {
}
def unlock() {
}
def unlock() {
- lock[0].unlock()
+ lock
s
[0].unlock()
}
}
diff --git
a/MobilePresence/MobilePresences.groovy
b/MobilePresence/MobilePresences.groovy
index d619868973fcb388f1656dc1288fafc2ca419e36..5fb45284c161dd44495cadf50536254ffb1059e1 100644
(file)
--- a/
MobilePresence/MobilePresences.groovy
+++ b/
MobilePresence/MobilePresences.groovy
@@
-13,7
+13,7
@@
public class MobilePresences extends SmartThings {
String id = "mobileDeviceID0"
String label = "mobileDevice"
String displayName = "mobileDevice"
String id = "mobileDeviceID0"
String label = "mobileDevice"
String displayName = "mobileDevice"
- String deviceNetworkId
+ String deviceNetworkId
= "id58323"
mobilePresences.add(new MobilePresence(sendEvent, id, label, displayName, deviceNetworkId))
}
mobilePresences.add(new MobilePresence(sendEvent, id, label, displayName, deviceNetworkId))
}
diff --git
a/MusicPlayer/MusicPlayer.groovy
b/MusicPlayer/MusicPlayer.groovy
index 425b3cab922500b309c45cf3f4d471fe8d5aecff..9afc0f4610dd4653e0418e8700af0c25997e3b47 100644
(file)
--- a/
MusicPlayer/MusicPlayer.groovy
+++ b/
MusicPlayer/MusicPlayer.groovy
@@
-26,7
+26,6
@@
public class MusicPlayer extends SmartThing {
// Initialization
this.id = id
this.label = label
// Initialization
this.id = id
this.label = label
- this.currentLevel = currentLevel
possibleValues.add("on")
possibleValues.add("off")
possibleValues.add("on")
possibleValues.add("off")
diff --git
a/SmartThing/SmartThing.groovy
b/SmartThing/SmartThing.groovy
index 1f46551234af7f69b9a1f93c3d438d6cc046332a..7b3b26efd42ac1c56b91df5f92dd3b35f39b2b3f 100644
(file)
--- a/
SmartThing/SmartThing.groovy
+++ b/
SmartThing/SmartThing.groovy
@@
-122,7
+122,7
@@
public class SmartThing {
}
// Methods to return values
}
// Methods to return values
- def
getProperty
(String currentProperty) {
+ def
propertyMissing
(String currentProperty) {
String property = currentProperty
if (property.contains("current")) // Check to see if we have currentXXX or xxx
property = property.substring(7,8).toLowerCase()+property.substring(8);
String property = currentProperty
if (property.contains("current")) // Check to see if we have currentXXX or xxx
property = property.substring(7,8).toLowerCase()+property.substring(8);
diff --git
a/SmartThing/SmartThings.groovy
b/SmartThing/SmartThings.groovy
index 4ac188d5b90c68fe962ecdd68a0232dd66219143..3e1d4e059bc33d5b62ebba760eccdeea60b93a7c 100644
(file)
--- a/
SmartThing/SmartThings.groovy
+++ b/
SmartThing/SmartThings.groovy
@@
-1,7
+1,7
@@
//Create a class for SmartThings
package SmartThing
//Create a class for SmartThings
package SmartThing
-class SmartThings {
+
public
class SmartThings {
List smartThings = new ArrayList()
// Methods for closures
List smartThings = new ArrayList()
// Methods for closures
@@
-39,7
+39,9
@@
class SmartThings {
}
// Methods to return states of the devices
}
// Methods to return states of the devices
- def getProperty(String currentProperty) {
+ def propertyMissing(String currentProperty) {
+ if (smartThings[0] == null)
+ return
List tmpValues = new ArrayList()
tmpValues.add(smartThings[0].getProperty(currentProperty))
return tmpValues
List tmpValues = new ArrayList()
tmpValues.add(smartThings[0].getProperty(currentProperty))
return tmpValues
diff --git
a/Thermostat/Thermostats.groovy
b/Thermostat/Thermostats.groovy
index b2d59811ad6ddd828a7461e8f34d5fe653c29c72..dae0d8583ce56c3ddceb0fd273806ba82511b391 100644
(file)
--- a/
Thermostat/Thermostats.groovy
+++ b/
Thermostat/Thermostats.groovy
@@
-13,7
+13,7
@@
class Thermostats extends SmartThings {
String id = "thermostatID0"
String label = "thermostat"
String displayName = "thermostat"
String id = "thermostatID0"
String label = "thermostat"
String displayName = "thermostat"
- String climateName "climateName"
+ String climateName
=
"climateName"
String thermostatOperatingState
String thermostatFanMode
String thermostatMode
String thermostatOperatingState
String thermostatFanMode
String thermostatMode
diff --git
a/appLists/device-interaction/locksAppList
b/appLists/device-interaction/locksAppList
index f07a9631556680a1ca0d5804f03f62011fd00990..0c3ac3f9eb613b79cf971374557f3998fb1f4394 100644
(file)
--- a/
appLists/device-interaction/locksAppList
+++ b/
appLists/device-interaction/locksAppList
@@
-1,17
+1,17
@@
-
##
beacon-control.groovy
+beacon-control.groovy
#enhanced-auto-lock-door.groovy
#enhanced-auto-lock-door.groovy
-good-night-house.groovy
-#
#
initial-state-event-streamer.groovy
+
#
good-night-house.groovy
+#initial-state-event-streamer.groovy
#lock-it-at-a-specific-time.groovy
#lock-it-when-i-leave.groovy
#make-it-so.groovy
#lock-it-at-a-specific-time.groovy
#lock-it-when-i-leave.groovy
#make-it-so.groovy
-nfc-tag-toggle.groovy
-#
#
single-button-controller.groovy
-#
#
smart-auto-lock-unlock.groovy
+
#
nfc-tag-toggle.groovy
+#single-button-controller.groovy
+#smart-auto-lock-unlock.groovy
#unlock-it-when-i-arrive.groovy
#auto-lock-door.smartapp.groovy
#unlock-it-when-i-arrive.groovy
#auto-lock-door.smartapp.groovy
-#
#
buffered-event-sender.groovy
-#
#
ecobeeAwayFromHome.groovy
+#buffered-event-sender.groovy
+#ecobeeAwayFromHome.groovy
#FireCO2Alarm.groovy
##groveStreams.groovy
##influxdb-logger.groovy
#FireCO2Alarm.groovy
##groveStreams.groovy
##influxdb-logger.groovy