Make emulator display a bit larger.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@502 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/drv/lcd_gfx.h b/drv/lcd_gfx.h
index 6409ac33367580a1aec83593225ef7a415fcaf6a..d8626313b196a4202ba7a4617a0f70b5232a92d4 100755 (executable)
--- a/drv/lcd_gfx.h
+++ b/drv/lcd_gfx.h
@@ -16,51 +16,14 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.3  2006/02/10 12:33:51  bernie
+ *#* Make emulator display a bit larger.
+ *#*
  *#* Revision 1.2  2006/01/17 22:59:48  bernie
  *#* Hardcode a different display size.
  *#*
  *#* Revision 1.1  2006/01/16 03:50:57  bernie
  *#* Import into DevLib.
- *#*
- *#* Revision 1.13  2005/11/27 22:41:08  bernie
- *#* Remove trailing whitespace.
- *#*
- *#* Revision 1.12  2004/08/29 21:46:11  bernie
- *#* CVSSILENT: Mark CVS log blocks.
- *#*
- *#* Revision 1.11  2004/06/11 12:40:11  customer_pw
- *#* Changes for new board_kf
- *#*
- *#* Revision 1.10  2004/03/24 15:37:03  bernie
- *#* Remove Copyright messages from Doxygen output
- *#*
- *#* Revision 1.9  2004/02/26 18:48:52  aleph
- *#* Remove generic setting function which live better in levels.c
- *#*
- *#* Revision 1.8  2004/02/11 11:14:35  aleph
- *#* Adeguate lcd_setcontrast to new leveledit callback interface
- *#*
- *#* Revision 1.7  2004/02/10 21:45:13  aleph
- *#* Values for contrast setting are logical ascending (1->10) instead of raw PWM (240->50)
- *#*
- *#* Revision 1.6  2004/02/09 15:52:09  aleph
- *#* Add reasonable min and max level #define for contrast
- *#*
- *#* Revision 1.5  2004/01/13 00:04:10  aleph
- *#* change lcd_clear() to static and minor var/define name enhancements
- *#*
- *#* Revision 1.4  2004/01/07 19:06:48  aleph
- *#* Some LCD bus optmizations and add bitmap rendering funcs
- *#*
- *#* Revision 1.3  2003/12/22 15:27:26  aleph
- *#* Add E2 chip select and some code cosmetic changes
- *#*
- *#* Revision 1.2  2003/12/19 00:20:17  aleph
- *#* Add contrast PWM
- *#*
- *#* Revision 1.1  2003/12/08 03:46:42  aleph
- *#* Add lcd driver
- *#*
  *#*/
 
 #ifndef LCD_GFX_H
@@ -72,8 +35,8 @@
 #define LCD_MIN_PWM 130
 
 /* Display bitmap dims */
-#define LCD_WIDTH 128
-#define LCD_HEIGHT 64
+#define LCD_WIDTH  320
+#define LCD_HEIGHT 200
 
 /* fwd decl */
 struct Bitmap;
@@ -84,4 +47,4 @@ void lcd_init(void);
 void lcd_setpwm(int duty);
 void lcd_blit_bitmap(struct Bitmap *bm);
 
-#endif // LCD_GFX_H
+#endif /* LCD_GFX_H */

diff --git a/drv/lcd_gfx_qt.cpp b/drv/lcd_gfx_qt.cpp
index b8e91cfa59a64bb700cf84974dd95d29346430e4..7c2b25f2f8dc18bffc41fb43b51bbd311a99892b 100755 (executable)
--- a/drv/lcd_gfx_qt.cpp
+++ b/drv/lcd_gfx_qt.cpp
@@ -14,6 +14,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.4  2006/02/10 12:33:49  bernie
+ *#* Make emulator display a bit larger.
+ *#*
  *#* Revision 1.3  2006/01/23 23:11:07  bernie
  *#* Use RASTER_SIZE() to compute... err... the raster size.
  *#*
@@ -98,6 +101,7 @@ void EmulLCD::writeRaster(uint8_t *new_raster)
 
 /*!
  * Raster buffer to draw into.
+ *
  * Bits in the bitmap bytes have vertical orientation,
  * as required by the LCD driver.
  */
@@ -108,18 +112,18 @@ DECLARE_WALL(wall_after_raster, WALL_SIZE)
 /*! Default LCD bitmap */
 struct Bitmap lcd_bitmap;
 
-extern "C" void lcd_init(void)
+/*extern "C"*/ void lcd_init(void)
 {
-       //INIT_WALL(wall_before_raster);
-       //INIT_WALL(wall_after_raster);
+       //FIXME INIT_WALL(wall_before_raster);
+       //FIXME INIT_WALL(wall_after_raster);
        gfx_bitmapInit(&lcd_bitmap, lcd_raster, EmulLCD::WIDTH, EmulLCD::HEIGHT);
        gfx_bitmapClear(&lcd_bitmap);
 }
 
-extern "C" void lcd_blit_bitmap(Bitmap *bm)
+/*extern "C"*/ void lcd_blit_bitmap(Bitmap *bm)
 {
-       //CHECK_WALL(wall_before_raster);
-       //CHECK_WALL(wall_after_raster);
+       //FIXME CHECK_WALL(wall_before_raster);
+       //FIXME CHECK_WALL(wall_after_raster);
        emul->emulLCD->writeRaster(bm->raster);
 }
 

diff --git a/drv/lcd_gfx_qt.h b/drv/lcd_gfx_qt.h
index f24e8e6d66b465e04a2b735237cfcb27f7fb1f5f..0b7e1d237ebae6a05862b4decd849346496dd0a0 100755 (executable)
--- a/drv/lcd_gfx_qt.h
+++ b/drv/lcd_gfx_qt.h
@@ -14,6 +14,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.2  2006/02/10 12:33:51  bernie
+ *#* Make emulator display a bit larger.
+ *#*
  *#* Revision 1.1  2006/01/16 03:51:35  bernie
  *#* Add LCD Qt emulator.
  *#*
@@ -37,7 +40,7 @@ class EmulLCD : public QFrame
 
 public:
 // Attributes
-       enum { WIDTH = 128, HEIGHT = 64 };
+       enum { WIDTH = 320, HEIGHT = 200 };
 
 // Construction
        EmulLCD(QWidget *parent = 0, const char *name = 0);