Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Olsen committed Mar 17, 2018
2 parents d68fd16 + 8cdf96a commit d0628ae
Show file tree
Hide file tree
Showing 103 changed files with 3,263 additions and 460 deletions.
2 changes: 1 addition & 1 deletion Examples/Teach/Teach.ino
@@ -1,4 +1,4 @@
#include <egoShield.h>
#include <egoShieldTeach.h>

#define ACCELERATION 4000 //Acceleration used during PLAY
#define VELOCITY 2000 //Velocity used during PLAY
Expand Down
6 changes: 6 additions & 0 deletions README.md
Expand Up @@ -18,6 +18,12 @@ http://ustepper.com/egoShield/docs/html/index.html


## Change Log
1.1.0:
- Fixed example code
- Display now shows current position in mm instead of degrees
- Rail now homes as part of the startup routine
- Made it possible to change speed while running

1.0.0:
- changed button debouncing algorithm
- fixed various minor bugs
Expand Down
Binary file added docs/doxygen_sqlite3.db
Binary file not shown.
411 changes: 264 additions & 147 deletions docs/egoShield

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions docs/html/annotated.html
Expand Up @@ -64,13 +64,14 @@
<div class="contents">
<div class="textblock">Here are the classes, structs, unions and interfaces with brief descriptions:</div><div class="directory">
<table class="directory">
<tr id="row_0_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classegoShield.html" target="_self">egoShield</a></td><td class="desc"></td></tr>
<tr id="row_0_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="structbuttons.html" target="_self">buttons</a></td><td class="desc">Struct to hold information required to debounce button </td></tr>
<tr id="row_1_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classegoShield.html" target="_self">egoShield</a></td><td class="desc">Watchdog timer interrupt handler, for examining the buttons periodically </td></tr>
</table>
</div><!-- directory -->
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Generated on Sun Sep 10 2017 07:18:41 for egoShield by &#160;<a href="http://www.doxygen.org/index.html">
Generated on Sat Mar 17 2018 14:11:53 for egoShield by &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.13
</small></address>
Expand Down
66 changes: 41 additions & 25 deletions docs/html/classegoShield-members.html

Large diffs are not rendered by default.

