Merge pull request #80 from sinricpro/dev-2.5.1

Dev 2.5.1

Author: sivar2311

changelog.md

@@ -1,4 +1,11 @@
 # Changelog
+## Version 2.5.1
+New:
+- added IP and MAC address to header
+
+## Version 2.5.0
+New:
+- Speaker device supports SelectInput
 
 ## Version 2.4.0
 New:

docs/_sinric_pro_blinds_8h_source.html

@@ -121,16 +121,16 @@
 <div class="line"><a name="l00022"></a><span class="lineno"><a class="line" href="class_sinric_pro_blinds.html">   22</a></span>&#160;<span class="keyword">class </span><a class="code" href="class_sinric_pro_blinds.html">SinricProBlinds</a> :  <span class="keyword">public</span> <a class="code" href="class_sinric_pro_device.html">SinricProDevice</a> {</div>
 <div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;  <span class="keyword">public</span>:</div>
 <div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;      <a class="code" href="class_sinric_pro_blinds.html">SinricProBlinds</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* deviceId, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> eventWaitTime=100);</div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160; </div>
-<div class="line"><a name="l00039"></a><span class="lineno"><a class="line" href="class_sinric_pro_blinds.html#a191ba7fd2f28b1892bc8ba7374089285">   39</a></span>&#160;    <span class="keyword">typedef</span> std::function&lt;bool(<span class="keyword">const</span> String&amp;, <span class="keywordtype">int</span>&amp;)&gt; <a class="code" href="class_sinric_pro_blinds.html#a191ba7fd2f28b1892bc8ba7374089285">SetPositionCallback</a>;</div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160; </div>
-<div class="line"><a name="l00055"></a><span class="lineno"><a class="line" href="class_sinric_pro_blinds.html#a4f6fdf591b948dc44154c33df5b8fb97">   55</a></span>&#160;    <span class="keyword">typedef</span> std::function&lt;bool(<span class="keyword">const</span> String&amp;, <span class="keywordtype">int</span>&amp;)&gt; <a class="code" href="class_sinric_pro_blinds.html#a4f6fdf591b948dc44154c33df5b8fb97">AdjustPositionCallback</a>;</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160; </div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;    <span class="keywordtype">void</span> <a class="code" href="class_sinric_pro_blinds.html#a5e67c0c58e46d4e0ad1b811df1119cde">onSetPosition</a>(<a class="code" href="class_sinric_pro_blinds.html#a191ba7fd2f28b1892bc8ba7374089285">SetPositionCallback</a> cb);</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    <span class="keywordtype">void</span> <a class="code" href="class_sinric_pro_blinds.html#a02b6fde78fad6ca77d5b14286199bad9">onAdjustPosition</a>(<a class="code" href="class_sinric_pro_blinds.html#a4f6fdf591b948dc44154c33df5b8fb97">AdjustPositionCallback</a> cb);</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160; </div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;    <span class="keywordtype">bool</span> <a class="code" href="class_sinric_pro_blinds.html#afd759f3d5859aee024c587a596378f46">sendPositionEvent</a>(<span class="keywordtype">int</span> position, String cause = <span class="stringliteral">&quot;PHYSICAL_INTERACTION&quot;</span>);</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160; </div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;    String getProductType() { <span class="keywordflow">return</span> SinricProDevice::getProductType() + String(<span class="stringliteral">&quot;BLIND&quot;</span>); }</div>
+<div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160; </div>
+<div class="line"><a name="l00040"></a><span class="lineno"><a class="line" href="class_sinric_pro_blinds.html#a191ba7fd2f28b1892bc8ba7374089285">   40</a></span>&#160;    <span class="keyword">typedef</span> std::function&lt;bool(<span class="keyword">const</span> String&amp;, <span class="keywordtype">int</span>&amp;)&gt; <a class="code" href="class_sinric_pro_blinds.html#a191ba7fd2f28b1892bc8ba7374089285">SetPositionCallback</a>;</div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160; </div>
+<div class="line"><a name="l00056"></a><span class="lineno"><a class="line" href="class_sinric_pro_blinds.html#a4f6fdf591b948dc44154c33df5b8fb97">   56</a></span>&#160;    <span class="keyword">typedef</span> std::function&lt;bool(<span class="keyword">const</span> String&amp;, <span class="keywordtype">int</span>&amp;)&gt; <a class="code" href="class_sinric_pro_blinds.html#a4f6fdf591b948dc44154c33df5b8fb97">AdjustPositionCallback</a>;</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160; </div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    <span class="keywordtype">void</span> <a class="code" href="class_sinric_pro_blinds.html#a5e67c0c58e46d4e0ad1b811df1119cde">onSetPosition</a>(<a class="code" href="class_sinric_pro_blinds.html#a191ba7fd2f28b1892bc8ba7374089285">SetPositionCallback</a> cb);</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;    <span class="keywordtype">void</span> <a class="code" href="class_sinric_pro_blinds.html#a02b6fde78fad6ca77d5b14286199bad9">onAdjustPosition</a>(<a class="code" href="class_sinric_pro_blinds.html#a4f6fdf591b948dc44154c33df5b8fb97">AdjustPositionCallback</a> cb);</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160; </div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;    <span class="keywordtype">bool</span> <a class="code" href="class_sinric_pro_blinds.html#afd759f3d5859aee024c587a596378f46">sendPositionEvent</a>(<span class="keywordtype">int</span> position, String cause = <span class="stringliteral">&quot;PHYSICAL_INTERACTION&quot;</span>);</div>
 <div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;    <span class="comment">// handle</span></div>
 <div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    <span class="keywordtype">bool</span> handleRequest(<span class="keyword">const</span> <span class="keywordtype">char</span>* deviceId, <span class="keyword">const</span> <span class="keywordtype">char</span>* action, JsonObject &amp;request_value, JsonObject &amp;response_value) <span class="keyword">override</span>;</div>
 <div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;  <span class="keyword">private</span>:</div>
