Sistema l'errore da me commesso in fase di conversione...

[bertos.git] / drv / lcd_hd44.h

diff --git a/drv/lcd_hd44.h b/drv/lcd_hd44.h
old mode 100755 (executable)
new mode 100644 (file)
index 0413bed..bcab214
--- a/drv/lcd_hd44.h
+++ b/drv/lcd_hd44.h
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2005 Develer S.r.l. (http://www.develer.com/)
@@ -14,6 +14,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.3  2006/09/20 19:55:01  marco
+ *#* Added CONFIG_LCD_4BIT.
+ *#*
+ *#* Revision 1.2  2006/07/19 12:56:25  bernie
+ *#* Convert to new Doxygen style.
+ *#*
  *#* Revision 1.1  2005/11/04 18:00:42  bernie
  *#* Import into DevLib.
  *#*
@@ -36,9 +42,10 @@
 #ifndef DRV_LCD_HD44_H
 #define DRV_LCD_HD44_H
 
+#include <appconfig.h>
 #include <cfg/compiler.h> /* For stdint types */
 
-/*!
+/**
  * \name Display dimensions (in chars)
  * \{
  */
@@ -46,19 +53,24 @@
 #define LCD_COLS  16
 /* \} */
 
-/*!
+/**
  * \name Hitachi HD44 commands.
  * \{
  */
 #define LCD_CMD_DISPLAY_INI      0x30
-//#define LCD_CMD_SETFUNC        0x38   /*!< 8 bits, 2 lines, 5x7 dots */
-#define LCD_CMD_SETFUNC          0x28   /*!< 4 bits, 2 lines, 5x7 dots */
-#define LCD_CMD_DISPLAY_ON       0x0F   /*!< Switch on display */
-#define LCD_CMD_DISPLAY_OFF      0x08   /*!< Switch off display */
-#define LCD_CMD_CLEAR            0x01   /*!< Clear display */
-#define LCD_CMD_CURSOR_BLOCK     0x0D   /*!< Show cursor (block) */
-#define LCD_CMD_CURSOR_LINE      0x0F   /*!< Show cursor (line) */
-#define LCD_CMD_CURSOR_OFF       0x0C   /*!< Hide cursor */
+
+#if CONFIG_LCD_4BIT
+       #define LCD_CMD_SETFUNC  0x28   /**< 4 bits, 2 lines, 5x7 dots */
+#else
+       #define LCD_CMD_SETFUNC  0x38   /**< 8 bits, 2 lines, 5x7 dots */
+#endif
+
+#define LCD_CMD_DISPLAY_ON       0x0F   /**< Switch on display */
+#define LCD_CMD_DISPLAY_OFF      0x08   /**< Switch off display */
+#define LCD_CMD_CLEAR            0x01   /**< Clear display */
+#define LCD_CMD_CURSOR_BLOCK     0x0D   /**< Show cursor (block) */
+#define LCD_CMD_CURSOR_LINE      0x0F   /**< Show cursor (line) */
+#define LCD_CMD_CURSOR_OFF       0x0C   /**< Hide cursor */
 #define LCD_CMD_DISPLAYMODE      0x06
 #define LCD_CMD_SET_CGRAMADDR    0x40
 #define LCD_CMD_RESET_DDRAM      0x80
@@ -68,7 +80,7 @@
 #define LCD_CMD_MOVESHIFT_RIGHT  0x04
 /*\}*/
 
-/*! Type for combined LCD cursor position (x,y). */
+/** Type for combined LCD cursor position (x,y). */
 typedef uint8_t lcdpos_t;
 
 void lcd_waitBusy(void);