From: Bdale Garbee <bdale@gag.com>
Date: Thu, 16 Aug 2018 17:28:43 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/web/gag.com
X-Git-Url: https://git.gag.com/?p=web%2Fgag.com;a=commitdiff_plain;h=39c4f97d84db1ceb4aec00d3669278f92e06514b;hp=60c5c591c9a27d1f772ab3de907a3d226175d209

Merge branch 'master' of ssh://git.gag.com/scm/git/web/gag.com
---

diff --git a/bdale/blog/posts/Mixed_Emotions_On_Debian_Anniversary.mdwn b/bdale/blog/posts/Mixed_Emotions_On_Debian_Anniversary.mdwn
index be0c3b5..ea29eeb 100644
--- a/bdale/blog/posts/Mixed_Emotions_On_Debian_Anniversary.mdwn
+++ b/bdale/blog/posts/Mixed_Emotions_On_Debian_Anniversary.mdwn
@@ -21,8 +21,7 @@ won something like 18 Grammy awards, the Presidential Medal of Freedom,
 and other honors too numerous to list.  She will be missed.
 
 What's the connection, if any, between these two?  In 2002, in the 
-[platform I wrote as a candidate for election as Debian Project Leader]
-(https://www.debian.org/vote/2002/platforms/bdale), 
+[platform I wrote as a candidate for election as Debian Project Leader](https://www.debian.org/vote/2002/platforms/bdale), 
 I wrote that "working on Debian is my way of expressing my most strongly 
 held beliefs about freedom, choice, quality, and utility."  Over the years,
 I've come to think of 
diff --git a/bdale/talks/2018/debconf/ElectronicsBOF.odp b/bdale/talks/2018/debconf/ElectronicsBOF.odp
new file mode 100644
index 0000000..9a4ab5d
Binary files /dev/null and b/bdale/talks/2018/debconf/ElectronicsBOF.odp differ
diff --git a/rockets/research/2018-batch-01.mdwn b/rockets/research/2018-batch-01.mdwn
index 4f18b0f..acc163b 100755
--- a/rockets/research/2018-batch-01.mdwn
+++ b/rockets/research/2018-batch-01.mdwn
@@ -26,20 +26,25 @@ batch size of 5kg:
 This formula is completely fluid with 225F indicated on the Presto Multicooker,
 but viscosity is noticeabley lower making for easier pouring at 250-275F.
 
-These grains were cast on <date>.
+Grain fill lines 120.6mm from the bottom of the casting tube.
+
+These grains were cast on 2018-07-05.
 
 ## Results ##
 
-Average casting tube weight <mumble>g.
+Had to cut about 11mm length off one grain to make things fit, chose to do
+this to the grain with rough core.
 
-* Grain 1, g gross, g net
-* Grain 2, g gross, g net
-* Grain 3, g gross, g net
-* Grain 4, g gross, g net
-* Grain 5, g gross, g net
-* Grain 6, g gross, g net
-* Grain 7, g gross, g net
+* Grain 1, 670g gross, 17.63g casting tube, g net propellant
+* Grain 2, 668g gross, 17.55g casting tube, g net propellant
+* Grain 3, 674g gross, 17.72g casting tube, g net propellant
+* Grain 4, 672g gross, 17.76g casting tube, g net propellant	*** pre trim ***
+* Grain 4, 610g gross, 17.76g casting tube, g net propellant
+* Grain 5, 664g gross, 17.70g casting tube, g net propellant
+* Grain 6, 666g gross, 17.61g casting tube, g net propellant
+* Grain 7, 668g gross, 17.64g casting tube, g net propellant
 
+Average casting tube weight <mumble>g.
 Total propellant load <mumble>g.  
 
 Revised simulation says this will be...