mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
Merge branch 'master' into issue437
This commit is contained in:
Grey-Echo
@@ -138,9 +138,27 @@
|
||||
<h2><a id="#(SPOT)">Type <code>SPOT</code></a></h2>
|
||||
<table class="function_list">
|
||||
<tr>
|
||||
<<<<<<< HEAD
|
||||
<td class="name" nowrap="nowrap"><a href="##(SPOT).IsLasing">SPOT:IsLasing()</a></td>
|
||||
<td class="summary">
|
||||
<p>Check if the SPOT is lasing</p>
|
||||
=======
|
||||
<td class="name" nowrap="nowrap"><a href="##(SPOT).Destroyed">SPOT:Destroyed()</a></td>
|
||||
<td class="summary">
|
||||
<p>Destroyed Trigger for SPOT</p>
|
||||
>>>>>>> master
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="name" nowrap="nowrap"><a href="##(SPOT).LaseOff">SPOT:LaseOff()</a></td>
|
||||
<td class="summary">
|
||||
<p>LaseOff Trigger for SPOT</p>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="name" nowrap="nowrap"><a href="##(SPOT).LaseOn">SPOT:LaseOn()</a></td>
|
||||
<td class="summary">
|
||||
<p>LaseOn Trigger for SPOT</p>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -174,6 +192,15 @@
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<td class="name" nowrap="nowrap"><a href="##(SPOT).OnAfterDestroyed">SPOT:OnAfterDestroyed(From, Event, To)</a></td>
|
||||
<td class="summary">
|
||||
<p>Destroyed Handler OnAfter for SPOT</p>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
>>>>>>> master
|
||||
<td class="name" nowrap="nowrap"><a href="##(SPOT).OnAfterLaseOff">SPOT:OnAfterLaseOff(From, Event, To)</a></td>
|
||||
<td class="summary">
|
||||
<p>LaseOff Handler OnAfter for SPOT</p>
|
||||
@@ -186,6 +213,15 @@
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<td class="name" nowrap="nowrap"><a href="##(SPOT).OnBeforeDestroyed">SPOT:OnBeforeDestroyed(From, Event, To)</a></td>
|
||||
<td class="summary">
|
||||
<p>Destroyed Handler OnBefore for SPOT</p>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
>>>>>>> master
|
||||
<td class="name" nowrap="nowrap"><a href="##(SPOT).OnBeforeLaseOff">SPOT:OnBeforeLaseOff(From, Event, To)</a></td>
|
||||
<td class="summary">
|
||||
<p>LaseOff Handler OnBefore for SPOT</p>
|
||||
@@ -216,7 +252,13 @@
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="name" nowrap="nowrap"><a href="##(SPOT).Spot">SPOT.Spot</a></td>
|
||||
<td class="name" nowrap="nowrap"><a href="##(SPOT).SpotIR">SPOT.SpotIR</a></td>
|
||||
<td class="summary">
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="name" nowrap="nowrap"><a href="##(SPOT).SpotLaser">SPOT.SpotLaser</a></td>
|
||||
<td class="summary">
|
||||
|
||||
</td>
|
||||
@@ -228,6 +270,15 @@
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<td class="name" nowrap="nowrap"><a href="##(SPOT).__Destroyed">SPOT:__Destroyed(Delay)</a></td>
|
||||
<td class="summary">
|
||||
<p>Destroyed Asynchronous Trigger for SPOT</p>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
>>>>>>> master
|
||||
<td class="name" nowrap="nowrap"><a href="##(SPOT).__LaseOff">SPOT:__LaseOff(Delay)</a></td>
|
||||
<td class="summary">
|
||||
<p>LaseOff Asynchronous Trigger for SPOT</p>
|
||||
@@ -281,18 +332,53 @@
|
||||
<dl class="function">
|
||||
<dt>
|
||||
|
||||
<<<<<<< HEAD
|
||||
<a id="#(SPOT).IsLasing" >
|
||||
<strong>SPOT:IsLasing()</strong>
|
||||
=======
|
||||
<a id="#(SPOT).Destroyed" >
|
||||
<strong>SPOT:Destroyed()</strong>
|
||||
>>>>>>> master
|
||||
</a>
|
||||
</dt>
|
||||
<dd>
|
||||
|
||||
<<<<<<< HEAD
|
||||
<p>Check if the SPOT is lasing</p>
|
||||
|
||||
<h3>Return value</h3>
|
||||
|
||||
<p><em>#boolean:</em>
|
||||
true if it is lasing</p>
|
||||
=======
|
||||
<p>Destroyed Trigger for SPOT</p>
|
||||
>>>>>>> master
|
||||
|
||||
</dd>
|
||||
</dl>
|
||||
<dl class="function">
|
||||
<dt>
|
||||
|
||||
<a id="#(SPOT).LaseOff" >
|
||||
<strong>SPOT:LaseOff()</strong>
|
||||
</a>
|
||||
</dt>
|
||||
<dd>
|
||||
|
||||
<p>LaseOff Trigger for SPOT</p>
|
||||
|
||||
</dd>
|
||||
</dl>
|
||||
<dl class="function">
|
||||
<dt>
|
||||
|
||||
<a id="#(SPOT).LaseOn" >
|
||||
<strong>SPOT:LaseOn()</strong>
|
||||
</a>
|
||||
</dt>
|
||||
<dd>
|
||||
|
||||
<p>LaseOn Trigger for SPOT</p>
|
||||
|
||||
</dd>
|
||||
</dl>
|
||||
@@ -389,6 +475,40 @@ true if it is lasing</p>
|
||||
<dl class="function">
|
||||
<dt>
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<a id="#(SPOT).OnAfterDestroyed" >
|
||||
<strong>SPOT:OnAfterDestroyed(From, Event, To)</strong>
|
||||
</a>
|
||||
</dt>
|
||||
<dd>
|
||||
|
||||
<p>Destroyed Handler OnAfter for SPOT</p>
|
||||
|
||||
<h3>Parameters</h3>
|
||||
<ul>
|
||||
<li>
|
||||
|
||||
<p><code><em>#string From </em></code>: </p>
|
||||
|
||||
</li>
|
||||
<li>
|
||||
|
||||
<p><code><em>#string Event </em></code>: </p>
|
||||
|
||||
</li>
|
||||
<li>
|
||||
|
||||
<p><code><em>#string To </em></code>: </p>
|
||||
|
||||
</li>
|
||||
</ul>
|
||||
</dd>
|
||||
</dl>
|
||||
<dl class="function">
|
||||
<dt>
|
||||
|
||||
>>>>>>> master
|
||||
<a id="#(SPOT).OnAfterLaseOff" >
|
||||
<strong>SPOT:OnAfterLaseOff(From, Event, To)</strong>
|
||||
</a>
|
||||
@@ -451,6 +571,45 @@ true if it is lasing</p>
|
||||
<dl class="function">
|
||||
<dt>
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<a id="#(SPOT).OnBeforeDestroyed" >
|
||||
<strong>SPOT:OnBeforeDestroyed(From, Event, To)</strong>
|
||||
</a>
|
||||
</dt>
|
||||
<dd>
|
||||
|
||||
<p>Destroyed Handler OnBefore for SPOT</p>
|
||||
|
||||
<h3>Parameters</h3>
|
||||
<ul>
|
||||
<li>
|
||||
|
||||
<p><code><em>#string From </em></code>: </p>
|
||||
|
||||
</li>
|
||||
<li>
|
||||
|
||||
<p><code><em>#string Event </em></code>: </p>
|
||||
|
||||
</li>
|
||||
<li>
|
||||
|
||||
<p><code><em>#string To </em></code>: </p>
|
||||
|
||||
</li>
|
||||
</ul>
|
||||
<h3>Return value</h3>
|
||||
|
||||
<p><em>#boolean:</em></p>
|
||||
|
||||
|
||||
</dd>
|
||||
</dl>
|
||||
<dl class="function">
|
||||
<dt>
|
||||
|
||||
>>>>>>> master
|
||||
<a id="#(SPOT).OnBeforeLaseOff" >
|
||||
<strong>SPOT:OnBeforeLaseOff(From, Event, To)</strong>
|
||||
</a>
|
||||
@@ -571,8 +730,26 @@ true if it is lasing</p>
|
||||
<dl class="function">
|
||||
<dt>
|
||||
|
||||
<<<<<<< HEAD
|
||||
<a id="#(SPOT).Spot" >
|
||||
<strong>SPOT.Spot</strong>
|
||||
=======
|
||||
<a id="#(SPOT).SpotIR" >
|
||||
<strong>SPOT.SpotIR</strong>
|
||||
</a>
|
||||
</dt>
|
||||
<dd>
|
||||
|
||||
|
||||
|
||||
</dd>
|
||||
</dl>
|
||||
<dl class="function">
|
||||
<dt>
|
||||
|
||||
<a id="#(SPOT).SpotLaser" >
|
||||
<strong>SPOT.SpotLaser</strong>
|
||||
>>>>>>> master
|
||||
</a>
|
||||
</dt>
|
||||
<dd>
|
||||
@@ -597,6 +774,30 @@ true if it is lasing</p>
|
||||
<dl class="function">
|
||||
<dt>
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<a id="#(SPOT).__Destroyed" >
|
||||
<strong>SPOT:__Destroyed(Delay)</strong>
|
||||
</a>
|
||||
</dt>
|
||||
<dd>
|
||||
|
||||
<p>Destroyed Asynchronous Trigger for SPOT</p>
|
||||
|
||||
<h3>Parameter</h3>
|
||||
<ul>
|
||||
<li>
|
||||
|
||||
<p><code><em>#number Delay </em></code>: </p>
|
||||
|
||||
</li>
|
||||
</ul>
|
||||
</dd>
|
||||
</dl>
|
||||
<dl class="function">
|
||||
<dt>
|
||||
|
||||
>>>>>>> master
|
||||
<a id="#(SPOT).__LaseOff" >
|
||||
<strong>SPOT:__LaseOff(Delay)</strong>
|
||||
</a>
|
||||
|
||||
Reference in New Issue
Block a user