Commit c6df2441 authored by Julian Stirling's avatar Julian Stirling 🐧
Browse files

Merge branch 'getiing-started' into 'master' 

Tidy up the bits of the instructions

Closes #402, #388, and #295

See merge request !525
parents 864d4c84 69d12f4d

docs/customisations/optics_options.md

+7 −6
Original line number Diff line number Diff line
@@ -67,14 +67,15 @@ You can use our **[interactive optics module chooser](interactive_optics_module_ 
* [optics_m12_rms_f50d13.stl](../models/optics_m12_rms_f50d13.stl){previewpage} 

* [optics_m12_rms_infinity_f50d13_beamsplitter.stl](../models/optics_m12_rms_infinity_f50d13_beamsplitter.stl){previewpage}

* [optics_m12_rms_infinity_f50d13.stl](../models/optics_m12_rms_infinity_f50d13.stl){previewpage}

* [optics_logitech_c270_rms_f50d13_beamsplitter.stl](../models/optics_logitech_c270_rms_f50d13_beamsplitter.stl){previewpage}*

* [optics_logitech_c270_rms_f50d13.stl](../models/optics_logitech_c270_rms_f50d13.stl){previewpage}*

* [optics_logitech_c270_rms_infinity_f50d13_beamsplitter.stl](../models/optics_logitech_c270_rms_infinity_f50d13_beamsplitter.stl){previewpage}*

* [optics_logitech_c270_rms_infinity_f50d13.stl](../models/optics_logitech_c270_rms_infinity_f50d13.stl){previewpage}*

* [optics_logitech_c270_rms_f50d13_beamsplitter.stl](../models/optics_logitech_c270_rms_f50d13_beamsplitter.stl){previewpage}

* [optics_logitech_c270_rms_f50d13.stl](../models/optics_logitech_c270_rms_f50d13.stl){previewpage}

* [optics_logitech_c270_rms_infinity_f50d13_beamsplitter.stl](../models/optics_logitech_c270_rms_infinity_f50d13_beamsplitter.stl){previewpage}

* [optics_logitech_c270_rms_infinity_f50d13.stl](../models/optics_logitech_c270_rms_infinity_f50d13.stl){previewpage}



>i The infinity corrected optics modules are taller, and require a tall microscope stand [(see "stands" section of customisation page)](../customisation.md).

>i The infinity corrected optics modules are taller, and require a **tall microscope stand** [(see "stands" section of customisation page)](../customisation.md).



**The C270 webcam needs to be dissembled before use. More details are provided on this procedure in the Assembly guide for the C270 basic optics module provided in the next section.*

>i **The C270 webcam needs to be dissembled before use**

>i More details are provided in the [preparation page](../usb_cameras/c270_preparation.md).

___



## List of basic optics modules

docs/finished.md

+6 −2
Original line number Diff line number Diff line
@@ -17,12 +17,16 @@ There is also an [interactive 3D view](interactive_3d_view_{{var_optics, default 
{{includetext: "

## Getting started with your microscope {pagestep}



Using the software on your microscope is detailed on the website, in the ['control' page].  If you access your microscope from another computer it may be helpful to install [OpenFlexure Connect] on your computer to identify your microscope on your local network. 

Connecting to your microscope is detailed on the website, in the ['control' page], or just [use any web browser].  If you access your microscope from another computer it will be helpful to install [OpenFlexure Connect] on your computer to identify your microscope on your local network. OpenFlexure Connect will also allow you to find and connect to more than one OpenFlexure Microscope on your network simultaneously.



For your first use you will need to set up and calibrate your camera and microscope. The [OpenFlexure Microscope Handbook] will help to guide you through the process. Note that the the handbook covers the OpenFlexure Server pre-release v3, not the stable release, v2.11. The setup and calibration process are similar, but v2.11 does not have the software wizard to guide you through the process.

", if: var_body is not _manual}}



[use any web browser]: https://openflexure.org/projects/microscope/install#use-a-web-browser

[OpenFlexure Connect]: https://openflexure.org/software/openflexure-connect

['control' page]: https://openflexure.org/projects/microscope/control

[OpenFlexure Microscope Handbook]: https://openflexure.gitlab.io/microscope-handbook



## Join the community {pagestep}



OpenFlexure is community project, and we are always delighted to hear from people who have built it on the [OpenFlexure forum](https://openflexure.discourse.group/). The forum is also a great resource for things to do with your microscope, tips and tricks, and others who have built it. Posting photos of your build, pictures taken with the microscope, or even just the fact that you've built it, will all help to keep the project thriving.
 
OpenFlexure is community project, and we are always delighted to hear from people who have built a microscope on the [OpenFlexure forum](https://openflexure.discourse.group/). The forum is also a great resource for things to do with your microscope, tips and tricks, and others who have built it. Posting photos of your build, pictures taken with the microscope, or even just the fact that you've built it, will all help to keep the project thriving.

docs/workaround_motor_electronics/mount_boards_and_upload_firmware.md

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Using the [nano converter plate](fromstep){qty:1} and [nano converter plate grip 


## Upload the firmware {pagestep}



Using the Arduno IDE load the [Sangaboard arduino sketch] onto the Arduino nano, in the same way as you would do for a Sangaboard v0.4.  If you have problems, check the troubleshooting hints below.

Using the Arduino IDE load the [Sangaboard arduino sketch] onto the Arduino Nano. You will need to copy all three files from the sangaboard folder in the link to a location on your computer. Open the `sangaboard.ino` file in the Arduino IDE and then load onto your Arduino Nano as you would for any other Arduino Sketch.  If you have problems, check the troubleshooting hints below.



---