From f8e9b4e7f0729b0224bb58971a615c32fb127a91 Mon Sep 17 00:00:00 2001 From: shennongmin Date: Thu, 13 Aug 2015 18:11:45 +0800 Subject: [PATCH] Update docs Signed-off-by: shennongmin --- NexTouch.cpp | 7 +- doc/API/_comp_button_8ino-example.html | 4 +- doc/API/_comp_button_8ino_source.html | 7 +- doc/API/_comp_crop_8ino-example.html | 4 +- doc/API/_comp_crop_8ino_source.html | 7 +- doc/API/_comp_gauge_8ino-example.html | 6 +- doc/API/_comp_gauge_8ino_source.html | 9 +- doc/API/_comp_hotspot_8ino-example.html | 10 +- doc/API/_comp_hotspot_8ino_source.html | 14 +- doc/API/_comp_page_8ino-example.html | 10 +- doc/API/_comp_page_8ino_source.html | 13 +- doc/API/_comp_picture_8ino-example.html | 4 +- doc/API/_comp_picture_8ino_source.html | 7 +- doc/API/_comp_progress_bar_8ino-example.html | 6 +- doc/API/_comp_progress_bar_8ino_source.html | 9 +- doc/API/_comp_slider_8ino-example.html | 4 +- doc/API/_comp_slider_8ino_source.html | 9 +- doc/API/_comp_text_8ino-example.html | 13 +- doc/API/_comp_text_8ino_source.html | 29 ++- doc/API/_comp_waveform_8ino-example.html | 2 +- doc/API/_comp_waveform_8ino_source.html | 2 +- doc/API/_nex_button_8cpp.html | 2 +- doc/API/_nex_button_8cpp_source.html | 29 +-- doc/API/_nex_button_8h.html | 2 +- doc/API/_nex_button_8h_source.html | 27 +-- doc/API/_nex_crop_8cpp.html | 2 +- doc/API/_nex_crop_8cpp_source.html | 28 +-- doc/API/_nex_crop_8h.html | 2 +- doc/API/_nex_crop_8h_source.html | 25 +- doc/API/_nex_gauge_8cpp.html | 2 +- doc/API/_nex_gauge_8cpp_source.html | 16 +- doc/API/_nex_gauge_8h.html | 2 +- doc/API/_nex_gauge_8h_source.html | 10 +- doc/API/_nex_hardware_8cpp.html | 2 +- doc/API/_nex_hardware_8cpp_source.html | 4 +- doc/API/_nex_hardware_8h.html | 2 +- doc/API/_nex_hardware_8h_source.html | 4 +- doc/API/_nex_hotspot_8cpp.html | 2 +- doc/API/_nex_hotspot_8cpp_source.html | 41 +--- doc/API/_nex_hotspot_8h.html | 2 +- doc/API/_nex_hotspot_8h_source.html | 28 +-- doc/API/_nex_object_8cpp.html | 75 ++++++ doc/API/_nex_object_8cpp_source.html | 113 +++++++++ doc/API/_nex_object_8h.html | 85 +++++++ doc/API/_nex_object_8h_source.html | 96 ++++++++ doc/API/_nex_page_8cpp.html | 2 +- doc/API/_nex_page_8cpp_source.html | 25 +- doc/API/_nex_page_8h.html | 2 +- doc/API/_nex_page_8h_source.html | 22 +- doc/API/_nex_picture_8cpp.html | 2 +- doc/API/_nex_picture_8cpp_source.html | 30 +-- doc/API/_nex_picture_8h.html | 2 +- doc/API/_nex_picture_8h_source.html | 25 +- doc/API/_nex_progress_bar_8cpp.html | 2 +- doc/API/_nex_progress_bar_8cpp_source.html | 16 +- doc/API/_nex_progress_bar_8h.html | 2 +- doc/API/_nex_progress_bar_8h_source.html | 10 +- doc/API/_nex_serial_config_8h.html | 2 +- doc/API/_nex_serial_config_8h_source.html | 2 +- doc/API/_nex_slider_8cpp.html | 2 +- doc/API/_nex_slider_8cpp_source.html | 81 +++---- doc/API/_nex_slider_8h.html | 2 +- doc/API/_nex_slider_8h_source.html | 31 +-- doc/API/_nex_text_8cpp.html | 2 +- doc/API/_nex_text_8cpp_source.html | 28 +-- doc/API/_nex_text_8h.html | 2 +- doc/API/_nex_text_8h_source.html | 25 +- doc/API/_nex_touch_8cpp.html | 2 +- doc/API/_nex_touch_8cpp_source.html | 206 +++++++--------- doc/API/_nex_touch_8h.html | 3 +- doc/API/_nex_touch_8h_source.html | 94 +++----- doc/API/_nex_waveform_8cpp.html | 2 +- doc/API/_nex_waveform_8cpp_source.html | 14 +- doc/API/_nex_waveform_8h.html | 2 +- doc/API/_nex_waveform_8h_source.html | 10 +- doc/API/_nextion_8h.html | 2 +- doc/API/_nextion_8h_source.html | 2 +- doc/API/_r_e_a_d_m_e_8md_source.html | 2 +- doc/API/annotated.html | 17 +- doc/API/class_nex_button-members.html | 16 +- doc/API/class_nex_button.html | 90 +++---- doc/API/class_nex_button.png | Bin 419 -> 592 bytes doc/API/class_nex_crop-members.html | 16 +- doc/API/class_nex_crop.html | 93 +++---- doc/API/class_nex_crop.png | Bin 419 -> 593 bytes doc/API/class_nex_gauge-members.html | 15 +- doc/API/class_nex_gauge.html | 42 ++-- doc/API/class_nex_gauge.png | Bin 437 -> 449 bytes doc/API/class_nex_hotspot-members.html | 18 +- doc/API/class_nex_hotspot.html | 138 +++-------- doc/API/class_nex_hotspot.png | Bin 429 -> 602 bytes doc/API/class_nex_object-members.html | 71 ++++++ doc/API/class_nex_object.html | 227 ++++++++++++++++++ doc/API/class_nex_object.png | Bin 0 -> 2522 bytes doc/API/class_nex_page-members.html | 16 +- doc/API/class_nex_page.html | 90 +++---- doc/API/class_nex_page.png | Bin 429 -> 601 bytes doc/API/class_nex_picture-members.html | 18 +- doc/API/class_nex_picture.html | 90 +++---- doc/API/class_nex_picture.png | Bin 421 -> 593 bytes doc/API/class_nex_progress_bar-members.html | 15 +- doc/API/class_nex_progress_bar.html | 42 ++-- doc/API/class_nex_progress_bar.png | Bin 508 -> 523 bytes doc/API/class_nex_slider-members.html | 16 +- doc/API/class_nex_slider.html | 94 +++----- doc/API/class_nex_slider.png | Bin 422 -> 598 bytes doc/API/class_nex_text-members.html | 16 +- doc/API/class_nex_text.html | 89 +++---- doc/API/class_nex_text.png | Bin 407 -> 581 bytes doc/API/class_nex_touch-members.html | 12 +- doc/API/class_nex_touch.html | 160 +++--------- doc/API/class_nex_touch.png | Bin 2814 -> 1677 bytes doc/API/class_nex_waveform-members.html | 13 +- doc/API/class_nex_waveform.html | 42 ++-- doc/API/class_nex_waveform.png | Bin 472 -> 481 bytes doc/API/classes.html | 8 +- .../dir_472f54fb1d9b74971d8e15d62f212bd3.html | 2 +- .../dir_4b43661efaa18af91f213d2681ebd37e.html | 2 +- .../dir_7962cac16a99e8bbaaea18abede03fcb.html | 2 +- .../dir_8dcbebf38b229bfa7bb34d68bf824093.html | 2 +- .../dir_9bbf8342b0f9a157b7af08fe1412fc17.html | 2 +- .../dir_a48692e2802a027399b146b680655303.html | 2 +- .../dir_c918e8bf3fc71f849978cdb0d900e61c.html | 2 +- .../dir_ce36ac18ad3deaf5eae0bd2e09775a7d.html | 2 +- .../dir_d28a4824dc47e487b107a5db32ef43c4.html | 2 +- .../dir_f3d39c87bc262720c50d5e3885667b8a.html | 2 +- .../dir_f76977d9ffe8ddf3ad01f3d689aa5df4.html | 2 +- doc/API/doxygen_8h.html | 2 +- doc/API/doxygen_8h_source.html | 2 +- doc/API/examples.html | 2 +- doc/API/files.html | 36 +-- doc/API/functions.html | 95 ++------ doc/API/functions_func.html | 95 ++------ doc/API/globals.html | 2 +- doc/API/globals_func.html | 2 +- doc/API/group___nextion.html | 4 +- doc/API/hierarchy.html | 27 ++- doc/API/index.html | 2 +- doc/API/md__r_e_a_d_m_e.html | 2 +- doc/API/modules.html | 2 +- doc/API/pages.html | 2 +- 141 files changed, 1603 insertions(+), 1591 deletions(-) create mode 100644 doc/API/_nex_object_8cpp.html create mode 100644 doc/API/_nex_object_8cpp_source.html create mode 100644 doc/API/_nex_object_8h.html create mode 100644 doc/API/_nex_object_8h_source.html create mode 100644 doc/API/class_nex_object-members.html create mode 100644 doc/API/class_nex_object.html create mode 100644 doc/API/class_nex_object.png diff --git a/NexTouch.cpp b/NexTouch.cpp index ee4ed99..f6ad71a 100644 --- a/NexTouch.cpp +++ b/NexTouch.cpp @@ -19,10 +19,9 @@ /** * Constructor of Nextouch. * - * @param pop - pop event function pointer. - * @param pop_ptr - the parameter was transmitted to pop event function pointer. - * @param push - push event function pointer. - * @param push_ptr - the parameter was transmitted to push event function pointer. + * @param pid - pid + * @param cid - cid + * @param name - name * */ NexTouch::NexTouch(NexPid pid, NexCid cid, const char *name) diff --git a/doc/API/_comp_button_8ino-example.html b/doc/API/_comp_button_8ino-example.html index 4dedd2b..9d7d5b5 100644 --- a/doc/API/_comp_button_8ino-example.html +++ b/doc/API/_comp_button_8ino-example.html @@ -85,7 +85,7 @@ This program is free software; you can redistribute it and/or modify it under th
void setup(void)
{
nexInit();
-
b0.attachPop(b0PopCallback, &b0);
+
b0.attachPop(b0PopCallback, &b0);
dbSerialPrintln("setup done");
}
@@ -96,7 +96,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_comp_button_8ino_source.html b/doc/API/_comp_button_8ino_source.html index 019e300..d8b8b9f 100644 --- a/doc/API/_comp_button_8ino_source.html +++ b/doc/API/_comp_button_8ino_source.html @@ -90,7 +90,7 @@
48 void setup(void)
49 {
50  nexInit();
-
51  b0.attachPop(b0PopCallback, &b0);
+
51  b0.attachPop(b0PopCallback, &b0);
52  dbSerialPrintln("setup done");
53 }
54 
@@ -100,16 +100,15 @@
58 }
NexButton::getText
uint16_t getText(char *buffer, uint16_t len)
Get text value from button component.
Definition: NexButton.cpp:35
nexLoop
void nexLoop(NexTouch **nex_listen_list)
Call mainEventLoop,watting for Nextion's touch event.
Definition: NexHardware.cpp:293
-
NexButton::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register button pop callback function.
Definition: NexButton.cpp:70
NexButton
NexButton,subclass of NexTouch,provides simple methods to control button component.
Definition: NexButton.h:26
NexButton::setText
bool setText(const char *buffer)
Set text value of button component.
Definition: NexButton.cpp:53
Nextion.h
Header file of Nextion Library.
nexInit
bool nexInit(void)
Init Nextion's baudrate,page id.
Definition: NexHardware.cpp:272
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_comp_crop_8ino-example.html b/doc/API/_comp_crop_8ino-example.html index 5e9c7bf..8fa1a27 100644 --- a/doc/API/_comp_crop_8ino-example.html +++ b/doc/API/_comp_crop_8ino-example.html @@ -77,7 +77,7 @@ This program is free software; you can redistribute it and/or modify it under th
void setup(void)
{
nexInit();
-
q0.attachPop(q0PopCallback);
+
q0.attachPop(q0PopCallback);
dbSerialPrintln("setup done");
}
@@ -89,7 +89,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_comp_crop_8ino_source.html b/doc/API/_comp_crop_8ino_source.html index 3e3b811..8c2e319 100644 --- a/doc/API/_comp_crop_8ino_source.html +++ b/doc/API/_comp_crop_8ino_source.html @@ -82,7 +82,7 @@
40 void setup(void)
41 {
42  nexInit();
-
43  q0.attachPop(q0PopCallback);
+
43  q0.attachPop(q0PopCallback);
44  dbSerialPrintln("setup done");
45 }
46 
@@ -92,15 +92,14 @@
50 }
51 
nexLoop
void nexLoop(NexTouch **nex_listen_list)
Call mainEventLoop,watting for Nextion's touch event.
Definition: NexHardware.cpp:293
-
NexCrop::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register crop pop callback function.
Definition: NexCrop.cpp:72
Nextion.h
Header file of Nextion Library.
nexInit
bool nexInit(void)
Init Nextion's baudrate,page id.
Definition: NexHardware.cpp:272
NexCrop
NexCrop,subclass of NexTouch,provides simple methods to control crop component.
Definition: NexCrop.h:26
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_comp_gauge_8ino-example.html b/doc/API/_comp_gauge_8ino-example.html index 6a7fc6a..8f8c8ae 100644 --- a/doc/API/_comp_gauge_8ino-example.html +++ b/doc/API/_comp_gauge_8ino-example.html @@ -98,8 +98,8 @@ This program is free software; you can redistribute it and/or modify it under th
void setup(void)
{
nexInit();
-
btn_up.attachPop(buttonUpPopCallback);
-
btn_down.attachPop(buttonDownPopCallback);
+
btn_up.attachPop(buttonUpPopCallback);
+
btn_down.attachPop(buttonDownPopCallback);
dbSerialPrintln("setup done");
}
@@ -111,7 +111,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_comp_gauge_8ino_source.html b/doc/API/_comp_gauge_8ino_source.html index c5079ee..b4b9ffd 100644 --- a/doc/API/_comp_gauge_8ino_source.html +++ b/doc/API/_comp_gauge_8ino_source.html @@ -103,8 +103,8 @@
61 void setup(void)
62 {
63  nexInit();
-
64  btn_up.attachPop(buttonUpPopCallback);
-
65  btn_down.attachPop(buttonDownPopCallback);
+
64  btn_up.attachPop(buttonUpPopCallback);
+
65  btn_down.attachPop(buttonDownPopCallback);
66  dbSerialPrintln("setup done");
67 }
68 
@@ -116,16 +116,15 @@
NexGauge
NexGauge,subclass of NexTouch,provides simple methods to control gauge component. ...
Definition: NexGauge.h:26
nexLoop
void nexLoop(NexTouch **nex_listen_list)
Call mainEventLoop,watting for Nextion's touch event.
Definition: NexHardware.cpp:293
NexGauge::setValue
bool setValue(uint32_t number)
Set the value of gauge.
Definition: NexGauge.cpp:52
-
NexButton::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register button pop callback function.
Definition: NexButton.cpp:70
NexButton
NexButton,subclass of NexTouch,provides simple methods to control button component.
Definition: NexButton.h:26
NexGauge::getValue
bool getValue(uint32_t *number)
Get the value of gauge.
Definition: NexGauge.cpp:35
Nextion.h
Header file of Nextion Library.
nexInit
bool nexInit(void)
Init Nextion's baudrate,page id.
Definition: NexHardware.cpp:272
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_comp_hotspot_8ino-example.html b/doc/API/_comp_hotspot_8ino-example.html index fbcb84e..f6afa91 100644 --- a/doc/API/_comp_hotspot_8ino-example.html +++ b/doc/API/_comp_hotspot_8ino-example.html @@ -93,10 +93,10 @@ This program is free software; you can redistribute it and/or modify it under th
void setup(void)
{
nexInit();
-
hot0.attachPush(hot0PushCallback, &hot0);
-
hot0.attachPop(hot0PopCallback, &hot0);
-
hot1.attachPush(hot1PushCallback, &hot1);
-
hot1.attachPop(hot1PopCallback, &hot1);
+
hot0.attachPush(hot0PushCallback, &hot0);
+
hot0.attachPop(hot0PopCallback, &hot0);
+
hot1.attachPush(hot1PushCallback, &hot1);
+
hot1.attachPop(hot1PopCallback, &hot1);
dbSerialPrintln("setup done");
}
@@ -107,7 +107,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_comp_hotspot_8ino_source.html b/doc/API/_comp_hotspot_8ino_source.html index e74b6b2..46da425 100644 --- a/doc/API/_comp_hotspot_8ino_source.html +++ b/doc/API/_comp_hotspot_8ino_source.html @@ -98,10 +98,10 @@
56 void setup(void)
57 {
58  nexInit();
-
59  hot0.attachPush(hot0PushCallback, &hot0);
-
60  hot0.attachPop(hot0PopCallback, &hot0);
-
61  hot1.attachPush(hot1PushCallback, &hot1);
-
62  hot1.attachPop(hot1PopCallback, &hot1);
+
59  hot0.attachPush(hot0PushCallback, &hot0);
+
60  hot0.attachPop(hot0PopCallback, &hot0);
+
61  hot1.attachPush(hot1PushCallback, &hot1);
+
62  hot1.attachPop(hot1PopCallback, &hot1);
63  dbSerialPrintln("setup done");
64 }
65 
@@ -113,13 +113,11 @@
Nextion.h
Header file of Nextion Library.
nexInit
bool nexInit(void)
Init Nextion's baudrate,page id.
Definition: NexHardware.cpp:272
NexHotspot
NexHotspot,subclass of NexTouch,provides simple methods to control hotspot component.
Definition: NexHotspot.h:26
-
NexHotspot::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register hotspot pop callback function.
Definition: NexHotspot.cpp:55
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
-
NexHotspot::attachPush
void attachPush(NexTouchEventCb push, void *ptr=NULL)
Register hotspot push callback function.
Definition: NexHotspot.cpp:35
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_comp_page_8ino-example.html b/doc/API/_comp_page_8ino-example.html index e8ccb13..51d6aa1 100644 --- a/doc/API/_comp_page_8ino-example.html +++ b/doc/API/_comp_page_8ino-example.html @@ -95,10 +95,10 @@ This program is free software; you can redistribute it and/or modify it under th
nexInit();
dbSerialPrintln("setup begin");
-
page0.attachPop(page0PopCallback);
-
page1.attachPop(page1PopCallback);
-
page2.attachPop(page2PopCallback);
-
page3.attachPop(page3PopCallback);
+
page0.attachPop(page0PopCallback);
+
page1.attachPop(page1PopCallback);
+
page2.attachPop(page2PopCallback);
+
page3.attachPop(page3PopCallback);
dbSerialPrintln("setup end");
}
@@ -110,7 +110,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_comp_page_8ino_source.html b/doc/API/_comp_page_8ino_source.html index 1fe229f..3d36d68 100644 --- a/doc/API/_comp_page_8ino_source.html +++ b/doc/API/_comp_page_8ino_source.html @@ -100,10 +100,10 @@
58  nexInit();
59  dbSerialPrintln("setup begin");
60 
-
61  page0.attachPop(page0PopCallback);
-
62  page1.attachPop(page1PopCallback);
-
63  page2.attachPop(page2PopCallback);
-
64  page3.attachPop(page3PopCallback);
+
61  page0.attachPop(page0PopCallback);
+
62  page1.attachPop(page1PopCallback);
+
63  page2.attachPop(page2PopCallback);
+
64  page3.attachPop(page3PopCallback);
65 
66  dbSerialPrintln("setup end");
67 }
@@ -117,12 +117,11 @@
NexPage
NexPage,subclass of NexTouch,provides simple methods to control page component.
Definition: NexPage.h:26
Nextion.h
Header file of Nextion Library.
nexInit
bool nexInit(void)
Init Nextion's baudrate,page id.
Definition: NexHardware.cpp:272
-
NexPage::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register page pop callback function.
Definition: NexPage.cpp:55
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_comp_picture_8ino-example.html b/doc/API/_comp_picture_8ino-example.html index 0e253cb..6d60aeb 100644 --- a/doc/API/_comp_picture_8ino-example.html +++ b/doc/API/_comp_picture_8ino-example.html @@ -83,7 +83,7 @@ This program is free software; you can redistribute it and/or modify it under th
void setup(void)
{
nexInit();
-
p0.attachPop(p0PopCallback);
+
p0.attachPop(p0PopCallback);
dbSerialPrintln("setup done");
}
@@ -95,7 +95,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_comp_picture_8ino_source.html b/doc/API/_comp_picture_8ino_source.html index fb88185..3f2a957 100644 --- a/doc/API/_comp_picture_8ino_source.html +++ b/doc/API/_comp_picture_8ino_source.html @@ -88,7 +88,7 @@
46 void setup(void)
47 {
48  nexInit();
-
49  p0.attachPop(p0PopCallback);
+
49  p0.attachPop(p0PopCallback);
50  dbSerialPrintln("setup done");
51 }
52 
@@ -100,15 +100,14 @@
NexPicture::setPic
bool setPic(uint32_t number)
Set picture's number.
Definition: NexPicture.cpp:52
nexLoop
void nexLoop(NexTouch **nex_listen_list)
Call mainEventLoop,watting for Nextion's touch event.
Definition: NexHardware.cpp:293
NexPicture
NexPicture,subclass of NexTouch,provides simple methods to control picture component.
Definition: NexPicture.h:26
-
NexPicture::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register picture pop callback function.
Definition: NexPicture.cpp:72
Nextion.h
Header file of Nextion Library.
nexInit
bool nexInit(void)
Init Nextion's baudrate,page id.
Definition: NexHardware.cpp:272
NexPicture::getPic
bool getPic(uint32_t *number)
Get picture's number.
Definition: NexPicture.cpp:35
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_comp_progress_bar_8ino-example.html b/doc/API/_comp_progress_bar_8ino-example.html index d212c56..8ab4b7c 100644 --- a/doc/API/_comp_progress_bar_8ino-example.html +++ b/doc/API/_comp_progress_bar_8ino-example.html @@ -98,8 +98,8 @@ This program is free software; you can redistribute it and/or modify it under th
void setup(void)
{
nexInit();
-
btn_up.attachPop(buttonUpPopCallback);
-
btn_down.attachPop(buttonDownPopCallback);
+
btn_up.attachPop(buttonUpPopCallback);
+
btn_down.attachPop(buttonDownPopCallback);
dbSerialPrintln("setup done");
}
@@ -111,7 +111,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_comp_progress_bar_8ino_source.html b/doc/API/_comp_progress_bar_8ino_source.html index a60b287..83782a5 100644 --- a/doc/API/_comp_progress_bar_8ino_source.html +++ b/doc/API/_comp_progress_bar_8ino_source.html @@ -103,8 +103,8 @@
61 void setup(void)
62 {
63  nexInit();
-
64  btn_up.attachPop(buttonUpPopCallback);
-
65  btn_down.attachPop(buttonDownPopCallback);
+
64  btn_up.attachPop(buttonUpPopCallback);
+
65  btn_down.attachPop(buttonDownPopCallback);
66  dbSerialPrintln("setup done");
67 }
68 
@@ -115,17 +115,16 @@
73 
NexProgressBar::setValue
bool setValue(uint32_t number)
Set the value of progress bar.
Definition: NexProgressBar.cpp:52
nexLoop
void nexLoop(NexTouch **nex_listen_list)
Call mainEventLoop,watting for Nextion's touch event.
Definition: NexHardware.cpp:293
-
NexButton::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register button pop callback function.
Definition: NexButton.cpp:70
NexButton
NexButton,subclass of NexTouch,provides simple methods to control button component.
Definition: NexButton.h:26
Nextion.h
Header file of Nextion Library.
nexInit
bool nexInit(void)
Init Nextion's baudrate,page id.
Definition: NexHardware.cpp:272
NexProgressBar::getValue
bool getValue(uint32_t *number)
Get the value of progress bar.
Definition: NexProgressBar.cpp:35
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
NexProgressBar
NexProgressBar,subclass of NexTouch,provides simple methods to control progress bar component...
Definition: NexProgressBar.h:26
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_comp_slider_8ino-example.html b/doc/API/_comp_slider_8ino-example.html index 5af6586..8cdec09 100644 --- a/doc/API/_comp_slider_8ino-example.html +++ b/doc/API/_comp_slider_8ino-example.html @@ -78,7 +78,7 @@ This program is free software; you can redistribute it and/or modify it under th
void setup(void)
{
nexInit();
-
h0.attachPop(h0PopCallback);
+
h0.attachPop(h0PopCallback);
dbSerialPrintln("setup done");
}
@@ -90,7 +90,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_comp_slider_8ino_source.html b/doc/API/_comp_slider_8ino_source.html index 98da397..a85ca69 100644 --- a/doc/API/_comp_slider_8ino_source.html +++ b/doc/API/_comp_slider_8ino_source.html @@ -83,7 +83,7 @@
41 void setup(void)
42 {
43  nexInit();
-
44  h0.attachPop(h0PopCallback);
+
44  h0.attachPop(h0PopCallback);
45  dbSerialPrintln("setup done");
46 }
47 
@@ -95,16 +95,15 @@
NexSlider
NexSlider,subclass of NexTouch,provides simple methods to control slider component.
Definition: NexSlider.h:26
NexText::setText
bool setText(const char *buffer)
Set the value of text.
Definition: NexText.cpp:53
nexLoop
void nexLoop(NexTouch **nex_listen_list)
Call mainEventLoop,watting for Nextion's touch event.
Definition: NexHardware.cpp:293
-
NexSlider::getValue
bool getValue(uint32_t *number)
Get the value of slider.
Definition: NexSlider.cpp:36
+
NexSlider::getValue
bool getValue(uint32_t *number)
Get the value of slider.
Definition: NexSlider.cpp:35
Nextion.h
Header file of Nextion Library.
nexInit
bool nexInit(void)
Init Nextion's baudrate,page id.
Definition: NexHardware.cpp:272
-
NexSlider::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register slider pop callback function.
Definition: NexSlider.cpp:73
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
NexText
NexText,subclass of NexTouch,provides simple methods to control text component.
Definition: NexText.h:26
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_comp_text_8ino-example.html b/doc/API/_comp_text_8ino-example.html index 45a7c7f..8853dc5 100644 --- a/doc/API/_comp_text_8ino-example.html +++ b/doc/API/_comp_text_8ino-example.html @@ -56,9 +56,9 @@ This program is free software; you can redistribute it and/or modify it under th
void b0PopCallback(void *ptr);
void b1PopCallback(void *ptr);
-
NexText t0 = NexText(0, 1, "t0", t0PopCallback);
-
NexButton b0 = NexButton(0, 2, "b0", b0PopCallback);
-
NexButton b1 = NexButton(0, 3, "b1", b1PopCallback);
+
NexText t0 = NexText(0, 1, "t0");
+
NexButton b0 = NexButton(0, 2, "b0");
+
NexButton b1 = NexButton(0, 3, "b1");
char buffer[100] = {0};
@@ -117,18 +117,21 @@ This program is free software; you can redistribute it and/or modify it under th
void setup(void)
{
nexInit();
+
t0.attachPop(t0PopCallback);
+
b0.attachPop(b0PopCallback);
+
b1.attachPop(b1PopCallback);
dbSerialPrintln("setup done");
}
void loop(void)
{
-
nexLoop(nex_listen_list);
+
nexLoop(nex_listen_list);
}
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_comp_text_8ino_source.html b/doc/API/_comp_text_8ino_source.html index c12eb2e..7ee93b5 100644 --- a/doc/API/_comp_text_8ino_source.html +++ b/doc/API/_comp_text_8ino_source.html @@ -61,9 +61,9 @@
19 void b0PopCallback(void *ptr);
20 void b1PopCallback(void *ptr);
21 
-
22 NexText t0 = NexText(0, 1, "t0", t0PopCallback);
-
23 NexButton b0 = NexButton(0, 2, "b0", b0PopCallback);
-
24 NexButton b1 = NexButton(0, 3, "b1", b1PopCallback);
+
22 NexText t0 = NexText(0, 1, "t0");
+
23 NexButton b0 = NexButton(0, 2, "b0");
+
24 NexButton b1 = NexButton(0, 3, "b1");
25 
26 char buffer[100] = {0};
27 
@@ -122,26 +122,29 @@
80 void setup(void)
81 {
82  nexInit();
-
83  dbSerialPrintln("setup done");
-
84 }
-
85 
-
86 void loop(void)
-
87 {
-
88  nexLoop(nex_listen_list);
-
89 }
-
90 
+
83  t0.attachPop(t0PopCallback);
+
84  b0.attachPop(b0PopCallback);
+
85  b1.attachPop(b1PopCallback);
+
86  dbSerialPrintln("setup done");
+
87 }
+
88 
+
89 void loop(void)
+
90 {
+
91  nexLoop(nex_listen_list);
+
92 }
+
93 
NexText::setText
bool setText(const char *buffer)
Set the value of text.
Definition: NexText.cpp:53
nexLoop
void nexLoop(NexTouch **nex_listen_list)
Call mainEventLoop,watting for Nextion's touch event.
Definition: NexHardware.cpp:293
NexButton
NexButton,subclass of NexTouch,provides simple methods to control button component.
Definition: NexButton.h:26
NexText::getText
uint16_t getText(char *buffer, uint16_t len)
Get the value of text.
Definition: NexText.cpp:35
Nextion.h
Header file of Nextion Library.
nexInit
bool nexInit(void)
Init Nextion's baudrate,page id.
Definition: NexHardware.cpp:272
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
NexText
NexText,subclass of NexTouch,provides simple methods to control text component.
Definition: NexText.h:26
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_comp_waveform_8ino-example.html b/doc/API/_comp_waveform_8ino-example.html index 703272e..c368c0e 100644 --- a/doc/API/_comp_waveform_8ino-example.html +++ b/doc/API/_comp_waveform_8ino-example.html @@ -104,7 +104,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_comp_waveform_8ino_source.html b/doc/API/_comp_waveform_8ino_source.html index 6bfbba3..34ae09b 100644 --- a/doc/API/_comp_waveform_8ino_source.html +++ b/doc/API/_comp_waveform_8ino_source.html @@ -113,7 +113,7 @@
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_button_8cpp.html b/doc/API/_nex_button_8cpp.html index ad2bf7a..1d7f02f 100644 --- a/doc/API/_nex_button_8cpp.html +++ b/doc/API/_nex_button_8cpp.html @@ -67,7 +67,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_button_8cpp_source.html b/doc/API/_nex_button_8cpp_source.html index ff345ef..7aa8363 100644 --- a/doc/API/_nex_button_8cpp_source.html +++ b/doc/API/_nex_button_8cpp_source.html @@ -53,8 +53,8 @@ Go to the documentation of this file.
1 
16 #include "NexButton.h"
17 
-
22 NexButton::NexButton(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop, void *pop_ptr)
-
23  :NexTouch(pid, cid, name, pop, pop_ptr)
+
22 NexButton::NexButton(NexPid pid, NexCid cid, const char *name)
+
23  :NexTouch(pid, cid, name)
24 {
25 }
26 
@@ -62,7 +62,7 @@
36 {
37  String cmd;
38  cmd += "get ";
-
39  cmd += getObjName();
+
39  cmd += getObjName();
40  cmd += ".txt";
41  sendCommand(cmd.c_str());
42  return recvRetString(buffer,len);
@@ -71,7 +71,7 @@
53 bool NexButton::setText(const char *buffer)
54 {
55  String cmd;
-
56  cmd += getObjName();
+
56  cmd += getObjName();
57  cmd += ".txt=\"";
58  cmd += buffer;
59  cmd += "\"";
@@ -79,32 +79,19 @@
61  return recvRetCommandFinished();
62 }
63 
-
70 void NexButton::attachPop(NexTouchEventCb pop, void *ptr)
-
71 {
-
72  NexTouch::attachPop(pop, ptr);
-
73 }
-
74 
-
79 void NexButton::detachPop(void)
-
80 {
-
81  NexTouch::detachPop();
-
82 }
-
83 
-
84 
-
NexButton::NexButton
NexButton(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL)
Constructor,inherited NexTouch's constructor function.
Definition: NexButton.cpp:22
recvRetCommandFinished
bool recvRetCommandFinished(uint32_t timeout)
Command is executed successfully.
Definition: NexHardware.cpp:187
NexButton::getText
uint16_t getText(char *buffer, uint16_t len)
Get text value from button component.
Definition: NexButton.cpp:35
NexButton.h
API of NexButton.
recvRetString
uint16_t recvRetString(char *buffer, uint16_t len, uint32_t timeout)
Receive string data.
Definition: NexHardware.cpp:97
-
NexButton::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register button pop callback function.
Definition: NexButton.cpp:70
-
NexTouch::getObjName
const char * getObjName(void)
Get component name.
Definition: NexTouch.cpp:69
+
NexButton::NexButton
NexButton(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexButton.cpp:22
+
NexObject::getObjName
const char * getObjName(void)
Get component name.
Definition: NexObject.cpp:58
NexButton::setText
bool setText(const char *buffer)
Set text value of button component.
Definition: NexButton.cpp:53
sendCommand
void sendCommand(const char *cmd)
Send command to Nextion.
Definition: NexHardware.cpp:164
-
NexButton::detachPop
void detachPop(void)
Unload button pop callback function.
Definition: NexButton.cpp:79
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_button_8h.html b/doc/API/_nex_button_8h.html index 6262f7d..eed63fc 100644 --- a/doc/API/_nex_button_8h.html +++ b/doc/API/_nex_button_8h.html @@ -77,7 +77,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_button_8h_source.html b/doc/API/_nex_button_8h_source.html index e08b82e..320dd11 100644 --- a/doc/API/_nex_button_8h_source.html +++ b/doc/API/_nex_button_8h_source.html @@ -60,30 +60,25 @@
26 class NexButton: public NexTouch
27 {
28 public: /* methods */
-
29  NexButton(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop = NULL, void *pop_ptr = NULL);
-
30 
-
31  void attachPop(NexTouchEventCb pop, void *ptr = NULL);
-
32  void detachPop(void);
-
33 
-
34  uint16_t getText(char *buffer, uint16_t len);
-
35  bool setText(const char *buffer);
-
36 };
-
37 
-
38 #endif /* #ifdef __cplusplus */
-
39 #endif /* #ifndef __NEXBUTTON_H__ */
-
NexButton::NexButton
NexButton(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL)
Constructor,inherited NexTouch's constructor function.
Definition: NexButton.cpp:22
+
29  NexButton(NexPid pid, NexCid cid, const char *name);
+
30 
+
31  uint16_t getText(char *buffer, uint16_t len);
+
32  bool setText(const char *buffer);
+
33 };
+
34 
+
35 #endif /* #ifdef __cplusplus */
+
36 #endif /* #ifndef __NEXBUTTON_H__ */
NexButton::getText
uint16_t getText(char *buffer, uint16_t len)
Get text value from button component.
Definition: NexButton.cpp:35
-
NexButton::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register button pop callback function.
Definition: NexButton.cpp:70
NexButton
NexButton,subclass of NexTouch,provides simple methods to control button component.
Definition: NexButton.h:26
+
NexButton::NexButton
NexButton(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexButton.cpp:22
NexButton::setText
bool setText(const char *buffer)
Set text value of button component.
Definition: NexButton.cpp:53
NexTouch.h
API of Nextion.
NexHardware.h
Hardware Srial API.
-
NexButton::detachPop
void detachPop(void)
Unload button pop callback function.
Definition: NexButton.cpp:79
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_crop_8cpp.html b/doc/API/_nex_crop_8cpp.html index 628540b..d7e58f6 100644 --- a/doc/API/_nex_crop_8cpp.html +++ b/doc/API/_nex_crop_8cpp.html @@ -67,7 +67,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_crop_8cpp_source.html b/doc/API/_nex_crop_8cpp_source.html index 8dc1263..f67aee4 100644 --- a/doc/API/_nex_crop_8cpp_source.html +++ b/doc/API/_nex_crop_8cpp_source.html @@ -53,8 +53,8 @@ Go to the documentation of this file.
1 
16 #include "NexCrop.h"
17 
-
22 NexCrop::NexCrop(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop, void *pop_ptr)
-
23  :NexTouch(pid, cid, name, pop, pop_ptr)
+
22 NexCrop::NexCrop(NexPid pid, NexCid cid, const char *name)
+
23  :NexTouch(pid, cid, name)
24 {
25 }
26 
@@ -69,7 +69,7 @@
35 bool NexCrop::getPic(uint32_t *number)
36 {
37  String cmd = String("get ");
-
38  cmd += getObjName();
+
38  cmd += getObjName();
39  cmd += ".picc";
40  sendCommand(cmd.c_str());
41  return recvRetNumber(number);
@@ -89,7 +89,7 @@
55  String cmd;
56 
57  utoa(number, buf, 10);
-
58  cmd += getObjName();
+
58  cmd += getObjName();
59  cmd += ".picc=";
60  cmd += buf;
61 
@@ -97,29 +97,17 @@
63  return recvRetCommandFinished();
64 }
65 
-
72 void NexCrop::attachPop(NexTouchEventCb pop, void *ptr)
-
73 {
-
74  NexTouch::attachPop(pop, ptr);
-
75 }
-
76 
-
81 void NexCrop::detachPop(void)
-
82 {
-
83  NexTouch::detachPop();
-
84 }
-
85 
recvRetNumber
bool recvRetNumber(uint32_t *number, uint32_t timeout)
Receive uint32_t data.
Definition: NexHardware.cpp:45
recvRetCommandFinished
bool recvRetCommandFinished(uint32_t timeout)
Command is executed successfully.
Definition: NexHardware.cpp:187
-
NexCrop::NexCrop
NexCrop(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL)
Constructor,inherited NexTouch's constructor function.
Definition: NexCrop.cpp:22
-
NexCrop::detachPop
void detachPop(void)
Unload crop pop callback function.
Definition: NexCrop.cpp:81
-
NexTouch::getObjName
const char * getObjName(void)
Get component name.
Definition: NexTouch.cpp:69
+
NexObject::getObjName
const char * getObjName(void)
Get component name.
Definition: NexObject.cpp:58
NexCrop.h
API of NexCrop.
-
NexCrop::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register crop pop callback function.
Definition: NexCrop.cpp:72
+
NexCrop::NexCrop
NexCrop(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexCrop.cpp:22
sendCommand
void sendCommand(const char *cmd)
Send command to Nextion.
Definition: NexHardware.cpp:164
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_crop_8h.html b/doc/API/_nex_crop_8h.html index 7c98d47..59aca40 100644 --- a/doc/API/_nex_crop_8h.html +++ b/doc/API/_nex_crop_8h.html @@ -77,7 +77,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_crop_8h_source.html b/doc/API/_nex_crop_8h_source.html index 374cd73..9b70d52 100644 --- a/doc/API/_nex_crop_8h_source.html +++ b/doc/API/_nex_crop_8h_source.html @@ -60,28 +60,23 @@
26 class NexCrop: public NexTouch
27 {
28 public: /* methods */
-
29  NexCrop(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop = NULL, void *pop_ptr = NULL);
+
29  NexCrop(NexPid pid, NexCid cid, const char *name);
30 
-
31  void attachPop(NexTouchEventCb pop, void *ptr = NULL);
-
32  void detachPop(void);
-
33 
-
34  bool getPic(uint32_t *number);
-
35  bool setPic(uint32_t number);
-
36 };
-
37 
-
38 #endif /* #ifdef __cplusplus */
-
39 #endif /* #ifndef __NEXCROP_H__ */
-
NexCrop::NexCrop
NexCrop(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL)
Constructor,inherited NexTouch's constructor function.
Definition: NexCrop.cpp:22
-
NexCrop::detachPop
void detachPop(void)
Unload crop pop callback function.
Definition: NexCrop.cpp:81
-
NexCrop::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register crop pop callback function.
Definition: NexCrop.cpp:72
+
31  bool getPic(uint32_t *number);
+
32  bool setPic(uint32_t number);
+
33 };
+
34 
+
35 #endif /* #ifdef __cplusplus */
+
36 #endif /* #ifndef __NEXCROP_H__ */
+
NexCrop::NexCrop
NexCrop(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexCrop.cpp:22
NexTouch.h
API of Nextion.
NexHardware.h
Hardware Srial API.
NexCrop
NexCrop,subclass of NexTouch,provides simple methods to control crop component.
Definition: NexCrop.h:26
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_gauge_8cpp.html b/doc/API/_nex_gauge_8cpp.html index f4b935c..cb7c425 100644 --- a/doc/API/_nex_gauge_8cpp.html +++ b/doc/API/_nex_gauge_8cpp.html @@ -67,7 +67,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_gauge_8cpp_source.html b/doc/API/_nex_gauge_8cpp_source.html index 99a2f0f..6d1f7db 100644 --- a/doc/API/_nex_gauge_8cpp_source.html +++ b/doc/API/_nex_gauge_8cpp_source.html @@ -53,15 +53,15 @@ Go to the documentation of this file.
1 
16 #include "NexGauge.h"
17 
-
22 NexGauge::NexGauge(NexPid pid, NexCid cid, char *name)
-
23  :NexTouch(pid, cid, name)
+
22 NexGauge::NexGauge(NexPid pid, NexCid cid, const char *name)
+
23  :NexObject(pid, cid, name)
24 {
25 }
26 
35 bool NexGauge::getValue(uint32_t *number)
36 {
37  String cmd = String("get ");
-
38  cmd += getObjName();
+
38  cmd += getObjName();
39  cmd += ".val";
40  sendCommand(cmd.c_str());
41  return recvRetNumber(number);
@@ -73,7 +73,7 @@
55  String cmd;
56 
57  utoa(number, buf, 10);
-
58  cmd += getObjName();
+
58  cmd += getObjName();
59  cmd += ".val=";
60  cmd += buf;
61 
@@ -84,16 +84,16 @@
recvRetNumber
bool recvRetNumber(uint32_t *number, uint32_t timeout)
Receive uint32_t data.
Definition: NexHardware.cpp:45
recvRetCommandFinished
bool recvRetCommandFinished(uint32_t timeout)
Command is executed successfully.
Definition: NexHardware.cpp:187
NexGauge::setValue
bool setValue(uint32_t number)
Set the value of gauge.
Definition: NexGauge.cpp:52
-
NexTouch::getObjName
const char * getObjName(void)
Get component name.
Definition: NexTouch.cpp:69
+
NexObject::getObjName
const char * getObjName(void)
Get component name.
Definition: NexObject.cpp:58
NexGauge.h
API of NexGauge.
NexGauge::getValue
bool getValue(uint32_t *number)
Get the value of gauge.
Definition: NexGauge.cpp:35
sendCommand
void sendCommand(const char *cmd)
Send command to Nextion.
Definition: NexHardware.cpp:164
-
NexGauge::NexGauge
NexGauge(NexPid pid, NexCid cid, char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexGauge.cpp:22
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexGauge::NexGauge
NexGauge(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexGauge.cpp:22
+
NexObject
Root Class of Nextion Components.
Definition: NexObject.h:28
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_gauge_8h.html b/doc/API/_nex_gauge_8h.html index 070411f..1ad4eb5 100644 --- a/doc/API/_nex_gauge_8h.html +++ b/doc/API/_nex_gauge_8h.html @@ -77,7 +77,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_gauge_8h_source.html b/doc/API/_nex_gauge_8h_source.html index 0c222ee..d09cd6c 100644 --- a/doc/API/_nex_gauge_8h_source.html +++ b/doc/API/_nex_gauge_8h_source.html @@ -57,10 +57,10 @@
19 #include "NexTouch.h"
20 #include "NexHardware.h"
21 
-
26 class NexGauge: public NexTouch
+
26 class NexGauge: public NexObject
27 {
28 public: /* methods */
-
29  NexGauge(NexPid pid, NexCid cid, char *name);
+
29  NexGauge(NexPid pid, NexCid cid, const char *name);
30 
31  bool getValue(uint32_t *number);
32  bool setValue(uint32_t number);
@@ -73,12 +73,12 @@
NexTouch.h
API of Nextion.
NexGauge::getValue
bool getValue(uint32_t *number)
Get the value of gauge.
Definition: NexGauge.cpp:35
NexHardware.h
Hardware Srial API.
-
NexGauge::NexGauge
NexGauge(NexPid pid, NexCid cid, char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexGauge.cpp:22
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexGauge::NexGauge
NexGauge(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexGauge.cpp:22
+
NexObject
Root Class of Nextion Components.
Definition: NexObject.h:28
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_hardware_8cpp.html b/doc/API/_nex_hardware_8cpp.html index ac08173..a3ad709 100644 --- a/doc/API/_nex_hardware_8cpp.html +++ b/doc/API/_nex_hardware_8cpp.html @@ -240,7 +240,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_hardware_8cpp_source.html b/doc/API/_nex_hardware_8cpp_source.html index 5f459cc..ca554fa 100644 --- a/doc/API/_nex_hardware_8cpp_source.html +++ b/doc/API/_nex_hardware_8cpp_source.html @@ -283,11 +283,11 @@
sendCommand
void sendCommand(const char *cmd)
Send command to Nextion.
Definition: NexHardware.cpp:164
NexHardware.h
Hardware Srial API.
nexInit
bool nexInit(void)
Init Nextion's baudrate,page id.
Definition: NexHardware.cpp:272
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_hardware_8h.html b/doc/API/_nex_hardware_8h.html index e404336..c205bf3 100644 --- a/doc/API/_nex_hardware_8h.html +++ b/doc/API/_nex_hardware_8h.html @@ -242,7 +242,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_hardware_8h_source.html b/doc/API/_nex_hardware_8h_source.html index 4c6668f..0193657 100644 --- a/doc/API/_nex_hardware_8h_source.html +++ b/doc/API/_nex_hardware_8h_source.html @@ -73,12 +73,12 @@
NexTouch.h
API of Nextion.
nexInit
bool nexInit(void)
Init Nextion's baudrate,page id.
Definition: NexHardware.cpp:272
recvRetCommandFinished
bool recvRetCommandFinished(uint32_t timeout=100)
Command is executed successfully.
Definition: NexHardware.cpp:187
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
sendCommand
void sendCommand(const char *cmd)
Send command to Nextion.
Definition: NexHardware.cpp:164
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_hotspot_8cpp.html b/doc/API/_nex_hotspot_8cpp.html index e152bc2..f7c2b66 100644 --- a/doc/API/_nex_hotspot_8cpp.html +++ b/doc/API/_nex_hotspot_8cpp.html @@ -67,7 +67,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_hotspot_8cpp_source.html b/doc/API/_nex_hotspot_8cpp_source.html index 79b7bea..4962a80 100644 --- a/doc/API/_nex_hotspot_8cpp_source.html +++ b/doc/API/_nex_hotspot_8cpp_source.html @@ -53,43 +53,18 @@ Go to the documentation of this file.
1 
16 #include "NexHotspot.h"
17 
-
22 NexHotspot::NexHotspot(NexPid pid, NexCid cid, char *name,
-
23  NexTouchEventCb pop, void *pop_ptr,
-
24  NexTouchEventCb push, void *push_ptr)
-
25  :NexTouch(pid, cid, name, pop, pop_ptr, push, push_ptr)
-
26 {
-
27 }
-
28 
-
35 void NexHotspot::attachPush(NexTouchEventCb push, void *ptr)
-
36 {
-
37  NexTouch::attachPush(push, ptr);
-
38 }
-
39 
-
44 void NexHotspot::detachPush(void)
-
45 {
-
46  NexTouch::detachPush();
-
47 }
-
48 
-
55 void NexHotspot::attachPop(NexTouchEventCb pop, void *ptr)
-
56 {
-
57  NexTouch::attachPop(pop, ptr);
-
58 }
-
59 
-
64 void NexHotspot::detachPop(void)
-
65 {
-
66  NexTouch::detachPop();
-
67 }
-
NexHotspot::detachPop
void detachPop(void)
Unload hotsopt pop callback function.
Definition: NexHotspot.cpp:64
-
NexHotspot::detachPush
void detachPush(void)
Unload hotsopt push callback function.
Definition: NexHotspot.cpp:44
-
NexHotspot::NexHotspot
NexHotspot(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL, NexTouchEventCb push=NULL, void *push_ptr=NULL)
Constructor,inherited NexTouch's constructor function.
Definition: NexHotspot.cpp:22
+
22 NexHotspot::NexHotspot(NexPid pid, NexCid cid, const char *name)
+
23  :NexTouch(pid, cid, name)
+
24 {
+
25 }
+
26 
+
NexHotspot::NexHotspot
NexHotspot(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexHotspot.cpp:22
NexHotspot.h
API of NexHotspot.
-
NexHotspot::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register hotspot pop callback function.
Definition: NexHotspot.cpp:55
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
-
NexHotspot::attachPush
void attachPush(NexTouchEventCb push, void *ptr=NULL)
Register hotspot push callback function.
Definition: NexHotspot.cpp:35
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_hotspot_8h.html b/doc/API/_nex_hotspot_8h.html index c73ad2c..5075644 100644 --- a/doc/API/_nex_hotspot_8h.html +++ b/doc/API/_nex_hotspot_8h.html @@ -77,7 +77,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_hotspot_8h_source.html b/doc/API/_nex_hotspot_8h_source.html index a3e95fa..86d6bc9 100644 --- a/doc/API/_nex_hotspot_8h_source.html +++ b/doc/API/_nex_hotspot_8h_source.html @@ -60,32 +60,20 @@
26 class NexHotspot: public NexTouch
27 {
28 public: /* methods */
-
29  NexHotspot(NexPid pid, NexCid cid, char *name,
-
30  NexTouchEventCb pop = NULL, void *pop_ptr = NULL,
-
31  NexTouchEventCb push = NULL, void *push_ptr = NULL);
-
32 
-
33  void attachPush(NexTouchEventCb push, void *ptr = NULL);
-
34  void detachPush(void);
-
35  void attachPop(NexTouchEventCb pop, void *ptr = NULL);
-
36  void detachPop(void);
-
37 
-
38 };
-
39 
-
40 #endif /* #ifdef __cplusplus */
-
41 #endif /* #ifndef __NEXHOTSPOT_H__ */
-
NexHotspot::detachPop
void detachPop(void)
Unload hotsopt pop callback function.
Definition: NexHotspot.cpp:64
-
NexHotspot::detachPush
void detachPush(void)
Unload hotsopt push callback function.
Definition: NexHotspot.cpp:44
+
29  NexHotspot(NexPid pid, NexCid cid, const char *name);
+
30 };
+
31 
+
32 #endif /* #ifdef __cplusplus */
+
33 #endif /* #ifndef __NEXHOTSPOT_H__ */
+
NexHotspot::NexHotspot
NexHotspot(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexHotspot.cpp:22
NexTouch.h
API of Nextion.
-
NexHotspot::NexHotspot
NexHotspot(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL, NexTouchEventCb push=NULL, void *push_ptr=NULL)
Constructor,inherited NexTouch's constructor function.
Definition: NexHotspot.cpp:22
NexHardware.h
Hardware Srial API.
NexHotspot
NexHotspot,subclass of NexTouch,provides simple methods to control hotspot component.
Definition: NexHotspot.h:26
-
NexHotspot::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register hotspot pop callback function.
Definition: NexHotspot.cpp:55
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
-
NexHotspot::attachPush
void attachPush(NexTouchEventCb push, void *ptr=NULL)
Register hotspot push callback function.
Definition: NexHotspot.cpp:35
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_object_8cpp.html b/doc/API/_nex_object_8cpp.html new file mode 100644 index 00000000..b320bd1 --- /dev/null +++ b/doc/API/_nex_object_8cpp.html @@ -0,0 +1,75 @@ + + + + + + +API: NexObject.cpp File Reference + + + + + + +
+
+ + + + + + + +
+
API +
+
For Arduino developers
+
+
+ + + + +
+
+
+
NexObject.cpp File Reference
+
+
+ +

The root of all classes in Nextion library. +More...

+
#include "NexObject.h"
+
+

Go to the source code of this file.

+

Detailed Description

+

The root of all classes in Nextion library.

+
Author
Wu Pengfei (email:pengf.nosp@m.ei.w.nosp@m.u@ite.nosp@m.ad.c.nosp@m.c)
+
Date
2015/8/13
+
Copyright
Copyright (C) 2014-2015 ITEAD Intelligent Systems Co., Ltd.
+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.
+ +

Definition in file NexObject.cpp.

+
+ +
+Generated on Thu Aug 13 2015 18:10:27 for API by   +doxygen + 1.8.7 +
+ + diff --git a/doc/API/_nex_object_8cpp_source.html b/doc/API/_nex_object_8cpp_source.html new file mode 100644 index 00000000..548cadc --- /dev/null +++ b/doc/API/_nex_object_8cpp_source.html @@ -0,0 +1,113 @@ + + + + + + +API: NexObject.cpp Source File + + + + + + +
+
+ + + + + + + +
+
API +
+
For Arduino developers
+
+
+ + + + +
+
+
+
NexObject.cpp
+
+
+Go to the documentation of this file.
1 
+
16 #include "NexObject.h"
+
17 
+
25 NexObject::NexObject(NexPid pid, NexCid cid, const char *name)
+
26 {
+
27  this->pid = pid;
+
28  this->cid = cid;
+
29  this->name = name;
+
30  dbSerialPrintln("NexObject called");
+
31 }
+
32 
+
38 NexPid NexObject::getObjPid(void)
+
39 {
+
40  return pid;
+
41 }
+
42 
+
48 NexCid NexObject::getObjCid(void)
+
49 {
+
50  return cid;
+
51 }
+
52 
+
58 const char* NexObject::getObjName(void)
+
59 {
+
60  return name;
+
61 }
+
62 
+
68 void NexObject::printObjInfo(void)
+
69 {
+
70  dbSerialPrint("[");
+
71  dbSerialPrint((uint32_t)this);
+
72  dbSerialPrint(":");
+
73  dbSerialPrint(pid);
+
74  dbSerialPrint(",");
+
75  dbSerialPrint(cid);
+
76  dbSerialPrint(",");
+
77  if (name)
+
78  {
+
79  dbSerialPrint(name);
+
80  }
+
81  else
+
82  {
+
83  dbSerialPrint("(null)");
+
84  }
+
85  dbSerialPrintln("]");
+
86 }
+
87 
+
NexObject::NexObject
NexObject(NexPid pid, NexCid cid, const char *name)
Constructor.
Definition: NexObject.cpp:25
+
NexObject::getObjCid
NexCid getObjCid(void)
Get component id.
Definition: NexObject.cpp:48
+
NexObject::getObjName
const char * getObjName(void)
Get component name.
Definition: NexObject.cpp:58
+
NexObject::getObjPid
NexPid getObjPid(void)
Get page id.
Definition: NexObject.cpp:38
+
NexObject.h
The root of all classes in Nextion library.
+
NexObject::printObjInfo
void printObjInfo(void)
Print current object address,page id,component id, component name,pop event function address...
Definition: NexObject.cpp:68
+
+ +
+Generated on Thu Aug 13 2015 18:10:27 for API by   +doxygen + 1.8.7 +
+ + diff --git a/doc/API/_nex_object_8h.html b/doc/API/_nex_object_8h.html new file mode 100644 index 00000000..6d5b59e --- /dev/null +++ b/doc/API/_nex_object_8h.html @@ -0,0 +1,85 @@ + + + + + + +API: NexObject.h File Reference + + + + + + +
+
+ + + + + + + +
+
API +
+
For Arduino developers
+
+
+ + + + +
+
+
+Classes
+
+
NexObject.h File Reference
+
+
+ +

The root of all classes in Nextion library. +More...

+
#include <Arduino.h>
+#include "NexSerialConfig.h"
+
+

Go to the source code of this file.

+ + + + + +

+Classes

class  NexObject
 Root Class of Nextion Components. More...
 
+

Detailed Description

+

The root of all classes in Nextion library.

+
Author
Wu Pengfei (email:pengf.nosp@m.ei.w.nosp@m.u@ite.nosp@m.ad.c.nosp@m.c)
+
Date
2015/8/13
+
Copyright
Copyright (C) 2014-2015 ITEAD Intelligent Systems Co., Ltd.
+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.
+ +

Definition in file NexObject.h.

+
+ +
+Generated on Thu Aug 13 2015 18:10:27 for API by   +doxygen + 1.8.7 +
+ + diff --git a/doc/API/_nex_object_8h_source.html b/doc/API/_nex_object_8h_source.html new file mode 100644 index 00000000..bff9c75 --- /dev/null +++ b/doc/API/_nex_object_8h_source.html @@ -0,0 +1,96 @@ + + + + + + +API: NexObject.h Source File + + + + + + +
+
+ + + + + + + +
+
API +
+
For Arduino developers
+
+
+ + + + +
+
+
+
NexObject.h
+
+
+Go to the documentation of this file.
1 
+
16 #ifndef __NEXOBJECT_H__
+
17 #define __NEXOBJECT_H__
+
18 #ifdef __cplusplus
+
19 #include <Arduino.h>
+
20 #include "NexSerialConfig.h"
+
21 
+
22 typedef uint8_t NexPid;
+
23 typedef uint8_t NexCid;
+
24 
+
28 class NexObject
+
29 {
+
30 public: /* methods */
+
31  NexObject(NexPid pid, NexCid cid, const char *name);
+
32 
+
33  NexPid getObjPid(void);
+
34  NexCid getObjCid(void);
+
35  const char *getObjName(void);
+
36  void printObjInfo(void);
+
37 
+
38 private: /* data */
+
39  NexPid pid; /* Page ID */
+
40  NexCid cid; /* Component ID */
+
41  const char *name; /* An unique name */
+
42 };
+
43 
+
44 #endif /* #ifdef __cplusplus */
+
45 #endif /* #ifndef __NEXOBJECT_H__ */
+
NexSerialConfig.h
Serial configure.
+
NexObject::NexObject
NexObject(NexPid pid, NexCid cid, const char *name)
Constructor.
Definition: NexObject.cpp:25
+
NexObject::getObjCid
NexCid getObjCid(void)
Get component id.
Definition: NexObject.cpp:48
+
NexObject::getObjName
const char * getObjName(void)
Get component name.
Definition: NexObject.cpp:58
+
NexObject::getObjPid
NexPid getObjPid(void)
Get page id.
Definition: NexObject.cpp:38
+
NexObject
Root Class of Nextion Components.
Definition: NexObject.h:28
+
NexObject::printObjInfo
void printObjInfo(void)
Print current object address,page id,component id, component name,pop event function address...
Definition: NexObject.cpp:68
+
+ +
+Generated on Thu Aug 13 2015 18:10:27 for API by   +doxygen + 1.8.7 +
+ + diff --git a/doc/API/_nex_page_8cpp.html b/doc/API/_nex_page_8cpp.html index 2ee7fa3..c195717 100644 --- a/doc/API/_nex_page_8cpp.html +++ b/doc/API/_nex_page_8cpp.html @@ -67,7 +67,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_page_8cpp_source.html b/doc/API/_nex_page_8cpp_source.html index 44307e2..877e9f6 100644 --- a/doc/API/_nex_page_8cpp_source.html +++ b/doc/API/_nex_page_8cpp_source.html @@ -53,8 +53,8 @@ Go to the documentation of this file.
1 
16 #include "NexPage.h"
17 
-
22 NexPage::NexPage(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop, void *pop_ptr)
-
23  :NexTouch(pid, cid, name, pop, pop_ptr)
+
22 NexPage::NexPage(NexPid pid, NexCid cid, const char *name)
+
23  :NexTouch(pid, cid, name)
24 {
25 }
26 
@@ -62,7 +62,7 @@
34 {
35  uint8_t buffer[4] = {0};
36 
-
37  const char *name = getObjName();
+
37  const char *name = getObjName();
38  if (!name)
39  {
40  return false;
@@ -74,28 +74,17 @@
46  return recvRetCommandFinished();
47 }
48 
-
55 void NexPage::attachPop(NexTouchEventCb pop, void *ptr)
-
56 {
-
57  NexTouch::attachPop(pop, ptr);
-
58 }
-
59 
-
64 void NexPage::detachPop(void)
-
65 {
-
66  NexTouch::detachPop();
-
67 }
-
NexPage::detachPop
void detachPop(void)
Unload page pop callback function.
Definition: NexPage.cpp:64
recvRetCommandFinished
bool recvRetCommandFinished(uint32_t timeout)
Command is executed successfully.
Definition: NexHardware.cpp:187
NexPage::show
bool show(void)
Change page.
Definition: NexPage.cpp:33
-
NexTouch::getObjName
const char * getObjName(void)
Get component name.
Definition: NexTouch.cpp:69
NexPage.h
API of NexPage.
-
NexPage::NexPage
NexPage(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL)
Constructor,inherited NexTouch's constructor function.
Definition: NexPage.cpp:22
+
NexObject::getObjName
const char * getObjName(void)
Get component name.
Definition: NexObject.cpp:58
sendCommand
void sendCommand(const char *cmd)
Send command to Nextion.
Definition: NexHardware.cpp:164
-
NexPage::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register page pop callback function.
Definition: NexPage.cpp:55
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexPage::NexPage
NexPage(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexPage.cpp:22
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_page_8h.html b/doc/API/_nex_page_8h.html index ab6fde2..f826a21 100644 --- a/doc/API/_nex_page_8h.html +++ b/doc/API/_nex_page_8h.html @@ -77,7 +77,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_page_8h_source.html b/doc/API/_nex_page_8h_source.html index 8e048fc..4b0b231 100644 --- a/doc/API/_nex_page_8h_source.html +++ b/doc/API/_nex_page_8h_source.html @@ -60,28 +60,22 @@
26 class NexPage: public NexTouch
27 {
28 public: /* methods */
-
29  NexPage(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop = NULL, void *pop_ptr = NULL);
+
29  NexPage(NexPid pid, NexCid cid, const char *name);
30  bool show(void);
-
31 
-
32  void attachPop(NexTouchEventCb pop, void *ptr = NULL);
-
33  void detachPop(void);
-
34 
-
35 };
-
36 
-
37 #endif /* #ifdef __cplusplus */
-
38 #endif /* #ifndef __NEXPAGE_H__ */
-
NexPage::detachPop
void detachPop(void)
Unload page pop callback function.
Definition: NexPage.cpp:64
+
31 };
+
32 
+
33 #endif /* #ifdef __cplusplus */
+
34 #endif /* #ifndef __NEXPAGE_H__ */
NexPage::show
bool show(void)
Change page.
Definition: NexPage.cpp:33
NexPage
NexPage,subclass of NexTouch,provides simple methods to control page component.
Definition: NexPage.h:26
NexTouch.h
API of Nextion.
-
NexPage::NexPage
NexPage(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL)
Constructor,inherited NexTouch's constructor function.
Definition: NexPage.cpp:22
NexHardware.h
Hardware Srial API.
-
NexPage::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register page pop callback function.
Definition: NexPage.cpp:55
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexPage::NexPage
NexPage(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexPage.cpp:22
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_picture_8cpp.html b/doc/API/_nex_picture_8cpp.html index 346ac7d..b61bd5b 100644 --- a/doc/API/_nex_picture_8cpp.html +++ b/doc/API/_nex_picture_8cpp.html @@ -67,7 +67,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_picture_8cpp_source.html b/doc/API/_nex_picture_8cpp_source.html index 1ee3d42..1c07dc4 100644 --- a/doc/API/_nex_picture_8cpp_source.html +++ b/doc/API/_nex_picture_8cpp_source.html @@ -53,15 +53,15 @@ Go to the documentation of this file.
1 
16 #include "NexPicture.h"
17 
-
22 NexPicture::NexPicture(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop, void *pop_ptr)
-
23  :NexTouch(pid, cid, name, pop, pop_ptr)
+
22 NexPicture::NexPicture(NexPid pid, NexCid cid, const char *name)
+
23  :NexTouch(pid, cid, name)
24 {
25 }
26 
35 bool NexPicture::getPic(uint32_t *number)
36 {
37  String cmd = String("get ");
-
38  cmd += getObjName();
+
38  cmd += getObjName();
39  cmd += ".pic";
40  sendCommand(cmd.c_str());
41  return recvRetNumber(number);
@@ -73,39 +73,27 @@
55  String cmd;
56 
57  utoa(number, buf, 10);
-
58  cmd += getObjName();
+
58  cmd += getObjName();
59  cmd += ".pic=";
60  cmd += buf;
61 
62  sendCommand(cmd.c_str());
63  return recvRetCommandFinished();
64 }
-
65 
-
72 void NexPicture::attachPop(NexTouchEventCb pop, void *ptr)
-
73 {
-
74  NexTouch::attachPop(pop, ptr);
-
75 }
-
76 
-
81 void NexPicture::detachPop(void)
-
82 {
-
83  NexTouch::detachPop();
-
84 }
-
85 
+
65 
recvRetNumber
bool recvRetNumber(uint32_t *number, uint32_t timeout)
Receive uint32_t data.
Definition: NexHardware.cpp:45
recvRetCommandFinished
bool recvRetCommandFinished(uint32_t timeout)
Command is executed successfully.
Definition: NexHardware.cpp:187
-
NexPicture::detachPop
void detachPop(void)
Unload picture pop callback function.
Definition: NexPicture.cpp:81
NexPicture::setPic
bool setPic(uint32_t number)
Set picture's number.
Definition: NexPicture.cpp:52
-
NexPicture::NexPicture
NexPicture(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL)
Constructor,inherited NexTouch's constructor function.
Definition: NexPicture.cpp:22
-
NexTouch::getObjName
const char * getObjName(void)
Get component name.
Definition: NexTouch.cpp:69
+
NexObject::getObjName
const char * getObjName(void)
Get component name.
Definition: NexObject.cpp:58
sendCommand
void sendCommand(const char *cmd)
Send command to Nextion.
Definition: NexHardware.cpp:164
-
NexPicture::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register picture pop callback function.
Definition: NexPicture.cpp:72
NexPicture::getPic
bool getPic(uint32_t *number)
Get picture's number.
Definition: NexPicture.cpp:35
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexPicture::NexPicture
NexPicture(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexPicture.cpp:22
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
NexPicture.h
API of NexPicture.
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_picture_8h.html b/doc/API/_nex_picture_8h.html index ed934e7..84c6e08 100644 --- a/doc/API/_nex_picture_8h.html +++ b/doc/API/_nex_picture_8h.html @@ -77,7 +77,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_picture_8h_source.html b/doc/API/_nex_picture_8h_source.html index 3781eae..10f59cd 100644 --- a/doc/API/_nex_picture_8h_source.html +++ b/doc/API/_nex_picture_8h_source.html @@ -60,30 +60,25 @@
26 class NexPicture: public NexTouch
27 {
28 public: /* methods */
-
29  NexPicture(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop = NULL, void *pop_ptr = NULL);
+
29  NexPicture(NexPid pid, NexCid cid, const char *name);
30 
-
31  void attachPop(NexTouchEventCb pop, void *ptr = NULL);
-
32  void detachPop(void);
-
33 
-
34  bool getPic(uint32_t *number);
-
35  bool setPic(uint32_t number);
-
36 };
-
37 
-
38 #endif /* #ifdef __cplusplus */
-
39 #endif /* #ifndef __NEXPICTURE_H__ */
-
NexPicture::detachPop
void detachPop(void)
Unload picture pop callback function.
Definition: NexPicture.cpp:81
+
31  bool getPic(uint32_t *number);
+
32  bool setPic(uint32_t number);
+
33 };
+
34 
+
35 #endif /* #ifdef __cplusplus */
+
36 #endif /* #ifndef __NEXPICTURE_H__ */
NexPicture::setPic
bool setPic(uint32_t number)
Set picture's number.
Definition: NexPicture.cpp:52
-
NexPicture::NexPicture
NexPicture(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL)
Constructor,inherited NexTouch's constructor function.
Definition: NexPicture.cpp:22
NexPicture
NexPicture,subclass of NexTouch,provides simple methods to control picture component.
Definition: NexPicture.h:26
NexTouch.h
API of Nextion.
-
NexPicture::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register picture pop callback function.
Definition: NexPicture.cpp:72
NexHardware.h
Hardware Srial API.
NexPicture::getPic
bool getPic(uint32_t *number)
Get picture's number.
Definition: NexPicture.cpp:35
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexPicture::NexPicture
NexPicture(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexPicture.cpp:22
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_progress_bar_8cpp.html b/doc/API/_nex_progress_bar_8cpp.html index b30acb3..162c8dd 100644 --- a/doc/API/_nex_progress_bar_8cpp.html +++ b/doc/API/_nex_progress_bar_8cpp.html @@ -67,7 +67,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_progress_bar_8cpp_source.html b/doc/API/_nex_progress_bar_8cpp_source.html index ec7ffac..0bad6f4 100644 --- a/doc/API/_nex_progress_bar_8cpp_source.html +++ b/doc/API/_nex_progress_bar_8cpp_source.html @@ -53,15 +53,15 @@ Go to the documentation of this file.
1 
16 #include "NexProgressBar.h"
17 
-
22 NexProgressBar::NexProgressBar(NexPid pid, NexCid cid, char *name)
-
23  :NexTouch(pid, cid, name)
+
22 NexProgressBar::NexProgressBar(NexPid pid, NexCid cid, const char *name)
+
23  :NexObject(pid, cid, name)
24 {
25 }
26 
35 bool NexProgressBar::getValue(uint32_t *number)
36 {
37  String cmd = String("get ");
-
38  cmd += getObjName();
+
38  cmd += getObjName();
39  cmd += ".val";
40  sendCommand(cmd.c_str());
41  return recvRetNumber(number);
@@ -73,7 +73,7 @@
55  String cmd;
56 
57  utoa(number, buf, 10);
-
58  cmd += getObjName();
+
58  cmd += getObjName();
59  cmd += ".val=";
60  cmd += buf;
61 
@@ -84,16 +84,16 @@
recvRetNumber
bool recvRetNumber(uint32_t *number, uint32_t timeout)
Receive uint32_t data.
Definition: NexHardware.cpp:45
recvRetCommandFinished
bool recvRetCommandFinished(uint32_t timeout)
Command is executed successfully.
Definition: NexHardware.cpp:187
NexProgressBar::setValue
bool setValue(uint32_t number)
Set the value of progress bar.
Definition: NexProgressBar.cpp:52
-
NexTouch::getObjName
const char * getObjName(void)
Get component name.
Definition: NexTouch.cpp:69
+
NexProgressBar::NexProgressBar
NexProgressBar(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexProgressBar.cpp:22
+
NexObject::getObjName
const char * getObjName(void)
Get component name.
Definition: NexObject.cpp:58
sendCommand
void sendCommand(const char *cmd)
Send command to Nextion.
Definition: NexHardware.cpp:164
NexProgressBar::getValue
bool getValue(uint32_t *number)
Get the value of progress bar.
Definition: NexProgressBar.cpp:35
-
NexProgressBar::NexProgressBar
NexProgressBar(NexPid pid, NexCid cid, char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexProgressBar.cpp:22
+
NexObject
Root Class of Nextion Components.
Definition: NexObject.h:28
NexProgressBar.h
API of NexProgressBar.
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_progress_bar_8h.html b/doc/API/_nex_progress_bar_8h.html index 59eb670..63da7c5 100644 --- a/doc/API/_nex_progress_bar_8h.html +++ b/doc/API/_nex_progress_bar_8h.html @@ -77,7 +77,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_progress_bar_8h_source.html b/doc/API/_nex_progress_bar_8h_source.html index a46b07f..af5efba 100644 --- a/doc/API/_nex_progress_bar_8h_source.html +++ b/doc/API/_nex_progress_bar_8h_source.html @@ -57,10 +57,10 @@
19 #include "NexTouch.h"
20 #include "NexHardware.h"
21 
-
26 class NexProgressBar: public NexTouch
+
26 class NexProgressBar: public NexObject
27 {
28 public: /* methods */
-
29  NexProgressBar(NexPid pid, NexCid cid, char *name);
+
29  NexProgressBar(NexPid pid, NexCid cid, const char *name);
30 
31  bool getValue(uint32_t *number);
32  bool setValue(uint32_t number);
@@ -69,16 +69,16 @@
35 #endif /* #ifdef __cplusplus */
36 #endif /* #ifndef __NEXPROGRESSBAR_H__ */
NexProgressBar::setValue
bool setValue(uint32_t number)
Set the value of progress bar.
Definition: NexProgressBar.cpp:52
+
NexProgressBar::NexProgressBar
NexProgressBar(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexProgressBar.cpp:22
NexTouch.h
API of Nextion.
NexHardware.h
Hardware Srial API.
NexProgressBar::getValue
bool getValue(uint32_t *number)
Get the value of progress bar.
Definition: NexProgressBar.cpp:35
-
NexProgressBar::NexProgressBar
NexProgressBar(NexPid pid, NexCid cid, char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexProgressBar.cpp:22
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexObject
Root Class of Nextion Components.
Definition: NexObject.h:28
NexProgressBar
NexProgressBar,subclass of NexTouch,provides simple methods to control progress bar component...
Definition: NexProgressBar.h:26
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_serial_config_8h.html b/doc/API/_nex_serial_config_8h.html index 43abf0d..1db9457 100644 --- a/doc/API/_nex_serial_config_8h.html +++ b/doc/API/_nex_serial_config_8h.html @@ -66,7 +66,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_serial_config_8h_source.html b/doc/API/_nex_serial_config_8h_source.html index 5ba76f4..314f238 100644 --- a/doc/API/_nex_serial_config_8h_source.html +++ b/doc/API/_nex_serial_config_8h_source.html @@ -77,7 +77,7 @@
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_slider_8cpp.html b/doc/API/_nex_slider_8cpp.html index 1d875b8..a1eea98 100644 --- a/doc/API/_nex_slider_8cpp.html +++ b/doc/API/_nex_slider_8cpp.html @@ -67,7 +67,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_slider_8cpp_source.html b/doc/API/_nex_slider_8cpp_source.html index 5762793..6272360 100644 --- a/doc/API/_nex_slider_8cpp_source.html +++ b/doc/API/_nex_slider_8cpp_source.html @@ -53,60 +53,47 @@ Go to the documentation of this file.
1 
16 #include "NexSlider.h"
17 
-
22 NexSlider::NexSlider(NexPid pid, NexCid cid, char *name,
-
23  NexTouchEventCb pop, void *pop_ptr)
-
24  :NexTouch(pid, cid, name, pop, pop_ptr)
-
25 {
-
26 }
-
27 
-
36 bool NexSlider::getValue(uint32_t *number)
-
37 {
-
38  String cmd = String("get ");
-
39  cmd += getObjName();
-
40  cmd += ".val";
-
41  sendCommand(cmd.c_str());
-
42  return recvRetNumber(number);
-
43 }
-
44 
-
53 bool NexSlider::setValue(uint32_t number)
-
54 {
-
55  char buf[10] = {0};
-
56  String cmd;
-
57 
-
58  utoa(number, buf, 10);
-
59  cmd += getObjName();
-
60  cmd += ".val=";
-
61  cmd += buf;
-
62 
-
63  sendCommand(cmd.c_str());
-
64  return recvRetCommandFinished();
-
65 }
-
66 
-
73 void NexSlider::attachPop(NexTouchEventCb pop, void *ptr)
-
74 {
-
75  NexTouch::attachPop(pop, ptr);
-
76 }
-
77 
-
82 void NexSlider::detachPop(void)
-
83 {
-
84  NexTouch::detachPop();
-
85 }
-
86 
+
22 NexSlider::NexSlider(NexPid pid, NexCid cid, const char *name)
+
23  :NexTouch(pid, cid, name)
+
24 {
+
25 }
+
26 
+
35 bool NexSlider::getValue(uint32_t *number)
+
36 {
+
37  String cmd = String("get ");
+
38  cmd += getObjName();
+
39  cmd += ".val";
+
40  sendCommand(cmd.c_str());
+
41  return recvRetNumber(number);
+
42 }
+
43 
+
52 bool NexSlider::setValue(uint32_t number)
+
53 {
+
54  char buf[10] = {0};
+
55  String cmd;
+
56 
+
57  utoa(number, buf, 10);
+
58  cmd += getObjName();
+
59  cmd += ".val=";
+
60  cmd += buf;
+
61 
+
62  sendCommand(cmd.c_str());
+
63  return recvRetCommandFinished();
+
64 }
+
65 
recvRetNumber
bool recvRetNumber(uint32_t *number, uint32_t timeout)
Receive uint32_t data.
Definition: NexHardware.cpp:45
recvRetCommandFinished
bool recvRetCommandFinished(uint32_t timeout)
Command is executed successfully.
Definition: NexHardware.cpp:187
-
NexSlider::setValue
bool setValue(uint32_t number)
Set the value of slider.
Definition: NexSlider.cpp:53
-
NexSlider::getValue
bool getValue(uint32_t *number)
Get the value of slider.
Definition: NexSlider.cpp:36
+
NexSlider::setValue
bool setValue(uint32_t number)
Set the value of slider.
Definition: NexSlider.cpp:52
+
NexSlider::getValue
bool getValue(uint32_t *number)
Get the value of slider.
Definition: NexSlider.cpp:35
NexSlider.h
API of NexSlider.
-
NexTouch::getObjName
const char * getObjName(void)
Get component name.
Definition: NexTouch.cpp:69
-
NexSlider::detachPop
void detachPop(void)
Unload slider pop callback function.
Definition: NexSlider.cpp:82
+
NexObject::getObjName
const char * getObjName(void)
Get component name.
Definition: NexObject.cpp:58
+
NexSlider::NexSlider
NexSlider(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexSlider.cpp:22
sendCommand
void sendCommand(const char *cmd)
Send command to Nextion.
Definition: NexHardware.cpp:164
-
NexSlider::NexSlider
NexSlider(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL)
Constructor,inherited NexTouch's constructor function.
Definition: NexSlider.cpp:22
-
NexSlider::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register slider pop callback function.
Definition: NexSlider.cpp:73
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_slider_8h.html b/doc/API/_nex_slider_8h.html index 60dc88f..85d9026 100644 --- a/doc/API/_nex_slider_8h.html +++ b/doc/API/_nex_slider_8h.html @@ -77,7 +77,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_slider_8h_source.html b/doc/API/_nex_slider_8h_source.html index 50593e4..089e854 100644 --- a/doc/API/_nex_slider_8h_source.html +++ b/doc/API/_nex_slider_8h_source.html @@ -60,30 +60,25 @@
26 class NexSlider: public NexTouch
27 {
28 public: /* methods */
-
29  NexSlider(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop = NULL, void *pop_ptr = NULL);
-
30 
-
31  void attachPop(NexTouchEventCb pop, void *ptr = NULL);
-
32  void detachPop(void);
-
33 
-
34  bool getValue(uint32_t *number);
-
35  bool setValue(uint32_t number);
-
36 };
-
37 
-
38 #endif /* #ifdef __cplusplus */
-
39 #endif /* #ifndef __NEXSLIDER_H__ */
+
29  NexSlider(NexPid pid, NexCid cid, const char *name);
+
30 
+
31  bool getValue(uint32_t *number);
+
32  bool setValue(uint32_t number);
+
33 };
+
34 
+
35 #endif /* #ifdef __cplusplus */
+
36 #endif /* #ifndef __NEXSLIDER_H__ */
NexSlider
NexSlider,subclass of NexTouch,provides simple methods to control slider component.
Definition: NexSlider.h:26
-
NexSlider::setValue
bool setValue(uint32_t number)
Set the value of slider.
Definition: NexSlider.cpp:53
-
NexSlider::getValue
bool getValue(uint32_t *number)
Get the value of slider.
Definition: NexSlider.cpp:36
-
NexSlider::detachPop
void detachPop(void)
Unload slider pop callback function.
Definition: NexSlider.cpp:82
+
NexSlider::setValue
bool setValue(uint32_t number)
Set the value of slider.
Definition: NexSlider.cpp:52
+
NexSlider::getValue
bool getValue(uint32_t *number)
Get the value of slider.
Definition: NexSlider.cpp:35
+
NexSlider::NexSlider
NexSlider(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexSlider.cpp:22
NexTouch.h
API of Nextion.
-
NexSlider::NexSlider
NexSlider(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL)
Constructor,inherited NexTouch's constructor function.
Definition: NexSlider.cpp:22
NexHardware.h
Hardware Srial API.
-
NexSlider::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register slider pop callback function.
Definition: NexSlider.cpp:73
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_text_8cpp.html b/doc/API/_nex_text_8cpp.html index c54a8b5..2b39af0 100644 --- a/doc/API/_nex_text_8cpp.html +++ b/doc/API/_nex_text_8cpp.html @@ -67,7 +67,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_text_8cpp_source.html b/doc/API/_nex_text_8cpp_source.html index b74692e..6da02a7 100644 --- a/doc/API/_nex_text_8cpp_source.html +++ b/doc/API/_nex_text_8cpp_source.html @@ -53,8 +53,8 @@ Go to the documentation of this file.
1 
16 #include "NexText.h"
17 
-
22 NexText::NexText(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop, void *pop_ptr)
-
23  :NexTouch(pid, cid, name, pop, pop_ptr)
+
22 NexText::NexText(NexPid pid, NexCid cid, const char *name)
+
23  :NexTouch(pid, cid, name)
24 {
25 }
26 
@@ -62,7 +62,7 @@
36 {
37  String cmd;
38  cmd += "get ";
-
39  cmd += getObjName();
+
39  cmd += getObjName();
40  cmd += ".txt";
41  sendCommand(cmd.c_str());
42  return recvRetString(buffer,len);
@@ -71,7 +71,7 @@
53 bool NexText::setText(const char *buffer)
54 {
55  String cmd;
-
56  cmd += getObjName();
+
56  cmd += getObjName();
57  cmd += ".txt=\"";
58  cmd += buffer;
59  cmd += "\"";
@@ -79,31 +79,19 @@
61  return recvRetCommandFinished();
62 }
63 
-
70 void NexText::attachPop(NexTouchEventCb pop, void *ptr)
-
71 {
-
72  NexTouch::attachPop(pop, ptr);
-
73 }
-
74 
-
79 void NexText::detachPop(void)
-
80 {
-
81  NexTouch::detachPop();
-
82 }
-
83 
recvRetCommandFinished
bool recvRetCommandFinished(uint32_t timeout)
Command is executed successfully.
Definition: NexHardware.cpp:187
NexText::setText
bool setText(const char *buffer)
Set the value of text.
Definition: NexText.cpp:53
-
NexText::detachPop
void detachPop(void)
Unload text pop callback function.
Definition: NexText.cpp:79
NexText.h
API of NexText.
recvRetString
uint16_t recvRetString(char *buffer, uint16_t len, uint32_t timeout)
Receive string data.
Definition: NexHardware.cpp:97
-
NexTouch::getObjName
const char * getObjName(void)
Get component name.
Definition: NexTouch.cpp:69
+
NexText::NexText
NexText(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexText.cpp:22
+
NexObject::getObjName
const char * getObjName(void)
Get component name.
Definition: NexObject.cpp:58
NexText::getText
uint16_t getText(char *buffer, uint16_t len)
Get the value of text.
Definition: NexText.cpp:35
-
NexText::NexText
NexText(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL)
Constructor,inherited NexTouch's constructor function.
Definition: NexText.cpp:22
sendCommand
void sendCommand(const char *cmd)
Send command to Nextion.
Definition: NexHardware.cpp:164
-
NexText::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register text pop callback function.
Definition: NexText.cpp:70
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_text_8h.html b/doc/API/_nex_text_8h.html index 360a631..d78788c 100644 --- a/doc/API/_nex_text_8h.html +++ b/doc/API/_nex_text_8h.html @@ -77,7 +77,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_text_8h_source.html b/doc/API/_nex_text_8h_source.html index 4b3f4f6..de35124 100644 --- a/doc/API/_nex_text_8h_source.html +++ b/doc/API/_nex_text_8h_source.html @@ -60,30 +60,25 @@
26 class NexText: public NexTouch
27 {
28 public: /* methods */
-
29  NexText(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop = NULL, void *pop_ptr = NULL);
+
29  NexText(NexPid pid, NexCid cid, const char *name);
30 
-
31  void attachPop(NexTouchEventCb pop, void *ptr = NULL);
-
32  void detachPop(void);
-
33 
-
34  uint16_t getText(char *buffer, uint16_t len);
-
35  bool setText(const char *buffer);
-
36 };
-
37 
-
38 #endif /* #ifdef __cplusplus */
-
39 #endif /* #ifndef __NEXTEXT_H__ */
+
31  uint16_t getText(char *buffer, uint16_t len);
+
32  bool setText(const char *buffer);
+
33 };
+
34 
+
35 #endif /* #ifdef __cplusplus */
+
36 #endif /* #ifndef __NEXTEXT_H__ */
NexText::setText
bool setText(const char *buffer)
Set the value of text.
Definition: NexText.cpp:53
-
NexText::detachPop
void detachPop(void)
Unload text pop callback function.
Definition: NexText.cpp:79
+
NexText::NexText
NexText(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexText.cpp:22
NexText::getText
uint16_t getText(char *buffer, uint16_t len)
Get the value of text.
Definition: NexText.cpp:35
NexTouch.h
API of Nextion.
-
NexText::NexText
NexText(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL)
Constructor,inherited NexTouch's constructor function.
Definition: NexText.cpp:22
NexHardware.h
Hardware Srial API.
-
NexText::attachPop
void attachPop(NexTouchEventCb pop, void *ptr=NULL)
Register text pop callback function.
Definition: NexText.cpp:70
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
NexText
NexText,subclass of NexTouch,provides simple methods to control text component.
Definition: NexText.h:26
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_touch_8cpp.html b/doc/API/_nex_touch_8cpp.html index b77f2bc..ab46007 100644 --- a/doc/API/_nex_touch_8cpp.html +++ b/doc/API/_nex_touch_8cpp.html @@ -67,7 +67,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_touch_8cpp_source.html b/doc/API/_nex_touch_8cpp_source.html index b30f98a..9320d9a 100644 --- a/doc/API/_nex_touch_8cpp_source.html +++ b/doc/API/_nex_touch_8cpp_source.html @@ -54,137 +54,95 @@
16 #include "NexTouch.h"
17 
18 
-
31 NexTouch::NexTouch(NexPid pid, NexCid cid, char *name,
-
32  NexTouchEventCb pop, void *pop_ptr,
-
33  NexTouchEventCb push, void *push_ptr)
-
34 {
-
35  this->pid = pid;
-
36  this->cid = cid;
-
37  this->name = name;
+
27 NexTouch::NexTouch(NexPid pid, NexCid cid, const char *name)
+
28  :NexObject(pid, cid, name)
+
29 {
+
30  this->cbPush = NULL;
+
31  this->cbPop = NULL;
+
32  this->__cbpop_ptr = NULL;
+
33  this->__cbpush_ptr = NULL;
+
34 }
+
35 
+
36 void NexTouch::attachPush(NexTouchEventCb push, void *ptr)
+
37 {
38  this->cbPush = push;
-
39  this->cbPop = pop;
-
40  this->__cbpop_ptr = pop_ptr;
-
41  this->__cbpush_ptr = push_ptr;
-
42 }
-
43 
-
49 NexPid NexTouch::getPid(void)
-
50 {
-
51  return pid;
+
39  this->__cbpush_ptr = ptr;
+
40 }
+
41 
+
42 void NexTouch::detachPush(void)
+
43 {
+
44  this->cbPush = NULL;
+
45  this->__cbpush_ptr = NULL;
+
46 }
+
47 
+
48 void NexTouch::attachPop(NexTouchEventCb pop, void *ptr)
+
49 {
+
50  this->cbPop = pop;
+
51  this->__cbpop_ptr = ptr;
52 }
53 
-
59 NexCid NexTouch::getCid(void)
-
60 {
-
61  return cid;
-
62 }
-
63 
-
69 const char* NexTouch::getObjName(void)
-
70 {
-
71  return name;
-
72 }
-
73 
-
79 void NexTouch::print(void)
-
80 {
-
81  dbSerialPrint("[");
-
82  dbSerialPrint((uint32_t)this);
-
83  dbSerialPrint(":");
-
84  dbSerialPrint(pid);
-
85  dbSerialPrint(",");
-
86  dbSerialPrint(cid);
-
87  dbSerialPrint(",");
-
88  if (name)
-
89  {
-
90  dbSerialPrint(name);
-
91  }
-
92  else
-
93  {
-
94  dbSerialPrint("(null)");
-
95  }
-
96  dbSerialPrint(",");
-
97  dbSerialPrint((uint32_t)cbPush);
-
98  dbSerialPrint(",");
-
99  dbSerialPrint((uint32_t)cbPop);
-
100  dbSerialPrintln("]");
-
101 }
-
102 
-
103 void NexTouch::attachPush(NexTouchEventCb push, void *ptr)
-
104 {
-
105  this->cbPush = push;
-
106  this->__cbpush_ptr = ptr;
-
107 }
-
108 
-
109 void NexTouch::detachPush(void)
-
110 {
-
111  this->cbPush = NULL;
-
112  this->__cbpush_ptr = NULL;
-
113 }
-
114 
-
115 void NexTouch::attachPop(NexTouchEventCb pop, void *ptr)
-
116 {
-
117  this->cbPop = pop;
-
118  this->__cbpop_ptr = ptr;
-
119 }
-
120 
-
121 void NexTouch::detachPop(void)
-
122 {
-
123  this->cbPop = NULL;
-
124  this->__cbpop_ptr = NULL;
-
125 }
-
126 
-
127 void NexTouch::push(void)
-
128 {
-
129  if (cbPush)
-
130  {
-
131  cbPush(__cbpush_ptr);
-
132  }
-
133 }
-
134 
-
135 void NexTouch::pop(void)
-
136 {
-
137  if (cbPop)
-
138  {
-
139  cbPop(__cbpop_ptr);
-
140  }
-
141 }
-
142 
-
143 void NexTouch::iterate(NexTouch **list, NexPid pid, NexCid cid, NexEventType event)
-
144 {
-
145  NexTouch *e = NULL;
-
146  uint16_t i = 0;
-
147 
-
148  if (NULL == list)
-
149  {
-
150  return;
-
151  }
-
152 
-
153  for(i = 0; (e = list[i]) != NULL; i++)
-
154  {
-
155  if (e->getPid() == pid && e->getCid() == cid)
-
156  {
-
157  e->print();
-
158  if (NEX_EVENT_PUSH == event)
-
159  {
-
160  e->push();
-
161  }
-
162  else if (NEX_EVENT_POP == event)
-
163  {
-
164  e->pop();
-
165  }
-
166 
-
167  break;
-
168  }
-
169  }
-
170 }
-
171 
-
NexTouch::getPid
NexPid getPid(void)
Get page id.
Definition: NexTouch.cpp:49
-
NexTouch::NexTouch
NexTouch(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL, NexTouchEventCb push=NULL, void *push_ptr=NULL)
Constructor of Nextouch.
Definition: NexTouch.cpp:31
-
NexTouch::getObjName
const char * getObjName(void)
Get component name.
Definition: NexTouch.cpp:69
-
NexTouch::getCid
NexCid getCid(void)
Get component id.
Definition: NexTouch.cpp:59
+
54 void NexTouch::detachPop(void)
+
55 {
+
56  this->cbPop = NULL;
+
57  this->__cbpop_ptr = NULL;
+
58 }
+
59 
+
60 void NexTouch::push(void)
+
61 {
+
62  if (cbPush)
+
63  {
+
64  cbPush(__cbpush_ptr);
+
65  }
+
66 }
+
67 
+
68 void NexTouch::pop(void)
+
69 {
+
70  if (cbPop)
+
71  {
+
72  cbPop(__cbpop_ptr);
+
73  }
+
74 }
+
75 
+
76 void NexTouch::iterate(NexTouch **list, NexPid pid, NexCid cid, NexEventType event)
+
77 {
+
78  NexTouch *e = NULL;
+
79  uint16_t i = 0;
+
80 
+
81  if (NULL == list)
+
82  {
+
83  return;
+
84  }
+
85 
+
86  for(i = 0; (e = list[i]) != NULL; i++)
+
87  {
+
88  if (e->getObjPid() == pid && e->getObjCid() == cid)
+
89  {
+
90  e->printObjInfo();
+
91  if (NEX_EVENT_PUSH == event)
+
92  {
+
93  e->push();
+
94  }
+
95  else if (NEX_EVENT_POP == event)
+
96  {
+
97  e->pop();
+
98  }
+
99 
+
100  break;
+
101  }
+
102  }
+
103 }
+
104 
+
NexObject::getObjCid
NexCid getObjCid(void)
Get component id.
Definition: NexObject.cpp:48
+
NexObject::getObjPid
NexPid getObjPid(void)
Get page id.
Definition: NexObject.cpp:38
NexTouch.h
API of Nextion.
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch::NexTouch
NexTouch(NexPid pid, NexCid cid, const char *name)
Constructor of Nextouch.
Definition: NexTouch.cpp:27
+
NexObject
Root Class of Nextion Components.
Definition: NexObject.h:28
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
+
NexObject::printObjInfo
void printObjInfo(void)
Print current object address,page id,component id, component name,pop event function address...
Definition: NexObject.cpp:68
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_touch_8h.html b/doc/API/_nex_touch_8h.html index d541de9..55038c3 100644 --- a/doc/API/_nex_touch_8h.html +++ b/doc/API/_nex_touch_8h.html @@ -57,6 +57,7 @@ More...

#include <Arduino.h>
#include "NexSerialConfig.h"
+#include "NexObject.h"

Go to the source code of this file.

@@ -77,7 +78,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_touch_8h_source.html b/doc/API/_nex_touch_8h_source.html index c6194b6..bc66232 100644 --- a/doc/API/_nex_touch_8h_source.html +++ b/doc/API/_nex_touch_8h_source.html @@ -56,65 +56,51 @@
18 #ifdef __cplusplus
19 #include <Arduino.h>
20 #include "NexSerialConfig.h"
-
21 
-
22 typedef uint8_t NexPid;
-
23 typedef uint8_t NexCid;
+
21 #include "NexObject.h"
+
22 
+
23 typedef void (*NexTouchEventCb)(void *ptr);
24 
-
25 typedef void (*NexTouchEventCb)(void *ptr);
-
26 
-
27 typedef enum {
-
28  NEX_EVENT_POP = 0x00,
-
29  NEX_EVENT_PUSH = 0x01,
-
30  NEX_EVENT_NULL
-
31 } NexEventType;
-
32 
-
37 class NexTouch
-
38 {
-
39 public: /* static methods */
-
40  static void iterate(NexTouch **list, NexPid pid, NexCid cid, NexEventType event);
-
41 
-
42 public: /* methods */
-
43  NexTouch(NexPid pid, NexCid cid, char *name,
-
44  NexTouchEventCb pop = NULL, void *pop_ptr = NULL,
-
45  NexTouchEventCb push = NULL, void *push_ptr = NULL);
-
46 
-
47  NexPid getPid(void);
-
48  NexCid getCid(void);
-
49  const char *getObjName(void);
-
50 
-
51 protected: /* methods */
-
52  void attachPush(NexTouchEventCb push, void *ptr = NULL);
-
53  void detachPush(void);
-
54  void attachPop(NexTouchEventCb pop, void *ptr = NULL);
-
55  void detachPop(void);
-
56 
-
57 private: /* methods */
-
58  void print(void);
-
59  void push(void);
-
60  void pop(void);
-
61 
-
62 private: /* data */
-
63  NexPid pid; /* Page ID */
-
64  NexCid cid; /* Component ID */
-
65  char *name; /* An unique name */
-
66  NexTouchEventCb cbPush;
-
67  void *__cbpush_ptr;
-
68  NexTouchEventCb cbPop;
-
69  void *__cbpop_ptr;
-
70 };
-
71 
-
72 #endif /* #ifdef __cplusplus */
-
73 #endif /* #ifndef __NEXTOUCH_H__ */
-
NexTouch::getPid
NexPid getPid(void)
Get page id.
Definition: NexTouch.cpp:49
-
NexTouch::NexTouch
NexTouch(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL, NexTouchEventCb push=NULL, void *push_ptr=NULL)
Constructor of Nextouch.
Definition: NexTouch.cpp:31
+
25 typedef enum {
+
26  NEX_EVENT_POP = 0x00,
+
27  NEX_EVENT_PUSH = 0x01,
+
28  NEX_EVENT_NULL
+
29 } NexEventType;
+
30 
+
35 class NexTouch: public NexObject
+
36 {
+
37 public: /* static methods */
+
38  static void iterate(NexTouch **list, NexPid pid, NexCid cid, NexEventType event);
+
39 
+
40 public: /* methods */
+
41  NexTouch(NexPid pid, NexCid cid, const char *name);
+
42 
+
43  void attachPush(NexTouchEventCb push, void *ptr = NULL);
+
44  void detachPush(void);
+
45  void attachPop(NexTouchEventCb pop, void *ptr = NULL);
+
46  void detachPop(void);
+
47 
+
48 private: /* methods */
+
49  void push(void);
+
50  void pop(void);
+
51 
+
52 private: /* data */
+
53  NexTouchEventCb cbPush;
+
54  void *__cbpush_ptr;
+
55  NexTouchEventCb cbPop;
+
56  void *__cbpop_ptr;
+
57 };
+
58 
+
59 #endif /* #ifdef __cplusplus */
+
60 #endif /* #ifndef __NEXTOUCH_H__ */
NexSerialConfig.h
Serial configure.
-
NexTouch::getObjName
const char * getObjName(void)
Get component name.
Definition: NexTouch.cpp:69
-
NexTouch::getCid
NexCid getCid(void)
Get component id.
Definition: NexTouch.cpp:59
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexTouch::NexTouch
NexTouch(NexPid pid, NexCid cid, const char *name)
Constructor of Nextouch.
Definition: NexTouch.cpp:27
+
NexObject
Root Class of Nextion Components.
Definition: NexObject.h:28
+
NexObject.h
The root of all classes in Nextion library.
+
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:35
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_waveform_8cpp.html b/doc/API/_nex_waveform_8cpp.html index 7f4c381..24325c8 100644 --- a/doc/API/_nex_waveform_8cpp.html +++ b/doc/API/_nex_waveform_8cpp.html @@ -67,7 +67,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_waveform_8cpp_source.html b/doc/API/_nex_waveform_8cpp_source.html index 187c55b..5487f3c 100644 --- a/doc/API/_nex_waveform_8cpp_source.html +++ b/doc/API/_nex_waveform_8cpp_source.html @@ -53,8 +53,8 @@ Go to the documentation of this file.
1 
16 #include "NexWaveform.h"
17 
-
22 NexWaveform::NexWaveform(NexPid pid, NexCid cid, char *name)
-
23  :NexTouch(pid, cid, name)
+
22 NexWaveform::NexWaveform(NexPid pid, NexCid cid, const char *name)
+
23  :NexObject(pid, cid, name)
24 {
25 }
26 
@@ -68,22 +68,22 @@
43  return false;
44  }
45 
-
46  sprintf(buf, "add %u,%u,%u", getCid(), ch, number);
+
46  sprintf(buf, "add %u,%u,%u", getObjCid(), ch, number);
47 
48  sendCommand(buf);
49  return true;
50 }
51 
NexWaveform.h
API of NexWaveform.
-
NexTouch::getCid
NexCid getCid(void)
Get component id.
Definition: NexTouch.cpp:59
+
NexObject::getObjCid
NexCid getObjCid(void)
Get component id.
Definition: NexObject.cpp:48
NexWaveform::addValue
bool addValue(uint8_t ch, uint8_t number)
Add value to show.
Definition: NexWaveform.cpp:37
-
NexWaveform::NexWaveform
NexWaveform(NexPid pid, NexCid cid, char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexWaveform.cpp:22
sendCommand
void sendCommand(const char *cmd)
Send command to Nextion.
Definition: NexHardware.cpp:164
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
+
NexWaveform::NexWaveform
NexWaveform(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexWaveform.cpp:22
+
NexObject
Root Class of Nextion Components.
Definition: NexObject.h:28
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_waveform_8h.html b/doc/API/_nex_waveform_8h.html index 162dfd5..9a99a55 100644 --- a/doc/API/_nex_waveform_8h.html +++ b/doc/API/_nex_waveform_8h.html @@ -77,7 +77,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nex_waveform_8h_source.html b/doc/API/_nex_waveform_8h_source.html index 89231ad..f9cdcbc 100644 --- a/doc/API/_nex_waveform_8h_source.html +++ b/doc/API/_nex_waveform_8h_source.html @@ -57,25 +57,25 @@
18 #include "NexTouch.h"
19 #include "NexHardware.h"
20 
-
25 class NexWaveform: public NexTouch
+
25 class NexWaveform: public NexObject
26 {
27 public: /* methods */
-
28  NexWaveform(NexPid pid, NexCid cid, char *name);
+
28  NexWaveform(NexPid pid, NexCid cid, const char *name);
29  bool addValue(uint8_t ch, uint8_t number);
30 };
31 
32 #endif /* #ifdef __cplusplus */
33 #endif /* #ifndef __NEXWAVEFORM_H__ */
NexWaveform::addValue
bool addValue(uint8_t ch, uint8_t number)
Add value to show.
Definition: NexWaveform.cpp:37
-
NexWaveform::NexWaveform
NexWaveform(NexPid pid, NexCid cid, char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexWaveform.cpp:22
NexTouch.h
API of Nextion.
NexHardware.h
Hardware Srial API.
+
NexWaveform::NexWaveform
NexWaveform(NexPid pid, NexCid cid, const char *name)
Constructor,inherited NexTouch's constructor function.
Definition: NexWaveform.cpp:22
+
NexObject
Root Class of Nextion Components.
Definition: NexObject.h:28
NexWaveform
NexWaveform,subclass of NexTouch,provides simple methods to control NexWaveform component.
Definition: NexWaveform.h:25
-
NexTouch
Root Class of Nextion Components.
Definition: NexTouch.h:37
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nextion_8h.html b/doc/API/_nextion_8h.html index ce7e926..3abc10b 100644 --- a/doc/API/_nextion_8h.html +++ b/doc/API/_nextion_8h.html @@ -81,7 +81,7 @@ This program is free software; you can redistribute it and/or modify it under th
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_nextion_8h_source.html b/doc/API/_nextion_8h_source.html index 74f8c19..fdbe4e3 100644 --- a/doc/API/_nextion_8h_source.html +++ b/doc/API/_nextion_8h_source.html @@ -87,7 +87,7 @@
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/_r_e_a_d_m_e_8md_source.html b/doc/API/_r_e_a_d_m_e_8md_source.html index ec1e057..28b22d3 100644 --- a/doc/API/_r_e_a_d_m_e_8md_source.html +++ b/doc/API/_r_e_a_d_m_e_8md_source.html @@ -148,7 +148,7 @@
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/annotated.html b/doc/API/annotated.html index 4f6e437..59a11eb 100644 --- a/doc/API/annotated.html +++ b/doc/API/annotated.html @@ -58,19 +58,20 @@ - - - - - - - + + + + + + + +
 CNexCropNexCrop,subclass of NexTouch,provides simple methods to control crop component
 CNexGaugeNexGauge,subclass of NexTouch,provides simple methods to control gauge component
 CNexHotspotNexHotspot,subclass of NexTouch,provides simple methods to control hotspot component
 CNexPageNexPage,subclass of NexTouch,provides simple methods to control page component
 CNexPictureNexPicture,subclass of NexTouch,provides simple methods to control picture component
 CNexProgressBarNexProgressBar,subclass of NexTouch,provides simple methods to control progress bar component
 CNexSliderNexSlider,subclass of NexTouch,provides simple methods to control slider component
 CNexTextNexText,subclass of NexTouch,provides simple methods to control text component
 CNexTouchRoot Class of Nextion Components
 CNexWaveformNexWaveform,subclass of NexTouch,provides simple methods to control NexWaveform component
 CNexObjectRoot Class of Nextion Components
 CNexPageNexPage,subclass of NexTouch,provides simple methods to control page component
 CNexPictureNexPicture,subclass of NexTouch,provides simple methods to control picture component
 CNexProgressBarNexProgressBar,subclass of NexTouch,provides simple methods to control progress bar component
 CNexSliderNexSlider,subclass of NexTouch,provides simple methods to control slider component
 CNexTextNexText,subclass of NexTouch,provides simple methods to control text component
 CNexTouchRoot Class of Nextion Components
 CNexWaveformNexWaveform,subclass of NexTouch,provides simple methods to control NexWaveform component
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/class_nex_button-members.html b/doc/API/class_nex_button-members.html index 802dada..a880114 100644 --- a/doc/API/class_nex_button-members.html +++ b/doc/API/class_nex_button-members.html @@ -55,19 +55,19 @@

This is the complete list of members for NexButton, including all inherited members.

- - - - - + + + - - + + + +
attachPop(NexTouchEventCb pop, void *ptr=NULL)NexButton
detachPop(void)NexButton
getCid(void)NexTouch
getObjName(void)NexTouch
getPid(void)NexTouch
getObjCid(void)NexObject
getObjName(void)NexObject
getObjPid(void)NexObject
getText(char *buffer, uint16_t len)NexButton
NexButton(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL)NexButton
NexTouch(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL, NexTouchEventCb push=NULL, void *push_ptr=NULL)NexTouch
NexButton(NexPid pid, NexCid cid, const char *name)NexButton
NexObject(NexPid pid, NexCid cid, const char *name)NexObject
NexTouch(NexPid pid, NexCid cid, const char *name)NexTouch
printObjInfo(void)NexObject
setText(const char *buffer)NexButton
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/class_nex_button.html b/doc/API/class_nex_button.html index ccbe501..782dfcb 100644 --- a/doc/API/class_nex_button.html +++ b/doc/API/class_nex_button.html @@ -66,23 +66,17 @@ Inheritance diagram for NexButton:
-NexTouch +NexTouch +NexObject
- - - - - - - - - + + + @@ -90,18 +84,26 @@ void  - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + +

Public Member Functions

- NexButton (NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL)
 Constructor,inherited NexTouch's constructor function.
 
void attachPop (NexTouchEventCb pop, void *ptr=NULL)
 Register button pop callback function. More...
 
-void detachPop (void)
 Unload button pop callback function.
 
+ NexButton (NexPid pid, NexCid cid, const char *name)
 Constructor,inherited NexTouch's constructor function.
 
uint16_t getText (char *buffer, uint16_t len)
 Get text value from button component. More...
 
 Set text value of button component. More...
 
- Public Member Functions inherited from NexTouch
 NexTouch (NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL, NexTouchEventCb push=NULL, void *push_ptr=NULL)
 Constructor of Nextouch. More...
 
NexPid getPid (void)
 Get page id. More...
 
NexCid getCid (void)
 Get component id. More...
 
const char * getObjName (void)
 Get component name. More...
 
 NexTouch (NexPid pid, NexCid cid, const char *name)
 Constructor of Nextouch. More...
 
- Public Member Functions inherited from NexObject
 NexObject (NexPid pid, NexCid cid, const char *name)
 Constructor. More...
 
NexPid getObjPid (void)
 Get page id. More...
 
NexCid getObjCid (void)
 Get component id. More...
 
const char * getObjName (void)
 Get component name. More...
 
+void printObjInfo (void)
 Print current object address,page id,component id, component name,pop event function address,push event function address.
 

Detailed Description

NexButton,subclass of NexTouch,provides simple methods to control button component.

@@ -109,44 +111,6 @@ void 26 of file NexButton.h.

Member Function Documentation

- -
-
- - - - - - - - - - - - - - - - - - -
void NexButton::attachPop (NexTouchEventCb pop,
void * ptr = NULL 
)
-
- -

Register button pop callback function.

-
Parameters
- - - -
pop- the pointer to button pop callback function.
ptr- the parameter to be transmitted to button pop callback function.
-
-
-
Examples:
CompButton.ino, CompGauge.ino, and CompProgressBar.ino.
-
-

Definition at line 70 of file NexButton.cpp.

- -
-
@@ -227,7 +191,7 @@ void 
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/class_nex_button.png b/doc/API/class_nex_button.png index 0cd1db00cf2cab9a9efa4eda558dc4eb3ad09a50..a3a9807c9253a9a98c9bb140303a1c5a16fb62cf 100644 GIT binary patch delta 545 zcmV++0^a?j1JDE^iBL{Q4GJ0x0000DNk~Le0000-0001p2m=5B0D{m4Opzfwf8R+& zK~#7F?Van=s~`+T7s-t8|Hwx{xd_p=GIKg#**TUfA;;zvm0Fee#@Uhzv}Zd?ALx?-agOPG5Sv&3*)~( zA|e->$Wc{&E`U2N024Hcvn+E!lQ=783TPJR>-yy!fD1VXz?O3WY&i$OmU94X{WM2a zb%Ib4k;ih5h={Gi3DrGcAzdOOz3SzP6PNof2E^vX^{5S*se7F5S?>SAiXP;wDhqI44b$y?4@+&8^N@V3(XOnq;?0#*Ox?dxXh{)%1 zj);h@Kg>~8eJ+4IecAu=vdjTZ;;fh{pjn)+>z8u?F60~lTh0Nn>ecV>t)FR^g=aOijJ0cfyUl6(>$QPP_ODC(fcaDhi%QbhcG!6`$*^^1{K zs%!jdqEfQMpCPAu<<{r;DR0ejRy{YIQ+*$B@+)V9E6)DxB~IV3gJ&0B*-%5qy7=0%q30bfL#AVO zEuUJ?MN6OCJC=6TQY4S-Y8A>efB9bKJ<5*0N716H`Zn95sv7x7OG+uN0`Pjc0k~jW03zE05ZM-h$hH7P{-;GmWElitk!=BpG)oyCm8Ah) z^!280u`yW2$>$dPVPxUCyjse;^V=v9_B^%t;IcSru9jI}mm#KXRO@nSN%6xD)wPGV zutm*s`O)%_+pjI{sI9D><$U*oCHAO(FXeBW?_H0g1>kMA1t9W~77>wEz5t^S4|+8% RbesSH002ovPDHLkV1hk`r{Mqq diff --git a/doc/API/class_nex_crop-members.html b/doc/API/class_nex_crop-members.html index c37bd41..f5a7010 100644 --- a/doc/API/class_nex_crop-members.html +++ b/doc/API/class_nex_crop-members.html @@ -55,17 +55,17 @@

This is the complete list of members for NexCrop, including all inherited members.

- - - - - - - + + + + + + +
attachPop(NexTouchEventCb pop, void *ptr=NULL)NexCrop
detachPop(void)NexCrop
getCid(void)NexTouch
getObjName(void)NexTouch
getPid(void)NexTouch
NexCrop(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL)NexCrop
NexTouch(NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL, NexTouchEventCb push=NULL, void *push_ptr=NULL)NexTouch
getObjCid(void)NexObject
getObjName(void)NexObject
getObjPid(void)NexObject
NexCrop(NexPid pid, NexCid cid, const char *name)NexCrop
NexObject(NexPid pid, NexCid cid, const char *name)NexObject
NexTouch(NexPid pid, NexCid cid, const char *name)NexTouch
printObjInfo(void)NexObject
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/class_nex_crop.html b/doc/API/class_nex_crop.html index aa2309b..56abc18 100644 --- a/doc/API/class_nex_crop.html +++ b/doc/API/class_nex_crop.html @@ -66,89 +66,52 @@ Inheritance diagram for NexCrop:
-NexTouch +NexTouch +NexObject
- - - - - - - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + +

Public Member Functions

- NexCrop (NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL)
 Constructor,inherited NexTouch's constructor function.
 
void attachPop (NexTouchEventCb pop, void *ptr=NULL)
 Register crop pop callback function. More...
 
-void detachPop (void)
 Unload crop pop callback function.
 
+ NexCrop (NexPid pid, NexCid cid, const char *name)
 Constructor,inherited NexTouch's constructor function.
 
- Public Member Functions inherited from NexTouch
 NexTouch (NexPid pid, NexCid cid, char *name, NexTouchEventCb pop=NULL, void *pop_ptr=NULL, NexTouchEventCb push=NULL, void *push_ptr=NULL)
 Constructor of Nextouch. More...
 
NexPid getPid (void)
 Get page id. More...
 
NexCid getCid (void)
 Get component id. More...
 
const char * getObjName (void)
 Get component name. More...
 
 NexTouch (NexPid pid, NexCid cid, const char *name)
 Constructor of Nextouch. More...
 
- Public Member Functions inherited from NexObject
 NexObject (NexPid pid, NexCid cid, const char *name)
 Constructor. More...
 
NexPid getObjPid (void)
 Get page id. More...
 
NexCid getObjCid (void)
 Get component id. More...
 
const char * getObjName (void)
 Get component name. More...
 
+void printObjInfo (void)
 Print current object address,page id,component id, component name,pop event function address,push event function address.
 

Detailed Description

NexCrop,subclass of NexTouch,provides simple methods to control crop component.

Examples:
CompCrop.ino.

Definition at line 26 of file NexCrop.h.

-

Member Function Documentation

- -
-
- - - - - - - - - - - - - - - - - - -
void NexCrop::attachPop (NexTouchEventCb pop,
void * ptr = NULL 
)
-
- -

Register crop pop callback function.

-
Parameters
- - - -
pop- the pointer to crop pop callback function.
ptr- the parameter to be transmitted to crop pop callback function.
-
-
-
Examples:
CompCrop.ino.
-
-

Definition at line 72 of file NexCrop.cpp.

- -
-
-
The documentation for this class was generated from the following files: -
-  - -

- a -

-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/globals.html b/doc/API/globals.html index e00253a..24acd0f 100644 --- a/doc/API/globals.html +++ b/doc/API/globals.html @@ -81,7 +81,7 @@
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/globals_func.html b/doc/API/globals_func.html index ca1491c..1a41a3a 100644 --- a/doc/API/globals_func.html +++ b/doc/API/globals_func.html @@ -81,7 +81,7 @@
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/group___nextion.html b/doc/API/group___nextion.html index 3311e46..1a0a10a 100644 --- a/doc/API/group___nextion.html +++ b/doc/API/group___nextion.html @@ -111,7 +111,7 @@ Functions -
Examples:
CompButton.ino, CompCrop.ino, CompGauge.ino, CompHotspot.ino, CompPage.ino, CompPicture.ino, CompProgressBar.ino, CompSlider.ino, and CompText.ino.
+
Examples:
CompButton.ino, CompCrop.ino, CompGauge.ino, CompHotspot.ino, CompPage.ino, CompPicture.ino, CompProgressBar.ino, CompSlider.ino, and CompText.ino.

Definition at line 293 of file NexHardware.cpp.

@@ -120,7 +120,7 @@ Functions
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/hierarchy.html b/doc/API/hierarchy.html index a7ae579..6cf5fca 100644 --- a/doc/API/hierarchy.html +++ b/doc/API/hierarchy.html @@ -53,24 +53,25 @@
This inheritance list is sorted roughly, but not completely, alphabetically:
-
[detail level 12]
- - - - - - - - - - - +
[detail level 123]
 ▼CNexTouchRoot Class of Nextion Components
 CNexButtonNexButton,subclass of NexTouch,provides simple methods to control button component
 CNexCropNexCrop,subclass of NexTouch,provides simple methods to control crop component
 CNexGaugeNexGauge,subclass of NexTouch,provides simple methods to control gauge component
 CNexHotspotNexHotspot,subclass of NexTouch,provides simple methods to control hotspot component
 CNexPageNexPage,subclass of NexTouch,provides simple methods to control page component
 CNexPictureNexPicture,subclass of NexTouch,provides simple methods to control picture component
 CNexProgressBarNexProgressBar,subclass of NexTouch,provides simple methods to control progress bar component
 CNexSliderNexSlider,subclass of NexTouch,provides simple methods to control slider component
 CNexTextNexText,subclass of NexTouch,provides simple methods to control text component
 CNexWaveformNexWaveform,subclass of NexTouch,provides simple methods to control NexWaveform component
+ + + + + + + + + + + +
 ▼CNexObjectRoot Class of Nextion Components
 CNexGaugeNexGauge,subclass of NexTouch,provides simple methods to control gauge component
 CNexProgressBarNexProgressBar,subclass of NexTouch,provides simple methods to control progress bar component
 ▼CNexTouchRoot Class of Nextion Components
 CNexButtonNexButton,subclass of NexTouch,provides simple methods to control button component
 CNexCropNexCrop,subclass of NexTouch,provides simple methods to control crop component
 CNexHotspotNexHotspot,subclass of NexTouch,provides simple methods to control hotspot component
 CNexPageNexPage,subclass of NexTouch,provides simple methods to control page component
 CNexPictureNexPicture,subclass of NexTouch,provides simple methods to control picture component
 CNexSliderNexSlider,subclass of NexTouch,provides simple methods to control slider component
 CNexTextNexText,subclass of NexTouch,provides simple methods to control text component
 CNexWaveformNexWaveform,subclass of NexTouch,provides simple methods to control NexWaveform component
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/index.html b/doc/API/index.html index 6050dba..74d2081 100644 --- a/doc/API/index.html +++ b/doc/API/index.html @@ -89,7 +89,7 @@
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/md__r_e_a_d_m_e.html b/doc/API/md__r_e_a_d_m_e.html index 1b5656b..d2e496e 100644 --- a/doc/API/md__r_e_a_d_m_e.html +++ b/doc/API/md__r_e_a_d_m_e.html @@ -47,7 +47,7 @@
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/modules.html b/doc/API/modules.html index 073b188..9b75f9e 100644 --- a/doc/API/modules.html +++ b/doc/API/modules.html @@ -52,7 +52,7 @@
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7
diff --git a/doc/API/pages.html b/doc/API/pages.html index b70d0e6..81bd389 100644 --- a/doc/API/pages.html +++ b/doc/API/pages.html @@ -52,7 +52,7 @@
-Generated on Wed Aug 12 2015 17:53:26 for API by   +Generated on Thu Aug 13 2015 18:10:27 for API by   doxygen 1.8.7