523 changes: 462 additions & 61 deletions docs/html/classegoShield.html

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions docs/html/classes.html
Expand Up @@ -62,19 +62,20 @@
<div class="title">Class Index</div> </div>
</div><!--header-->
<div class="contents">
<div class="qindex"><a class="qindex" href="#letter_e">e</a></div>
<div class="qindex"><a class="qindex" href="#letter_b">b</a>&#160;|&#160;<a class="qindex" href="#letter_e">e</a></div>
<table class="classindex">
<tr><td rowspan="2" valign="bottom"><a name="letter_e"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;e&#160;&#160;</div></td></tr></table>
<tr><td rowspan="2" valign="bottom"><a name="letter_b"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;b&#160;&#160;</div></td></tr></table>
</td><td rowspan="2" valign="bottom"><a name="letter_e"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;e&#160;&#160;</div></td></tr></table>
</td><td></td></tr>
<tr><td></td></tr>
<tr><td valign="top"><a class="el" href="classegoShield.html">egoShield</a>&#160;&#160;&#160;</td><td></td></tr>
<tr><td></td><td></td></tr>
<tr><td valign="top"><a class="el" href="structbuttons.html">buttons</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classegoShield.html">egoShield</a>&#160;&#160;&#160;</td><td></td></tr>
<tr><td></td><td></td><td></td></tr>
</table>
<div class="qindex"><a class="qindex" href="#letter_e">e</a></div>
<div class="qindex"><a class="qindex" href="#letter_b">b</a>&#160;|&#160;<a class="qindex" href="#letter_e">e</a></div>
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Generated on Sun Sep 10 2017 07:18:41 for egoShield by &#160;<a href="http://www.doxygen.org/index.html">
Generated on Sat Mar 17 2018 14:11:53 for egoShield by &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.13
</small></address>
Expand Down
12 changes: 6 additions & 6 deletions docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
Expand Up @@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
<meta name="generator" content="Doxygen 1.8.13"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>egoShield: C:/Users/Mogens/Documents/Git/egoShield/src Directory Reference</title>
<title>egoShield: /c/Users/Thomas/Documents/Arduino/libraries/egoShieldTeach/src Directory Reference</title>
<link href="tabs.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
Expand Down Expand Up @@ -69,17 +69,17 @@
<table class="memberdecls">
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="files"></a>
Files</h2></td></tr>
<tr class="memitem:egoShield_8cpp"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="egoShield_8cpp.html">egoShield.cpp</a> <a href="egoShield_8cpp_source.html">[code]</a></td></tr>
<tr class="memdesc:egoShield_8cpp"><td class="mdescLeft">&#160;</td><td class="mdescRight">Class implementations for the <a class="el" href="classegoShield.html">egoShield</a> library. <br /></td></tr>
<tr class="memitem:egoShieldTeach_8cpp"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="egoShieldTeach_8cpp.html">egoShieldTeach.cpp</a> <a href="egoShieldTeach_8cpp_source.html">[code]</a></td></tr>
<tr class="memdesc:egoShieldTeach_8cpp"><td class="mdescLeft">&#160;</td><td class="mdescRight">Class implementations for the <a class="el" href="classegoShield.html" title="Watchdog timer interrupt handler, for examining the buttons periodically. ">egoShield</a> Teach library. <br /></td></tr>
<tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:egoShield_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="egoShield_8h.html">egoShield.h</a> <a href="egoShield_8h_source.html">[code]</a></td></tr>
<tr class="memdesc:egoShield_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Function prototypes and definitions for the <a class="el" href="classegoShield.html">egoShield</a> library. <br /></td></tr>
<tr class="memitem:egoShieldTeach_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="egoShieldTeach_8h.html">egoShieldTeach.h</a> <a href="egoShieldTeach_8h_source.html">[code]</a></td></tr>
<tr class="memdesc:egoShieldTeach_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Function prototypes and definitions for the <a class="el" href="classegoShield.html" title="Watchdog timer interrupt handler, for examining the buttons periodically. ">egoShield</a> library. <br /></td></tr>
<tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
</table>
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Generated on Sun Sep 10 2017 07:18:41 for egoShield by &#160;<a href="http://www.doxygen.org/index.html">
Generated on Sat Mar 17 2018 14:11:53 for egoShield by &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.13
</small></address>
Expand Down
105 changes: 105 additions & 0 deletions docs/html/egoShieldTeach_8cpp.html
@@ -0,0 +1,105 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
<meta name="generator" content="Doxygen 1.8.13"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>egoShield: /c/Users/Thomas/Documents/Arduino/libraries/egoShieldTeach/src/egoShieldTeach.cpp File Reference</title>
<link href="tabs.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
<link href="search/search.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="search/searchdata.js"></script>
<script type="text/javascript" src="search/search.js"></script>
<link href="doxygen.css" rel="stylesheet" type="text/css" />
</head>
<body>
<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
<div id="titlearea">
<table cellspacing="0" cellpadding="0">
<tbody>
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">egoShield
</div>
</td>
</tr>
</tbody>
</table>
</div>
<!-- end header part -->
<!-- Generated by Doxygen 1.8.13 -->
<script type="text/javascript">
var searchBox = new SearchBox("searchBox", "search",false,'Search');
</script>
<script type="text/javascript" src="menudata.js"></script>
<script type="text/javascript" src="menu.js"></script>
<script type="text/javascript">
$(function() {
initMenu('',true,false,'search.php','Search');
$(document).ready(function() { init_search(); });
});
</script>
<div id="main-nav"></div>
<!-- window showing the filter options -->
<div id="MSearchSelectWindow"
onmouseover="return searchBox.OnSearchSelectShow()"
onmouseout="return searchBox.OnSearchSelectHide()"
onkeydown="return searchBox.OnSearchSelectKey(event)">
</div>

