wuqiyang312
/
u8g2-copy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added post label

This commit is contained in:
olikraus 2016-05-30 00:31:03 +02:00
parent c2b177f35a
commit 4834f54832
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
csrc/u8x8.h
View File

@ -722,7 +722,7 @@ uint8_t u8x8_UserInterfaceMessage(u8x8_t *u8x8, const char *title1, const char *
/* u8x8_input_value.c */
uint8_t u8x8_UserInterfaceInputValue(u8x8_t *u8x8, const char *title, const char *label, uint8_t *value, uint8_t lo, uint8_t hi, uint8_t digits);
uint8_t u8x8_UserInterfaceInputValue(u8x8_t *u8x8, const char *title, const char *pre, uint8_t *value, uint8_t lo, uint8_t hi, uint8_t digits, const char *post);
/*==========================================*/

13
csrc/u8x8_input_value.c
View File

@ -41,7 +41,7 @@
1: value has been updated
*/
uint8_t u8x8_UserInterfaceInputValue(u8x8_t *u8x8, const char *title, const char *label, uint8_t *value, uint8_t lo, uint8_t hi, uint8_t digits)
uint8_t u8x8_UserInterfaceInputValue(u8x8_t *u8x8, const char *title, const char *pre, uint8_t *value, uint8_t lo, uint8_t hi, uint8_t digits, const char *post)
{
uint8_t height;
uint8_t y;
@ -66,11 +66,13 @@ uint8_t u8x8_UserInterfaceInputValue(u8x8_t *u8x8, const char *title, const char
/* calculate offset from left for the label */
x = 0;
width = u8x8_GetUTF8Len(u8x8, label);
width = u8x8_GetUTF8Len(u8x8, pre);
width += digits;
if ( *label == '\t' )
width += u8x8_GetUTF8Len(u8x8, post);
if ( *pre == '\t' )
{
label++;
width--;
pre++;
if ( width < u8x8_GetCols(u8x8) )
{
x = u8x8_GetCols(u8x8);
@ -83,7 +85,8 @@ uint8_t u8x8_UserInterfaceInputValue(u8x8_t *u8x8, const char *title, const char
u8x8_ClearDisplay(u8x8); /* required, because not everything is filled */
u8x8_SetInverseFont(u8x8, 0);
y += u8x8_DrawUTF8Lines(u8x8, 0, y, u8x8_GetCols(u8x8), title);
x += u8x8_DrawUTF8(u8x8, x, y, label);
x += u8x8_DrawUTF8(u8x8, x, y, pre);
u8x8_DrawUTF8(u8x8, x+digits, y, post);
u8x8_SetInverseFont(u8x8, 1);
/* event loop */

4
sys/arduino/internal/InputValueU8x8/InputValueU8x8.ino
View File

@ -87,10 +87,10 @@ void loop(void) {
u8x8_UserInterfaceInputValue(
u8x8.getU8x8(),
"\tEnter Number:",
"\tEnter Distance:",
"\t",
&current_value,
3, 20, 3);
3, 20, 3, " cm");
u8x8_UserInterfaceMessage(
u8x8.getU8x8(),