@@ -153,14 +153,14 @@
 <div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;  <span class="keywordflow">if</span> (actionString == <span class="stringliteral">&quot;setRangeValue&quot;</span> &amp;&amp; setPositionCallback) {</div>
 <div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;    <span class="keywordtype">int</span> position = request_value[<span class="stringliteral">&quot;rangeValue&quot;</span>] | 0;</div>
 <div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;    success = setPositionCallback(String(deviceId), position);</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;    response_value[<span class="stringliteral">&quot;rangeValue&quot;</span>] = position;</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;    response_value[<span class="stringliteral">&quot;rangeValue&quot;</span>] = limitValue(position, 0, 100);</div>
 <div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;    <span class="keywordflow">return</span> success;</div>
 <div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;  }</div>
 <div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160; </div>
 <div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;  <span class="keywordflow">if</span> (actionString == <span class="stringliteral">&quot;adjustRangeValue&quot;</span> &amp;&amp; adjustPositionCallback) {</div>
 <div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;    <span class="keywordtype">int</span> positionDelta = request_value[<span class="stringliteral">&quot;rangeValueDelta&quot;</span>] | 0;</div>
 <div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;    success = adjustPositionCallback(String(deviceId), positionDelta);</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;    response_value[<span class="stringliteral">&quot;rangeValue&quot;</span>] = positionDelta;</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;    response_value[<span class="stringliteral">&quot;rangeValue&quot;</span>] = limitValue(positionDelta, 0, 100);</div>
 <div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;    <span class="keywordflow">return</span> success;</div>
 <div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;  }</div>
 <div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160; </div>
@@ -186,8 +186,8 @@
 <div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160; </div>
 </div><!-- fragment --></div><!-- contents -->
 </div><!-- doc-content -->
