Berack/upo-senior-assistant-pi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

non so

Browse Source
This commit is contained in:
Dawit Gulino 20013954
2018-05-31 16:00:00 +02:00
parent b79a7615d2
commit 2f5b7826d9
11 changed files with 252 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.gradle/4.4/fileHashes/fileHashes.bin
View File

Binary file not shown.

BIN
.gradle/4.4/fileHashes/fileHashes.lock
View File

Binary file not shown.

9
.idea/compiler.xml generated Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel>
<module name="SeniorAssistant_main" target="1.8" />
<module name="SeniorAssistant_test" target="1.8" />
</bytecodeTargetLevel>
</component>
</project>

1
.idea/misc.xml generated
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>

10
.idea/modules.xml generated Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/SeniorAssistant.iml" filepath="$PROJECT_DIR$/SeniorAssistant.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/SeniorAssistant_main.iml" filepath="$PROJECT_DIR$/.idea/modules/SeniorAssistant_main.iml" group="SeniorAssistant" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/SeniorAssistant_test.iml" filepath="$PROJECT_DIR$/.idea/modules/SeniorAssistant_test.iml" group="SeniorAssistant" />
</modules>
</component>
</project>

18
.idea/modules/SeniorAssistant_main.iml generated Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="SeniorAssistant:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="SeniorAssistant" external.system.module.type="sourceSet" external.system.module.version="1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/../../out/production/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$/../../src/main">
<sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.0" level="project" />
<orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient:4.5.3" level="project" />
<orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpcore:4.4.6" level="project" />
<orderEntry type="library" name="Gradle: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.9" level="project" />
</component>
</module>

22
.idea/modules/SeniorAssistant_test.iml generated Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="SeniorAssistant:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="SeniorAssistant" external.system.module.type="sourceSet" external.system.module.version="1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output-test url="file://$MODULE_DIR$/../../out/test/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$/../../src/test">
<sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="SeniorAssistant_main" />
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.0" level="project" />
<orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient:4.5.3" level="project" />
<orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
<orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpcore:4.4.6" level="project" />
<orderEntry type="library" name="Gradle: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.9" level="project" />
<orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
</component>
<component name="TestModuleProperties" production-module="SeniorAssistant_main" />
</module>

245
.idea/workspace.xml generated
View File

