move stuff

yoelk · May 25, 2016 · 7a414f9 · 7a414f9
1 parent 6074869
commit 7a414f9
Show file tree

Hide file tree

Showing 65 changed files with 1 addition and 15 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/instrumentino/LICENSE → LICENSE b/instrumentino/LICENSE → LICENSE
diff --git a/README.md b/README.md
@@ -1,14 +1,4 @@
-Instrumentino
+instrumentino
 =============
 
 Instrumentino is an open-source modular graphical user interface framework for controlling Arduino based experimental instruments
-
-It consists of two separate programs:
-- instrumentino: which is run on a PC and provides the graphical user interface.
-- controlino:    which is the program running on the Arduino controller itself, and is used to communicate with instrumentino.
-
-See the [documents](https://github.com/yoelk/Instrumentino/tree/master/documents) library for further instructions and examples.
-
-We are looking forward for contributors. There is lots of potential for Instrumentino to grow!
-Please contact me if you want to add features and make Instrumentino better.
-yoelk [at] tx.technion.ac.il
diff --git a/...mentino/dist/instrumentino-1.31-py2.7.egg → dist/instrumentino-1.31-py2.7.egg b/...mentino/dist/instrumentino-1.31-py2.7.egg → dist/instrumentino-1.31-py2.7.egg
diff --git a/instrumentino/ez_setup.py → ez_setup.py b/instrumentino/ez_setup.py → ez_setup.py
diff --git a/...rumentino/instrumentino.egg-info/PKG-INFO → instrumentino.egg-info/PKG-INFO b/...rumentino/instrumentino.egg-info/PKG-INFO → instrumentino.egg-info/PKG-INFO
diff --git a/...entino/instrumentino.egg-info/SOURCES.txt → instrumentino.egg-info/SOURCES.txt b/...entino/instrumentino.egg-info/SOURCES.txt → instrumentino.egg-info/SOURCES.txt
diff --git a/...strumentino.egg-info/dependency_links.txt → instrumentino.egg-info/dependency_links.txt b/...strumentino.egg-info/dependency_links.txt → instrumentino.egg-info/dependency_links.txt
diff --git a/...ntino/instrumentino.egg-info/requires.txt → instrumentino.egg-info/requires.txt b/...ntino/instrumentino.egg-info/requires.txt → instrumentino.egg-info/requires.txt
diff --git a/...tino/instrumentino.egg-info/top_level.txt → instrumentino.egg-info/top_level.txt b/...tino/instrumentino.egg-info/top_level.txt → instrumentino.egg-info/top_level.txt
diff --git a/...rumentino/instrumentino.egg-info/zip-safe → instrumentino.egg-info/zip-safe b/...rumentino/instrumentino.egg-info/zip-safe → instrumentino.egg-info/zip-safe
diff --git a/instrumentino/.DS_Store b/instrumentino/.DS_Store
diff --git a/instrumentino/instrumentino/.gitignore → instrumentino/.gitignore b/instrumentino/instrumentino/.gitignore → instrumentino/.gitignore
diff --git a/instrumentino/README.md b/instrumentino/README.md
diff --git a/instrumentino/instrumentino/__init__.py → instrumentino/__init__.py b/instrumentino/instrumentino/__init__.py → instrumentino/__init__.py
diff --git a/instrumentino/instrumentino/action.py → instrumentino/action.py b/instrumentino/instrumentino/action.py → instrumentino/action.py
diff --git a/instrumentino/instrumentino/cfg.py → instrumentino/cfg.py b/instrumentino/instrumentino/cfg.py → instrumentino/cfg.py
diff --git a/instrumentino/instrumentino/comp.py → instrumentino/comp.py b/instrumentino/instrumentino/comp.py → instrumentino/comp.py
diff --git a/...tino/instrumentino/controllers/.gitignore → instrumentino/controllers/.gitignore b/...tino/instrumentino/controllers/.gitignore → instrumentino/controllers/.gitignore
diff --git a/...ino/instrumentino/controllers/__init__.py → instrumentino/controllers/__init__.py b/...ino/instrumentino/controllers/__init__.py → instrumentino/controllers/__init__.py
diff --git a/...trumentino/controllers/arduino/.gitignore → instrumentino/controllers/arduino/.gitignore b/...trumentino/controllers/arduino/.gitignore → instrumentino/controllers/arduino/.gitignore
diff --git a/...rumentino/controllers/arduino/__init__.py → ...rumentino/controllers/arduino/__init__.py b/...rumentino/controllers/arduino/__init__.py → ...rumentino/controllers/arduino/__init__.py
diff --git a/...instrumentino/controllers/arduino/edaq.py → instrumentino/controllers/arduino/edaq.py b/...instrumentino/controllers/arduino/edaq.py → instrumentino/controllers/arduino/edaq.py
diff --git a/...instrumentino/controllers/arduino/emco.py → instrumentino/controllers/arduino/emco.py b/...instrumentino/controllers/arduino/emco.py → instrumentino/controllers/arduino/emco.py
diff --git a/.../instrumentino/controllers/arduino/hvm.py → instrumentino/controllers/arduino/hvm.py b/.../instrumentino/controllers/arduino/hvm.py → instrumentino/controllers/arduino/hvm.py
diff --git a/.../instrumentino/controllers/arduino/mks.py → instrumentino/controllers/arduino/mks.py b/.../instrumentino/controllers/arduino/mks.py → instrumentino/controllers/arduino/mks.py
diff --git a/...strumentino/controllers/arduino/parker.py → instrumentino/controllers/arduino/parker.py b/...strumentino/controllers/arduino/parker.py → instrumentino/controllers/arduino/parker.py
diff --git a/...rumentino/controllers/arduino/pewatron.py → ...rumentino/controllers/arduino/pewatron.py b/...rumentino/controllers/arduino/pewatron.py → ...rumentino/controllers/arduino/pewatron.py
diff --git a/...ino/controllers/arduino/pid_thermostat.py → ...ino/controllers/arduino/pid_thermostat.py b/...ino/controllers/arduino/pid_thermostat.py → ...ino/controllers/arduino/pid_thermostat.py
diff --git a/...instrumentino/controllers/arduino/pins.py → instrumentino/controllers/arduino/pins.py b/...instrumentino/controllers/arduino/pins.py → instrumentino/controllers/arduino/pins.py
diff --git a/...rumentino/controllers/arduino/spellman.py → ...rumentino/controllers/arduino/spellman.py b/...rumentino/controllers/arduino/spellman.py → ...rumentino/controllers/arduino/spellman.py
diff --git a/...nstrumentino/controllers/arduino/tecan.py → instrumentino/controllers/arduino/tecan.py b/...nstrumentino/controllers/arduino/tecan.py → instrumentino/controllers/arduino/tecan.py
diff --git a/...entino/controllers/arduino/thermometer.py → ...entino/controllers/arduino/thermometer.py b/...entino/controllers/arduino/thermometer.py → ...entino/controllers/arduino/thermometer.py
diff --git a/...ntino/controllers/labsmith_eib/.gitignore → ...ntino/controllers/labsmith_eib/.gitignore b/...ntino/controllers/labsmith_eib/.gitignore → ...ntino/controllers/labsmith_eib/.gitignore
diff --git a/...tino/controllers/labsmith_eib/__init__.py → ...tino/controllers/labsmith_eib/__init__.py b/...tino/controllers/labsmith_eib/__init__.py → ...tino/controllers/labsmith_eib/__init__.py
diff --git a/...ontrollers/labsmith_eib/labsmith_comps.py → ...ontrollers/labsmith_eib/labsmith_comps.py b/...ontrollers/labsmith_eib/labsmith_comps.py → ...ontrollers/labsmith_eib/labsmith_comps.py
diff --git a/...tino/instrumentino/executable_listctrl.py → instrumentino/executable_listctrl.py b/...tino/instrumentino/executable_listctrl.py → instrumentino/executable_listctrl.py
diff --git a/instrumentino/instrumentino/.DS_Store b/instrumentino/instrumentino/.DS_Store
diff --git a/instrumentino/instrumentino/controllers/arduino/hvm.pyc b/instrumentino/instrumentino/controllers/arduino/hvm.pyc
diff --git a/instrumentino/instrumentino/controllers/arduino/mks.pyc b/instrumentino/instrumentino/controllers/arduino/mks.pyc
diff --git a/instrumentino/instrumentino/controllers/arduino/pewatron.pyc b/instrumentino/instrumentino/controllers/arduino/pewatron.pyc
diff --git a/instrumentino/instrumentino/controllers/arduino/pid_thermostat.pyc b/instrumentino/instrumentino/controllers/arduino/pid_thermostat.pyc
diff --git a/instrumentino/instrumentino/controllers/arduino/tecan.pyc b/instrumentino/instrumentino/controllers/arduino/tecan.pyc
diff --git a/instrumentino/instrumentino/controllers/arduino/thermometer.pyc b/instrumentino/instrumentino/controllers/arduino/thermometer.pyc
diff --git a/instrumentino/instrumentino/resources/.DS_Store b/instrumentino/instrumentino/resources/.DS_Store
diff --git a/instrumentino/instrumentino/log_graph.py → instrumentino/log_graph.py b/instrumentino/instrumentino/log_graph.py → instrumentino/log_graph.py
diff --git a/instrumentino/instrumentino/method.py → instrumentino/method.py b/instrumentino/instrumentino/method.py → instrumentino/method.py
diff --git a/...entino/instrumentino/resources/.gitignore → instrumentino/resources/.gitignore b/...entino/instrumentino/resources/.gitignore → instrumentino/resources/.gitignore
diff --git a/...ntino/instrumentino/resources/__init__.py → instrumentino/resources/__init__.py b/...ntino/instrumentino/resources/__init__.py → instrumentino/resources/__init__.py
diff --git a/...umentino/instrumentino/resources/main.xrc → instrumentino/resources/main.xrc b/...umentino/instrumentino/resources/main.xrc → instrumentino/resources/main.xrc
diff --git a/...o/instrumentino/resources/new/__init__.py → instrumentino/resources/new/__init__.py b/...o/instrumentino/resources/new/__init__.py → instrumentino/resources/new/__init__.py
diff --git a/...umentino/resources/new/uProcessDriver.dll → ...umentino/resources/new/uProcessDriver.dll b/...umentino/resources/new/uProcessDriver.dll → ...umentino/resources/new/uProcessDriver.dll
diff --git a/...resources/new/uProcessDriver_C_V1_2_2.dll → ...resources/new/uProcessDriver_C_V1_2_2.dll b/...resources/new/uProcessDriver_C_V1_2_2.dll → ...resources/new/uProcessDriver_C_V1_2_2.dll
diff --git a/...o/instrumentino/resources/old/__init__.py → instrumentino/resources/old/__init__.py b/...o/instrumentino/resources/old/__init__.py → instrumentino/resources/old/__init__.py
diff --git a/...umentino/resources/old/uProcessDriver.dll → ...umentino/resources/old/uProcessDriver.dll b/...umentino/resources/old/uProcessDriver.dll → ...umentino/resources/old/uProcessDriver.dll
diff --git a/...resources/old/uProcessDriver_C_V1_2_1.dll → ...resources/old/uProcessDriver_C_V1_2_1.dll b/...resources/old/uProcessDriver_C_V1_2_1.dll → ...resources/old/uProcessDriver_C_V1_2_1.dll
diff --git a/...no/instrumentino/resources/stopButton.png → instrumentino/resources/stopButton.png b/...no/instrumentino/resources/stopButton.png → instrumentino/resources/stopButton.png
diff --git a/...nstrumentino/resources/uProcessDriver.dll → instrumentino/resources/uProcessDriver.dll b/...nstrumentino/resources/uProcessDriver.dll → instrumentino/resources/uProcessDriver.dll
diff --git a/...ino/resources/uProcessDriver_C_V1_2_1.dll → ...ino/resources/uProcessDriver_C_V1_2_1.dll b/...ino/resources/uProcessDriver_C_V1_2_1.dll → ...ino/resources/uProcessDriver_C_V1_2_1.dll
diff --git a/instrumentino/instrumentino/sequence.py → instrumentino/sequence.py b/instrumentino/instrumentino/sequence.py → instrumentino/sequence.py
diff --git a/instrumentino/setup.pyc b/instrumentino/setup.pyc
diff --git a/instrumentino/instrumentino/util.py → instrumentino/util.py b/instrumentino/instrumentino/util.py → instrumentino/util.py
diff --git a/instrumentino/readme.txt → readme.txt b/instrumentino/readme.txt → readme.txt
diff --git a/instrumentino/setup.py → setup.py b/instrumentino/setup.py → setup.py
diff --git a/instrumentino/test_system.py → test_system.py b/instrumentino/test_system.py → test_system.py