-<div class="ttc" id="aclass_sinric_pro_blinds_html_a191ba7fd2f28b1892bc8ba7374089285"><div class="ttname"><a href="class_sinric_pro_blinds.html#a191ba7fd2f28b1892bc8ba7374089285">SinricProBlinds::SetPositionCallback</a></div><div class="ttdeci">std::function&lt; bool(const String &amp;, int &amp;)&gt; SetPositionCallback</div><div class="ttdoc">Callback definition for onSetPosition function.</div><div class="ttdef"><b>Definition:</b> SinricProBlinds.h:39</div></div>
-<div class="ttc" id="aclass_sinric_pro_blinds_html_a4f6fdf591b948dc44154c33df5b8fb97"><div class="ttname"><a href="class_sinric_pro_blinds.html#a4f6fdf591b948dc44154c33df5b8fb97">SinricProBlinds::AdjustPositionCallback</a></div><div class="ttdeci">std::function&lt; bool(const String &amp;, int &amp;)&gt; AdjustPositionCallback</div><div class="ttdoc">Callback definition for onAdjustPosition function.</div><div class="ttdef"><b>Definition:</b> SinricProBlinds.h:55</div></div>
+<div class="ttc" id="aclass_sinric_pro_blinds_html_a191ba7fd2f28b1892bc8ba7374089285"><div class="ttname"><a href="class_sinric_pro_blinds.html#a191ba7fd2f28b1892bc8ba7374089285">SinricProBlinds::SetPositionCallback</a></div><div class="ttdeci">std::function&lt; bool(const String &amp;, int &amp;)&gt; SetPositionCallback</div><div class="ttdoc">Callback definition for onSetPosition function.</div><div class="ttdef"><b>Definition:</b> SinricProBlinds.h:40</div></div>
+<div class="ttc" id="aclass_sinric_pro_blinds_html_a4f6fdf591b948dc44154c33df5b8fb97"><div class="ttname"><a href="class_sinric_pro_blinds.html#a4f6fdf591b948dc44154c33df5b8fb97">SinricProBlinds::AdjustPositionCallback</a></div><div class="ttdeci">std::function&lt; bool(const String &amp;, int &amp;)&gt; AdjustPositionCallback</div><div class="ttdoc">Callback definition for onAdjustPosition function.</div><div class="ttdef"><b>Definition:</b> SinricProBlinds.h:56</div></div>
 <div class="ttc" id="aclass_sinric_pro_blinds_html"><div class="ttname"><a href="class_sinric_pro_blinds.html">SinricProBlinds</a></div><div class="ttdoc">Device to control interior blinds.</div><div class="ttdef"><b>Definition:</b> SinricProBlinds.h:22</div></div>
 <div class="ttc" id="aclass_sinric_pro_blinds_html_afd759f3d5859aee024c587a596378f46"><div class="ttname"><a href="class_sinric_pro_blinds.html#afd759f3d5859aee024c587a596378f46">SinricProBlinds::sendPositionEvent</a></div><div class="ttdeci">bool sendPositionEvent(int position, String cause=&quot;PHYSICAL_INTERACTION&quot;)</div><div class="ttdoc">Send setPosition event to update actual position on SinricPro Server.</div><div class="ttdef"><b>Definition:</b> SinricProBlinds.h:128</div></div>
 <div class="ttc" id="aclass_sinric_pro_blinds_html_a5e67c0c58e46d4e0ad1b811df1119cde"><div class="ttname"><a href="class_sinric_pro_blinds.html#a5e67c0c58e46d4e0ad1b811df1119cde">SinricProBlinds::onSetPosition</a></div><div class="ttdeci">void onSetPosition(SetPositionCallback cb)</div><div class="ttdoc">Set callback function for setPosition request.</div><div class="ttdef"><b>Definition:</b> SinricProBlinds.h:105</div></div>

docs/_sinric_pro_config_8h_source.html

@@ -132,7 +132,7 @@
 <div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160; </div>
 <div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="comment">// Version Configuration</span></div>
 <div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="preprocessor">#define SINRICPRO_VERSION_MAJOR     2</span></div>
-<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="preprocessor">#define SINRICPRO_VERSION_MINOR     4</span></div>
+<div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="preprocessor">#define SINRICPRO_VERSION_MINOR     5</span></div>
 <div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="preprocessor">#define SINRICPRO_VERSION_REVISION  0</span></div>
 <div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="preprocessor">#define SINRICPRO_VERSION STR(SINRICPRO_VERSION_MAJOR) &quot;.&quot; STR(SINRICPRO_VERSION_MINOR) &quot;.&quot; STR(SINRICPRO_VERSION_REVISION)</span></div>
 <div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160; </div>

docs/_sinric_pro_contactsensor_8h_source.html

@@ -121,10 +121,10 @@
 <div class="line"><a name="l00017"></a><span class="lineno"><a class="line" href="class_sinric_pro_contactsensor.html">   17</a></span>&#160;<span class="keyword">class </span><a class="code" href="class_sinric_pro_contactsensor.html">SinricProContactsensor</a> :  <span class="keyword">public</span> <a class="code" href="class_sinric_pro_device.html">SinricProDevice</a> {</div>
 <div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;  <span class="keyword">public</span>:</div>
 <div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;      <a class="code" href="class_sinric_pro_contactsensor.html">SinricProContactsensor</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* deviceId, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> eventWaitTime=100);</div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160; </div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;    <span class="comment">// event</span></div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;    <span class="keywordtype">bool</span> <a class="code" href="class_sinric_pro_contactsensor.html#a0b4b9006c0be003c615848bcc2b690fd">sendContactEvent</a>(<span class="keywordtype">bool</span> detected, String cause = <span class="stringliteral">&quot;PHYSICAL_INTERACTION&quot;</span>);</div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160; </div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;    String getProductType() { <span class="keywordflow">return</span> SinricProDevice::getProductType() + String(<span class="stringliteral">&quot;CONTACT_SENSOR&quot;</span>); }</div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160; </div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;    <span class="comment">// event</span></div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;    <span class="keywordtype">bool</span> <a class="code" href="class_sinric_pro_contactsensor.html#a0b4b9006c0be003c615848bcc2b690fd">sendContactEvent</a>(<span class="keywordtype">bool</span> detected, String cause = <span class="stringliteral">&quot;PHYSICAL_INTERACTION&quot;</span>);</div>
 <div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;  <span class="keyword">private</span>:</div>
 <div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;};</div>
 <div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160; </div>