@@ -2,14 +2,17 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="bf16df42-e8f6-4a52-a6da-5bff747a1a87" name="Default" comment=""> <list default="true" id="bf16df42-e8f6-4a52-a6da-5bff747a1a87" name="Default" comment="">
<change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/modules/SeniorAssistant_main.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/modules/SeniorAssistant_test.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/SeniorAssistant.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/device/Hue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/device/Hue.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/device/Hue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/device/Hue.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/tests/TestLights.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/TestLights.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/test/java/TestLights.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/TestLights.java" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/.gradle/" /> <ignored path="$PROJECT_DIR$/.gradle/" />
<ignored path="$PROJECT_DIR$/build/" /> <ignored path="$PROJECT_DIR$/build/" />
@@ -31,11 +34,10 @@
<file leaf-file-name="TestLights.java" pinned="false" current-in-tab="true"> <file leaf-file-name="TestLights.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/test/java/TestLights.java"> <entry file="file://$PROJECT_DIR$/src/test/java/TestLights.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="612"> <state relative-caret-position="221">
<caret line="36" column="5" selection-start-line="36" selection-start-column="5" selection-end-line="36" selection-end-column="5" /> <caret line="13" column="43" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="43" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#351#359#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -44,21 +46,8 @@
<file leaf-file-name="Hue.java" pinned="false" current-in-tab="false"> <file leaf-file-name="Hue.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/device/Hue.java"> <entry file="file://$PROJECT_DIR$/src/main/java/device/Hue.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state relative-caret-position="301">
<caret line="20" column="5" lean-forward="true" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" /> <caret line="59" column="56" lean-forward="true" selection-start-line="59" selection-start-column="56" selection-end-line="59" selection-end-column="56" />
<folding>
<element signature="e#520#521#0" expanded="true" />
<element signature="e#551#552#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Rest.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/manage/Rest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -85,7 +74,7 @@
<component name="GradleLocalSettings"> <component name="GradleLocalSettings">
<option name="myGradleHomes"> <option name="myGradleHomes">
<map> <map>
<entry key="$PROJECT_DIR$" value="C:\Users\f19st\.gradle\wrapper\dists\gradle-4.4-all\9br9xq1tocpiv8o6njlyu5op1\gradle-4.4" /> <entry key="$PROJECT_DIR$" value="C:\Users\Dawit\.gradle\wrapper\dists\gradle-4.4-all\9br9xq1tocpiv8o6njlyu5op1\gradle-4.4" />
</map> </map>
</option> </option>
<option name="myGradleVersions"> <option name="myGradleVersions">
@@ -260,6 +249,7 @@
</option> </option>
<option name="modificationStamps"> <option name="modificationStamps">
<map> <map>
<entry key="$PROJECT_DIR$" value="6111089685131" />
<entry key="$PROJECT_DIR$/.gradle" value="0" /> <entry key="$PROJECT_DIR$/.gradle" value="0" />
<entry key="$PROJECT_DIR$/build.gradle" value="2680631353" /> <entry key="$PROJECT_DIR$/build.gradle" value="2680631353" />
<entry key="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" value="2083459160" /> <entry key="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" value="2083459160" />
@@ -439,6 +429,7 @@
</option> </option>
<option name="projectSyncType"> <option name="projectSyncType">
<map> <map>
<entry key="$PROJECT_DIR$" value="RE_IMPORT" />
<entry key="$PROJECT_DIR$/../Spark-rest" value="PREVIEW" /> <entry key="$PROJECT_DIR$/../Spark-rest" value="PREVIEW" />
<entry key="$PROJECT_DIR$/../mqtt-intro" value="PREVIEW" /> <entry key="$PROJECT_DIR$/../mqtt-intro" value="PREVIEW" />
</map> </map>
@@ -447,8 +438,8 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/main/java/device/Hue.java" />
<option value="$PROJECT_DIR$/src/test/java/TestLights.java" /> <option value="$PROJECT_DIR$/src/test/java/TestLights.java" />
<option value="$PROJECT_DIR$/src/main/java/device/Hue.java" />
</list> </list>
</option> </option>
</component> </component>
@@ -478,68 +469,52 @@
<subPane> <subPane>
<expand> <expand>
<path> <path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" /> <item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path> </path>
<path> <path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" /> <item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name=".gradle" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name=".gradle" type="462c0819:PsiDirectoryNode" />
<item name="4.4" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="gradle" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" /> <item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path> </path>
<path> <path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" /> <item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" /> <item name="java" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" /> <item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" /> <item name="java" type="462c0819:PsiDirectoryNode" />
<item name="device" type="462c0819:PsiDirectoryNode" /> <item name="device" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" /> <item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" /> <item name="java" type="462c0819:PsiDirectoryNode" />
<item name="manage" type="462c0819:PsiDirectoryNode" /> <item name="manage" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" /> <item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path> </path>
<path> <path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" /> <item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" /> <item name="java" type="462c0819:PsiDirectoryNode" />
@@ -557,6 +532,9 @@
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.0" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
@@ -655,65 +633,100 @@
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
<history-entry file="TestLights - 2018.05.29 at 09h 57m 50s.xml"> <history-entry file="TestLights - 2018.05.31 at 15h 15m 54s.xml">
<configuration name="TestLights" configurationId="JUnit" /> <configuration name="TestLights" configurationId="JUnit" />
</history-entry> </history-entry>
<history-entry file="TestLights - 2018.05.29 at 10h 00m 46s.xml"> <history-entry file="TestLights - 2018.05.31 at 15h 19m 10s.xml">
<configuration name="TestLights" configurationId="JUnit" /> <configuration name="TestLights" configurationId="JUnit" />
</history-entry> </history-entry>
<history-entry file="TestLights - 2018.05.29 at 10h 02m 22s.xml"> <history-entry file="TestLights - 2018.05.31 at 15h 20m 54s.xml">
<configuration name="TestLights" configurationId="JUnit" /> <configuration name="TestLights" configurationId="JUnit" />
</history-entry> </history-entry>
<history-entry file="TestLights - 2018.05.29 at 10h 09m 06s.xml"> <history-entry file="TestLights - 2018.05.31 at 15h 24m 15s.xml">
<configuration name="TestLights" configurationId="JUnit" /> <configuration name="TestLights" configurationId="JUnit" />
</history-entry> </history-entry>
<history-entry file="TestLights - 2018.05.29 at 10h 31m 26s.xml"> <history-entry file="TestLights - 2018.05.31 at 15h 29m 17s.xml">
<configuration name="TestLights" configurationId="JUnit" /> <configuration name="TestLights" configurationId="JUnit" />
</history-entry> </history-entry>
<history-entry file="TestLights - 2018.05.29 at 10h 33m 54s.xml"> <history-entry file="TestLights - 2018.05.31 at 15h 32m 23s.xml">
<configuration name="TestLights" configurationId="JUnit" /> <configuration name="TestLights" configurationId="JUnit" />
</history-entry> </history-entry>
<history-entry file="TestLights - 2018.05.29 at 10h 35m 52s.xml"> <history-entry file="TestLights - 2018.05.31 at 15h 33m 01s.xml">
<configuration name="TestLights" configurationId="JUnit" />
</history-entry>
<history-entry file="TestLights - 2018.05.31 at 15h 34m 38s.xml">
<configuration name="TestLights" configurationId="JUnit" />
</history-entry>
<history-entry file="TestLights - 2018.05.31 at 15h 36m 59s.xml">
<configuration name="TestLights" configurationId="JUnit" />
</history-entry>
<history-entry file="TestLights - 2018.05.31 at 15h 39m 18s.xml">
<configuration name="TestLights" configurationId="JUnit" /> <configuration name="TestLights" configurationId="JUnit" />
</history-entry> </history-entry>
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="3638000" /> <option name="totallyTimeSpent" value="7123000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info anchor="right" id="Palette" /> <window_info anchor="right" id="Palette" />
<window_info anchor="right" id="sbt" />
<window_info anchor="bottom" id="Event Log" side_tool="true" /> <window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="right" id="Maven Projects" /> <window_info anchor="right" id="Maven Projects" />
<window_info anchor="bottom" id="Database Changes" show_stripe_button="false" /> <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
<window_info id="Capture Tool" /> <window_info id="Capture Tool" />
<window_info id="Designer" /> <window_info id="Designer" />
<window_info anchor="bottom" id="Build" weight="0.3290938" /> <window_info anchor="bottom" id="Build" weight="0.32965517" />
<window_info anchor="right" id="Database" /> <window_info anchor="right" id="Database" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info id="UI Designer" /> <window_info id="UI Designer" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Messages" /> <window_info anchor="bottom" id="Messages" order="7" />
<window_info anchor="right" id="Palette&#9;" /> <window_info anchor="right" id="Palette&#9;" />
<window_info id="Image Layers" /> <window_info id="Image Layers" />
<window_info anchor="right" id="Capture Analysis" /> <window_info anchor="right" id="Capture Analysis" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3290938" /> <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32965517" />
<window_info anchor="bottom" id="Version Control" /> <window_info anchor="bottom" id="Version Control" />
<window_info anchor="bottom" id="Terminal" /> <window_info anchor="bottom" id="Terminal" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24963397" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="sbt-shell-toolwindow" />
<window_info id="Learn" />
<window_info anchor="right" id="Gradle" /> <window_info anchor="right" id="Gradle" />
<window_info anchor="right" id="Theme Preview" /> <window_info anchor="right" id="Theme Preview" />
<window_info id="Favorites" side_tool="true" /> <window_info id="Favorites" side_tool="true" />
<window_info anchor="bottom" id="Build" order="7" weight="0.3290938" />
<window_info id="Designer" order="2" />
<window_info anchor="right" id="Palette" order="3" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3290938" />
<window_info id="Image Layers" order="2" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info id="UI Designer" order="2" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Terminal" order="7" />
<window_info id="Capture Tool" order="2" />
<window_info anchor="right" id="Capture Analysis" order="3" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24963397" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="7" />
<window_info anchor="right" id="Maven Projects" order="3" />
<window_info anchor="right" id="Gradle" order="3" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="right" id="Palette&#9;" order="3" />
<window_info anchor="right" id="Theme Preview" order="3" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@@ -722,6 +735,9 @@
<component name="VcsContentAnnotationSettings"> <component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="VcsManagerConfiguration">
<option name="LAST_COMMIT_MESSAGE" value="" />
</component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/build.gradle"> <entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
@@ -735,22 +751,17 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/device/Hue.java"> <entry file="file://$PROJECT_DIR$/src/main/java/device/Hue.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state relative-caret-position="301">
<caret line="20" column="5" lean-forward="true" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" /> <caret line="59" column="56" lean-forward="true" selection-start-line="59" selection-start-column="56" selection-end-line="59" selection-end-column="56" />
<folding>
<element signature="e#520#521#0" expanded="true" />
<element signature="e#551#552#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/test/java/TestLights.java"> <entry file="file://$PROJECT_DIR$/src/test/java/TestLights.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="612"> <state relative-caret-position="221">
<caret line="36" column="5" selection-start-line="36" selection-start-column="5" selection-end-line="36" selection-end-column="5" /> <caret line="13" column="43" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="43" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#351#359#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -758,6 +769,66 @@
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>
<state key="ArtifactsStructureConfigurable.UI">
<settings>
<artifact-editor />
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="FacetStructureConfigurable.UI">
<settings>
<last-edited>No facets are configured</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="GlobalLibrariesConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="JdkListConfigurable.UI">
<settings>
<last-edited>1.8</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ModuleStructureConfigurable.UI">
<settings>
<last-edited>SeniorAssistant_test|SeniorAssistant</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
<option value="0.6" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ProjectJDKs.UI"> <state key="ProjectJDKs.UI">
<settings> <settings>
<last-edited>1.8</last-edited> <last-edited>1.8</last-edited>
@@ -770,6 +841,18 @@
</splitter-proportions> </splitter-proportions>
</settings> </settings>
</state> </state>
<state key="ProjectLibrariesConfigurable.UI">
<settings>
<last-edited>Gradle: com.fasterxml.jackson.core:jackson-core:2.1.3</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states> </states>
</component> </component>
</project> </project>

