From 801371150427f605ddd246a55f4e96d39229842a Mon Sep 17 00:00:00 2001 From: Werner Almesberger Date: Tue, 3 Aug 2010 11:00:29 -0300 Subject: [PATCH] The git to SVN gateway presents index.html as source and not as plain HTML at the moment, so we keep the old page on www.almesberger.net for now. - web/style.sh (BASE): introduced URL prefix - web/Makefile: upload only index.html to www.almesberger.net - index.html: regenerated, for consistency (it currently doesn't serve any purpose) --- index.html | 322 +++++++++++++++++++++++++-------------------------- web/Makefile | 4 +- web/style.sh | 7 +- 3 files changed, 167 insertions(+), 166 deletions(-) diff --git a/index.html b/index.html index 3f21e91..d27404d 100644 --- a/index.html +++ b/index.html @@ -48,38 +48,38 @@ If a file is 1 MB of bigger, its size is indicated. Complete device. Bottom up. -
+ - + - +
X/Y step size: 1 mm.
Z resolution: DRAFT
Approximate scan time: 1.5 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV) 		X/Y step size: 500 μm.
Z resolution: 25 μm.
Approximate scan time: 10 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV) 		X/Y step size: 100 μm.
Z resolution: 25 μm.
Approximate scan time: 53 h
-PIJ 4.9 MB -DXF 5.9 MB -STL 9.1 MB -TXT(CSV) 1.5 MB +PIJ 4.9 MB +DXF 5.9 MB +STL 9.1 MB +TXT(CSV) 1.5 MB

@@ -96,9 +96,9 @@ Approximate scan time: 53 h
Battery and cover removed. Bottom up.
- @@ -106,19 +106,19 @@ Approximate scan time: 53 h
X/Y step size: 1 mm.
Z resolution: DRAFT
Approximate scan time: 4 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV)
+ - +

Under consideration

X/Y step size: 500 μm.
Z resolution: 25 μm.
Approximate scan time: 11.5 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV) 		X/Y step size: 100 μm.
@@ -176,38 +176,38 @@ Approximate scan time: 53 h
LCD module on PCB. Display side.
-
+ - + - +
X/Y step size: 1 mm.
Z resolution: DRAFT
Approximate scan time: 1 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV) 		X/Y step size: 500 μm.
Z resolution: 25 μm.
Approximate scan time: 3 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV) 		X/Y step size: 100 μm.
Z resolution: 25 μm.
Approximate scan time: 34 h
-PIJ 3.4 MB -DXF 3.7 MB -STL 5.5 MB -TXT(CSV) 1.0 MB +PIJ 3.4 MB +DXF 3.7 MB +STL 5.5 MB +TXT(CSV) 1.0 MB

@@ -243,38 +243,38 @@ by the scanner's needle, leaving what appears to be a ragged edge. -
+ - + - +
X/Y step size: 1 mm.
Z resolution: DRAFT
Approximate scan time: 1 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV) 		X/Y step size: 500 μm.
Z resolution: 25 μm.
Approximate scan time: 5 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV) 		X/Y step size: 100 μm.
Z resolution: 25 μm.
Approximate scan time: 34 h
-PIJ 3.2 MB -DXF 3.8 MB -STL 6.2 MB -TXT(CSV) 1.0 MB +PIJ 3.2 MB +DXF 3.8 MB +STL 6.2 MB +TXT(CSV) 1.0 MB

@@ -291,38 +291,38 @@ Approximate scan time: 34 h
Battery cover. Outside.
-
+ - + - +
X/Y step size: 1 mm.
Z resolution: DRAFT
Approximate scan time: 1.5 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV) 		X/Y step size: 500 μm.
Z resolution: 25 μm.
Approximate scan time: 3 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV) 		X/Y step size: 100 μm.
Z resolution: 25 μm.
Approximate scan time: 20 h
-PIJ 1.9 MB -DXF 1.8 MB -STL 2.8 MB -TXT(CSV) +PIJ 1.9 MB +DXF 1.8 MB +STL 2.8 MB +TXT(CSV)

@@ -339,38 +339,38 @@ Approximate scan time: 20 h
Battery cover. Inside.
-
+ - + - +
X/Y step size: 1 mm.
Z resolution: DRAFT
Approximate scan time: 1.5 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV) 		X/Y step size: 500 μm.
Z resolution: 25 μm.
Approximate scan time: 5 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV) 		X/Y step size: 100 μm.
Z resolution: 25 μm.
Approximate scan time: 33.5 h
-PIJ 1.9 MB -DXF 1.9 MB -STL 2.9 MB -TXT(CSV) +PIJ 1.9 MB +DXF 1.9 MB +STL 2.9 MB +TXT(CSV)

