index.html.itex: Add conclusions for salt, hardware, and software

diff --git a/Makefile b/Makefile
index 6fa0f2c8e806350e87205010c102473c02283e6e..093da053a76035a82ecc82bf0858ac9955a4cc33 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,7 @@ THUMBNAILS = \
        $(DEST)/afm-3d-fw-fh.png \
        $(DEST)/contact-afm.ogv \
        $(DEST)/afm-fw-fh.png \
+       $(DEST)/afm-hw-hh.png \
        $(DEST)/piezo-fw-fh.png \
        $(DEST)/unfolding-fw-fh.png \
        $(DEST)/unfolding-hw-fh.png \
@@ -33,6 +34,7 @@ THUMBNAILS = \
        $(DEST)/apparatus-fw-fh.png \
        $(DEST)/labview-fw-fh.png \
        $(DEST)/pyafm-fw-fh.png \
+       $(DEST)/pyafm-hw-hh.png \
        $(DEST)/ants-fw-fh.png \
        $(DEST)/cantilever.jpg \
        $(DEST)/tip.jpg \

diff --git a/index.html.itex b/index.html.itex
index dbe6854b4a3514865047ca60079a106e232ad5df..12e3a7d9bb4b33a245bc76144d130c1476b298a8 100644 (file)
--- a/index.html.itex
+++ b/index.html.itex
@@ -898,6 +898,58 @@ index 60741c6..e76b118 100644
                                                        <li><a href="#/8" class="active">Conclusions</a></li>
                                                </ol>
                                        </section>
+                                       <section>
+                                               <h2>Conclusions: Salt</h2>
+                                               <ul>
+                                                       <li>
+                                                               Prelimiary results show the expected destabilizing
+                                                               effect of CaCl₂
+                                                       </li>
+                                                       <li>More contextual data!
+                                                               <ul>
+                                                                       <li>Pulling speeds</li>
+                                                                       <li>Salt concentrations (physiological levels)</li>
+                                                                       <li>Salt species</li>
+                                                               </ul>
+                                                       </li>
+                                                       <li>Mutated proteins?
+                                                               <ul>
+                                                                       <li>Is glutamic acid special?</li>
+                                                               </ul>
+                                                       </li>
+                                               </ul>
+                                       </section>
+                                       <section>
+                                               <h2>Conclusions: Hardware</h2>
+                                               <table class="center">
+                                                       <tr>
+                                                               <td style="vertical-align: top;">
+                                                                       <img src="media/build/afm-hw-hh.png" />
+                                                               </td>
+                                                               <td>
+                                                                       <p>For automatic control, it would be nice to have…</p>
+                                                                       <ul>
+                                                                               <li>Piezos with capacitive feedback ($10k an axis)</li>
+                                                                               <li>Independent 4-segment photodiode readout</li>
+                                                                               <li>Control over photodiode positioning</li>
+                                                                               <li>Control over laser alignment</li>
+                                                                       </ul>
+                                                               </td>
+                                                       </tr>
+                                               </table>
+                                       </section>
+                                       <section>
+                                               <h2>Conclusions: Software</h2>
+                                               <p>
+                                                       <img src="media/build/pyafm-hw-hh.png" />
+                                               </p>
+                                               <p style="text-align: left;">
+                                                       Everything works for me, and I expect it will work for
+                                                       others… but no software (except
+                                                       maybe <a href="http://en.wikipedia.org/wiki/TeX#Development">TeX</a>)
+                                                       is without bugs.  Testers welcome!
+                                               </p>
+                                       </section>
                                </section>
                                <section>
                                        <section>