2015-hackathon
diff --git a/‎client/browser/README.md
+4 b/‎client/browser/README.md
+4
diff --git a/‎browser/index.html renamed to ‎client/browser/index.html b/‎browser/index.html renamed to ‎client/browser/index.html
diff --git a/‎browser/scripts/cao.js renamed to ‎client/browser/scripts/cao.js b/‎browser/scripts/cao.js renamed to ‎client/browser/scripts/cao.js
diff --git a/‎browser/scripts/libs/audio.js renamed to ‎client/browser/scripts/libs/audio.js b/‎browser/scripts/libs/audio.js renamed to ‎client/browser/scripts/libs/audio.js
diff --git a/‎browser/scripts/libs/bootstrap.min.js renamed to ‎client/browser/scripts/libs/bootstrap.min.js b/‎browser/scripts/libs/bootstrap.min.js renamed to ‎client/browser/scripts/libs/bootstrap.min.js
diff --git a/‎browser/scripts/libs/jquery.min.js renamed to ‎client/browser/scripts/libs/jquery.min.js b/‎browser/scripts/libs/jquery.min.js renamed to ‎client/browser/scripts/libs/jquery.min.js
diff --git a/‎browser/scripts/libs/jquery.sinescroller.min.js renamed to ‎client/browser/scripts/libs/jquery.sinescroller.min.js b/‎browser/scripts/libs/jquery.sinescroller.min.js renamed to ‎client/browser/scripts/libs/jquery.sinescroller.min.js
diff --git a/‎browser/scripts/libs/simpleSheetMusic.js renamed to ‎client/browser/scripts/libs/simpleSheetMusic.js b/‎browser/scripts/libs/simpleSheetMusic.js renamed to ‎client/browser/scripts/libs/simpleSheetMusic.js
diff --git a/‎browser/scripts/libs/underscore-min.js renamed to ‎client/browser/scripts/libs/underscore-min.js b/‎browser/scripts/libs/underscore-min.js renamed to ‎client/browser/scripts/libs/underscore-min.js
diff --git a/‎browser/scripts/main.js renamed to ‎client/browser/scripts/main.js b/‎browser/scripts/main.js renamed to ‎client/browser/scripts/main.js
diff --git a/‎browser/scripts/player.js renamed to ‎client/browser/scripts/player.js b/‎browser/scripts/player.js renamed to ‎client/browser/scripts/player.js
diff --git a/‎browser/style/bootstrap.min.css renamed to ‎client/browser/style/bootstrap.min.css b/‎browser/style/bootstrap.min.css renamed to ‎client/browser/style/bootstrap.min.css
diff --git a/‎browser/style/main.css renamed to ‎client/browser/style/main.css b/‎browser/style/main.css renamed to ‎client/browser/style/main.css
diff --git a/‎client/raspberry/README.md
+6 b/‎client/raspberry/README.md
+6
diff --git a/‎controller/__init__.py renamed to ‎client/raspberry/controler/__init__.py b/‎controller/__init__.py renamed to ‎client/raspberry/controler/__init__.py
diff --git a/‎controller/app.py renamed to ‎client/raspberry/controler/app.py b/‎controller/app.py renamed to ‎client/raspberry/controler/app.py
diff --git a/‎controller/ultrasound.py renamed to ‎client/raspberry/controler/ultrasound.py b/‎controller/ultrasound.py renamed to ‎client/raspberry/controler/ultrasound.py
diff --git a/‎client/raspberry/example.zip
-61.1 KB b/‎client/raspberry/example.zip
-61.1 KB
diff --git a/‎client/scripts/README.md
+5 b/‎client/scripts/README.md
+5
diff --git a/‎scripts/notes_convert.py renamed to ‎client/scripts/notes_convert.py b/‎scripts/notes_convert.py renamed to ‎client/scripts/notes_convert.py
diff --git a/‎scripts/super_mario_notes.txt renamed to ‎client/scripts/super_mario_notes.txt b/‎scripts/super_mario_notes.txt renamed to ‎client/scripts/super_mario_notes.txt
diff --git a/‎senser/ultrasound/build/lib/__init__/__init__.py
-53 b/‎senser/ultrasound/build/lib/__init__/__init__.py
-53
diff --git a/‎senser/ultrasound/build/lib/__init__/test.py
-16 b/‎senser/ultrasound/build/lib/__init__/test.py
-16
diff --git a/‎senser/ultrasound/dist/ultrasound-1.10.27-py2.7.egg
-1.92 KB b/‎senser/ultrasound/dist/ultrasound-1.10.27-py2.7.egg
-1.92 KB
diff --git a/‎senser/ultrasound/dist/ultrasound-1.10.27.tar.gz
-1.43 KB b/‎senser/ultrasound/dist/ultrasound-1.10.27.tar.gz
-1.43 KB
diff --git a/‎senser/ultrasound/setup.py
-16 b/‎senser/ultrasound/setup.py
-16
diff --git a/‎senser/ultrasound/ultrasound.egg-info/PKG-INFO
-11 b/‎senser/ultrasound/ultrasound.egg-info/PKG-INFO
-11
diff --git a/‎senser/ultrasound/ultrasound.egg-info/SOURCES.txt
-8 b/‎senser/ultrasound/ultrasound.egg-info/SOURCES.txt
-8
diff --git a/‎senser/ultrasound/ultrasound.egg-info/dependency_links.txt
-1 b/‎senser/ultrasound/ultrasound.egg-info/dependency_links.txt
-1
diff --git a/‎senser/ultrasound/ultrasound.egg-info/requires.txt
-1 b/‎senser/ultrasound/ultrasound.egg-info/requires.txt
-1
diff --git a/‎senser/ultrasound/ultrasound.egg-info/top_level.txt
-1 b/‎senser/ultrasound/ultrasound.egg-info/top_level.txt
-1
diff --git a/‎senser/ultrasound/ultrasound/__init__.py
-53 b/‎senser/ultrasound/ultrasound/__init__.py
-53
diff --git a/‎senser/ultrasound/ultrasound/test.py
-16 b/‎senser/ultrasound/ultrasound/test.py
-16
diff --git a/‎server/README.txt
+5 b/‎server/README.txt
+5
@@ -0,0 +1,4 @@
+author 3D & homeway
+date 2015.03.28-2015.03.29
+
+## 播放音乐、校验音符、显示结果、链接socket等web前端
@@ -0,0 +1,6 @@
+author Tevin
+date 2015.03.28
+
+## Get Raspberry Pi ultrasonic distance sensor, and forwarded to the server through socket
+
+## 获取树莓派超声波传感器距离，并通过socket转发给服务器
@@ -0,0 +1,5 @@
+author 3D
+date 2015.03.28
+
+## The stave transcoding into play electronic code
+## 将音乐五线谱转码成播放电子码
@@ -0,0 +1,5 @@
+author homeway
+date 2015.03.28
+
+//socket服务端，负责转发数据
+