Clean up repoistory

gampleman · Nov 4, 2011 · c5b9feb · c5b9feb
1 parent d7bc33d
commit c5b9feb
Show file tree

Hide file tree

Showing 25 changed files with 14 additions and 84 deletions.
diff --git a/readme.md b/readme.md
@@ -1,6 +1,10 @@
 # Dodo #
 
-For a paper about the design of this robot see the [Final Report](https://github.com/gampleman/Robot-IAR/blob/master/reports/final.md).
+Dodo is a reactive robotics project by Jakub Hampl (@gampleman), Denes Findrick (@daneeesh) and Lachezar Kamburov (@lkamburov) built from LEGO.
+
+For a paper about this robot see the [Final Report](https://github.com/gampleman/Robot-IAR/blob/master/reports/final.md).
+
+The rest of this file details technicalities about the robot.
 
 # Connection specs #
 
@@ -10,17 +14,18 @@ For a paper about the design of this robot see the [Final Report](https://github
 
 1. Left Whisker
 2. Right Whisker
-3. Black Bumper
-4. Red Bumper
-5. Red Plate Bumper
-6. Blue Bumper
+3. -
+4. -
+5. -
+6. -
+7. Hall Sensor
 
 ### Analogue ###
 
-0. Spinning sensor
-1. Wheel-attached IR
+
+1. Top IR
 2. Front-facing IR
-3. Sonar
+3. -
 4. Right Light sensor
 5. Left Light sensor
 6. Top Right Light sensor
@@ -32,13 +37,3 @@ For a paper about the design of this robot see the [Final Report](https://github
 1. Right Motor
 
 
-# Reports
-
-Regenerate with `make report`.
-
-1. [Report](reports/1.md)
-
-# IDEAS #
-
-1) measure the greatest distance we can get within the arena then set that as a threshold so if we get anything that indicates bigger distance than that, we don't go that way but rather try to approach objects.
-
diff --git a/reports/IAR3.pdf b/reports/IAR3.pdf
diff --git a/reports/IR readings.numbers → reports/data/IR readings.numbers b/reports/IR readings.numbers → reports/data/IR readings.numbers
diff --git a/reports/IR readings.ods → reports/data/IR readings.ods b/reports/IR readings.ods → reports/data/IR readings.ods
diff --git a/reports/IR readings.xls → reports/data/IR readings.xls b/reports/IR readings.xls → reports/data/IR readings.xls
diff --git a/reports/results.numbers → reports/data/results.numbers b/reports/results.numbers → reports/data/results.numbers
diff --git a/reports/final.md b/reports/final.md
@@ -114,7 +114,7 @@ Frequency of the light switch mainly exploits the hardware configuration of the
 
 We carried out tests to verify the efficiency of this method. In these experiments the robot was aligned facing the switch, the program was started and we let the robot find the switch, trigger it and readings of frequencies were recorded. For all lights that were available in the laboratory, we have measured the frequencies ten times and the result is shown by Figure x. The algorithm performs constantly well for lower frequencies with a mean of 0.984Hz (SD=0.002) for the 1Hz switch and 1.956Hz (SD=0.009) for the 2Hz switch. The higher frequencies showed more variance but still were very accurate with a mean of 3.984Hz (SD=0.121) for the 4Hz light,  with 5.925Hz (SD=0.086) for the 6Hz light and 7.863Hz (SD=0.114) for the 8Hz light.
 
-![Graph showing the recognised frequencies](https://github.com/gampleman/Robot-IAR/raw/master/reports/images/chart.png)
+![Graph showing the recognised frequencies](https://github.com/gampleman/Robot-IAR/raw/master/reports/images/chart2.png)
 
 ## Experimental Design
 

diff --git a/reports/final.rtf b/reports/final.rtf
diff --git a/reports/iar3.doc b/reports/iar3.doc
diff --git a/reports/images/arena_layout.pdf b/reports/images/arena_layout.pdf
diff --git a/reports/Arena layout.sketch/Data → reports/images/src/Arena layout.sketch/Data b/reports/Arena layout.sketch/Data → reports/images/src/Arena layout.sketch/Data
diff --git a/reports/Arena layout.sketch/Images/1.png → ...ages/src/Arena layout.sketch/Images/1.png b/reports/Arena layout.sketch/Images/1.png → ...ages/src/Arena layout.sketch/Images/1.png
diff --git a/...Arena layout.sketch/QuickLook/Preview.pdf → ...Arena layout.sketch/QuickLook/Preview.pdf b/...Arena layout.sketch/QuickLook/Preview.pdf → ...Arena layout.sketch/QuickLook/Preview.pdf
diff --git a/...ena layout.sketch/QuickLook/Thumbnail.jpg → ...ena layout.sketch/QuickLook/Thumbnail.jpg b/...ena layout.sketch/QuickLook/Thumbnail.jpg → ...ena layout.sketch/QuickLook/Thumbnail.jpg
diff --git a/reports/images/blueprint.sketch/Data → reports/images/src/blueprint.sketch/Data b/reports/images/blueprint.sketch/Data → reports/images/src/blueprint.sketch/Data
diff --git a/reports/images/blueprint.sketch/Images/1.png → .../images/src/blueprint.sketch/Images/1.png b/reports/images/blueprint.sketch/Images/1.png → .../images/src/blueprint.sketch/Images/1.png
diff --git a/...es/blueprint.sketch/QuickLook/Preview.pdf → ...rc/blueprint.sketch/QuickLook/Preview.pdf b/...es/blueprint.sketch/QuickLook/Preview.pdf → ...rc/blueprint.sketch/QuickLook/Preview.pdf
diff --git a/.../blueprint.sketch/QuickLook/Thumbnail.jpg → .../blueprint.sketch/QuickLook/Thumbnail.jpg b/.../blueprint.sketch/QuickLook/Thumbnail.jpg → .../blueprint.sketch/QuickLook/Thumbnail.jpg
diff --git a/reports/whisker.jpg → reports/images/whisker.jpg b/reports/whisker.jpg → reports/images/whisker.jpg
diff --git a/reports/final.pages → reports/pdfs/final.pages b/reports/final.pages → reports/pdfs/final.pages
diff --git a/...s/findrik_hampl_kamburov_final_report.pdf → ...s/findrik_hampl_kamburov_final_report.pdf b/...s/findrik_hampl_kamburov_final_report.pdf → ...s/findrik_hampl_kamburov_final_report.pdf
diff --git a/reports/findrik_hampl_kamburov_report3.pdf → ...s/pdfs/findrik_hampl_kamburov_report3.pdf b/reports/findrik_hampl_kamburov_report3.pdf → ...s/pdfs/findrik_hampl_kamburov_report3.pdf
diff --git a/reports/findrik_hampl_report1.pdf → reports/pdfs/findrik_hampl_report1.pdf b/reports/findrik_hampl_report1.pdf → reports/pdfs/findrik_hampl_report1.pdf
diff --git a/reports/findrik_hampl_report2.pdf → reports/pdfs/findrik_hampl_report2.pdf b/reports/findrik_hampl_report2.pdf → reports/pdfs/findrik_hampl_report2.pdf
diff --git a/reports/plan.pdf b/reports/plan.pdf