Skip to content

Commit

Permalink
1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Trusty77
Trusty77 committed Apr 2, 2018
1 parent 09908d5 commit e57ffaf
Show file tree
Hide file tree
Showing 67 changed files with 764 additions and 183 deletions.
Binary file modified DCCpp.zip
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions examples/MaxiDcc/MaxiDcc.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,19 +140,23 @@ void loop()
DCCpp::setFunctionsMain(2, locoId, locoFunctions);
break;

case DCCINT(100, 0):
case EVENT_TURNOUT1:
if (turn1.isActivated())
turn1.inactivate();
else
turn1.activate();
break;

case DCCINT(20, 0):
case EVENT_TURNOUT2:
if (turn2.isActivated())
turn2.inactivate();
else
turn2.activate();
break;


}
}

2 changes: 1 addition & 1 deletion extras/Doc/Comm_8h_source.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
<ul>
<li class="navelem"><a class="el" href="dir_d41d8cd98f00b204e9800998ecf8427e.html">src</a></li><li class="navelem"><b>Comm.h</b></li>
<li class="footer">Generated on mar. janv. 9 2018 20:54:46 for DCCpp &nbsp; by
<li class="footer">Generated on lun. avr. 2 2018 10:45:19 for DCCpp &nbsp; by
<a href="http://www.copperspice.com/documentation-doxypress.html">
<img class="footer" src="doxypress.png" alt="DoxyPress"/></a> 1.2.10 </li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions extras/Doc/Config_8h_source.html
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions extras/Doc/CurrentMonitor_8cpp_source.html
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions extras/Doc/CurrentMonitor_8h_source.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
<div class="clear-floats"></div>
</div><!--header-->
<div class="contents">
<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno"> 1</span>&#160;<span class="comment">/**********************************************************************</span></div><div class="line"><a name="l00002"></a><span class="lineno"> 2</span>&#160;<span class="comment"></span></div><div class="line"><a name="l00003"></a><span class="lineno"> 3</span>&#160;<span class="comment">CurrentMonitor.h</span></div><div class="line"><a name="l00004"></a><span class="lineno"> 4</span>&#160;<span class="comment">COPYRIGHT (c) 2013-2016 Gregg E. Berman</span></div><div class="line"><a name="l00005"></a><span class="lineno"> 5</span>&#160;<span class="comment"></span></div><div class="line"><a name="l00006"></a><span class="lineno"> 6</span>&#160;<span class="comment">Part of DCC++ BASE STATION for the Arduino</span></div><div class="line"><a name="l00007"></a><span class="lineno"> 7</span>&#160;<span class="comment"></span></div><div class="line"><a name="l00008"></a><span class="lineno"> 8</span>&#160;<span class="comment">**********************************************************************/</span></div><div class="line"><a name="l00009"></a><span class="lineno"> 9</span>&#160;</div><div class="line"><a name="l00010"></a><span class="lineno"> 10</span>&#160;<span class="preprocessor">#ifndef CurrentMonitor_h</span></div><div class="line"><a name="l00011"></a><span class="lineno"> 11</span>&#160;<span class="preprocessor">#define CurrentMonitor_h</span></div><div class="line"><a name="l00012"></a><span class="lineno"> 12</span>&#160;</div><div class="line"><a name="l00014"></a><span class="lineno"> 14</span>&#160;<span class="preprocessor">#define CURRENT_SAMPLE_SMOOTHING 0.01</span></div><div class="line"><a name="l00015"></a><span class="lineno"> 15</span>&#160;</div><div class="line"><a name="l00019"></a><span class="lineno"> 19</span>&#160;<span class="preprocessor">#if defined(ARDUINO_AVR_UNO) || defined(ARDUINO_AVR_NANO) // Configuration for UNO</span></div><div class="line"><a name="l00020"></a><span class="lineno"> 20</span>&#160;<span class="preprocessor"> #define CURRENT_SAMPLE_TIME 10</span></div><div class="line"><a name="l00021"></a><span class="lineno"> 21</span>&#160;<span class="preprocessor">#else // Configuration for MEGA </span></div><div class="line"><a name="l00022"></a><span class="lineno"> 22</span>&#160;<span class="preprocessor"> #define CURRENT_SAMPLE_TIME 1</span></div><div class="line"><a name="l00023"></a><span class="lineno"> 23</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00024"></a><span class="lineno"> 24</span>&#160;</div><div class="line"><a name="l00027"></a><span class="lineno"><a class="line" href="structCurrentMonitor.html"> 27</a></span>&#160;<span class="keyword">struct </span><a class="code" href="structCurrentMonitor.html">CurrentMonitor</a>{</div><div class="line"><a name="l00028"></a><span class="lineno"><a class="line" href="structCurrentMonitor.html#ac4ebbe3141ce8efde47e5b55259a6998"> 28</a></span>&#160; <span class="keyword">static</span> <span class="keywordtype">long</span> <span class="keywordtype">int</span> <a class="code" href="structCurrentMonitor.html#ac4ebbe3141ce8efde47e5b55259a6998">sampleTime</a>; </div><div class="line"><a name="l00029"></a><span class="lineno"><a class="line" href="structCurrentMonitor.html#aeabac9491522ec7f68102bfeab33d5c1"> 29</a></span>&#160; <span class="keywordtype">int</span> <a class="code" href="structCurrentMonitor.html#aeabac9491522ec7f68102bfeab33d5c1">pin</a>; </div><div class="line"><a name="l00030"></a><span class="lineno"><a class="line" href="structCurrentMonitor.html#ae04eb956c01d669583be386c2400a6ed"> 30</a></span>&#160; <span class="keywordtype">float</span> <a class="code" href="structCurrentMonitor.html#ae04eb956c01d669583be386c2400a6ed">currentSampleMax</a>; </div><div class="line"><a name="l00031"></a><span class="lineno"><a class="line" href="structCurrentMonitor.html#af9653d31acfffa5a40aa709b2065e00b"> 31</a></span>&#160; <span class="keywordtype">float</span> <a class="code" href="structCurrentMonitor.html#af9653d31acfffa5a40aa709b2065e00b">current</a>; </div><div class="line"><a name="l00032"></a><span class="lineno"><a class="line" href="structCurrentMonitor.html#a2c3cb87d009c003069b9a90f020f8a9f"> 32</a></span>&#160; <span class="keyword">const</span> <span class="keywordtype">char</span> *<a class="code" href="structCurrentMonitor.html#a2c3cb87d009c003069b9a90f020f8a9f">msg</a>; </div><div class="line"><a name="l00038"></a><span class="lineno"> 38</span>&#160; <span class="keywordtype">void</span> <a class="code" href="structCurrentMonitor.html#a02f9ea5e724c59e5325100488b068ac9">begin</a>(<span class="keywordtype">int</span> pin, <span class="keyword">const</span> <span class="keywordtype">char</span> *msg, <span class="keywordtype">float</span> inSampleMax = 300);</div><div class="line"><a name="l00041"></a><span class="lineno"> 41</span>&#160; <span class="keyword">static</span> <span class="keywordtype">boolean</span> <a class="code" href="structCurrentMonitor.html#aa1551a05a2069e54f59fd50984884199">checkTime</a>();</div><div class="line"><a name="l00044"></a><span class="lineno"> 44</span>&#160; <span class="keywordtype">void</span> <a class="code" href="structCurrentMonitor.html#a83f8adca24e250bfb5c9a90a35503ae9">check</a>();</div><div class="line"><a name="l00045"></a><span class="lineno"> 45</span>&#160;};</div><div class="line"><a name="l00046"></a><span class="lineno"> 46</span>&#160;</div><div class="line"><a name="l00047"></a><span class="lineno"> 47</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00048"></a><span class="lineno"> 48</span>&#160;</div><div class="ttc" id="structCurrentMonitor_html_a02f9ea5e724c59e5325100488b068ac9"><div class="ttname"><a href="structCurrentMonitor.html#a02f9ea5e724c59e5325100488b068ac9">CurrentMonitor::begin</a></div><div class="ttdeci">void begin(int pin, const char *msg, float inSampleMax = 300)</div><div class="ttdef"><b>Definition:</b> <a href="CurrentMonitor_8cpp_source.html#l00016">CurrentMonitor.cpp:16</a></div></div>
<div class="ttc" id="structCurrentMonitor_html_a83f8adca24e250bfb5c9a90a35503ae9"><div class="ttname"><a href="structCurrentMonitor.html#a83f8adca24e250bfb5c9a90a35503ae9">CurrentMonitor::check</a></div><div class="ttdeci">void check()</div><div class="ttdef"><b>Definition:</b> <a href="CurrentMonitor_8cpp_source.html#l00032">CurrentMonitor.cpp:32</a></div></div>
<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno"> 1</span>&#160;<span class="comment">/**********************************************************************</span></div><div class="line"><a name="l00002"></a><span class="lineno"> 2</span>&#160;<span class="comment"></span></div><div class="line"><a name="l00003"></a><span class="lineno"> 3</span>&#160;<span class="comment">CurrentMonitor.h</span></div><div class="line"><a name="l00004"></a><span class="lineno"> 4</span>&#160;<span class="comment">COPYRIGHT (c) 2013-2016 Gregg E. Berman</span></div><div class="line"><a name="l00005"></a><span class="lineno"> 5</span>&#160;<span class="comment"></span></div><div class="line"><a name="l00006"></a><span class="lineno"> 6</span>&#160;<span class="comment">Part of DCC++ BASE STATION for the Arduino</span></div><div class="line"><a name="l00007"></a><span class="lineno"> 7</span>&#160;<span class="comment"></span></div><div class="line"><a name="l00008"></a><span class="lineno"> 8</span>&#160;<span class="comment">**********************************************************************/</span></div><div class="line"><a name="l00009"></a><span class="lineno"> 9</span>&#160;</div><div class="line"><a name="l00010"></a><span class="lineno"> 10</span>&#160;<span class="preprocessor">#ifndef CurrentMonitor_h</span></div><div class="line"><a name="l00011"></a><span class="lineno"> 11</span>&#160;<span class="preprocessor">#define CurrentMonitor_h</span></div><div class="line"><a name="l00012"></a><span class="lineno"> 12</span>&#160;</div><div class="line"><a name="l00014"></a><span class="lineno"> 14</span>&#160;<span class="preprocessor">#define CURRENT_SAMPLE_SMOOTHING 0.01</span></div><div class="line"><a name="l00015"></a><span class="lineno"> 15</span>&#160;</div><div class="line"><a name="l00019"></a><span class="lineno"> 19</span>&#160;<span class="preprocessor">#if defined(ARDUINO_AVR_UNO) || defined(ARDUINO_AVR_NANO) // Configuration for UNO</span></div><div class="line"><a name="l00020"></a><span class="lineno"> 20</span>&#160;<span class="preprocessor"> #define CURRENT_SAMPLE_TIME 10</span></div><div class="line"><a name="l00021"></a><span class="lineno"> 21</span>&#160;<span class="preprocessor">#else // Configuration for MEGA </span></div><div class="line"><a name="l00022"></a><span class="lineno"> 22</span>&#160;<span class="preprocessor"> #define CURRENT_SAMPLE_TIME 1</span></div><div class="line"><a name="l00023"></a><span class="lineno"> 23</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00024"></a><span class="lineno"> 24</span>&#160;</div><div class="line"><a name="l00027"></a><span class="lineno"><a class="line" href="structCurrentMonitor.html"> 27</a></span>&#160;<span class="keyword">struct </span><a class="code" href="structCurrentMonitor.html">CurrentMonitor</a>{</div><div class="line"><a name="l00028"></a><span class="lineno"><a class="line" href="structCurrentMonitor.html#ac4ebbe3141ce8efde47e5b55259a6998"> 28</a></span>&#160; <span class="keyword">static</span> <span class="keywordtype">long</span> <span class="keywordtype">int</span> <a class="code" href="structCurrentMonitor.html#ac4ebbe3141ce8efde47e5b55259a6998">sampleTime</a>; </div><div class="line"><a name="l00029"></a><span class="lineno"><a class="line" href="structCurrentMonitor.html#aeabac9491522ec7f68102bfeab33d5c1"> 29</a></span>&#160; <span class="keywordtype">int</span> <a class="code" href="structCurrentMonitor.html#aeabac9491522ec7f68102bfeab33d5c1">pin</a>; </div><div class="line"><a name="l00030"></a><span class="lineno"><a class="line" href="structCurrentMonitor.html#ae04eb956c01d669583be386c2400a6ed"> 30</a></span>&#160; <span class="keywordtype">float</span> <a class="code" href="structCurrentMonitor.html#ae04eb956c01d669583be386c2400a6ed">currentSampleMax</a>; </div><div class="line"><a name="l00031"></a><span class="lineno"><a class="line" href="structCurrentMonitor.html#af9653d31acfffa5a40aa709b2065e00b"> 31</a></span>&#160; <span class="keywordtype">float</span> <a class="code" href="structCurrentMonitor.html#af9653d31acfffa5a40aa709b2065e00b">current</a>; </div><div class="line"><a name="l00032"></a><span class="lineno"><a class="line" href="structCurrentMonitor.html#a2c3cb87d009c003069b9a90f020f8a9f"> 32</a></span>&#160; <span class="keyword">const</span> <span class="keywordtype">char</span> *<a class="code" href="structCurrentMonitor.html#a2c3cb87d009c003069b9a90f020f8a9f">msg</a>; </div><div class="line"><a name="l00038"></a><span class="lineno"> 38</span>&#160; <span class="keywordtype">void</span> <a class="code" href="structCurrentMonitor.html#a02f9ea5e724c59e5325100488b068ac9">begin</a>(<span class="keywordtype">int</span> pin, <span class="keyword">const</span> <span class="keywordtype">char</span> *msg, <span class="keywordtype">float</span> inSampleMax = 300);</div><div class="line"><a name="l00041"></a><span class="lineno"> 41</span>&#160; <span class="keyword">static</span> <span class="keywordtype">boolean</span> <a class="code" href="structCurrentMonitor.html#aa1551a05a2069e54f59fd50984884199">checkTime</a>();</div><div class="line"><a name="l00044"></a><span class="lineno"> 44</span>&#160; <span class="keywordtype">void</span> <a class="code" href="structCurrentMonitor.html#a83f8adca24e250bfb5c9a90a35503ae9">check</a>();</div><div class="line"><a name="l00045"></a><span class="lineno"> 45</span>&#160;};</div><div class="line"><a name="l00046"></a><span class="lineno"> 46</span>&#160;</div><div class="line"><a name="l00047"></a><span class="lineno"> 47</span>&#160;<span class="preprocessor">#endif</span></div><div class="line"><a name="l00048"></a><span class="lineno"> 48</span>&#160;</div><div class="ttc" id="structCurrentMonitor_html_a83f8adca24e250bfb5c9a90a35503ae9"><div class="ttname"><a href="structCurrentMonitor.html#a83f8adca24e250bfb5c9a90a35503ae9">CurrentMonitor::check</a></div><div class="ttdeci">void check()</div><div class="ttdef"><b>Definition:</b> <a href="CurrentMonitor_8cpp_source.html#l00032">CurrentMonitor.cpp:32</a></div></div>
<div class="ttc" id="structCurrentMonitor_html_a02f9ea5e724c59e5325100488b068ac9"><div class="ttname"><a href="structCurrentMonitor.html#a02f9ea5e724c59e5325100488b068ac9">CurrentMonitor::begin</a></div><div class="ttdeci">void begin(int pin, const char *msg, float inSampleMax = 300)</div><div class="ttdef"><b>Definition:</b> <a href="CurrentMonitor_8cpp_source.html#l00016">CurrentMonitor.cpp:16</a></div></div>
<div class="ttc" id="structCurrentMonitor_html_a2c3cb87d009c003069b9a90f020f8a9f"><div class="ttname"><a href="structCurrentMonitor.html#a2c3cb87d009c003069b9a90f020f8a9f">CurrentMonitor::msg</a></div><div class="ttdeci">const char * msg</div><div class="ttdef"><b>Definition:</b> <a href="CurrentMonitor_8h_source.html#l00032">CurrentMonitor.h:32</a></div></div>
<div class="ttc" id="structCurrentMonitor_html_aa1551a05a2069e54f59fd50984884199"><div class="ttname"><a href="structCurrentMonitor.html#aa1551a05a2069e54f59fd50984884199">CurrentMonitor::checkTime</a></div><div class="ttdeci">static boolean checkTime()</div><div class="ttdef"><b>Definition:</b> <a href="CurrentMonitor_8cpp_source.html#l00024">CurrentMonitor.cpp:24</a></div></div>
<div class="ttc" id="structCurrentMonitor_html_af9653d31acfffa5a40aa709b2065e00b"><div class="ttname"><a href="structCurrentMonitor.html#af9653d31acfffa5a40aa709b2065e00b">CurrentMonitor::current</a></div><div class="ttdeci">float current</div><div class="ttdef"><b>Definition:</b> <a href="CurrentMonitor_8h_source.html#l00031">CurrentMonitor.h:31</a></div></div>
Expand All @@ -110,7 +110,7 @@
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
<ul>
<li class="navelem"><a class="el" href="dir_d41d8cd98f00b204e9800998ecf8427e.html">src</a></li><li class="navelem"><b>CurrentMonitor.h</b></li>
<li class="footer">Generated on mar. janv. 9 2018 20:54:46 for DCCpp &nbsp; by
<li class="footer">Generated on lun. avr. 2 2018 10:45:19 for DCCpp &nbsp; by
<a href="http://www.copperspice.com/documentation-doxypress.html">
<img class="footer" src="doxypress.png" alt="DoxyPress"/></a> 1.2.10 </li>
</ul>
Expand Down
26 changes: 13 additions & 13 deletions extras/Doc/DCCpp_8cpp_source.html
View file

Large diffs are not rendered by default.

Loading

0 comments on commit e57ffaf

Please sign in to comment.