Skip to content

Commit

Permalink
Merge branch 'master' into hall_effect
Browse files Browse the repository at this point in the history
  • Loading branch information
scottbez1 committed Aug 4, 2018
2 parents 48552ef + 8bdf98f commit 5acd453
Show file tree
Hide file tree
Showing 12 changed files with 105 additions and 6,848 deletions.
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# DIY Split-Flap Display

This is a work in progress DIY [split-flap display](https://en.wikipedia.org/wiki/Split-flap_display).
Prototype three-character display: [video](https://www.youtube.com/watch?v=bslkflVv-Hw).
Prototype four-character display: [video](https://www.youtube.com/watch?v=vq4o_88kN8g).

![animated rendering](https://s3.amazonaws.com/splitflap-travis/branches/hall_effect/3d_animation.gif)
[![prototype video](renders/prototypeVideoThumbnail.jpg)](https://www.youtube.com/watch?v=bslkflVv-Hw)
[![prototype video](renders/prototypeVideoThumbnail.jpg)](https://www.youtube.com/watch?v=vq4o_88kN8g)

[![Build Status](https://travis-ci.org/scottbez1/splitflap.svg?branch=hall_effect)](https://travis-ci.org/scottbez1/splitflap)

Expand All @@ -16,6 +16,9 @@ The 3d model is built using OpenSCAD in `3d/splitflap.scad`, the driver board is

You can view an interactive 3d model of the design on the [project website](https://scottbez1.github.io/splitflap/).

Want to help support prototyping and development?
<a href="https://www.buymeacoffee.com/scottbez1" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" height="22" ></a>

### Current Status ###
This design is currently at a *prototype* stage. The source files provided here were able to produce multiple working prototypes, but may still have some minor issues and/or incomplete documentation.

Expand Down Expand Up @@ -230,7 +233,7 @@ I'd love to hear your thoughts and questions about this project, and happy to in

The vast majority of this project is licensed under Apache v2 (see [LICENSE.txt](LICENSE.txt) for full details).

Copyright 2015-2016 Scott Bezek and the splitflap contributors
Copyright 2015-2018 Scott Bezek and the splitflap contributors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ <h1>Welcome</h1>
errors/omissions), but I wouldn't necessarily recommend building your own quite yet, until there
are fewer bugs, better documentation, and an improved instruction guide.
</p>
<iframe class="video" width="560" height="315" src="https://www.youtube.com/embed/bslkflVv-Hw" frameborder="0" allowfullscreen></iframe>
<iframe class="video" width="560" height="315" src="https://www.youtube.com/embed/vq4o_88kN8g" frameborder="0" allowfullscreen></iframe>
<h1>Open source, up to date</h1>
<a href="https://s3.amazonaws.com/splitflap-travis/branches/master/schematic.pdf">
<img class="floater right_float" src="https://s3.amazonaws.com/splitflap-travis/branches/master/schematic.png" title="Driver schematic"/>
Expand Down Expand Up @@ -102,7 +102,7 @@ <h3>License</h3>
details).
</p>
<pre>
Copyright 2015-2016 Scott Bezek and the splitflap contributors
Copyright 2015-2018 Scott Bezek and the splitflap contributors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Binary file removed renders/animation.gif
Binary file not shown.
3,461 changes: 0 additions & 3,461 deletions renders/order_v0.2_cbee392.svg

This file was deleted.

3,382 changes: 0 additions & 3,382 deletions renders/orderf659842.svg

This file was deleted.

Binary file removed renders/pcb_2016-03-16_887bf82.zip
Binary file not shown.
Binary file modified renders/prototypeVideoThumbnail.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed renders/raster.png
Binary file not shown.
Binary file removed renders/splitflap-brd.png
Binary file not shown.
7 changes: 7 additions & 0 deletions scripts/video_thumb/generate_thumbnail.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"

VIDEO_ID="vq4o_88kN8g"

curl https://img.youtube.com/vi/$VIDEO_ID/maxresdefault.jpg | convert - -resize 400x "$DIR/play_button.png" -gravity center -composite -format jpg -quality 90 "$DIR/../../renders/prototypeVideoThumbnail.jpg"
Binary file added scripts/video_thumb/play_button.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
90 changes: 90 additions & 0 deletions scripts/video_thumb/play_button.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5acd453

Please sign in to comment.