sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename SLCD geometry tructure to attributes; Move MAX contrast to attributes. Add attribute and ioctl commands to get and set SLCD brightness

Browse Source
This commit is contained in:
Gregory Nutt 2013-05-27 07:26:59 -06:00
parent 1a46e1253f
commit c9175e1dd0
3 changed files with 53 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
View File

@ -786,26 +786,28 @@ static int lcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg)
switch (cmd) switch (cmd)
{ {
/* SLCDIOC_GEOMETRY: Get the SLCD geometry (rows x characters) /* SLCDIOC_GETATTRIBUTES: Get the attributes of the SLCD
* *
* argument: Pointer to struct slcd_geometry_s in which values will be * argument: Pointer to struct slcd_attributes_s in which values will be
* returned * returned
*/ */
case SLCDIOC_GEOMETRY: case SLCDIOC_GETATTRIBUTES:
{ {
FAR struct slcd_geometry_s *geo = (FAR struct slcd_geometry_s *)((uintptr_t)arg); FAR struct slcd_attributes_s *attr = (FAR struct slcd_attributes_s *)((uintptr_t)arg);
lcdvdbg("SLCDIOC_GEOMETRY: nrows=%d ncolumns=%d\n", LCD_NROWS, LCD_NCOLUMNS); lcdvdbg("SLCDIOC_GETATTRIBUTES:\n");
if (!geo) if (!attr)
{ {
return -EINVAL; return -EINVAL;
} }
geo->nrows = LCD_NROWS; attr->nrows = LCD_NROWS;
geo->ncolumns = LCD_NCOLUMNS; attr->ncolumns = LCD_NCOLUMNS;
geo->nbars = 0; attr->nbars = 0;
attr->maxcontrast = 0;
attr->maxbrightness = 0
} }
break; break;
@ -834,8 +836,9 @@ static int lcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg)
case SLCDIOC_SETBAR: /* SLCDIOC_SETBAR: Set bars on a bar display */ case SLCDIOC_SETBAR: /* SLCDIOC_SETBAR: Set bars on a bar display */
case SLCDIOC_GETCONTRAST: /* SLCDIOC_GETCONTRAST: Get the current contrast setting */ case SLCDIOC_GETCONTRAST: /* SLCDIOC_GETCONTRAST: Get the current contrast setting */
case SLCDIOC_MAXCONTRAST: /* SLCDIOC_MAXCONTRAST: Get the maximum contrast setting */
case SLCDIOC_SETCONTRAST: /* SLCDIOC_SETCONTRAST: Set the contrast to a new value */ case SLCDIOC_SETCONTRAST: /* SLCDIOC_SETCONTRAST: Set the contrast to a new value */
case SLCDIOC_GETBRIGHTNESS: /* Get the current brightness setting */
case SLCDIOC_SETBRIGHTNESS: /* Set the brightness to a new value */
default: default:
return -ENOTTY; return -ENOTTY;
} }

43
configs/stm32ldiscovery/src/stm32_lcd.c
View File

@ -1310,26 +1310,28 @@ static int slcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg)
switch (cmd) switch (cmd)
{ {
/* SLCDIOC_GEOMETRY: Get the SLCD geometry (rows x characters) /* SLCDIOC_GETATTRIBUTES: Get the attributes of the SLCD
* *
* argument: Pointer to struct slcd_geometry_s in which values will be * argument: Pointer to struct slcd_attributes_s in which values will be
* returned * returned
*/ */
case SLCDIOC_GEOMETRY: case SLCDIOC_GETATTRIBUTES:
{ {
FAR struct slcd_geometry_s *geo = (FAR struct slcd_geometry_s *)((uintptr_t)arg); FAR struct slcd_attributes_s *attr = (FAR struct slcd_attributes_s *)((uintptr_t)arg);
lcdvdbg("SLCDIOC_GEOMETRY: nrows=%d ncolumns=%d\n", SLCD_NROWS, SLCD_NCHARS); lcdvdbg("SLCDIOC_GETATTRIBUTES:\n");
if (!geo) if (!attr)
{ {
return -EINVAL; return -EINVAL;
} }
geo->nrows = SLCD_NROWS; attr->nrows = SLCD_NROWS;
geo->ncolumns = SLCD_NCHARS; attr->ncolumns = SLCD_NCHARS;
geo->nbars = SLCD_NBARS; attr->nbars = SLCD_NBARS;
attr->maxcontrast = SLCD_MAXCONTRAST;
attr->maxbrightness = 0;
} }
break; break;
@ -1415,27 +1417,6 @@ static int slcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg)
} }
break; break;
/* SLCDIOC_MAXCONTRAST: Get the maximum contrast setting
*
* argument: Pointer type int that will receive the maximum contrast
* setting
*/
case SLCDIOC_MAXCONTRAST:
{
FAR int *contrast = (FAR int *)((uintptr_t)arg);
lcdvdbg("SLCDIOC_MAXCONTRAST: contrast=%d\n", SLCD_MAXCONTRAST);
if (!contrast)
{
return -EINVAL;
}
*contrast = SLCD_MAXCONTRAST;
}
break;
/* SLCDIOC_SETCONTRAST: Set the contrast to a new value /* SLCDIOC_SETCONTRAST: Set the contrast to a new value
* *
* argument: The new contrast value * argument: The new contrast value
@ -1454,6 +1435,8 @@ static int slcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg)
} }
break; break;
case SLCDIOC_GETBRIGHTNESS: /* Get the current brightness setting */
case SLCDIOC_SETBRIGHTNESS: /* Set the brightness to a new value */
default: default:
return -ENOTTY; return -ENOTTY;
} }

