Commit Graph

10 Commits

Author SHA1 Message Date
66f1bc3f7a Merge branches 'dawit' and 'master' of https://github.com/reti2vc-2018/SeniorAssistant into dawit
# Conflicts:
#	.gradle/4.4/fileHashes/fileHashes.bin
#	.gradle/4.4/fileHashes/fileHashes.lock
#	.idea/gradle.xml
#	.idea/workspace.xml
#	build.gradle
#	src/test/java/TestLights.java

#MaybeThisTimeIsCorrect
2018-06-01 21:33:50 +02:00
Giulia
fc135908f5 Work on FITBIT classes proceeds 2018-06-01 12:30:44 +02:00
79989af712 Merge branch 'master' into dawit
# Conflicts:
#	.gradle/4.4/fileHashes/fileHashes.bin
#	.gradle/4.4/fileHashes/fileHashes.lock
#	.idea/workspace.xml
#	build.gradle
2018-06-01 11:29:06 +02:00
8c2d94d90a Aggiunto jar per Z-Wave 2018-06-01 11:19:06 +02:00
f19stefano96
09f96fc590 Aggiunto classe Sensor e testSensor. NON SO se giusto 2018-05-31 21:14:58 +02:00
Giulia
7d28391db0 Added classes for manage authentication and retrieve data to/from fitbit... but the code needs some mods! 2018-05-31 15:00:59 +02:00
Giulia
cd65149211 Added classes for manage authentication and retrieve data to/from fitbit... but the code needs some mods! 2018-05-29 18:18:13 +02:00
Giulia
b132736a8e Updated build gradle
Added functions ph. hue
2018-05-28 16:35:48 +02:00
Dawit Gulino 20013954
9a83a06215 Updated hue nad compile settings 2018-05-24 11:49:35 +02:00
Dawit Gulino 20013954
a67aea0c37 Src folder 2018-05-24 09:20:46 +02:00