mirror of https://github.com/Trivernis/spydian.git
Project cleanup
- Removed old main file - Removed idea files - Reformatted Code - Moved testscripts to test folderpull/1/head
Trivernis
6 years ago
parent
4b94903bcf
commit
b0481b7b17
@ -1,2 +1,2 @@
|
|||||||
.idea/
|
.idea*
|
||||||
*.pyc
|
*.pyc
|
||||||
|
|||||||
@ -1,12 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<module type="PYTHON_MODULE" version="4">
|
|
||||||
<component name="NewModuleRootManager">
|
|
||||||
<content url="file://$MODULE_DIR$" />
|
|
||||||
<orderEntry type="jdk" jdkName="Python 3.6 (spydian)" jdkType="Python SDK" />
|
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
|
||||||
</component>
|
|
||||||
<component name="TestRunnerService">
|
|
||||||
<option name="projectConfiguration" value="Nosetests" />
|
|
||||||
<option name="PROJECT_TEST_RUNNER" value="Nosetests" />
|
|
||||||
</component>
|
|
||||||
</module>
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (spydian)" project-jdk-type="Python SDK" />
|
|
||||||
<component name="masterDetails">
|
|
||||||
<states>
|
|
||||||
<state key="ScopeChooserConfigurable.UI">
|
|
||||||
<settings>
|
|
||||||
<splitter-proportions>
|
|
||||||
<option name="proportions">
|
|
||||||
<list>
|
|
||||||
<option value="0.2" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</splitter-proportions>
|
|
||||||
</settings>
|
|
||||||
</state>
|
|
||||||
</states>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="ProjectModuleManager">
|
|
||||||
<modules>
|
|
||||||
<module fileurl="file://$PROJECT_DIR$/.idea/spydian.iml" filepath="$PROJECT_DIR$/.idea/spydian.iml" />
|
|
||||||
<module fileurl="file://$PROJECT_DIR$/.idea/spydian.iml" filepath="$PROJECT_DIR$/.idea/spydian.iml" />
|
|
||||||
</modules>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="VcsDirectoryMappings">
|
|
||||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@ -1,458 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="ChangeListManager">
|
|
||||||
<list default="true" id="49388e57-2b9e-468a-b880-1d7fb243112d" name="Default" comment="" />
|
|
||||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
||||||
<option name="TRACKING_ENABLED" value="true" />
|
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
||||||
</component>
|
|
||||||
<component name="FavoritesManager">
|
|
||||||
<favorites_list name="für Robotototo" />
|
|
||||||
</component>
|
|
||||||
<component name="FileEditorManager">
|
|
||||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
||||||
<file leaf-file-name="install.sh" pinned="false" current-in-tab="false">
|
|
||||||
<entry file="file://$PROJECT_DIR$/install.sh">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="136">
|
|
||||||
<caret line="8" column="20" lean-forward="false" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file leaf-file-name="main.py" pinned="false" current-in-tab="true">
|
|
||||||
<entry file="file://$PROJECT_DIR$/main.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="340">
|
|
||||||
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
|
|
||||||
<folding>
|
|
||||||
<element signature="e#0#19#0" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file leaf-file-name="stream.sh" pinned="false" current-in-tab="false">
|
|
||||||
<entry file="file://$PROJECT_DIR$/stream.sh">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="0">
|
|
||||||
<caret line="0" column="44" lean-forward="false" selection-start-line="0" selection-start-column="44" selection-end-line="0" selection-end-column="44" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
</leaf>
|
|
||||||
</component>
|
|
||||||
<component name="FileTemplateManagerImpl">
|
|
||||||
<option name="RECENT_TEMPLATES">
|
|
||||||
<list>
|
|
||||||
<option value="Python Script" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
<component name="Git.Settings">
|
|
||||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
||||||
</component>
|
|
||||||
<component name="IdeDocumentHistory">
|
|
||||||
<option name="CHANGED_PATHS">
|
|
||||||
<list>
|
|
||||||
<option value="$PROJECT_DIR$/main beta.py" />
|
|
||||||
<option value="$PROJECT_DIR$/28byj-48-driver.py" />
|
|
||||||
<option value="$PROJECT_DIR$/ultrasonic_test.py" />
|
|
||||||
<option value="$PROJECT_DIR$/stream.sh" />
|
|
||||||
<option value="$PROJECT_DIR$/gyro_test.py" />
|
|
||||||
<option value="$PROJECT_DIR$/ultrasonic.py" />
|
|
||||||
<option value="$PROJECT_DIR$/gyro.py" />
|
|
||||||
<option value="$PROJECT_DIR$/install.sh" />
|
|
||||||
<option value="$PROJECT_DIR$/motors.py" />
|
|
||||||
<option value="$PROJECT_DIR$/motor.py" />
|
|
||||||
<option value="$PROJECT_DIR$/servo_2.py" />
|
|
||||||
<option value="$PROJECT_DIR$/thermo.py" />
|
|
||||||
<option value="$PROJECT_DIR$/main.py" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
<component name="ProjectFrameBounds" extendedState="6">
|
|
||||||
<option name="x" value="306" />
|
|
||||||
<option name="y" value="-9" />
|
|
||||||
<option name="width" value="1400" />
|
|
||||||
<option name="height" value="1000" />
|
|
||||||
</component>
|
|
||||||
<component name="ProjectInspectionProfilesVisibleTreeState">
|
|
||||||
<entry key="Project Default">
|
|
||||||
<profile-state>
|
|
||||||
<expanded-state>
|
|
||||||
<State>
|
|
||||||
<id />
|
|
||||||
</State>
|
|
||||||
</expanded-state>
|
|
||||||
<selected-state>
|
|
||||||
<State>
|
|
||||||
<id>Buildout</id>
|
|
||||||
</State>
|
|
||||||
</selected-state>
|
|
||||||
</profile-state>
|
|
||||||
</entry>
|
|
||||||
</component>
|
|
||||||
<component name="ProjectView">
|
|
||||||
<navigator currentView="ProjectPane" proportions="" version="1">
|
|
||||||
<flattenPackages />
|
|
||||||
<showMembers />
|
|
||||||
<showModules />
|
|
||||||
<showLibraryContents />
|
|
||||||
<hideEmptyPackages />
|
|
||||||
<abbreviatePackageNames />
|
|
||||||
<autoscrollToSource />
|
|
||||||
<autoscrollFromSource />
|
|
||||||
<sortByType />
|
|
||||||
<manualOrder />
|
|
||||||
<foldersAlwaysOnTop value="true" />
|
|
||||||
</navigator>
|
|
||||||
<panes>
|
|
||||||
<pane id="Scope" />
|
|
||||||
<pane id="ProjectPane">
|
|
||||||
<subPane>
|
|
||||||
<expand>
|
|
||||||
<path>
|
|
||||||
<item name="spydian" type="b2602c69:ProjectViewProjectNode" />
|
|
||||||
<item name="spydian" type="462c0819:PsiDirectoryNode" />
|
|
||||||
</path>
|
|
||||||
</expand>
|
|
||||||
<select />
|
|
||||||
</subPane>
|
|
||||||
</pane>
|
|
||||||
<pane id="Scratches" />
|
|
||||||
</panes>
|
|
||||||
</component>
|
|
||||||
<component name="PropertiesComponent">
|
|
||||||
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
|
|
||||||
<property name="last_opened_file_path" value="/usr/bin/python3.5" />
|
|
||||||
</component>
|
|
||||||
<component name="RunDashboard">
|
|
||||||
<option name="ruleStates">
|
|
||||||
<list>
|
|
||||||
<RuleState>
|
|
||||||
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
|
|
||||||
</RuleState>
|
|
||||||
<RuleState>
|
|
||||||
<option name="name" value="StatusDashboardGroupingRule" />
|
|
||||||
</RuleState>
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
<component name="RunManager">
|
|
||||||
<configuration default="true" type="PythonConfigurationType" factoryName="Python">
|
|
||||||
<option name="INTERPRETER_OPTIONS" value="" />
|
|
||||||
<option name="PARENT_ENVS" value="true" />
|
|
||||||
<envs>
|
|
||||||
<env name="PYTHONUNBUFFERED" value="1" />
|
|
||||||
</envs>
|
|
||||||
<option name="SDK_HOME" value="" />
|
|
||||||
<option name="WORKING_DIRECTORY" value="" />
|
|
||||||
<option name="IS_MODULE_SDK" value="false" />
|
|
||||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
|
||||||
<option name="ADD_SOURCE_ROOTS" value="true" />
|
|
||||||
<module name="für Robotototo" />
|
|
||||||
<option name="SCRIPT_NAME" value="" />
|
|
||||||
<option name="PARAMETERS" value="" />
|
|
||||||
<option name="SHOW_COMMAND_LINE" value="false" />
|
|
||||||
<option name="EMULATE_TERMINAL" value="false" />
|
|
||||||
<option name="MODULE_MODE" value="false" />
|
|
||||||
</configuration>
|
|
||||||
<configuration default="true" type="Tox" factoryName="Tox">
|
|
||||||
<option name="INTERPRETER_OPTIONS" value="" />
|
|
||||||
<option name="PARENT_ENVS" value="true" />
|
|
||||||
<envs />
|
|
||||||
<option name="SDK_HOME" value="" />
|
|
||||||
<option name="WORKING_DIRECTORY" value="" />
|
|
||||||
<option name="IS_MODULE_SDK" value="false" />
|
|
||||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
|
||||||
<option name="ADD_SOURCE_ROOTS" value="true" />
|
|
||||||
<module name="für Robotototo" />
|
|
||||||
</configuration>
|
|
||||||
<configuration default="true" type="tests" factoryName="Doctests">
|
|
||||||
<option name="INTERPRETER_OPTIONS" value="" />
|
|
||||||
<option name="PARENT_ENVS" value="true" />
|
|
||||||
<envs />
|
|
||||||
<option name="SDK_HOME" value="" />
|
|
||||||
<option name="WORKING_DIRECTORY" value="" />
|
|
||||||
<option name="IS_MODULE_SDK" value="false" />
|
|
||||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
|
||||||
<option name="ADD_SOURCE_ROOTS" value="true" />
|
|
||||||
<module name="für Robotototo" />
|
|
||||||
<option name="SCRIPT_NAME" value="" />
|
|
||||||
<option name="CLASS_NAME" value="" />
|
|
||||||
<option name="METHOD_NAME" value="" />
|
|
||||||
<option name="FOLDER_NAME" value="" />
|
|
||||||
<option name="TEST_TYPE" value="TEST_SCRIPT" />
|
|
||||||
<option name="PATTERN" value="" />
|
|
||||||
<option name="USE_PATTERN" value="false" />
|
|
||||||
</configuration>
|
|
||||||
<configuration default="true" type="tests" factoryName="Nosetests">
|
|
||||||
<option name="INTERPRETER_OPTIONS" value="" />
|
|
||||||
<option name="PARENT_ENVS" value="true" />
|
|
||||||
<envs />
|
|
||||||
<option name="SDK_HOME" value="" />
|
|
||||||
<option name="WORKING_DIRECTORY" value="" />
|
|
||||||
<option name="IS_MODULE_SDK" value="false" />
|
|
||||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
|
||||||
<option name="ADD_SOURCE_ROOTS" value="true" />
|
|
||||||
<module name="für Robotototo" />
|
|
||||||
<option name="_new_regexPattern" value="""" />
|
|
||||||
<option name="_new_additionalArguments" value="""" />
|
|
||||||
<option name="_new_target" value=""."" />
|
|
||||||
<option name="_new_targetType" value=""PATH"" />
|
|
||||||
</configuration>
|
|
||||||
</component>
|
|
||||||
<component name="ShelveChangesManager" show_recycled="false">
|
|
||||||
<option name="remove_strategy" value="false" />
|
|
||||||
</component>
|
|
||||||
<component name="SvnConfiguration">
|
|
||||||
<configuration />
|
|
||||||
</component>
|
|
||||||
<component name="TaskManager">
|
|
||||||
<task active="true" id="Default" summary="Default task">
|
|
||||||
<changelist id="49388e57-2b9e-468a-b880-1d7fb243112d" name="Default" comment="" />
|
|
||||||
<created>1501667906814</created>
|
|
||||||
<option name="number" value="Default" />
|
|
||||||
<option name="presentableId" value="Default" />
|
|
||||||
<updated>1501667906814</updated>
|
|
||||||
</task>
|
|
||||||
<servers />
|
|
||||||
</component>
|
|
||||||
<component name="TodoView">
|
|
||||||
<todo-panel id="selected-file">
|
|
||||||
<is-autoscroll-to-source value="true" />
|
|
||||||
</todo-panel>
|
|
||||||
<todo-panel id="all">
|
|
||||||
<are-packages-shown value="true" />
|
|
||||||
<is-autoscroll-to-source value="true" />
|
|
||||||
</todo-panel>
|
|
||||||
</component>
|
|
||||||
<component name="ToolWindowManager">
|
|
||||||
<frame x="-8" y="-8" width="1936" height="1096" extended-state="6" />
|
|
||||||
<layout>
|
|
||||||
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17966281" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
||||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32921347" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
|
||||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39979655" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
|
||||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
|
||||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
||||||
</layout>
|
|
||||||
</component>
|
|
||||||
<component name="VcsContentAnnotationSettings">
|
|
||||||
<option name="myLimit" value="2678400000" />
|
|
||||||
</component>
|
|
||||||
<component name="XDebuggerManager">
|
|
||||||
<breakpoint-manager>
|
|
||||||
<default-breakpoints>
|
|
||||||
<breakpoint type="python-exception">
|
|
||||||
<properties notifyOnTerminate="true" exception="BaseException">
|
|
||||||
<option name="notifyOnTerminate" value="true" />
|
|
||||||
</properties>
|
|
||||||
</breakpoint>
|
|
||||||
</default-breakpoints>
|
|
||||||
<option name="time" value="3" />
|
|
||||||
</breakpoint-manager>
|
|
||||||
<watches-manager />
|
|
||||||
</component>
|
|
||||||
<component name="editorHistoryManager">
|
|
||||||
<entry file="file://$PROJECT_DIR$/ultrasonic.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/ultrasonic_test.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/gyro.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/install.sh">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="0">
|
|
||||||
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/motors.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/main.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="1462">
|
|
||||||
<caret line="86" column="12" lean-forward="false" selection-start-line="86" selection-start-column="12" selection-end-line="86" selection-end-column="12" />
|
|
||||||
<folding>
|
|
||||||
<element signature="e#0#19#0" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/stream.sh">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="0">
|
|
||||||
<caret line="0" column="44" lean-forward="false" selection-start-line="0" selection-start-column="44" selection-end-line="0" selection-end-column="44" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/gyro_test.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/ultrasonic.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/ultrasonic_test.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/gyro.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/install.sh">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="17">
|
|
||||||
<caret line="1" column="29" lean-forward="false" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/motors.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/main.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="1292">
|
|
||||||
<caret line="76" column="73" lean-forward="false" selection-start-line="76" selection-start-column="73" selection-end-line="76" selection-end-column="73" />
|
|
||||||
<folding>
|
|
||||||
<element signature="e#0#19#0" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/stream.sh">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="0">
|
|
||||||
<caret line="0" column="44" lean-forward="false" selection-start-line="0" selection-start-column="44" selection-end-line="0" selection-end-column="44" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/gyro_test.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/ultrasonic_test.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/gyro.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/ultrasonic.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/install.sh">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="17">
|
|
||||||
<caret line="1" column="29" lean-forward="false" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/motors.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/main.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="952">
|
|
||||||
<caret line="56" column="41" lean-forward="true" selection-start-line="56" selection-start-column="41" selection-end-line="56" selection-end-column="41" />
|
|
||||||
<folding>
|
|
||||||
<element signature="e#0#19#0" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/ultrasonic.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/gyro.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/stream.sh">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="0">
|
|
||||||
<caret line="0" column="36" lean-forward="false" selection-start-line="0" selection-start-column="36" selection-end-line="0" selection-end-column="36" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/install.sh">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="17">
|
|
||||||
<caret line="1" column="29" lean-forward="false" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/main.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="1632">
|
|
||||||
<caret line="96" column="34" lean-forward="false" selection-start-line="96" selection-start-column="34" selection-end-line="96" selection-end-column="34" />
|
|
||||||
<folding>
|
|
||||||
<element signature="e#0#19#0" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/motors.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/ultrasonic.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/gyro.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/install.sh">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="17">
|
|
||||||
<caret line="1" column="29" lean-forward="false" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/ultrasonic.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/motors.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/gyro.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/install.sh">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="34">
|
|
||||||
<caret line="2" column="26" lean-forward="false" selection-start-line="2" selection-start-column="26" selection-end-line="2" selection-end-column="26" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/motor.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/main beta.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/install.sh">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="0">
|
|
||||||
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/28byj-48-driver.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/main beta.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/gyro.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/motors.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/install.sh">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="136">
|
|
||||||
<caret line="8" column="20" lean-forward="false" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/gyro_test.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/ultrasonic_test.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/ultrasonic.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/motor.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/stream.sh">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="0">
|
|
||||||
<caret line="0" column="44" lean-forward="false" selection-start-line="0" selection-start-column="44" selection-end-line="0" selection-end-column="44" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/servo_2.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/thermo.py" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/main.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="340">
|
|
||||||
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
|
|
||||||
<folding>
|
|
||||||
<element signature="e#0#19#0" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@ -1,8 +1,11 @@
|
|||||||
import Adafruit_DHT
|
import Adafruit_DHT
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
humidity, temperature = Adafruit_DHT.read_retry(11, 14)
|
humidity, temperature = Adafruit_DHT.read_retry(11, 14)
|
||||||
print '{}|{}'.format(temperature, humidity)
|
print
|
||||||
|
'{}|{}'.format(temperature, humidity)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main()
|
main()
|
||||||
|
|||||||
@ -1,366 +0,0 @@
|
|||||||
import pygame, picamera #,gyro
|
|
||||||
from lib import ultrasonic
|
|
||||||
from datetime import datetime
|
|
||||||
from subprocess import call
|
|
||||||
import RPi.GPIO as GPIO
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Define some colors
|
|
||||||
BLACK = ( 0, 0, 0)
|
|
||||||
WHITE = ( 255, 255, 255)
|
|
||||||
# --ultrasonic--
|
|
||||||
sensor= ultrasonic.Sensor()
|
|
||||||
sensor.init(11,7)
|
|
||||||
# -- Nightmode
|
|
||||||
# WHITE, BLACK=BLACK,WHITE
|
|
||||||
# Pins BCM
|
|
||||||
motor = 16
|
|
||||||
lightpin=15
|
|
||||||
#
|
|
||||||
# --config--
|
|
||||||
use_camera=False
|
|
||||||
use_gyro_preview=False
|
|
||||||
#--
|
|
||||||
forpress = False
|
|
||||||
light = False
|
|
||||||
lpress = False
|
|
||||||
play = False
|
|
||||||
ppress = False
|
|
||||||
voluppress = False
|
|
||||||
voldopress = False
|
|
||||||
recpress=False
|
|
||||||
recording=False
|
|
||||||
left=False
|
|
||||||
right=False
|
|
||||||
lastContact=datetime.now()
|
|
||||||
if use_camera:
|
|
||||||
cam = picamera.PiCamera()
|
|
||||||
|
|
||||||
top_view = pygame.image.load('top_view.png')
|
|
||||||
top_view= pygame.transform.scale(top_view, (192, 108))
|
|
||||||
|
|
||||||
# Axis
|
|
||||||
GAS = 5
|
|
||||||
STOP = 2
|
|
||||||
|
|
||||||
# Buttons
|
|
||||||
MUSIC = 1
|
|
||||||
LIGHT = 0
|
|
||||||
VOLUP = 5
|
|
||||||
VOLDO = 4
|
|
||||||
RECSTART = 3
|
|
||||||
|
|
||||||
# setup the relais
|
|
||||||
GPIO.setup(motor,GPIO.OUT)
|
|
||||||
GPIO.setup(lightpin,GPIO.OUT)
|
|
||||||
GPIO.output(motor,True)
|
|
||||||
GPIO.output(lightpin, True)
|
|
||||||
# ____________________________
|
|
||||||
# -- driving functions
|
|
||||||
def drive_forw():
|
|
||||||
GPIO.output(motor,False)
|
|
||||||
return
|
|
||||||
|
|
||||||
def drive_backw():
|
|
||||||
print(drive_backw)
|
|
||||||
return
|
|
||||||
|
|
||||||
def reset_dire():
|
|
||||||
GPIO.output(motor,True)
|
|
||||||
return
|
|
||||||
|
|
||||||
def drive_left():
|
|
||||||
if not left:
|
|
||||||
call(['python', './lib/servolib.py','left'])
|
|
||||||
return
|
|
||||||
|
|
||||||
def drive_right():
|
|
||||||
if not right:
|
|
||||||
call(['python', './lib/servolib.py','right'])
|
|
||||||
return
|
|
||||||
|
|
||||||
def reset_turn():
|
|
||||||
if left or right:
|
|
||||||
call(['python','./lib/servolib.py'])
|
|
||||||
return
|
|
||||||
# ____________________________
|
|
||||||
# -- special functions
|
|
||||||
def turn_light(shine):
|
|
||||||
if shine:
|
|
||||||
GPIO.output(lightpin, False)
|
|
||||||
else:
|
|
||||||
GPIO.output(lightpin, True)
|
|
||||||
return
|
|
||||||
|
|
||||||
def turn_rec(*record):
|
|
||||||
#if record:
|
|
||||||
#cam.start_recording('record.h264')
|
|
||||||
#return
|
|
||||||
#else:
|
|
||||||
#cam.stop_recording()
|
|
||||||
#return
|
|
||||||
if use_camera:
|
|
||||||
try:
|
|
||||||
cam.capture('image.jpg', resize=(192 * 2, 108 * 2))
|
|
||||||
cam.capture("./Images/image{}.jpg".format(str(datetime.now()).replace(':','_')))
|
|
||||||
except Exception as error:
|
|
||||||
print(error)
|
|
||||||
|
|
||||||
def imgRefresh():
|
|
||||||
#turn_rec(True)
|
|
||||||
image = None
|
|
||||||
try:
|
|
||||||
image = pygame.image.load('image.jpg')
|
|
||||||
image = pygame.transform.scale(image, (192*2, 108*2))
|
|
||||||
except:
|
|
||||||
pass
|
|
||||||
screen.blit(image, (500, 10))
|
|
||||||
#gyro_output = gyro.getAllOut()
|
|
||||||
#rotation = gyro_output['rot']
|
|
||||||
if use_gyro_preview:
|
|
||||||
top_view = pygame.image.load('top_view.png')
|
|
||||||
# The scaling of the top_view Spider
|
|
||||||
scal_x = abs(int(192 * ((abs(rotation[0]) / 90) - 1)))
|
|
||||||
scal_y = abs(int(108 * ((abs(rotation[1]) / 90) - 1)) - 1)
|
|
||||||
top_view = pygame.transform.scale(top_view, (scal_x, scal_y))
|
|
||||||
screen.blit(top_view, (550 - (scal_x / 2), 300 - (scal_y / 2)))
|
|
||||||
|
|
||||||
def printDriveData():
|
|
||||||
textPrint.print(screen,"")
|
|
||||||
textPrint.print(screen,"Sound Information")
|
|
||||||
textPrint.print(screen, " Sound: {}".format(play))
|
|
||||||
textPrint.print(screen, " Volume: {}".format(sound.get_volume()))
|
|
||||||
textPrint.print(screen, "Light: {}".format(light))
|
|
||||||
textPrint.print(screen, "Last Controller Input: {}".format((datetime.now()-lastContact).seconds))
|
|
||||||
#gyro_output=gyro.getAllOut()
|
|
||||||
#rotation=gyro_output['rot']
|
|
||||||
#textPrint.print(screen, "Rotation: X:{}; Y:{}".format(rotation[0],rotation[1]))
|
|
||||||
#acceleration = gyro_output['acc_sca']
|
|
||||||
#textPrint.print(screen, "Acceleration: X:{}; Y:{}; Z:{}".format(acceleration[0], acceleration[1],acceleration[2]))
|
|
||||||
distance=sensor.echo()
|
|
||||||
textPrint.print(screen, "Distance: {} cm".format(distance))
|
|
||||||
#if distance<40:
|
|
||||||
# turn_rec()
|
|
||||||
|
|
||||||
def doSubroutine():
|
|
||||||
if abs((datetime.now()-lastContact).seconds)==30:
|
|
||||||
print('Contact Lost')
|
|
||||||
imgRefresh()
|
|
||||||
|
|
||||||
# ____________________________
|
|
||||||
class TextPrint:
|
|
||||||
def __init__(self):
|
|
||||||
self.reset()
|
|
||||||
self.font = pygame.font.Font(None, 20)
|
|
||||||
|
|
||||||
def print(self, screen, textString):
|
|
||||||
textBitmap = self.font.render(textString, True, BLACK)
|
|
||||||
screen.blit(textBitmap, [self.x, self.y])
|
|
||||||
self.y += self.line_height
|
|
||||||
|
|
||||||
def reset(self):
|
|
||||||
self.x = 10
|
|
||||||
self.y = 10
|
|
||||||
self.line_height = 15
|
|
||||||
|
|
||||||
def indent(self):
|
|
||||||
self.x += 10
|
|
||||||
|
|
||||||
def unindent(self):
|
|
||||||
self.x -= 10
|
|
||||||
|
|
||||||
pygame.init()
|
|
||||||
|
|
||||||
# ________________________
|
|
||||||
# -- music playback
|
|
||||||
pygame.mixer.init()
|
|
||||||
sound=pygame.mixer.Sound('./sounds/gasgasgas.wav')
|
|
||||||
sound.set_volume(0.3)
|
|
||||||
# ________________________
|
|
||||||
|
|
||||||
# Set the width and height of the screen [width,height]
|
|
||||||
size = [1000, 700]
|
|
||||||
screen = pygame.display.set_mode(size)
|
|
||||||
|
|
||||||
pygame.display.set_caption("SPYDER STEUERZENTRALE")
|
|
||||||
|
|
||||||
# Loop until the user clicks the close button.
|
|
||||||
done = False
|
|
||||||
|
|
||||||
# Used to manage how fast the screen updates
|
|
||||||
clock = pygame.time.Clock()
|
|
||||||
|
|
||||||
# Initialize the joysticks
|
|
||||||
pygame.joystick.init()
|
|
||||||
|
|
||||||
# Get ready to print
|
|
||||||
textPrint = TextPrint()
|
|
||||||
turn_rec(True)
|
|
||||||
image=pygame.image.load('image.jpg')
|
|
||||||
image=pygame.transform.scale(image,(192*2,108*2))
|
|
||||||
count=0
|
|
||||||
|
|
||||||
# -------- Main Program Loop -----------
|
|
||||||
while done==False:
|
|
||||||
# EVENT PROCESSING STEP
|
|
||||||
for event in pygame.event.get(): # User did something
|
|
||||||
if event.type == pygame.QUIT: # If user clicked close
|
|
||||||
done=True # Flag that we are done so we exit this loop
|
|
||||||
|
|
||||||
# Possible joystick actions: JOYAXISMOTION JOYBALLMOTION JOYBUTTONDOWN JOYBUTTONUP JOYHATMOTIO
|
|
||||||
|
|
||||||
|
|
||||||
# DRAWING STEP
|
|
||||||
# First, clear the screen to white. Don't put other drawing commands
|
|
||||||
# above this, or they will be erased with this command.
|
|
||||||
screen.fill(WHITE)
|
|
||||||
textPrint.reset()
|
|
||||||
|
|
||||||
# Get count of joysticks
|
|
||||||
joystick_count = pygame.joystick.get_count()
|
|
||||||
|
|
||||||
textPrint.print(screen, "Number of joysticks: {}".format(joystick_count) )
|
|
||||||
textPrint.indent()
|
|
||||||
|
|
||||||
# For each joystick:
|
|
||||||
for i in range(joystick_count):
|
|
||||||
joystick = pygame.joystick.Joystick(i)
|
|
||||||
joystick.init()
|
|
||||||
|
|
||||||
textPrint.print(screen, "Joystick {}".format(i) )
|
|
||||||
textPrint.indent()
|
|
||||||
|
|
||||||
# Get the name from the OS for the controller/joystick
|
|
||||||
#name = joystick.get_name()
|
|
||||||
#textPrint.print(screen, "Joystick name: {}".format(name) )
|
|
||||||
|
|
||||||
# Usually axis run in pairs, up/down for one, and left/right for
|
|
||||||
# the other.
|
|
||||||
axes = joystick.get_numaxes()
|
|
||||||
textPrint.print(screen, "Number of axes: {}".format(axes) )
|
|
||||||
textPrint.indent()
|
|
||||||
|
|
||||||
for i in range( axes ):
|
|
||||||
axis = joystick.get_axis( i )
|
|
||||||
textPrint.print(screen, "Axis {} value: {:>6.3f}".format(i, axis) )
|
|
||||||
if i==STOP and axis>0.1:
|
|
||||||
print('STOP')
|
|
||||||
drive_backw()
|
|
||||||
lastContact=datetime.now()
|
|
||||||
elif i==GAS and axis>0.1:
|
|
||||||
print('GAS')
|
|
||||||
if not forpress:
|
|
||||||
drive_forw()
|
|
||||||
forpress=True
|
|
||||||
lastContact=datetime.now()
|
|
||||||
elif i==GAS and axis<0.1:
|
|
||||||
if forpress:
|
|
||||||
reset_dire()
|
|
||||||
print('RESETDRIVE')
|
|
||||||
forpress=False
|
|
||||||
|
|
||||||
textPrint.unindent()
|
|
||||||
|
|
||||||
buttons = joystick.get_numbuttons()
|
|
||||||
textPrint.print(screen, "Number of buttons: {}".format(buttons) )
|
|
||||||
textPrint.indent()
|
|
||||||
|
|
||||||
for i in range( buttons ):
|
|
||||||
button = joystick.get_button( i )
|
|
||||||
textPrint.print(screen, "Button {:>2} value: {}".format(i,button) )
|
|
||||||
if button==1:
|
|
||||||
lastContact=datetime.now()
|
|
||||||
#if i==7 and button==1:
|
|
||||||
# print('GAS')
|
|
||||||
# drive_forw()
|
|
||||||
#elif i==6 and button==1:
|
|
||||||
# print('STOP')
|
|
||||||
# drive_backw()
|
|
||||||
if i==LIGHT and button==1 and not lpress:
|
|
||||||
light=not light
|
|
||||||
lpress=True
|
|
||||||
turn_light(light)
|
|
||||||
print('Light: {}'.format(light))
|
|
||||||
elif i==LIGHT and button==0:
|
|
||||||
lpress=False
|
|
||||||
elif i==MUSIC and button==1 and not play and not ppress:
|
|
||||||
ppress=True
|
|
||||||
sound.play()
|
|
||||||
play=True
|
|
||||||
print('Sound: {}'.format(play))
|
|
||||||
elif i==MUSIC and button==1 and play and not ppress:
|
|
||||||
ppress=True
|
|
||||||
sound.stop()
|
|
||||||
play=False
|
|
||||||
print('Sound: {}'.format(play))
|
|
||||||
elif i==MUSIC and button==0 and ppress:
|
|
||||||
ppress=False
|
|
||||||
elif i==VOLUP and button==1 and not voluppress:
|
|
||||||
sound.set_volume(sound.get_volume()+0.1)
|
|
||||||
print('Volume: {}'.format(sound.get_volume()))
|
|
||||||
voluppress=True
|
|
||||||
elif i==VOLUP and button==0:
|
|
||||||
voluppress=False
|
|
||||||
elif i== VOLDO and button==0:
|
|
||||||
voldopress=False
|
|
||||||
elif i==VOLDO and button==1 and not voldopress:
|
|
||||||
sound.set_volume(sound.get_volume()-0.1)
|
|
||||||
print('Volume: {}'.format(sound.get_volume()))
|
|
||||||
voldopress=True
|
|
||||||
elif i==RECSTART and button==1 and not recpress:
|
|
||||||
recording=not recording
|
|
||||||
turn_rec(recording)
|
|
||||||
print('Recording: {}'.format(recording))
|
|
||||||
recpress=True
|
|
||||||
elif i==RECSTART and button==0:
|
|
||||||
recpress=False
|
|
||||||
|
|
||||||
textPrint.unindent()
|
|
||||||
|
|
||||||
# Hat switch. All or nothing for direction, not like joysticks.
|
|
||||||
# Value comes back in an array.
|
|
||||||
hats = joystick.get_numhats()
|
|
||||||
textPrint.print(screen, "Number of hats: {}".format(hats) )
|
|
||||||
textPrint.indent()
|
|
||||||
|
|
||||||
for i in range( hats ):
|
|
||||||
hat = joystick.get_hat( i )
|
|
||||||
textPrint.print(screen, "Hat {} value: {}".format(i, str(hat)) )
|
|
||||||
if hat==(-1,0):
|
|
||||||
print('LEFT')
|
|
||||||
drive_left()
|
|
||||||
left=True
|
|
||||||
right=False
|
|
||||||
lastContact=datetime.now()
|
|
||||||
elif hat==(1,0):
|
|
||||||
print('RIGHT')
|
|
||||||
drive_right()
|
|
||||||
right=True
|
|
||||||
left=False
|
|
||||||
lastContact=datetime.now()
|
|
||||||
else:
|
|
||||||
reset_turn()
|
|
||||||
left=False
|
|
||||||
right=False
|
|
||||||
textPrint.unindent()
|
|
||||||
|
|
||||||
textPrint.unindent()
|
|
||||||
|
|
||||||
printDriveData()
|
|
||||||
doSubroutine()
|
|
||||||
|
|
||||||
|
|
||||||
# ALL CODE TO DRAW SHOULD GO ABOVE THIS COMMENT
|
|
||||||
|
|
||||||
# Go ahead and update the screen with what we've drawn.
|
|
||||||
pygame.display.flip()
|
|
||||||
|
|
||||||
# Limit to 20 frames per second
|
|
||||||
clock.tick(20)
|
|
||||||
|
|
||||||
# Close the window and quit.
|
|
||||||
# If you forget this line, the program will 'hang'
|
|
||||||
# on exit if running from IDLE.
|
|
||||||
sensor.clean()
|
|
||||||
pygame.quit ()
|
|
||||||
@ -1 +1,2 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
raspivid -o - -t 0 -hf -w 640 -h 360 -fps 25 | cvlc -vvv stream:///dev/stdin --sout '#rtp{sdp=rtsp://:8554}' :demux=h264
|
raspivid -o - -t 0 -hf -w 640 -h 360 -fps 25 | cvlc -vvv stream:///dev/stdin --sout '#rtp{sdp=rtsp://:8554}' :demux=h264
|
||||||
@ -1,5 +1,6 @@
|
|||||||
from lib import gyro
|
from lib import gyro
|
||||||
import time
|
import time
|
||||||
|
|
||||||
while True:
|
while True:
|
||||||
print(gyro.getAllOut()['rot'])
|
print(gyro.getAllOut()['rot'])
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
@ -1,131 +1,139 @@
|
|||||||
|
import time
|
||||||
|
|
||||||
import RPi.GPIO as GPIO
|
import RPi.GPIO as GPIO
|
||||||
import sys, time
|
|
||||||
GPIO.setmode(GPIO.BCM)
|
GPIO.setmode(GPIO.BCM)
|
||||||
GPIO.setwarnings(False)
|
GPIO.setwarnings(False)
|
||||||
|
|
||||||
def full_step(phase,pins):
|
|
||||||
|
def full_step(phase, pins):
|
||||||
pin1, pin2, pin3, pin4 = pins
|
pin1, pin2, pin3, pin4 = pins
|
||||||
|
|
||||||
if phase==0:
|
if phase == 0:
|
||||||
GPIO.output(pin1, 0)
|
GPIO.output(pin1, 0)
|
||||||
GPIO.output(pin2, 0)
|
GPIO.output(pin2, 0)
|
||||||
GPIO.output(pin3, 0)
|
GPIO.output(pin3, 0)
|
||||||
GPIO.output(pin4, 0)
|
GPIO.output(pin4, 0)
|
||||||
|
|
||||||
if phase==1:
|
if phase == 1:
|
||||||
GPIO.output(pin1, 1)
|
GPIO.output(pin1, 1)
|
||||||
GPIO.output(pin2, 1)
|
GPIO.output(pin2, 1)
|
||||||
GPIO.output(pin3, 0)
|
GPIO.output(pin3, 0)
|
||||||
GPIO.output(pin4, 0)
|
GPIO.output(pin4, 0)
|
||||||
|
|
||||||
if phase==2:
|
if phase == 2:
|
||||||
GPIO.output(pin1, 0)
|
GPIO.output(pin1, 0)
|
||||||
GPIO.output(pin2, 1)
|
GPIO.output(pin2, 1)
|
||||||
GPIO.output(pin3, 1)
|
GPIO.output(pin3, 1)
|
||||||
GPIO.output(pin4, 0)
|
GPIO.output(pin4, 0)
|
||||||
|
|
||||||
if phase==3:
|
if phase == 3:
|
||||||
GPIO.output(pin1, 0)
|
GPIO.output(pin1, 0)
|
||||||
GPIO.output(pin2, 0)
|
GPIO.output(pin2, 0)
|
||||||
GPIO.output(pin3, 1)
|
GPIO.output(pin3, 1)
|
||||||
GPIO.output(pin4, 1)
|
GPIO.output(pin4, 1)
|
||||||
|
|
||||||
if phase==4:
|
if phase == 4:
|
||||||
GPIO.output(pin1, 1)
|
GPIO.output(pin1, 1)
|
||||||
GPIO.output(pin2, 0)
|
GPIO.output(pin2, 0)
|
||||||
GPIO.output(pin3, 0)
|
GPIO.output(pin3, 0)
|
||||||
GPIO.output(pin4, 1)
|
GPIO.output(pin4, 1)
|
||||||
|
|
||||||
def half_step(phase,pins):
|
|
||||||
|
def half_step(phase, pins):
|
||||||
pin1, pin2, pin3, pin4 = pins
|
pin1, pin2, pin3, pin4 = pins
|
||||||
|
|
||||||
if phase==0:
|
if phase == 0:
|
||||||
GPIO.output(pin1, 0)
|
GPIO.output(pin1, 0)
|
||||||
GPIO.output(pin2, 0)
|
GPIO.output(pin2, 0)
|
||||||
GPIO.output(pin3, 0)
|
GPIO.output(pin3, 0)
|
||||||
GPIO.output(pin4, 0)
|
GPIO.output(pin4, 0)
|
||||||
|
|
||||||
if phase==1:
|
if phase == 1:
|
||||||
GPIO.output(pin1, 1)
|
GPIO.output(pin1, 1)
|
||||||
GPIO.output(pin2, 0)
|
GPIO.output(pin2, 0)
|
||||||
GPIO.output(pin3, 0)
|
GPIO.output(pin3, 0)
|
||||||
GPIO.output(pin4, 0)
|
GPIO.output(pin4, 0)
|
||||||
|
|
||||||
if phase==2:
|
if phase == 2:
|
||||||
GPIO.output(pin1, 1)
|
GPIO.output(pin1, 1)
|
||||||
GPIO.output(pin2, 1)
|
GPIO.output(pin2, 1)
|
||||||
GPIO.output(pin3, 0)
|
GPIO.output(pin3, 0)
|
||||||
GPIO.output(pin4, 0)
|
GPIO.output(pin4, 0)
|
||||||
|
|
||||||
if phase==3:
|
if phase == 3:
|
||||||
GPIO.output(pin1, 0)
|
GPIO.output(pin1, 0)
|
||||||
GPIO.output(pin2, 1)
|
GPIO.output(pin2, 1)
|
||||||
GPIO.output(pin3, 0)
|
GPIO.output(pin3, 0)
|
||||||
GPIO.output(pin4, 0)
|
GPIO.output(pin4, 0)
|
||||||
|
|
||||||
if phase==4:
|
if phase == 4:
|
||||||
GPIO.output(pin1, 0)
|
GPIO.output(pin1, 0)
|
||||||
GPIO.output(pin2, 1)
|
GPIO.output(pin2, 1)
|
||||||
GPIO.output(pin3, 1)
|
GPIO.output(pin3, 1)
|
||||||
GPIO.output(pin4, 0)
|
GPIO.output(pin4, 0)
|
||||||
|
|
||||||
if phase==5:
|
if phase == 5:
|
||||||
GPIO.output(pin1, 0)
|
GPIO.output(pin1, 0)
|
||||||
GPIO.output(pin2, 0)
|
GPIO.output(pin2, 0)
|
||||||
GPIO.output(pin3, 1)
|
GPIO.output(pin3, 1)
|
||||||
GPIO.output(pin4, 0)
|
GPIO.output(pin4, 0)
|
||||||
|
|
||||||
if phase==6:
|
if phase == 6:
|
||||||
GPIO.output(pin1, 0)
|
GPIO.output(pin1, 0)
|
||||||
GPIO.output(pin2, 0)
|
GPIO.output(pin2, 0)
|
||||||
GPIO.output(pin3, 1)
|
GPIO.output(pin3, 1)
|
||||||
GPIO.output(pin4, 1)
|
GPIO.output(pin4, 1)
|
||||||
|
|
||||||
if phase==7:
|
if phase == 7:
|
||||||
GPIO.output(pin1, 0)
|
GPIO.output(pin1, 0)
|
||||||
GPIO.output(pin2, 0)
|
GPIO.output(pin2, 0)
|
||||||
GPIO.output(pin3, 0)
|
GPIO.output(pin3, 0)
|
||||||
GPIO.output(pin4, 1)
|
GPIO.output(pin4, 1)
|
||||||
|
|
||||||
if phase==8:
|
if phase == 8:
|
||||||
GPIO.output(pin1, 1)
|
GPIO.output(pin1, 1)
|
||||||
GPIO.output(pin2, 0)
|
GPIO.output(pin2, 0)
|
||||||
GPIO.output(pin3, 0)
|
GPIO.output(pin3, 0)
|
||||||
GPIO.output(pin4, 1)
|
GPIO.output(pin4, 1)
|
||||||
|
|
||||||
|
|
||||||
def full_phase(pins):
|
def full_phase(pins):
|
||||||
#order=[1,2,3,4]
|
# order=[1,2,3,4]
|
||||||
order=[4,3,2,1]
|
order = [4, 3, 2, 1]
|
||||||
print("Moving in {}-order".format(order))
|
print("Moving in {}-order".format(order))
|
||||||
for i in order:
|
for i in order:
|
||||||
full_step(i, pins)
|
full_step(i, pins)
|
||||||
time.sleep(0.005)
|
time.sleep(0.005)
|
||||||
|
|
||||||
|
|
||||||
def half_phase(pins):
|
def half_phase(pins):
|
||||||
for i in range(0,8):
|
for i in range(0, 8):
|
||||||
half_step(i,pins)
|
half_step(i, pins)
|
||||||
time.sleep(0.0025)
|
time.sleep(0.0025)
|
||||||
|
|
||||||
|
|
||||||
def forward(pins):
|
def forward(pins):
|
||||||
half_phase(pins)
|
half_phase(pins)
|
||||||
|
|
||||||
|
|
||||||
def backward(pins):
|
def backward(pins):
|
||||||
(pins[0], pins[1], pins[2], pins[3]) = (pins[1], pins[0], pins[2], pins[3])
|
(pins[0], pins[1], pins[2], pins[3]) = (pins[1], pins[0], pins[2], pins[3])
|
||||||
half_phase(pins)
|
half_phase(pins)
|
||||||
|
|
||||||
if __name__=='__main__':
|
|
||||||
pins=[6, 13, 19, 26]
|
if __name__ == '__main__':
|
||||||
|
pins = [6, 13, 19, 26]
|
||||||
for pin in pins:
|
for pin in pins:
|
||||||
GPIO.setup(pin, GPIO.OUT)
|
GPIO.setup(pin, GPIO.OUT)
|
||||||
while True:
|
while True:
|
||||||
try:
|
try:
|
||||||
start=time.time()
|
start = time.time()
|
||||||
while(time.time()<start+10):
|
while (time.time() < start + 10):
|
||||||
forward(pins)
|
forward(pins)
|
||||||
start=time.time()
|
start = time.time()
|
||||||
while(time.time()<start+10):
|
while (time.time() < start + 10):
|
||||||
backward(pins)
|
backward(pins)
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
break
|
break
|
||||||
GPIO.cleanup()
|
GPIO.cleanup()
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
from lib import ultrasonic
|
from lib import ultrasonic
|
||||||
|
|
||||||
sensor= ultrasonic.Sensor()
|
sensor = ultrasonic.Sensor()
|
||||||
sensor.init(11,7)
|
sensor.init(11, 7)
|
||||||
print('Beginn der Messung')
|
print('Beginn der Messung')
|
||||||
print(sensor.echo())
|
print(sensor.echo())
|
||||||
sensor.clean()
|
sensor.clean()
|
||||||
Loading…
Reference in New Issue