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

Dawit #1

Merged
DawitG96 merged 10 commits from dawit into master 2018-06-01 21:36:48 +02:00
Conversation 0 Commits 10 Files Changed 20 +206 -280
8 changed files with 206 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b79a7615d2 - Show all commits

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.

2
.idea/gradle.xml generated
View File

@@ -3,8 +3,10 @@
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<option name="createEmptyContentRootDirectories" value="true" />
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="C:/Gradle/gradle-4.2" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />

2
.idea/misc.xml generated
View File

@@ -1,7 +1,7 @@
<?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="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" project-jdk-name="9" 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>
</project> </project>

395
.idea/workspace.xml generated
View File

@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="78e01e81-87ab-43aa-be01-5489e21c7fc2" name="Default" comment=""> <list default="true" id="bf16df42-e8f6-4a52-a6da-5bff747a1a87" name="Default" comment="">
<change afterPath="$PROJECT_DIR$/src/main/java/tests/TestLights.java" 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$/.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/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/manage/rest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/manage/Rest.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" />
</list> </list>
<ignored path="$PROJECT_DIR$/.gradle/" /> <ignored path="$PROJECT_DIR$/.gradle/" />
<ignored path="$PROJECT_DIR$/build/" /> <ignored path="$PROJECT_DIR$/build/" />
@@ -22,111 +26,66 @@
<ProjectState /> <ProjectState />
</projectState> </projectState>
</component> </component>
<component name="ExternalProjectsManager">
<system id="GRADLE">
<state>
<task path="$PROJECT_DIR$">
<activation />
</task>
<projects_view>
<tree_state>
<expand>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="SeniorAssistant" type="f1a62948:ProjectNode" />
</path>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="SeniorAssistant" type="f1a62948:ProjectNode" />
<item name="Source Sets" type="e897c970:GradleViewContributor$SourceSetsNode" />
</path>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="SeniorAssistant" type="f1a62948:ProjectNode" />
<item name="Source Sets" type="e897c970:GradleViewContributor$SourceSetsNode" />
<item name="main" type="396b929e:GradleViewContributor$SourceSetNode" />
</path>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="SeniorAssistant" type="f1a62948:ProjectNode" />
<item name="Source Sets" type="e897c970:GradleViewContributor$SourceSetsNode" />
<item name="main" type="396b929e:GradleViewContributor$SourceSetNode" />
<item name="Dependencies" type="6de06a37:ExternalSystemViewDefaultContributor$MyDependenciesNode" />
</path>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="SeniorAssistant" type="f1a62948:ProjectNode" />
<item name="Source Sets" type="e897c970:GradleViewContributor$SourceSetsNode" />
<item name="test" type="396b929e:GradleViewContributor$SourceSetNode" />
</path>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="SeniorAssistant" type="f1a62948:ProjectNode" />
<item name="Source Sets" type="e897c970:GradleViewContributor$SourceSetsNode" />
<item name="test" type="396b929e:GradleViewContributor$SourceSetNode" />
<item name="Dependencies" type="6de06a37:ExternalSystemViewDefaultContributor$MyDependenciesNode" />
</path>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="SeniorAssistant" type="f1a62948:ProjectNode" />
<item name="Tasks" type="e4a08cd1:TasksNode" />
</path>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="SeniorAssistant" type="f1a62948:ProjectNode" />
<item name="Tasks" type="e4a08cd1:TasksNode" />
<item name="build" type="c8890929:TasksNode$1" />
</path>
</expand>
<select />
</tree_state>
</projects_view>
</state>
</system>
</component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf>
<file leaf-file-name="Hue.java" pinned="false" current-in-tab="false"> <file leaf-file-name="TestLights.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/device/Hue.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="240"> <state relative-caret-position="612">
<caret line="18" column="5" lean-forward="true" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" /> <caret line="36" column="5" selection-start-line="36" selection-start-column="5" selection-end-line="36" selection-end-column="5" />
<folding> <folding>
<element signature="e#310#311#0" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#362#363#0" expanded="true" /> <element signature="e#351#359#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="TestLights.java" pinned="false" current-in-tab="true"> <file leaf-file-name="Hue.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tests/TestLights.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="102"> <state relative-caret-position="255">
<caret line="8" column="17" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" /> <caret line="20" column="5" lean-forward="true" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="e#520#521#0" expanded="true" />
<element signature="e#551#552#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </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>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FindInProjectRecents">
<option name="RECENT_TEMPLATES"> <findStrings>
<list> <find>nameLights</find>
<option value="Class" /> <find>nameLights</find>
</list> </findStrings>
</option> <replaceStrings>
<replace />
</replaceStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="master" />
</map>
</option>
</component> </component>
<component name="GradleLocalSettings"> <component name="GradleLocalSettings">
<option name="myGradleHomes"> <option name="myGradleHomes">
<map> <map>
<entry key="$PROJECT_DIR$" value="C:\Users\Giulia\.gradle\wrapper\dists\gradle-4.4-all\9br9xq1tocpiv8o6njlyu5op1\gradle-4.4" /> <entry key="$PROJECT_DIR$" value="C:\Users\f19st\.gradle\wrapper\dists\gradle-4.4-all\9br9xq1tocpiv8o6njlyu5op1\gradle-4.4" />
</map> </map>
</option> </option>
<option name="myGradleVersions"> <option name="myGradleVersions">
@@ -301,7 +260,6 @@
</option> </option>
<option name="modificationStamps"> <option name="modificationStamps">
<map> <map>
<entry key="$PROJECT_DIR$" value="6110052192246" />
<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" />
@@ -481,19 +439,16 @@
</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" />
</map> </map>
</option> </option>
</component> </component>
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/build.gradle" />
<option value="$PROJECT_DIR$/src/main/java/device/hue.java" />
<option value="$PROJECT_DIR$/src/main/java/tests/Test.java" />
<option value="$PROJECT_DIR$/src/main/java/device/Hue.java" /> <option value="$PROJECT_DIR$/src/main/java/device/Hue.java" />
<option value="$PROJECT_DIR$/src/main/java/tests/TestLights.java" /> <option value="$PROJECT_DIR$/src/test/java/TestLights.java" />
</list> </list>
</option> </option>
</component> </component>
@@ -518,62 +473,83 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" /> <pane id="AndroidView" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
<path> <path>
<item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" /> <item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path> </path>
<path> <path>
<item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" /> <item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <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=".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="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" /> <item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="SeniorAssistant2" 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="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" /> <item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="SeniorAssistant2" 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="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" /> <item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="SeniorAssistant2" 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="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" /> <item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="SeniorAssistant2" 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="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" /> <item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="SeniorAssistant2" 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="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" /> <item name="java" type="462c0819:PsiDirectoryNode" />
<item name="tests" type="462c0819:PsiDirectoryNode" />
</path> </path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
<pane id="PackagesPane" /> <pane id="PackagesPane" />
<pane id="AndroidView" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@@ -581,7 +557,11 @@
<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="settings.editor.selected.configurable" value="gradle.experimental" /> </component>
<component name="RecentsManager">
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
<recent name="" />
</key>
</component> </component>
<component name="RunDashboard"> <component name="RunDashboard">
<option name="ruleStates"> <option name="ruleStates">
@@ -595,55 +575,16 @@
</list> </list>
</option> </option>
</component> </component>
<component name="RunManager" selected="JUnit.TestLights"> <component name="RunManager">
<configuration default="true" type="Application" factoryName="Application"> <configuration default="true" type="Application" factoryName="Application">
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration> </configuration>
<configuration name="SeniorAssistant [build]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="build" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
</configuration>
<configuration name="build (1)" type="GroovyScriptRunConfiguration" factoryName="Groovy" temporary="true">
<module name="SeniorAssistant" />
<setting name="path" value="file://$PROJECT_DIR$/build.gradle" />
<setting name="vmparams" value="" />
<setting name="params" value="" />
<setting name="workDir" value="file://$PROJECT_DIR$" />
<setting name="debug" value="false" />
</configuration>
<configuration name="build" type="GroovyScriptRunConfiguration" factoryName="Groovy" temporary="true">
<module name="SeniorAssistant" />
<setting name="path" value="file://$PROJECT_DIR$/build.gradle" />
<setting name="vmparams" value="" />
<setting name="params" value="" />
<setting name="workDir" value="file://$PROJECT_DIR$" />
<setting name="debug" value="false" />
</configuration>
<configuration name="TestLights" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true"> <configuration name="TestLights" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="SeniorAssistant_main" /> <module name="SeniorAssistant_test" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="tests.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" /> <option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="tests" /> <option name="PACKAGE_NAME" value="" />
<option name="MAIN_CLASS_NAME" value="tests.TestLights" /> <option name="MAIN_CLASS_NAME" value="TestLights" />
<option name="METHOD_NAME" /> <option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" /> <option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" /> <option name="VM_PARAMETERS" value="-ea" />
@@ -693,18 +634,9 @@
<properties /> <properties />
<listeners /> <listeners />
</configuration> </configuration>
<list>
<item itemvalue="Groovy.build" />
<item itemvalue="Groovy.build (1)" />
<item itemvalue="Gradle.SeniorAssistant [build]" />
<item itemvalue="JUnit.TestLights" />
</list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="JUnit.TestLights" /> <item itemvalue="JUnit.TestLights" />
<item itemvalue="Gradle.SeniorAssistant [build]" />
<item itemvalue="Groovy.build (1)" />
<item itemvalue="Groovy.build" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
@@ -713,72 +645,75 @@
</component> </component>
<component name="TaskManager"> <component name="TaskManager">
<task active="true" id="Default" summary="Default task"> <task active="true" id="Default" summary="Default task">
<changelist id="78e01e81-87ab-43aa-be01-5489e21c7fc2" name="Default" comment="" /> <changelist id="bf16df42-e8f6-4a52-a6da-5bff747a1a87" name="Default" comment="" />
<created>1527511421271</created> <created>1527578891261</created>
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1527511421271</updated> <updated>1527578891261</updated>
<workItem from="1527511465296" duration="493000" /> <workItem from="1527578893151" duration="3638000" />
<workItem from="1527514123141" duration="7701000" />
</task> </task>
<task id="LOCAL-00001" summary="Updated build gradle &#10;Added functions ph. hue">
<created>1527518149240</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1527518149240</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
<history-entry file="TestLights - 2018.05.28 at 17h 29m 58s.xml"> <history-entry file="TestLights - 2018.05.29 at 09h 57m 50s.xml">
<configuration name="TestLights" configurationId="JUnit" /> <configuration name="TestLights" configurationId="JUnit" />
</history-entry> </history-entry>
<history-entry file="TestLights - 2018.05.28 at 17h 34m 08s.xml"> <history-entry file="TestLights - 2018.05.29 at 10h 00m 46s.xml">
<configuration name="TestLights" configurationId="JUnit" /> <configuration name="TestLights" configurationId="JUnit" />
</history-entry> </history-entry>
<history-entry file="TestLights - 2018.05.28 at 17h 38m 24s.xml"> <history-entry file="TestLights - 2018.05.29 at 10h 02m 22s.xml">
<configuration name="TestLights" configurationId="JUnit" />
</history-entry>
<history-entry file="TestLights - 2018.05.29 at 10h 09m 06s.xml">
<configuration name="TestLights" configurationId="JUnit" />
</history-entry>
<history-entry file="TestLights - 2018.05.29 at 10h 31m 26s.xml">
<configuration name="TestLights" configurationId="JUnit" />
</history-entry>
<history-entry file="TestLights - 2018.05.29 at 10h 33m 54s.xml">
<configuration name="TestLights" configurationId="JUnit" />
</history-entry>
<history-entry file="TestLights - 2018.05.29 at 10h 35m 52s.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="8194000" /> <option name="totallyTimeSpent" value="3638000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info anchor="right" id="Palette" order="3" /> <window_info anchor="right" id="Palette" />
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Messages" /> <window_info anchor="right" id="Maven Projects" />
<window_info anchor="right" id="Palette&#9;" order="3" /> <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
<window_info id="Image Layers" order="2" /> <window_info id="Capture Tool" />
<window_info anchor="right" id="Capture Analysis" order="3" /> <window_info id="Designer" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.32838285" /> <window_info anchor="bottom" id="Build" weight="0.3290938" />
<window_info anchor="right" id="Maven Projects" order="3" /> <window_info anchor="right" id="Database" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="7" weight="0.32838285" />
<window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32838285" />
<window_info anchor="bottom" id="Terminal" order="7" />
<window_info id="Capture Tool" order="2" />
<window_info id="Designer" order="2" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2579425" />
<window_info anchor="bottom" id="Build" order="7" weight="0.3290938" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="right" id="Gradle" order="3" weight="0.32980332" />
<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" order="2" /> <window_info id="UI Designer" />
<window_info anchor="right" id="Theme Preview" order="3" />
<window_info id="Favorites" order="2" side_tool="true" />
<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="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Messages" />
<window_info anchor="right" id="Palette&#9;" />
<window_info id="Image Layers" />
<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="Version Control" />
<window_info anchor="bottom" id="Terminal" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24963397" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="right" id="Gradle" />
<window_info anchor="right" id="Theme Preview" />
<window_info id="Favorites" side_tool="true" />
<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="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="bottom" id="Find" order="1" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@@ -787,64 +722,35 @@
<component name="VcsContentAnnotationSettings"> <component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Updated build gradle &#10;Added functions ph. hue" />
<option name="LAST_COMMIT_MESSAGE" value="Updated build gradle &#10;Added functions ph. hue" />
</component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/device/Hue.java"> <entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret lean-forward="true" />
<folding>
<element signature="e#310#311#0" expanded="true" />
<element signature="e#362#363#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/settings.gradle">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/manage/Rest.java"> <entry file="file://$PROJECT_DIR$/src/main/java/manage/Rest.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="262"> <state relative-caret-position="153">
<caret line="67" column="35" selection-start-line="67" selection-start-column="35" selection-end-line="67" selection-end-column="35" /> <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1136" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="13" column="14" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
</state> </state>
</provider> </provider>
</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="240"> <state relative-caret-position="255">
<caret line="18" column="5" lean-forward="true" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" /> <caret line="20" column="5" lean-forward="true" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" />
<folding> <folding>
<element signature="e#310#311#0" expanded="true" /> <element signature="e#520#521#0" expanded="true" />
<element signature="e#362#363#0" expanded="true" /> <element signature="e#551#552#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tests/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="102"> <state relative-caret-position="612">
<caret line="8" column="17" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" /> <caret line="36" column="5" selection-start-line="36" selection-start-column="5" selection-end-line="36" selection-end-column="5" />
<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>
@@ -854,6 +760,7 @@
<states> <states>
<state key="ProjectJDKs.UI"> <state key="ProjectJDKs.UI">
<settings> <settings>
<last-edited>1.8</last-edited>
<splitter-proportions> <splitter-proportions>
<option name="proportions"> <option name="proportions">
<list> <list>

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

