diff --git a/img/gnal_100ft_v3_spindle_bottom.png b/img/gnal_100ft_v3_spindle_bottom.png new file mode 100644 index 0000000..23a1eff Binary files /dev/null and b/img/gnal_100ft_v3_spindle_bottom.png differ diff --git a/img/gnal_100ft_v3_spindle_top.png b/img/gnal_100ft_v3_spindle_top.png new file mode 100644 index 0000000..e31b44f Binary files /dev/null and b/img/gnal_100ft_v3_spindle_top.png differ diff --git a/img/gnal_50ft_v3_spindle_bottom.png b/img/gnal_50ft_v3_spindle_bottom.png new file mode 100644 index 0000000..23a1eff Binary files /dev/null and b/img/gnal_50ft_v3_spindle_bottom.png differ diff --git a/img/gnal_50ft_v3_spindle_top.png b/img/gnal_50ft_v3_spindle_top.png new file mode 100644 index 0000000..634da74 Binary files /dev/null and b/img/gnal_50ft_v3_spindle_top.png differ diff --git a/libraries/gnal_v3.scad b/libraries/gnal_v3.scad index 1908e75..b6fe5d7 100644 --- a/libraries/gnal_v3.scad +++ b/libraries/gnal_v3.scad @@ -15,6 +15,8 @@ include <./Triangles.scad>; * metric_thread (diameter=10, pitch=1.5, thread_size = 1.6, length=LEN); */ +FINE = 200; + OD = 10 + .5; PITCH = 1.5; THREAD = 1.6; diff --git a/scripts/v3.sh b/scripts/v3.sh index 4e8022c..0546b21 100644 --- a/scripts/v3.sh +++ b/scripts/v3.sh @@ -9,7 +9,9 @@ DIST=./stl IMG=./img NOTES=./notes/${V}.csv -FILES=( "spindle_top" "spindle_bottom" "spacer" "top" "spiral" "quarter_a" "quarter_b" "quarter_c" "quarter_d" "insert_s8" "insert_16" "spacer_16" ) +#"quarter_a" "quarter_b" "quarter_c" "quarter_d" +#quarter pieces not rendering properly +FILES=( "spindle_bottom" "spindle_top" "spacer" "top" "spiral" "insert_s8" "insert_16" "spacer_16" ) SIZES=( "50ft" "100ft" ) mkdir -p $DIST @@ -40,9 +42,10 @@ do end=`date +%s` runtime=$((end-start)) - hash=`sha256sum "$stl" | awk '{ print $1 }'` + fileSize=`wc -c < "$stl"` fileSize=`echo $fileSize | xargs` + if ! [ -x "$(command -v admesh)" ]; then facets="N/A" volume="N/A" @@ -54,6 +57,7 @@ do newSize=`wc -c < "$stl"` newSize=`echo $newSize | xargs` percent=`echo "scale=1;($newSize/$fileSize)*100" | bc` + fileSize="${newSize}" echo "Binary conversion created STL file ${percent}% of original" fi ao=`admesh -c "$stl"` @@ -61,6 +65,8 @@ do volume=`echo "$ao" | grep "Number of parts" | awk '{print $8}'` fi + hash=`sha256sum "$stl" | awk '{ print $1 }'` + line="${VERSION},${CPU},$stl,$hash,$fileSize,$srchash,$srcsize,$facets,$volume,$runtime" echo "$line" >> $NOTES echo "$line" diff --git a/stl/100ft_v3/gnal_100ft_spindle_bottom.stl b/stl/100ft_v3/gnal_100ft_spindle_bottom.stl new file mode 100644 index 0000000..b9019c0 Binary files /dev/null and b/stl/100ft_v3/gnal_100ft_spindle_bottom.stl differ diff --git a/stl/100ft_v3/gnal_100ft_spindle_top.stl b/stl/100ft_v3/gnal_100ft_spindle_top.stl new file mode 100644 index 0000000..53be29e Binary files /dev/null and b/stl/100ft_v3/gnal_100ft_spindle_top.stl differ diff --git a/stl/50ft_v3/gnal_50ft_spindle_bottom.stl b/stl/50ft_v3/gnal_50ft_spindle_bottom.stl new file mode 100644 index 0000000..70807db Binary files /dev/null and b/stl/50ft_v3/gnal_50ft_spindle_bottom.stl differ diff --git a/stl/50ft_v3/gnal_50ft_spindle_top.stl b/stl/50ft_v3/gnal_50ft_spindle_top.stl new file mode 100644 index 0000000..af0f376 Binary files /dev/null and b/stl/50ft_v3/gnal_50ft_spindle_top.stl differ