Skip to content

Commit 1438324

Browse files
sonteksontek
committed
Update documentation
1 parent 958ce4b commit 1438324

File tree

7 files changed

+21
-7
lines changed

7 files changed

+21
-7
lines changed

‎atom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
<li><strong> Soft Real-time network streaming</strong> FFMPEG server and Blender Client for a single camera video stream. This can be found <a href="https://bitbucket.org/italianmarssociety/v-eras-blender/src/42063c0b489152a9f124f80824ad095a752c29ff/scripts/webstream/single%20camera/?at=default">here</a></li>
2121
</ul>
2222
<h2>Under <strong>heavy</strong> Development</h2>
23-
<h2>- Integration of Bodytracking with Telerobotics. The following message format has been decided upon by the mentors and students:</h2>
23+
<ul>
24+
<li>Integration of Bodytracking with Telerobotics. The following message format has been decided upon by the mentors and students:</li>
25+
</ul>
2426
<div class="highlight"><pre><span class="cp"># Attribute definitions for various diagnostic messages</span>
2527
<span class="n">moves</span> <span class="o">=</span> <span class="n">attribute</span><span class="p">(</span><span class="n">label</span><span class="o">=</span><span class="s">"Linear and angular displacement"</span><span class="p">,</span> <span class="n">dtype</span> <span class="o">=</span> <span class="p">(</span><span class="kt">float</span><span class="p">,),</span>
2628
<span class="n">display_level</span> <span class="o">=</span> <span class="n">DispLevel</span><span class="p">.</span><span class="n">EXPERT</span><span class="p">,</span>

‎blog/2015/06/24/the-half-life-of-telerobotics/index.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ <h2>Deliverables</h2>
8484
<li><strong> Soft Real-time network streaming</strong> FFMPEG server and Blender Client for a single camera video stream. This can be found <a href="https://bitbucket.org/italianmarssociety/v-eras-blender/src/42063c0b489152a9f124f80824ad095a752c29ff/scripts/webstream/single%20camera/?at=default">here</a></li>
8585
</ul>
8686
<h2>Under <strong>heavy</strong> Development</h2>
87-
<h2>- Integration of Bodytracking with Telerobotics. The following message format has been decided upon by the mentors and students:</h2>
87+
<ul>
88+
<li>Integration of Bodytracking with Telerobotics. The following message format has been decided upon by the mentors and students:</li>
89+
</ul>
8890
<div class="highlight"><pre><span class="cp"># Attribute definitions for various diagnostic messages</span>
8991
<span class="n">moves</span> <span class="o">=</span> <span class="n">attribute</span><span class="p">(</span><span class="n">label</span><span class="o">=</span><span class="s">&quot;Linear and angular displacement&quot;</span><span class="p">,</span> <span class="n">dtype</span> <span class="o">=</span> <span class="p">(</span><span class="kt">float</span><span class="p">,),</span>
9092
<span class="n">display_level</span> <span class="o">=</span> <span class="n">DispLevel</span><span class="p">.</span><span class="n">EXPERT</span><span class="p">,</span>

‎feeds/all-en.atom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
&lt;li&gt;&lt;strong&gt; Soft Real-time network streaming&lt;/strong&gt; FFMPEG server and Blender Client for a single camera video stream. This can be found &lt;a href="https://bitbucket.org/italianmarssociety/v-eras-blender/src/42063c0b489152a9f124f80824ad095a752c29ff/scripts/webstream/single%20camera/?at=default"&gt;here&lt;/a&gt;&lt;/li&gt;
2121
&lt;/ul&gt;
2222
&lt;h2&gt;Under &lt;strong&gt;heavy&lt;/strong&gt; Development&lt;/h2&gt;
23-
&lt;h2&gt;- Integration of Bodytracking with Telerobotics. The following message format has been decided upon by the mentors and students:&lt;/h2&gt;
23+
&lt;ul&gt;
24+
&lt;li&gt;Integration of Bodytracking with Telerobotics. The following message format has been decided upon by the mentors and students:&lt;/li&gt;
25+
&lt;/ul&gt;
2426
&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="cp"&gt;# Attribute definitions for various diagnostic messages&lt;/span&gt;
2527
&lt;span class="n"&gt;moves&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="n"&gt;attribute&lt;/span&gt;&lt;span class="p"&gt;(&lt;/span&gt;&lt;span class="n"&gt;label&lt;/span&gt;&lt;span class="o"&gt;=&lt;/span&gt;&lt;span class="s"&gt;&amp;quot;Linear and angular displacement&amp;quot;&lt;/span&gt;&lt;span class="p"&gt;,&lt;/span&gt; &lt;span class="n"&gt;dtype&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="p"&gt;(&lt;/span&gt;&lt;span class="kt"&gt;float&lt;/span&gt;&lt;span class="p"&gt;,),&lt;/span&gt;
2628
&lt;span class="n"&gt;display_level&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="n"&gt;DispLevel&lt;/span&gt;&lt;span class="p"&gt;.&lt;/span&gt;&lt;span class="n"&gt;EXPERT&lt;/span&gt;&lt;span class="p"&gt;,&lt;/span&gt;

‎feeds/all.atom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
&lt;li&gt;&lt;strong&gt; Soft Real-time network streaming&lt;/strong&gt; FFMPEG server and Blender Client for a single camera video stream. This can be found &lt;a href="https://bitbucket.org/italianmarssociety/v-eras-blender/src/42063c0b489152a9f124f80824ad095a752c29ff/scripts/webstream/single%20camera/?at=default"&gt;here&lt;/a&gt;&lt;/li&gt;
2121
&lt;/ul&gt;
2222
&lt;h2&gt;Under &lt;strong&gt;heavy&lt;/strong&gt; Development&lt;/h2&gt;
23-
&lt;h2&gt;- Integration of Bodytracking with Telerobotics. The following message format has been decided upon by the mentors and students:&lt;/h2&gt;
23+
&lt;ul&gt;
24+
&lt;li&gt;Integration of Bodytracking with Telerobotics. The following message format has been decided upon by the mentors and students:&lt;/li&gt;
25+
&lt;/ul&gt;
2426
&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="cp"&gt;# Attribute definitions for various diagnostic messages&lt;/span&gt;
2527
&lt;span class="n"&gt;moves&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="n"&gt;attribute&lt;/span&gt;&lt;span class="p"&gt;(&lt;/span&gt;&lt;span class="n"&gt;label&lt;/span&gt;&lt;span class="o"&gt;=&lt;/span&gt;&lt;span class="s"&gt;&amp;quot;Linear and angular displacement&amp;quot;&lt;/span&gt;&lt;span class="p"&gt;,&lt;/span&gt; &lt;span class="n"&gt;dtype&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="p"&gt;(&lt;/span&gt;&lt;span class="kt"&gt;float&lt;/span&gt;&lt;span class="p"&gt;,),&lt;/span&gt;
2628
&lt;span class="n"&gt;display_level&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="n"&gt;DispLevel&lt;/span&gt;&lt;span class="p"&gt;.&lt;/span&gt;&lt;span class="n"&gt;EXPERT&lt;/span&gt;&lt;span class="p"&gt;,&lt;/span&gt;

‎feeds/gsoc.atom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
&lt;li&gt;&lt;strong&gt; Soft Real-time network streaming&lt;/strong&gt; FFMPEG server and Blender Client for a single camera video stream. This can be found &lt;a href="https://bitbucket.org/italianmarssociety/v-eras-blender/src/42063c0b489152a9f124f80824ad095a752c29ff/scripts/webstream/single%20camera/?at=default"&gt;here&lt;/a&gt;&lt;/li&gt;
2121
&lt;/ul&gt;
2222
&lt;h2&gt;Under &lt;strong&gt;heavy&lt;/strong&gt; Development&lt;/h2&gt;
23-
&lt;h2&gt;- Integration of Bodytracking with Telerobotics. The following message format has been decided upon by the mentors and students:&lt;/h2&gt;
23+
&lt;ul&gt;
24+
&lt;li&gt;Integration of Bodytracking with Telerobotics. The following message format has been decided upon by the mentors and students:&lt;/li&gt;
25+
&lt;/ul&gt;
2426
&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="cp"&gt;# Attribute definitions for various diagnostic messages&lt;/span&gt;
2527
&lt;span class="n"&gt;moves&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="n"&gt;attribute&lt;/span&gt;&lt;span class="p"&gt;(&lt;/span&gt;&lt;span class="n"&gt;label&lt;/span&gt;&lt;span class="o"&gt;=&lt;/span&gt;&lt;span class="s"&gt;&amp;quot;Linear and angular displacement&amp;quot;&lt;/span&gt;&lt;span class="p"&gt;,&lt;/span&gt; &lt;span class="n"&gt;dtype&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="p"&gt;(&lt;/span&gt;&lt;span class="kt"&gt;float&lt;/span&gt;&lt;span class="p"&gt;,),&lt;/span&gt;
2628
&lt;span class="n"&gt;display_level&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="n"&gt;DispLevel&lt;/span&gt;&lt;span class="p"&gt;.&lt;/span&gt;&lt;span class="n"&gt;EXPERT&lt;/span&gt;&lt;span class="p"&gt;,&lt;/span&gt;

‎feeds/siddhant-shrivastava.atom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
&lt;li&gt;&lt;strong&gt; Soft Real-time network streaming&lt;/strong&gt; FFMPEG server and Blender Client for a single camera video stream. This can be found &lt;a href="https://bitbucket.org/italianmarssociety/v-eras-blender/src/42063c0b489152a9f124f80824ad095a752c29ff/scripts/webstream/single%20camera/?at=default"&gt;here&lt;/a&gt;&lt;/li&gt;
2121
&lt;/ul&gt;
2222
&lt;h2&gt;Under &lt;strong&gt;heavy&lt;/strong&gt; Development&lt;/h2&gt;
23-
&lt;h2&gt;- Integration of Bodytracking with Telerobotics. The following message format has been decided upon by the mentors and students:&lt;/h2&gt;
23+
&lt;ul&gt;
24+
&lt;li&gt;Integration of Bodytracking with Telerobotics. The following message format has been decided upon by the mentors and students:&lt;/li&gt;
25+
&lt;/ul&gt;
2426
&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="cp"&gt;# Attribute definitions for various diagnostic messages&lt;/span&gt;
2527
&lt;span class="n"&gt;moves&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="n"&gt;attribute&lt;/span&gt;&lt;span class="p"&gt;(&lt;/span&gt;&lt;span class="n"&gt;label&lt;/span&gt;&lt;span class="o"&gt;=&lt;/span&gt;&lt;span class="s"&gt;&amp;quot;Linear and angular displacement&amp;quot;&lt;/span&gt;&lt;span class="p"&gt;,&lt;/span&gt; &lt;span class="n"&gt;dtype&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="p"&gt;(&lt;/span&gt;&lt;span class="kt"&gt;float&lt;/span&gt;&lt;span class="p"&gt;,),&lt;/span&gt;
2628
&lt;span class="n"&gt;display_level&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="n"&gt;DispLevel&lt;/span&gt;&lt;span class="p"&gt;.&lt;/span&gt;&lt;span class="n"&gt;EXPERT&lt;/span&gt;&lt;span class="p"&gt;,&lt;/span&gt;

‎feeds/siddhant-shrivastava.rss.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
&lt;li&gt;&lt;strong&gt; Soft Real-time network streaming&lt;/strong&gt; FFMPEG server and Blender Client for a single camera video stream. This can be found &lt;a href="https://bitbucket.org/italianmarssociety/v-eras-blender/src/42063c0b489152a9f124f80824ad095a752c29ff/scripts/webstream/single%20camera/?at=default"&gt;here&lt;/a&gt;&lt;/li&gt;
2121
&lt;/ul&gt;
2222
&lt;h2&gt;Under &lt;strong&gt;heavy&lt;/strong&gt; Development&lt;/h2&gt;
23-
&lt;h2&gt;- Integration of Bodytracking with Telerobotics. The following message format has been decided upon by the mentors and students:&lt;/h2&gt;
23+
&lt;ul&gt;
24+
&lt;li&gt;Integration of Bodytracking with Telerobotics. The following message format has been decided upon by the mentors and students:&lt;/li&gt;
25+
&lt;/ul&gt;
2426
&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span class="cp"&gt;# Attribute definitions for various diagnostic messages&lt;/span&gt;
2527
&lt;span class="n"&gt;moves&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="n"&gt;attribute&lt;/span&gt;&lt;span class="p"&gt;(&lt;/span&gt;&lt;span class="n"&gt;label&lt;/span&gt;&lt;span class="o"&gt;=&lt;/span&gt;&lt;span class="s"&gt;&amp;quot;Linear and angular displacement&amp;quot;&lt;/span&gt;&lt;span class="p"&gt;,&lt;/span&gt; &lt;span class="n"&gt;dtype&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="p"&gt;(&lt;/span&gt;&lt;span class="kt"&gt;float&lt;/span&gt;&lt;span class="p"&gt;,),&lt;/span&gt;
2628
&lt;span class="n"&gt;display_level&lt;/span&gt; &lt;span class="o"&gt;=&lt;/span&gt; &lt;span class="n"&gt;DispLevel&lt;/span&gt;&lt;span class="p"&gt;.&lt;/span&gt;&lt;span class="n"&gt;EXPERT&lt;/span&gt;&lt;span class="p"&gt;,&lt;/span&gt;

0 commit comments

Comments
 (0)