@@ -387,27 +387,27 @@ Approximate scan time: 33.5 h
Main PCB. Component side.
-
+ - +
X/Y step size: 1 mm.
Z resolution: DRAFT
Approximate scan time: 2.5 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV) 		X/Y step size: 500 μm.
Z resolution: 25 μm.
Approximate scan time: 8.5 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV)

@@ -437,38 +437,38 @@ leaving some small dents and deformations.
-
+ - + - +
X/Y step size: 1 mm.
Z resolution: DRAFT
Approximate scan time: 4 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV) 		X/Y step size: 500 μm.
Z resolution: 25 μm.
Approximate scan time: 12 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV) 		X/Y step size: 100 μm.
Z resolution: 25 μm.
Approximate scan time: 58 h
-PIJ 4.8 MB -DXF 5.5 MB -STL 8.3 MB -TXT(CSV) 1.4 MB +PIJ 4.8 MB +DXF 5.5 MB +STL 8.3 MB +TXT(CSV) 1.4 MB

@@ -485,7 +485,7 @@ Approximate scan time: 58 h
Display shell, base structure. Back side.
-
+

In progress

@@ -495,10 +495,10 @@ Approximate scan time: 58 h
X/Y step size: 1 mm.
Z resolution: DRAFT
Approximate scan time: 1 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV) 		X/Y step size: 500 μm.
@@ -553,19 +553,19 @@ Approximate scan time: 50 h
 -
+
-
+
-
+
@@ -576,10 +576,10 @@ Approximate scan time: 50 h
Approximate scan time: 5.5 h
X/Y step size: 100 μm.
Z resolution: 25 μm.
-PIJ -DXF -STL 1.0 MB -TXT(CSV) +PIJ +DXF +STL 1.0 MB +TXT(CSV)
@@ -590,10 +590,10 @@ Z resolution: 25 μm.
Approximate scan time: 1.5 h
X/Y step size: 100 μm.
Z resolution: 25 μm.
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV) @@ -604,10 +604,10 @@ Z resolution: 25 μm.
Approximate scan time: 6.75 h
X/Y step size: 100 μm.
Z resolution: 25 μm.
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV)

@@ -637,13 +637,13 @@ Z resolution: 25 μm.
-
+
-
+
@@ -664,10 +664,10 @@ Note: I added a 1 mm wedge between the
speaker and the hinge to hold the PCB Approximate scan time: 11.5 h
X/Y step size: 100 μm.
Z resolution: 25 μm.
-PIJ -DXF -STL 1.2 MB -TXT(CSV) +PIJ +DXF +STL 1.2 MB +TXT(CSV) @@ -678,10 +678,10 @@ Z resolution: 25 μm.
Approximate scan time: 0.25 h
X/Y step size: 100 μm.
Z resolution: 25 μm.
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV)

@@ -719,27 +719,27 @@ show the hinge correctly. -
+ - +
X/Y step size: 1 mm.
Z resolution: DRAFT
Approximate scan time: 4 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV) 		X/Y step size: 500 μm.
Z resolution: 25 μm.
Approximate scan time: 14 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV)

@@ -769,31 +769,31 @@ show the hinge correctly.
-
+ - +
X/Y step size: 1 mm.
Z resolution: DRAFT
Approximate scan time: 4 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV) 		X/Y step size: 500 μm.
Z resolution: 25 μm.
Approximate scan time: 11 h
-PIJ -DXF -STL -TXT(CSV) +PIJ +DXF +STL +TXT(CSV)

-2010-08-03 12:40:00 UTC +2010-08-03 13:57:32 UTC diff --git a/web/Makefile b/web/Makefile index a0eb4eb..5f84322 100644 --- a/web/Makefile +++ b/web/Makefile @@ -3,11 +3,11 @@ all: ../index.html # -# @@@ upload is obsolete, maybe even unnecessary (TBD) +# remove once a better place for index.html has been found # upload: ../index.html - rsync -v --progress * \ + rsync -v --progress $< \ werner@host:/home/httpd/almesberger/misc/ben/scan/ ../index.html: style.sh index.sh diff --git a/web/style.sh b/web/style.sh index 906de3b..182e386 100644 --- a/web/style.sh +++ b/web/style.sh @@ -1,5 +1,6 @@ #!/bin/sh +BASE=http://projects.qi-hardware.com/index.php/p/ben-scans/source/tree/master/ # ----- section --------------------------------------------------------------- @@ -87,7 +88,7 @@ image() { __do_before_image cat < + EOF } @@ -149,7 +150,7 @@ link() else size="`echo $size | awk '{printf("%.1f MB", $1/1000000)}'`" fi - echo "$2 $size" + echo "$2 $size" } @@ -249,7 +250,7 @@ cat < -
+
EOF }