<!-- iframe showing the search results (closed by default) -->
<div id="MSearchResultsWindow">
<iframe src="javascript:void(0)" frameborder="0"
name="MSearchResults" id="MSearchResults">
</iframe>
</div>

<div id="nav-path" class="navpath">
<ul>
<li class="navelem"><a class="el" href="dir_68267d1309a1af8e8297ef4c3efbcdba.html">src</a></li> </ul>
</div>
</div><!-- top -->
<div class="header">
<div class="summary">
<a href="#func-members">Functions</a> &#124;
<a href="#var-members">Variables</a> </div>
<div class="headertitle">
<div class="title">egoShieldTeach.cpp File Reference</div> </div>
</div><!--header-->
<div class="contents">

<p>Class implementations for the <a class="el" href="classegoShield.html" title="Watchdog timer interrupt handler, for examining the buttons periodically. ">egoShield</a> Teach library.
<a href="#details">More...</a></p>
<div class="textblock"><code>#include &quot;<a class="el" href="egoShieldTeach_8h_source.html">egoShieldTeach.h</a>&quot;</code><br />
</div>
<p><a href="egoShieldTeach_8cpp_source.html">Go to the source code of this file.</a></p>
<table class="memberdecls">
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
Functions</h2></td></tr>
<tr class="memitem:a319b165efb2bddcda34dbf7edadceddd"><td class="memItemLeft" align="right" valign="top"><a id="a319b165efb2bddcda34dbf7edadceddd"></a>
void&#160;</td><td class="memItemRight" valign="bottom"><b>WDT_vect</b> (void)</td></tr>
<tr class="separator:a319b165efb2bddcda34dbf7edadceddd"><td class="memSeparator" colspan="2">&#160;</td></tr>
</table><table class="memberdecls">
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="var-members"></a>
Variables</h2></td></tr>
<tr class="memitem:a12128c997febe32401eee2dc9c5eb728"><td class="memItemLeft" align="right" valign="top"><a id="a12128c997febe32401eee2dc9c5eb728"></a>
<a class="el" href="classegoShield.html">egoShield</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>egoPointer</b></td></tr>
<tr class="separator:a12128c997febe32401eee2dc9c5eb728"><td class="memSeparator" colspan="2">&#160;</td></tr>
</table>
<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
<div class="textblock"><p>Class implementations for the <a class="el" href="classegoShield.html" title="Watchdog timer interrupt handler, for examining the buttons periodically. ">egoShield</a> Teach library. </p>
<p>This file contains the implementations of the classes defined in <a class="el" href="egoShieldTeach_8h.html" title="Function prototypes and definitions for the egoShield library. ">egoShieldTeach.h</a></p>
<dl class="section author"><dt>Author</dt><dd>Mogens Groth Nicolaisen (<a href="#" onclick="location.href='mai'+'lto:'+'mog'+'en'+'s@u'+'st'+'epp'+'er'+'.co'+'m'; return false;">mogen<span style="display: none;">.nosp@m.</span>s@us<span style="display: none;">.nosp@m.</span>teppe<span style="display: none;">.nosp@m.</span>r.co<span style="display: none;">.nosp@m.</span>m</a>) </dd></dl>

<p class="definition">Definition in file <a class="el" href="egoShieldTeach_8cpp_source.html">egoShieldTeach.cpp</a>.</p>
</div></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Generated on Sat Mar 17 2018 14:11:53 for egoShield by &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.13
</small></address>
</body>
</html>
136 changes: 136 additions & 0 deletions docs/html/egoShieldTeach_8cpp_source.html

Large diffs are not rendered by default.

0 comments on commit d0628ae

Please sign in to comment.