diff options
| author | Andrew Hannam <andrewh@inmarket.com.au> | 2013-01-18 05:12:09 -0800 |
|---|---|---|
| committer | Andrew Hannam <andrewh@inmarket.com.au> | 2013-01-18 05:12:09 -0800 |
| commit | 333fcad87fe0f62b8679845c23fb8f885e656109 (patch) | |
| tree | e4b1511faeb033ebcba2e8d9469ec477f3f93206 /include | |
| parent | 5b444276ae427091d7c413eb297a909f0a9472b3 (diff) | |
| parent | 58eaf1059161ee0db5e8eff20bb0490ca3012384 (diff) | |
| download | uGFX-333fcad87fe0f62b8679845c23fb8f885e656109.tar.gz uGFX-333fcad87fe0f62b8679845c23fb8f885e656109.tar.bz2 uGFX-333fcad87fe0f62b8679845c23fb8f885e656109.zip | |
Merge pull request #15 from Tectu/master
Merge Tectu Changes
Diffstat (limited to 'include')
| -rw-r--r-- | include/tdisp/lld/tdisp_lld.h | 1 | ||||
| -rw-r--r-- | include/tdisp/tdisp.h | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/tdisp/lld/tdisp_lld.h b/include/tdisp/lld/tdisp_lld.h index 891b7b98..de6266f3 100644 --- a/include/tdisp/lld/tdisp_lld.h +++ b/include/tdisp/lld/tdisp_lld.h @@ -44,6 +44,7 @@ extern void tdisp_lld_set_cursor(coord_t col, coord_t row); extern void tdisp_lld_create_char(uint8_t address, char *charmap); extern void tdisp_lld_clear(void); extern void tdisp_lld_home(void); +extern void tdisp_lld_control(uint16_t what, void *value); #ifdef __cplusplus } diff --git a/include/tdisp/tdisp.h b/include/tdisp/tdisp.h index c9a8f842..01cb76a0 100644 --- a/include/tdisp/tdisp.h +++ b/include/tdisp/tdisp.h @@ -67,12 +67,13 @@ bool_t tdispInit(void); /** * @brief Control different display properties - * @note Multiple attributes can be passed using the OR operator. - * @note Example: tdispSetAttributes(TDISP_DISPLAY_ON | TDISP_CURSOR_BLINK) + * @note A wrapper macro exists for each option, please use them + * instead of this function manually. * - * @param[in] attributes The attributes + * @param[in] what What you want to control + * @param[in] value The value to be assigned */ -void tdispSetAttributes(uint8_t attributes); +void tdispControl(uint16_t what, void *value); /** * @brief Clears the display |