Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: PolygonalTree/ethoscope_hardware
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: gilestrolab/ethoscope_hardware
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
5 contributors

Commits on Feb 1, 2016

  1. Updated part number for female light connector

    @ggilestro
    ggilestro committed Feb 1, 2016
    Copy the full SHA
    9d33928 View commit details

  2. Update README.md

    @qgeissmann
    qgeissmann committed Feb 1, 2016
    Copy the full SHA
    1b726db View commit details

Commits on Feb 2, 2016

  1. Update BOM.csv

    @qgeissmann
    qgeissmann committed Feb 2, 2016
    Copy the full SHA
    678f705 View commit details

  2. Update BOM.csv

    @qgeissmann
    qgeissmann committed Feb 2, 2016
    Copy the full SHA
    521c0db View commit details

  3. Update README.md

    @qgeissmann
    qgeissmann committed Feb 2, 2016
    Copy the full SHA
    ed0a7e3 View commit details

Commits on Feb 26, 2016

  1. Adding approximate prices

    @ggilestro
    ggilestro committed Feb 26, 2016
    Copy the full SHA
    ad546f0 View commit details

  2. Update BOM.csv

    @ggilestro
    ggilestro committed Feb 26, 2016
    Copy the full SHA
    09dc6c5 View commit details

Commits on Mar 11, 2016

  1. add new arenas/backup onshape

    @qgeissmann
    qgeissmann committed Mar 11, 2016
    Copy the full SHA
    c1ae032 View commit details

  2. update arena readme

    @qgeissmann
    qgeissmann committed Mar 11, 2016
    Copy the full SHA
    d65da51 View commit details

Commits on Mar 17, 2016

  1. Added files via upload

    @qgeissmann
    qgeissmann committed Mar 17, 2016
    Copy the full SHA
    48e459a View commit details

  2. Added files via upload

    @qgeissmann
    qgeissmann committed Mar 17, 2016
    Copy the full SHA
    dbc58fe View commit details

  3. Update README.md

    @qgeissmann
    qgeissmann committed Mar 17, 2016
    Copy the full SHA
    c1aeab7 View commit details

  4. Update README.md

    @qgeissmann
    qgeissmann committed Mar 17, 2016
    Copy the full SHA
    cdcafe3 View commit details

  5. Update README.md

    @qgeissmann
    qgeissmann committed Mar 17, 2016
    Copy the full SHA
    1a1b156 View commit details

Commits on Apr 14, 2016

  1. Create BOM.csv

    @qgeissmann
    qgeissmann committed Apr 14, 2016
    Copy the full SHA
    590aa50 View commit details

  2. Update BOM.csv

    @qgeissmann
    qgeissmann committed Apr 14, 2016
    Copy the full SHA
    c143069 View commit details

  3. Update BOM.csv

    @qgeissmann
    qgeissmann committed Apr 14, 2016
    Copy the full SHA
    9cfd137 View commit details

  4. Update BOM.csv

    @qgeissmann
    qgeissmann committed Apr 14, 2016
    Copy the full SHA
    e521991 View commit details

  5. especification and provider for the acrylic walls

    @estebanbeck
    estebanbeck committed Apr 14, 2016
    Copy the full SHA
    3a445b5 View commit details

  6. Merge pull request #1 from estebanbeck/patch-1 

    specification and provider for the acrylic walls
    @estebanbeck
    estebanbeck committed Apr 14, 2016
    Copy the full SHA
    53c679e View commit details

  7. Update BOM.csv

    @qgeissmann
    qgeissmann committed Apr 14, 2016
    Copy the full SHA
    aa579a3 View commit details

Commits on May 9, 2016

  1. Add files via upload

    @estebanbeck
    estebanbeck committed May 9, 2016
    Copy the full SHA
    ba2c223 View commit details

Commits on Nov 22, 2016

  1. add prototype of gmsd firmware

    @qgeissmann
    qgeissmann committed Nov 22, 2016
    Copy the full SHA
    196dda5 View commit details

Commits on Nov 25, 2016

  1. instructions for the new SD ++

    @qgeissmann
    qgeissmann committed Nov 25, 2016
    Copy the full SHA
    039589a View commit details

Commits on Nov 29, 2016

  1. use TLC5947 to control gear motor as well as LEDs

    @qgeissmann
    qgeissmann committed Nov 29, 2016
    Copy the full SHA
    a6fcf5c View commit details