@@ -1,23 +1,34 @@
package device; package device;
import java.util.Map; import java.util.Map;
import java.util.Set;
import manage.Rest; import manage.Rest;
public class Hue { public class Hue {
//private String baseURL;// = "192.168.0.2"; //private String baseURL = "192.168.0.2";
//private String username;// = "admin"; //private String username = "C0vPwqjJZo5Jt9Oe5HgO6sBFFMxgoR532IxFoGmx";
private String lightsURL;// = baseURL+"/api/"+username+"/lights/"; private String lightsURL;// = baseURL+"/api/"+username+"/lights/";
private Map<String, ?> allLights; private Map<String, ?> allLights;
public Hue () { public Hue () {
this("192.168.0.2/api/admin/lights/"); this("http://172.30.1.138/api/C0vPwqjJZo5Jt9Oe5HgO6sBFFMxgoR532IxFoGmx/lights/");
} }
public Hue (String url) { public Hue (String url) {
lightsURL = url; lightsURL = url;
allLights = Rest.get(lightsURL); allLights = Rest.get(lightsURL);
} }
public Set<String> getNameLights() {
return allLights.keySet();
}
public void removeLights(Set<String> toRemove) {
for(String string : toRemove)
allLights.remove(string);
}
public void turnOn() { public void turnOn() {
for (String light : allLights.keySet()) { for (String light : allLights.keySet()) {
String callURL = lightsURL + light + "/state"; String callURL = lightsURL + light + "/state";

32
src/main/java/tests/TestLights.java
View File

@@ -1,32 +0,0 @@
package tests;
import device.Hue;
import org.junit.Test;
public class TestLights {
@Test
synchronized public void firstTestLights() throws InterruptedException {
Hue lights = new Hue("http://localhost/api/newdeveloper/");
for(int i=0; i<10; i++) {
lights.turnOn();
this.wait(0b11001000); // 200
lights.turnOff();
this.wait(0b11001000); // 200
}
lights.turnOn();
for(int i=0; i<256; i++) {
lights.setBrightness(i);
this.wait(50);
}
for(int i=256; i>=0; i--) {
lights.setBrightness(i);
this.wait(50);
}
}
}

38
src/test/java/TestLights.java Normal file
View File

@@ -0,0 +1,38 @@
import device.Hue;
import org.junit.Test;
import java.util.HashSet;
import java.util.Set;
public class TestLights {
@Test
synchronized public void firstTestLights() throws InterruptedException {
//Hue lights = new Hue("http://localhost/api/newdeveloper/");
Hue lights = new Hue();
Set<String> toRemove = new HashSet<String>();
for(String str: lights.getNameLights())
if(!str.equals("4"))
toRemove.add(str);
lights.removeLights(toRemove);
for(int i=0; i<10; i++) {
lights.turnOn();
this.wait(0b1111101000); // 1000
lights.turnOff();
this.wait(0b1111101000); // 1000
}
lights.turnOn();
for(int i=0; i<256; i++) {
lights.setBrightness(i);
this.wait(10);
}
for(int i=256; i>=0; i--) {
lights.setBrightness(i);
this.wait(10);
}
}
}