commit 60aded585a8115434c542b85602fc399010a376e
parent 045d701c5dbed457206710896a0dded06d9f2fa3
Author: rob <rob@tarina.org>
Date: Mon, 2 Dec 2019 18:00:51 +0200
Merge branch 'master' of https://github.com/rbckman/tarina
Diffstat:
13 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/3d/tarina-body.stl b/3d/tarina-body.stl
Binary files differ.
diff --git a/3d/tarina-mic-body.stl b/3d/tarina-mic-body.stl
Binary files differ.
diff --git a/3d/tarina-mic-lid.stl b/3d/tarina-mic-lid.stl
Binary files differ.
diff --git a/3d/tarina-picamera-body-lid.stl b/3d/tarina-picamera-body-lid.stl
Binary files differ.
diff --git a/3d/tarina-picamera-body.stl b/3d/tarina-picamera-body.stl
Binary files differ.
diff --git a/3d/tarina-plate.stl b/3d/tarina-plate.stl
Binary files differ.
diff --git a/3d/tarina-right-side.stl b/3d/tarina-right-side.stl
Binary files differ.
diff --git a/3d/tarina-screen-lid.stl b/3d/tarina-screen-lid.stl
Binary files differ.
diff --git a/3d/tarina-viewfinder.stl b/3d/tarina-viewfinder.stl
Binary files differ.
diff --git a/3d/tarina.blend b/3d/tarina.blend
Binary files differ.
diff --git a/docs/tarina-manual.html b/docs/tarina-manual.html
@@ -100,7 +100,7 @@
<img src="tarina-build.jpg" alt="Tarina parts layed out" />
<p class="caption">Tarina parts layed out</p>
</div>
-<p>Here is a list of parts that will work, there are other parts that probably will work but this is what I recommend.</p>
+<p>Here is a list of parts that will work, there are other parts that probably will work but requires some hacking.</p>
<h2 id="raspberry-pi-3-b">Raspberry pi 3 B</h2>
<p>Price ~30 eur</p>
<p>The heart of Tarina. Why Raspberry pi you ask? There are several reasons:</p>
diff --git a/docs/tarina-manual.md b/docs/tarina-manual.md
@@ -116,7 +116,7 @@ Get the parts
![Tarina parts layed out](tarina-build.jpg)
-Here is a list of parts that will work, there are other parts that probably will work but this is what I recommend.
+Here is a list of parts that will work, there are other parts that probably will work but requires some hacking.
Raspberry pi 3 B
diff --git a/docs/tarina-manual.pdf b/docs/tarina-manual.pdf
Binary files differ.