Commits on Nov 30, 2016

  1. add push button!

    @qgeissmann
    qgeissmann committed Nov 30, 2016
    Copy the full SHA
    3e38541 View commit details

Commits on Dec 1, 2016

  1. add push button and fix demo

    @qgeissmann
    qgeissmann committed Dec 1, 2016
    Copy the full SHA
    7c33820 View commit details

Commits on Dec 5, 2016

  1. rename project

    @qgeissmann
    qgeissmann committed Dec 5, 2016
    Copy the full SHA
    4023669 View commit details

  2. Update BOM.csv

    @a-r-j
    a-r-j authored Dec 5, 2016
    Copy the full SHA
    638acb7 View commit details

  3. more renaming

    @qgeissmann
    qgeissmann committed Dec 5, 2016
    Copy the full SHA
    db462bb View commit details

  4. Merge branch 'master' of https://github.com/gilestrolab/ethoscope_har… 

    …dware
    @qgeissmann
    qgeissmann committed Dec 5, 2016
    Copy the full SHA
    8d3c5af View commit details

  5. Update BOM.csv

    @qgeissmann
    qgeissmann authored Dec 5, 2016
    Copy the full SHA
    bce6a7c View commit details

  6. BOM ++

    @qgeissmann
    qgeissmann committed Dec 5, 2016
    Copy the full SHA
    503843f View commit details

Commits on Dec 7, 2016

  1. add filters to bom. please fill the rest

    @qgeissmann
    qgeissmann committed Dec 7, 2016
    Copy the full SHA
    bd28a31 View commit details

Commits on Jan 18, 2017

  1. added screws and power to BOM

    @qgeissmann
    qgeissmann committed Jan 18, 2017
    Copy the full SHA
    f2c4e18 View commit details

Commits on Jan 19, 2017

  1. draft a doc for optomotor

    @qgeissmann
    qgeissmann authored Jan 19, 2017
    Copy the full SHA
    06b8745 View commit details

  2. Update README.md

    @qgeissmann
    qgeissmann authored Jan 19, 2017
    Copy the full SHA
    5d1e016 View commit details

Commits on Jan 31, 2017

  1. update doc, mainly pictures

    @qgeissmann
    qgeissmann committed Jan 31, 2017
    Copy the full SHA
    076bdcb View commit details

  2. update doc, text

    @qgeissmann
    qgeissmann committed Jan 31, 2017
    Copy the full SHA
    717fccd View commit details

  3. update doc

    @qgeissmann
    qgeissmann committed Jan 31, 2017
    Copy the full SHA
    8ff0805 View commit details

  4. pictures ae now pngs

    @qgeissmann
    qgeissmann committed Jan 31, 2017
    Copy the full SHA
    fe91a11 View commit details

Commits on Mar 17, 2017

  1. Update BOM.csv

    @qgeissmann
    qgeissmann authored Mar 17, 2017
    Copy the full SHA
    1f6ae35 View commit details

  2. Update BOM.csv

    @qgeissmann
    qgeissmann authored Mar 17, 2017
    Copy the full SHA
    b0cd60e View commit details

Commits on Mar 21, 2017

  1. Update BOM.csv

    @qgeissmann
    qgeissmann authored Mar 21, 2017
    Copy the full SHA
    aad2630 View commit details

Commits on Mar 22, 2017

  1. Create odour_delivery_module

    @qgeissmann
    qgeissmann authored Mar 22, 2017
    Copy the full SHA
    52a01ca View commit details

Commits on Mar 24, 2017

  1. Create README.md

    @qgeissmann
    qgeissmann authored Mar 24, 2017
    Copy the full SHA
    b1ad2f1 View commit details

  2. Update README.md

    @qgeissmann
    qgeissmann authored Mar 24, 2017
    Copy the full SHA
    cdfd974 View commit details

  3. Delete odour_delivery_module

    @qgeissmann
    qgeissmann authored Mar 24, 2017
    Copy the full SHA
    82561b5 View commit details

  4. Update README.md

    @qgeissmann
    qgeissmann authored Mar 24, 2017
    Copy the full SHA
    a241519 View commit details

  5. Update README.md

    @qgeissmann
    qgeissmann authored Mar 24, 2017
    Copy the full SHA
    9e444f0 View commit details