31
configs/sure-pic32mx/src/pic32mx_lcd1602.c
View File

@ -103,6 +103,14 @@
# error "CONFIG_PIC32MX_PMP is required to use the LCD" # error "CONFIG_PIC32MX_PMP is required to use the LCD"
#endif #endif
#ifndef CONFIG_LCD_MAXCONTRAST
# define CONFIG_LCD_MAXCONTRAST 100
#endif
#ifndef CONFIG_LCD_MAXPOWER
# define CONFIG_LCD_MAXPOWER 100
#endif
/* Define CONFIG_DEBUG_LCD to enable detailed LCD debug output. Verbose debug must /* Define CONFIG_DEBUG_LCD to enable detailed LCD debug output. Verbose debug must
* also be enabled. * also be enabled.
*/ */
@ -787,26 +795,28 @@ static int lcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg)
switch (cmd) switch (cmd)
{ {
/* SLCDIOC_GEOMETRY: Get the SLCD geometry (rows x characters) /* SLCDIOC_GETATTRIBUTES: Get the attributes of the SLCD
* *
* argument: Pointer to struct slcd_geometry_s in which values will be * argument: Pointer to struct slcd_attributes_s in which values will be
* returned * returned
*/ */
case SLCDIOC_GEOMETRY: case SLCDIOC_GETATTRIBUTES:
{ {
FAR struct slcd_geometry_s *geo = (FAR struct slcd_geometry_s *)((uintptr_t)arg); FAR struct slcd_attributes_s *attr = (FAR struct slcd_attributes_s *)((uintptr_t)arg);
lcdvdbg("SLCDIOC_GEOMETRY: nrows=%d ncolumns=%d\n", LCD_NROWS, LCD_NCOLUMNS); lcdvdbg("SLCDIOC_GETATTRIBUTES:\n");
if (!geo) if (!attr)
{ {
return -EINVAL; return -EINVAL;
} }
geo->nrows = LCD_NROWS; attr->nrows = LCD_NROWS;
geo->ncolumns = LCD_NCOLUMNS; attr->ncolumns = LCD_NCOLUMNS;
geo->nbars = 0; attr->nbars = 0;
attr->maxcontrast = CONFIG_LCD_MAXCONTRAST;
attr->maxbrightness = CONFIG_LCD_MAXPOWER;
} }
break; break;
@ -835,8 +845,9 @@ static int lcd_ioctl(FAR struct file *filp, int cmd, unsigned long arg)
case SLCDIOC_SETBAR: /* SLCDIOC_SETBAR: Set bars on a bar display */ case SLCDIOC_SETBAR: /* SLCDIOC_SETBAR: Set bars on a bar display */
case SLCDIOC_GETCONTRAST: /* SLCDIOC_GETCONTRAST: Get the current contrast setting */ case SLCDIOC_GETCONTRAST: /* SLCDIOC_GETCONTRAST: Get the current contrast setting */
case SLCDIOC_MAXCONTRAST: /* SLCDIOC_MAXCONTRAST: Get the maximum contrast setting */
case SLCDIOC_SETCONTRAST: /* SLCDIOC_SETCONTRAST: Set the contrast to a new value */ case SLCDIOC_SETCONTRAST: /* SLCDIOC_SETCONTRAST: Set the contrast to a new value */
case SLCDIOC_GETBRIGHTNESS: /* Get the current brightness setting */
case SLCDIOC_SETBRIGHTNESS: /* Set the brightness to a new value */
default: default:
return -ENOTTY; return -ENOTTY;
} }