Skip to content

Commit 5a5cf0a

Browse files
author
神农民
authored
Merge pull request #34 from hxming123456/update_items_based_on_ide
Update items based on ide
2 parents e26f025 + 268d352 commit 5a5cf0a

File tree

365 files changed

+5467
-1659
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

365 files changed

+5467
-1659
lines changed

‎doc/Documentation/_comp_button_8ino-example.html

+3-80
Original file line numberDiff line numberDiff line change
@@ -67,92 +67,15 @@
6767
<div class="contents">
6868
<dl class="section user"><dt>How to Use</dt><dd>This example shows that when the button component on the Nextion screen is released, the text of this button will plus one every time.</dd></dl>
6969
<dl class="section author"><dt>Author</dt><dd>Wu Pengfei (email:<a href="#" onclick="location.href='mai'+'lto:'+'pen'+'gf'+'ei.'+'wu'+'@it'+'ea'+'d.c'+'c'; return false;">pengf<span style="display: none;">.nosp@m.</span>ei.w<span style="display: none;">.nosp@m.</span>u@ite<span style="display: none;">.nosp@m.</span>ad.c<span style="display: none;">.nosp@m.</span>c</a>) </dd></dl>
70-
<dl class="section date"><dt>Date</dt><dd>2015/7/10 </dd></dl>
70+
<dl class="section date"><dt>Date</dt><dd>2015/7/10 2016/12/25 bring HMI up to v0.32 to avoid too old issues by Patrick Martin, no other changes made </dd></dl>
7171
<dl class="section copyright"><dt>Copyright</dt><dd>Copyright (C) 2014-2015 ITEAD Intelligent Systems Co., Ltd. <br />
7272
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.</dd></dl>
73-
<div class="fragment"><div class="line"></div>
74-
<div class="line"><span class="preprocessor">#include &quot;<a class="code" href="_nextion_8h.html">Nextion.h</a>&quot;</span></div>
75-
<div class="line"></div>
76-
<div class="line"><span class="comment">/*</span></div>
77-
<div class="line"><span class="comment"> * Declare a button object [page id:0,component id:1, component name: &quot;b0&quot;]. </span></div>
78-
<div class="line"><span class="comment"> */</span></div>
79-
<div class="line"><a name="_a0"></a><a class="code" href="class_nex_button.html">NexButton</a> b0 = <a class="code" href="class_nex_button.html">NexButton</a>(0, 1, <span class="stringliteral">&quot;b0&quot;</span>);</div>
80-
<div class="line"></div>
81-
<div class="line"><span class="keywordtype">char</span> buffer[100] = {0};</div>
82-
<div class="line"></div>
83-
<div class="line"><span class="comment">/*</span></div>
84-
<div class="line"><span class="comment"> * Register a button object to the touch event list. </span></div>
85-
<div class="line"><span class="comment"> */</span></div>
86-
<div class="line"><a name="_a1"></a><a class="code" href="class_nex_touch.html">NexTouch</a> *nex_listen_list[] = </div>
87-
<div class="line">{</div>
88-
<div class="line"> &amp;b0,</div>
89-
<div class="line"> NULL</div>
90-
<div class="line">};</div>
91-
<div class="line"></div>
92-
<div class="line"><span class="comment">/*</span></div>
93-
<div class="line"><span class="comment"> * Button component pop callback function. </span></div>
94-
<div class="line"><span class="comment"> * In this example,the button&#39;s text value will plus one every time when it is released. </span></div>
95-
<div class="line"><span class="comment"> */</span></div>
96-
<div class="line"><span class="keywordtype">void</span> b0PopCallback(<span class="keywordtype">void</span> *ptr)</div>
97-
<div class="line">{</div>
98-
<div class="line"> uint16_t len;</div>
99-
<div class="line"> uint16_t number;</div>
100-
<div class="line"> <a class="code" href="class_nex_button.html">NexButton</a> *btn = (<a class="code" href="class_nex_button.html">NexButton</a> *)ptr;</div>
101-
<div class="line"> dbSerialPrintln(<span class="stringliteral">&quot;b0PopCallback&quot;</span>);</div>
102-
<div class="line"> dbSerialPrint(<span class="stringliteral">&quot;ptr=&quot;</span>);</div>
103-
<div class="line"> dbSerialPrintln((uint32_t)ptr); </div>
104-
<div class="line"> memset(buffer, 0, <span class="keyword">sizeof</span>(buffer));</div>
105-
<div class="line"></div>
106-
<div class="line"> <span class="comment">/* Get the text value of button component [the value is string type]. */</span></div>
107-
<div class="line"> btn-&gt;<a name="a2"></a><a class="code" href="class_nex_button.html#a5ba1f74aa94b41b98172e42583ee13d6">getText</a>(buffer, <span class="keyword">sizeof</span>(buffer));</div>
108-
<div class="line"> </div>
109-
<div class="line"> number = atoi(buffer);</div>
110-
<div class="line"> number += 1;</div>
111-
<div class="line"></div>
112-
<div class="line"> memset(buffer, 0, <span class="keyword">sizeof</span>(buffer));</div>
113-
<div class="line"> itoa(number, buffer, 10);</div>
114-
<div class="line"></div>
115-
<div class="line"> <span class="comment">/* Set the text value of button component [the value is string type]. */</span></div>
116-
<div class="line"> btn-&gt;<a name="a3"></a><a class="code" href="class_nex_button.html#a649dafc5afb1dc7f1fc1bde1e6270290">setText</a>(buffer);</div>
117-
<div class="line">}</div>
118-
<div class="line"></div>
119-
<div class="line"><span class="keywordtype">void</span> setup(<span class="keywordtype">void</span>)</div>
120-
<div class="line">{ </div>
121-
<div class="line"> <span class="comment">/* Set the baudrate which is for debug and communicate with Nextion screen. */</span></div>
122-
<div class="line"> <a name="a4"></a><a class="code" href="group___core_a_p_i.html#gab09ddba6b72334d30ae091a7b038d790">nexInit</a>();</div>
123-
<div class="line"></div>
124-
<div class="line"> <span class="comment">/* Register the pop event callback function of the current button component. */</span></div>
125-
<div class="line"> b0.<a name="a5"></a><a class="code" href="class_nex_touch.html#a4da1c4fcdfadb7eabfb9ccaba9ecad11">attachPop</a>(b0PopCallback, &amp;b0);</div>
126-
<div class="line"> </div>
127-
<div class="line"> dbSerialPrintln(<span class="stringliteral">&quot;setup done&quot;</span>); </div>
128-
<div class="line">}</div>
129-
<div class="line"></div>
130-
<div class="line"><span class="keywordtype">void</span> loop(<span class="keywordtype">void</span>)</div>
131-
<div class="line">{ </div>
132-
<div class="line"> <span class="comment">/*</span></div>
133-
<div class="line"><span class="comment"> * When a pop or push event occured every time,</span></div>
134-
<div class="line"><span class="comment"> * the corresponding component[right page id and component id] in touch event list will be asked.</span></div>
135-
<div class="line"><span class="comment"> */</span></div>
136-
<div class="line"> <a name="a6"></a><a class="code" href="group___core_a_p_i.html#ga91c549e696b0ca035cf18901e6a50d5a">nexLoop</a>(nex_listen_list);</div>
137-
<div class="line">}</div>
138-
<div class="line"></div>
139-
<div class="line"></div>
140-
<div class="line"></div>
141-
<div class="line"></div>
142-
<div class="line"></div>
143-
<div class="line"></div>
144-
<div class="line"></div>
145-
<div class="line"></div>
146-
<div class="line"></div>
147-
<div class="line"></div>
148-
<div class="line"></div>
149-
<div class="line"></div>
150-
</div><!-- fragment --> </div><!-- contents -->
73+
<div class="fragment"></div><!-- fragment --> </div><!-- contents -->
15174
</div><!-- doc-content -->
15275
<!-- start footer part -->
15376
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
15477
<ul>
155-
<li class="footer">Generated on Thu Dec 8 2016 14:46:05 for Documentation by
78+
<li class="footer">Generated on Fri Jan 6 2017 14:00:35 for Documentation by
15679
<a href="http://www.doxygen.org/index.html">
15780
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.7 </li>
15881
</ul>

‎doc/Documentation/_comp_button_8ino_source.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
163163
<ul>
164164
<li class="navelem"><a class="el" href="dir_13cb27e7707bad7dfc51e3225831c378.html">examples</a></li><li class="navelem"><a class="el" href="dir_a6c6ee996e64a0a9573e0623ecba0f92.html">CompButton</a></li><li class="navelem"><b>CompButton.ino</b></li>
165-
<li class="footer">Generated on Thu Dec 8 2016 14:46:06 for Documentation by
165+
<li class="footer">Generated on Fri Jan 6 2017 08:58:29 for Documentation by
166166
<a href="http://www.doxygen.org/index.html">
167167
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.7 </li>
168168
</ul>

0 commit comments

Comments
 (0)