13
SeniorAssistant.iml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="SeniorAssistant" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="SeniorAssistant" external.system.module.version="1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/build" />
<excludeFolder url="file://$MODULE_DIR$/out" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

12
src/main/java/device/Hue.java
View File

@@ -53,10 +53,18 @@ public class Hue {
} }
} }
public void setAttribute(String attribute, String value){ /*public void setAttribute(String attribute, String value){
for (String light : allLights.keySet()) { for (String light : allLights.keySet()) {
String callURL = lightsURL + light + "/state"; String callURL = lightsURL + light + "/state";
String body = "{ \""+attribute+"\" : "+value+" }"; String body = "{ \"+attribute+\" : "+value+" }";
Rest.put(callURL, body, "application/json");
}
}*/
public void colorLoop() {
for (String light : allLights.keySet()) {
String callURL = lightsURL + light + "/state";
String body = "{ \"on\" : true, \"effect\" : \"colorloop\" }";
Rest.put(callURL, body, "application/json"); Rest.put(callURL, body, "application/json");
} }
} }

12
src/test/java/TestLights.java
View File

@@ -11,7 +11,7 @@ public class TestLights {
//Hue lights = new Hue("http://localhost/api/newdeveloper/"); //Hue lights = new Hue("http://localhost/api/newdeveloper/");
Hue lights = new Hue(); Hue lights = new Hue();
Set<String> toRemove = new HashSet<String>(); Set<String> toRemove = new HashSet<>();
for(String str: lights.getNameLights()) for(String str: lights.getNameLights())
if(!str.equals("4")) if(!str.equals("4"))
toRemove.add(str); toRemove.add(str);
@@ -24,15 +24,15 @@ public class TestLights {
this.wait(0b1111101000); // 1000 this.wait(0b1111101000); // 1000
} }
lights.turnOn(); lights.turnOn();
for(int i=0; i<256; i++) { for(int i=0; i<256; i++) {
lights.setBrightness(i); lights.setBrightness(i);
this.wait(10); this.wait(2);
} }
for(int i=256; i>=0; i--) { lights.colorLoop();
lights.setBrightness(i); this.wait(20);
this.wait(10); lights.turnOff();
}
} }
} }