Showing with 37,194 additions and 5,980 deletions.
  1. +3 −13 README.md
  2. BIN arenas/20 Tubes/20_tubes_20150922.stl
  3. +0 −2,802 arenas/20 Tubes/20_tubes_arena.step
  4. +0 −29 arenas/20 Tubes/README.md
  5. BIN arenas/20 Tubes/image.png
  6. +36 −0 arenas/README.md
  7. BIN arenas/arena_10x1_longTubes/arena_10x1_longTubes.stl
  8. +18 −0 arenas/arena_10x2_shortTubes/README.md
  9. BIN arenas/arena_10x2_shortTubes/arena_10x2_shortTubes.stl
  10. BIN arenas/arena_10x2_shortTubes/arena_10x2_sortTubes.mp4
  11. BIN arenas/arena_glassLid_template/arena_glassLid_template.stl
  12. BIN arenas/arena_mini_12_tubes/arena_mini_12_tubes.stl
  13. BIN arenas/arena_mini_12_tubes/arena_mini_12tubes.mp4
  14. BIN arenas/arena_mini_squares/arena_mini_squares.stl
  15. BIN arenas/arena_mini_template/arena_mini_template.stl
  16. BIN arenas/arena_sdModule/arena_sdModule.stl
  17. BIN arenas/arena_squares/arena_squares.stl
  18. BIN arenas/arena_targets_printable.pdf
  19. BIN arenas/arena_template/arena_template.stl
  20. +0 −17 arenas/master arena/README.md
  21. +0 −1,425 arenas/master arena/arena_clean.stp
  22. +0 −1,558 arenas/master arena/arena_empty_for_extrusion.stp
  23. +21 −22 core/BOM.csv
  24. +1 −113 core/README.md
  25. +7 −1 core/side_wall/README.md
  26. +18 −0 modules/odour_delivery/BOM.csv
  27. +89 −0 modules/odour_delivery/README.md
  28. +27 −0 modules/optomotor/BOM.csv
  29. +1 −0 modules/optomotor/README.md
  30. BIN modules/optomotor/img/arduino.png
  31. +5,588 −0 modules/optomotor/img/arduino.svg
  32. BIN modules/optomotor/img/board_connector.png
  33. +251 −0 modules/optomotor/img/board_connector.svg
  34. BIN modules/optomotor/img/main_finished.png
  35. +211 −0 modules/optomotor/img/main_finished.svg
  36. BIN modules/optomotor/img/optomotor.png
  37. BIN modules/optomotor/img/push_button.png
  38. +30,519 −0 modules/optomotor/img/push_button.svg
  39. BIN modules/optomotor/img/tlc.png
  40. +219 −0 modules/optomotor/img/tlc.svg
  41. +174 −0 modules/optomotor/optomotor.ino
  42. +11 −0 modules/sleep_depriver/BOM.csv
16 changes: 3 additions & 13 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
Ethoscope Hardware
========================
This is the hardware repository of the [ethoscope platform](http://gilestrolab.github.io/ethoscope).
It contains 3d printable files and instructions that alltogether should be enough to build ethoscopes, arenas and modules.

The software repository lives [here](https://github.com/gilestrolab/ethoscope)


Organisation
==================
This repo is organized as follows:
1. There is a collection of folders for every module in the Ethoscope.
2. Inside each folder there is a README file explaning the function of the module and how to put all the parts together.
3. There is as well a folder for each part of the module.
4. Inside the part folder you can find the last version of the hardware with a README explaning its function in detail.

Version control is provided in the name by partName-year-month-versionNumber.step (e.g. 20TubesArena-15-09-001.step)
This is the github repository of the (firmware) part of the [ethoscope platform](http://gilestrolab.github.io/ethoscope/).
All technical information regarding ethoscope is compiled in [our documentation](https://qgeissmann.gitbooks.io/ethoscope-manual/content/).
The ethoscope hardware project is developed on [onshape](https://cad.onshape.com/documents?filter=team&teamId=562b938ce4b0462e71ca0169&column=modifiedAt&order=desc&viewMode=0) (feel free to visit and copy!).

Binary file removed arenas/20 Tubes/20_tubes_20150922.stl
View file
Binary file not shown.
Loading