Skip to content

Commit 76e4521

Browse files
committed
Merge branch 'beta'
The test case has been built - Merge changes from beta.
2 parents 189a192 + 339c5eb commit 76e4521

19 files changed

+372
-235
lines changed

.dockerignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
**/.git
2+
**/.github
3+
**/export
4+
**/thumbnails
5+
**/legacy
210 KB
Binary file not shown.
244 KB
Binary file not shown.

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ OPENSCAD_OPTIONS=-q
33
STL_SORTER=lib/sort_stl.py
44
IMAGE_OPTIONS=--imgsize=1024,768 --colorscheme "Tomorrow Night" --render true -D orient_for_printing=false
55
THUMBNAIL_OPTIONS=--imgsize=400,300 --colorscheme "Tomorrow Night" --render true -D fast=true -D orient_for_printing=false
6+
LOGO_USE_PREBUILD=true
67

78
SHELL=bash
89

@@ -56,7 +57,7 @@ render/assembly.gif: assembly.scad $(SRCS)
5657
define logo-part-rule
5758
export/logo/$(1)/$(shell basename $(2))-$(4)-$(3).stl: src/$(2).scad logo/$(1)/$(shell basename $(2)).svg export/$(2).stl
5859
@mkdir -p $$(shell dirname $$@)
59-
$$(OPENSCAD) $$(OPENSCAD_OPTIONS) -D orient_for_printing=true -D logo_enabled=true -D logo_use_prebuild=true -D 'logo_mode="$(4)"' -D 'logo_part="$(3)"' -D 'logo_name="$(1)"' -o $$@ $$<
60+
$$(OPENSCAD) $$(OPENSCAD_OPTIONS) -D orient_for_printing=true -D logo_enabled=true -D logo_use_prebuild=$(LOGO_USE_PREBUILD) -D 'logo_mode="$(4)"' -D 'logo_part="$(3)"' -D 'logo_name="$(1)"' -o $$@ $$<
6061
$$(STL_SORTER) $$@
6162
logo-$1-$4: export/logo/$(1)/$(shell basename $(2))-$(4)-$(3).stl
6263
logo-$1: export/logo/$(1)/$(shell basename $(2))-$(4)-$(3).stl

README.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,16 @@ git submodule update --init --recursive
2424

2525
## About the files
2626

27+
We expect a recent version of OpenSCAD, for development we currently use OpenSCAD 2021.
28+
2729
This repository contains a lot of files for different options
2830

2931
* The `export/` folder contains the latest prebuilt `.stl` files for 3D printing.
3032
You can use those unless you want to make customizations. If you contribute
3133
changes to the models, you can refresh the models you changed using the
32-
``make export-all`` command.
34+
``make export-all`` command. If your ``openscad`` binary does not reside
35+
in ``/usr/bin/openscad`` you can specify its location by overriding the
36+
``OPENSCAD`` variable like so (substitute your specific openscad path): ``make -j OPENSCAD=/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD``
3337
* The `legacy/` folder contains old versions of the case, including lots of
3438
variants that were created but unmaintained. These were built with
3539
proprietary software packages and often available in their native format(s)
@@ -201,6 +205,14 @@ the magnets.
201205

202206
![Mounting/HandlebarRail](./render/thumbnails/Mounting/HandlebarRail.png)
203207

208+
An alternative Handlebar rail can be mounted like most bike computers with a
209+
rubber o ring;
210+
![Mounting/HandlebarRailOring](./render/thumbnails/Mounting/HandlebarRailOring.png)
211+
212+
Often you find magnets where one magnet is strong enough for your display - you
213+
can use a platic decoy to save on magnets in these cases
214+
![Mounting/DisplayMagnetDummy](./render/thumbnails/Mounting/DisplayMagnetDummy.png)
215+
204216
#### Bike rack mount
205217

206218
The bike rack mount can be used to attach a "Top Rider" main case to a standard

lib/utils.scad

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ include <../variables.scad>
22

33
use <./Round-Anything/polyround.scad>
44

5+
function remove_conseq_dupes(list) = [for (i = [0 : 1 : len(list) - 2]) if (!((abs(list[i][0] - list[i+1][0])<0.01) && (abs(list[i][1] - list[i+1][1])<0.01))) list[i]];
6+
57

68
module mirrorCopy(v, mirrorOffset=0) {
79
children();

logo/OpenBikeSensor/MainCase.svg

Lines changed: 24 additions & 24 deletions
Loading

0 commit comments

Comments
 (0)