Merge remote-tracking branch 'upstream/master' into master

hue_remote/presets.py

@@ -1,44 +1,44 @@
 # Presets goes in here
 PRESETS = {
 
-    "default": {
+	"default": {
-        "color": (178, 199, 255),
+		"color": (178, 199, 255),
-        "brightness": 255
+		"brightness": 255
-    },
+	},
-
+
-    "dim": {
+	"dim": {
-        "color": (178, 199, 255),
+		"color": (178, 199, 255),
-        "brightness": 111
+		"brightness": 111
-    },
+	},
-
+
-    "dim": {
+	"dim": {
-        "color": (178, 199, 255),
+		"color": (178, 199, 255),
-        "brightness": 80
+		"brightness": 80
-    },
+	},
-
+
-    "red": {
+	"red": {
-        "color": (255, 0, 0),
+		"color": (255, 0, 0),
-        "brightness": 255
+		"brightness": 255
-    },
+	},
-
+
-    "green": {
+	"green": {
-        "color": (0, 255, 0),
+		"color": (0, 255, 0),
-        "brightness": 255
+		"brightness": 255
-    },
+	},
-
+
-    "blue": {
+	"blue": {
-        "color": (0, 0, 255),
+		"color": (0, 0, 255),
-        "brightness": 255
+		"brightness": 255
-    },
+	},
-
+
-    "ice" : {
+	"ice" : {
-        "color": ( 80, 100, 255 ),
+		"color": ( 80, 100, 255 ),
-        "brightness": 120
+		"brightness": 120
-    },
+	},
-
+
-    "sleep": {
+	"sleep": {
-        "color": (185, 155, 25),
+		"color": (185, 155, 25),
-        "brightness": 60
+		"brightness": 60
-    }
+	}
 
 }