Fixes to Nokia6610 driver, add Win32 driver
Fix errors that crept in recent macro changes to the Nokia6610 driver. Removed some redundant code from Nokia6610 driver now that it is functional for the GE8 controller. Add Win32 driver. Untested at present as ChibiOS Win32 compile appears broken.ugfx_release_2.6
Andrew Hannam
parent
c15b2b4200
commit
b051ab8ef7
|
|
@ -48,9 +48,16 @@
|
|||
#error "gdispNokia6610: Either GDISP_USE_GE8 or GDISP_USE_GE12 must be defined depending on your controller"
|
||||
#endif
|
||||
|
||||
/* This controller is only ever used with a 132 x 132 display */
|
||||
#if defined(GDISP_SCREEN_HEIGHT)
|
||||
#undef GDISP_SCREEN_HEIGHT
|
||||
#endif
|
||||
#if defined(GDISP_SCREEN_WIDTH)
|
||||
#undef GDISP_SCREEN_WIDTH
|
||||
#endif
|
||||
#define GDISP_SCREEN_HEIGHT 132
|
||||
#define GDISP_SCREEN_WIDTH 132
|
||||
#define INITIAL_CONTRAST 38
|
||||
#define GDISP_INITIAL_CONTRAST 38
|
||||
|
||||
/*===========================================================================*/
|
||||
/* Driver exported variables. */
|
||||
|
|
@ -110,7 +117,6 @@ bool_t GDISP_LLD(init)(void) {
|
|||
chThdSleepMilliseconds(20);
|
||||
|
||||
#if defined(GDISP_USE_GE8)
|
||||
#if 1
|
||||
GDISP_LLD(write_cmd)(DISCTL); // Display control
|
||||
GDISP_LLD(write_data)(0x00); // P1: 0x00 = 2 divisions, switching period=8 (default)
|
||||
GDISP_LLD(write_data)(0x20); // P2: 0x20 = nlines/4 - 1 = 132/4 - 1 = 32)
|
||||
|
|
@ -121,57 +127,15 @@ bool_t GDISP_LLD(init)(void) {
|
|||
GDISP_LLD(write_cmd)(SLPOUT); // Sleep out
|
||||
GDISP_LLD(write_cmd)(PWRCTR); // Power control
|
||||
GDISP_LLD(write_data)(0x0f); // reference voltage regulator on, circuit voltage follower on, BOOST ON
|
||||
// Interesting - all the code seems to say this should be done. But my display doesn't want it!
|
||||
//GDISP_LLD(write_cmd)(DISINV); // Inverse display
|
||||
GDISP_LLD(write_cmd)(DATCTL); // Data control
|
||||
GDISP_LLD(write_data)(0x48/*0x01*/); // P1: 0x01 = page address inverted, column address normal, address scan in column direction
|
||||
GDISP_LLD(write_data)(0x48); // P1: 0x01 = page address inverted, column address normal, address scan in column direction
|
||||
GDISP_LLD(write_data)(0x00); // P2: 0x00 = RGB sequence (default value)
|
||||
GDISP_LLD(write_data)(0x02); // P3: 0x02 = Grayscale -> 16 (selects 12-bit color, type A)
|
||||
GDISP_LLD(write_cmd)(VOLCTR); // Voltage control (contrast setting)
|
||||
GDISP_LLD(write_data)(INITIAL_CONTRAST); // P1 = Contrast
|
||||
GDISP_LLD(write_data)(GDISP_INITIAL_CONTRAST); // P1 = Contrast
|
||||
GDISP_LLD(write_data)(3); // P2 = 3 resistance ratio (only value that works)
|
||||
chThdSleepMilliseconds(100); // allow power supply to stabilize
|
||||
GDISP_LLD(write_cmd)(DISON); // Turn on the display
|
||||
#else
|
||||
// Alternative
|
||||
GDISP_LLD(write_cmd)(DISCTL); // Display control
|
||||
GDISP_LLD(write_data)(0x00); // default
|
||||
GDISP_LLD(write_data)(0x20); // (32 + 1) * 4 = 132 lines (of which 130 are visible)
|
||||
GDISP_LLD(write_data)(0x0a); // default
|
||||
GDISP_LLD(write_cmd)(COMSCN); // COM scan
|
||||
GDISP_LLD(write_data)(0x00); // Scan 1-80
|
||||
GDISP_LLD(write_cmd)(OSCON); // Internal oscilator ON
|
||||
chThdSleepMilliseconds(100); // wait aproximetly 100ms
|
||||
GDISP_LLD(write_cmd)(SLPOUT); // Sleep out
|
||||
GDISP_LLD(write_cmd)(VOLCTR); // Voltage control
|
||||
GDISP_LLD(write_data)(INITIAL_CONTRAST); // middle value of V1
|
||||
GDISP_LLD(write_data)(0x03); // middle value of resistance value
|
||||
GDISP_LLD(write_cmd)(TMPGRD); // Temperature gradient
|
||||
GDISP_LLD(write_data)(0x00); // default
|
||||
GDISP_LLD(write_cmd)(PWRCTR); // Power control
|
||||
GDISP_LLD(write_data)(0x0f); // referance voltage regulator on, circuit voltage follower on, BOOST ON
|
||||
GDISP_LLD(write_cmd)(DISNOR); // Normal display
|
||||
GDISP_LLD(write_cmd)(DISINV); // Inverse display
|
||||
GDISP_LLD(write_cmd)(PTLOUT); // Partial area off
|
||||
// GDISP_LLD(write_cmd)(ASCSET); // Scroll area set
|
||||
// GDISP_LLD(write_data)(0);
|
||||
// GDISP_LLD(write_data)(0);
|
||||
// GDISP_LLD(write_data)(40);
|
||||
// GDISP_LLD(write_data)(3);
|
||||
// GDISP_LLD(write_cmd)(SCSTART); // Vertical scrool address start
|
||||
// GDISP_LLD(write_data)(0);
|
||||
GDISP_LLD(write_cmd)(DATCTL); // Data control
|
||||
GDISP_LLD(write_data)(0x00); // all inversions off, column direction
|
||||
GDISP_LLD(write_data)(0x03); // RGB sequence
|
||||
GDISP_LLD(write_data)(0x02); // Grayscale -> 16
|
||||
GDISP_LLD(write_cmd)(PASET); // Page Address set
|
||||
GDISP_LLD(write_data)(0);
|
||||
GDISP_LLD(write_data)(131);
|
||||
GDISP_LLD(write_cmd)(CASET); // Page Column set
|
||||
GDISP_LLD(write_data)(0);
|
||||
GDISP_LLD(write_data)(131);
|
||||
GDISP_LLD(write_cmd)(DISON); // Turn on the display
|
||||
#endif
|
||||
|
||||
#elif defined(GDISP_USE_GE12)
|
||||
#if 1
|
||||
|
|
@ -182,7 +146,7 @@ bool_t GDISP_LLD(init)(void) {
|
|||
GDISP_LLD(write_cmd)(MADCTL); // Memory access controler
|
||||
GDISP_LLD(write_data)(0xC8); // 0xC0 = mirror x and y, reverse rgb
|
||||
GDISP_LLD(write_cmd)(SETCON); // Write contrast
|
||||
GDISP_LLD(write_data)(INITIAL_CONTRAST); // contrast - experiental value
|
||||
GDISP_LLD(write_data)(GDISP_INITIAL_CONTRAST); // contrast - experiental value
|
||||
chThdSleepMilliseconds(20);
|
||||
GDISP_LLD(write_cmd)(DISPON); // Display On
|
||||
#else
|
||||
|
|
@ -240,7 +204,7 @@ bool_t GDISP_LLD(init)(void) {
|
|||
//GDISP_LLD(write_data)(0x7f); // full voltage control
|
||||
//GDISP_LLD(write_data)(0x03); // must be "1"
|
||||
GDISP_LLD(write_cmd)(CONTRAST); // Write contrast
|
||||
GDISP_LLD(write_data)(INITIAL_CONTRAST); // contrast
|
||||
GDISP_LLD(write_data)(GDISP_INITIAL_CONTRAST); // contrast
|
||||
chThdSleepMilliseconds(20);
|
||||
GDISP_LLD(write_cmd)(TEMPGRADIENT); // Temperature gradient
|
||||
for(i=0; i<14; i++) GDISP_LLD(write_data)(0);
|
||||
|
|
@ -258,7 +222,7 @@ bool_t GDISP_LLD(init)(void) {
|
|||
GDISP.Orientation = GDISP_ROTATE_0;
|
||||
GDISP.Powermode = powerOn;
|
||||
GDISP.Backlight = 100;
|
||||
GDISP.Contrast = INITIAL_CONTRAST;
|
||||
GDISP.Contrast = GDISP_INITIAL_CONTRAST;
|
||||
#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
|
||||
GDISP.clipx0 = 0;
|
||||
GDISP.clipy0 = 0;
|
||||
|
|
|
|||
|
|
@ -18,6 +18,10 @@
|
|||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#if !defined(GDISP_USE_SPI)
|
||||
#error "GDISP_USE_SPI must be defined for the board"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @file gdispNokia6610/gdisp_lld_board_olimexsam7ex256.h
|
||||
* @brief GDISP Graphic Driver subsystem board interface for the Olimex SAM7-EX256 board.
|
||||
|
|
@ -100,12 +104,12 @@ static __inline void GDISP_LLD(init_board)(void) {
|
|||
/* This code should really use the ChibiOS driver for these functions */
|
||||
|
||||
// Pin for backlight
|
||||
pPIOB->PIO_CODR = PIOB_GDISP_BL_MASK; // Set PB20 to LOW
|
||||
pPIOB->PIO_OER = PIOB_GDISP_BL_MASK; // Configure PB20 as output
|
||||
pPIOB->PIO_CODR = PIOB_LCD_BL_MASK; // Set PB20 to LOW
|
||||
pPIOB->PIO_OER = PIOB_LCD_BL_MASK; // Configure PB20 as output
|
||||
|
||||
// Reset pin
|
||||
pPIOA->PIO_SODR = PIOA_GDISP_RESET_MASK; // Set PA2 to HIGH
|
||||
pPIOA->PIO_OER = PIOA_GDISP_RESET_MASK; // Configure PA2 as output
|
||||
pPIOA->PIO_SODR = PIOA_LCD_RESET_MASK; // Set PA2 to HIGH
|
||||
pPIOA->PIO_OER = PIOA_LCD_RESET_MASK; // Configure PA2 as output
|
||||
|
||||
// CS pin - this seems to be ignored
|
||||
// pPIOA->PIO_SODR = BIT12; // Set PA2 to HIGH
|
||||
|
|
@ -144,11 +148,11 @@ static __inline void GDISP_LLD(init_board)(void) {
|
|||
*/
|
||||
static __inline void GDISP_LLD(setpin_reset)(bool_t state) {
|
||||
if (state)
|
||||
palClearPad(IOPORT1, PIOA_GDISP_RESET);
|
||||
// pPIOA->PIO_CODR = PIOA_GDISP_RESET_MASK;
|
||||
palClearPad(IOPORT1, PIOA_LCD_RESET);
|
||||
// pPIOA->PIO_CODR = PIOA_LCD_RESET_MASK;
|
||||
else
|
||||
palSetPad(IOPORT1, PIOA_GDISP_RESET);
|
||||
// pPIOA->PIO_SODR = PIOA_GDISP_RESET_MASK;
|
||||
palSetPad(IOPORT1, PIOA_LCD_RESET);
|
||||
// pPIOA->PIO_SODR = PIOA_LCD_RESET_MASK;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -160,11 +164,11 @@ static __inline void GDISP_LLD(setpin_reset)(bool_t state) {
|
|||
*/
|
||||
static __inline void GDISP_LLD(setpin_backlight)(bool_t state) {
|
||||
if (state)
|
||||
palSetPad(IOPORT2, PIOB_GDISP_BL);
|
||||
// pPIOB->PIO_SODR = PIOB_GDISP_BL_MASK;
|
||||
palSetPad(IOPORT2, PIOB_LCD_BL);
|
||||
// pPIOB->PIO_SODR = PIOB_LCD_BL_MASK;
|
||||
else
|
||||
palClearPad(IOPORT2, PIOB_GDISP_BL);
|
||||
// pPIOB->PIO_CODR = PIOB_GDISP_BL_MASK;
|
||||
palClearPad(IOPORT2, PIOB_LCD_BL);
|
||||
// pPIOB->PIO_CODR = PIOB_LCD_BL_MASK;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -0,0 +1,414 @@
|
|||
/*
|
||||
ChibiOS/RT - Copyright (C) 2012
|
||||
Joel Bodenmann aka Tectu <joel@unormal.org>
|
||||
|
||||
This file is part of ChibiOS-LCD-Driver.
|
||||
|
||||
ChibiOS-LCD-Driver is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
ChibiOS-LCD-Driver is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file Win32/gdisp_lld.c
|
||||
* @brief GDISP Graphics Driver subsystem low level driver source for Win32.
|
||||
*
|
||||
* @addtogroup GDISP
|
||||
* @{
|
||||
*/
|
||||
|
||||
#include "ch.h"
|
||||
#include "hal.h"
|
||||
#include "gdisp.h"
|
||||
|
||||
#if GFX_USE_GDISP || defined(__DOXYGEN__)
|
||||
|
||||
/* Include the emulation code for things we don't support */
|
||||
#include "gdisp_emulation.c"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <windows.h>
|
||||
#include <wingdi.h>
|
||||
#include <assert.h>
|
||||
|
||||
/*===========================================================================*/
|
||||
/* Driver local routines . */
|
||||
/*===========================================================================*/
|
||||
|
||||
#define APP_NAME "GDISP"
|
||||
|
||||
#define COLOR2BGR(c) ((((c) & 0xFF)<<16)|((c) & 0xFF00)|(((c)>>16) & 0xFF))
|
||||
#define BGR2COLOR(c) COLOR2BGR(c)
|
||||
|
||||
static HWND winRootWindow = NULL;
|
||||
static HDC dcBuffer = NULL;
|
||||
static HBITMAP dcBitmap = NULL;
|
||||
static HBITMAP dcOldBitmap;
|
||||
|
||||
static LRESULT
|
||||
myWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
HDC dc;
|
||||
PAINTSTRUCT ps;
|
||||
|
||||
switch (Msg) {
|
||||
case WM_CREATE:
|
||||
break;
|
||||
case WM_MOUSEMOVE:
|
||||
case WM_LBUTTONDOWN:
|
||||
case WM_LBUTTONUP:
|
||||
case WM_LBUTTONDBLCLK:
|
||||
case WM_MBUTTONDOWN:
|
||||
case WM_MBUTTONUP:
|
||||
case WM_MBUTTONDBLCLK:
|
||||
case WM_RBUTTONDOWN:
|
||||
case WM_RBUTTONUP:
|
||||
case WM_RBUTTONDBLCLK:
|
||||
break;
|
||||
case WM_SYSKEYDOWN:
|
||||
case WM_KEYDOWN:
|
||||
case WM_SYSKEYUP:
|
||||
case WM_KEYUP:
|
||||
break;
|
||||
case WM_CHAR:
|
||||
case WM_DEADCHAR:
|
||||
case WM_SYSCHAR:
|
||||
case WM_SYSDEADCHAR:
|
||||
break;
|
||||
case WM_PAINT:
|
||||
dc = BeginPaint(hWnd, &ps);
|
||||
BitBlt(dc, ps.rcPaint.left, ps.rcPaint.top,
|
||||
ps.rcPaint.right - ps.rcPaint.left,
|
||||
ps.rcPaint.bottom - ps.rcPaint.top,
|
||||
dcBuffer, ps.rcPaint.left, ps.rcPaint.top, SRCCOPY);
|
||||
EndPaint(hWnd, &ps);
|
||||
break;
|
||||
case WM_DESTROY:
|
||||
PostQuitMessage(0);
|
||||
SelectObject(dcBuffer, dcOldBitmap);
|
||||
DeleteDC(dcBuffer);
|
||||
DeleteObject(dcBitmap);
|
||||
winRootWindow = NULL;
|
||||
break;
|
||||
default:
|
||||
return DefWindowProc(hWnd, Msg, wParam, lParam);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*===========================================================================*/
|
||||
/* Driver exported functions. */
|
||||
/*===========================================================================*/
|
||||
|
||||
/* ---- Required Routines ---- */
|
||||
/*
|
||||
The following 2 routines are required.
|
||||
All other routines are optional.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @brief Low level GDISP driver initialisation.
|
||||
* @return TRUE if successful, FALSE on error.
|
||||
*
|
||||
* @notapi
|
||||
*/
|
||||
bool_t GDISP_LLD(init)(void) {
|
||||
/* Initialise the window */
|
||||
HANDLE hInstance;
|
||||
HDC rootDC;
|
||||
int depth;
|
||||
RECT rect;
|
||||
PSUBDRIVER subdriver;
|
||||
WNDCLASS wc;
|
||||
|
||||
hInstance = GetModuleHandle(NULL);
|
||||
rootDC = CreateDC("DISPLAY", NULL, NULL, NULL);
|
||||
depth = GetDeviceCaps(rootDC, BITSPIXEL);
|
||||
DeleteDC(rootDC);
|
||||
GetWindowRect(GetDesktopWindow(), &rect);
|
||||
GDISP.Width = rect.right - rect.left;
|
||||
GDISP.Height = rect.bottom - rect.top;
|
||||
if (GDISP.Width > GDISP_SCREEN_WIDTH)
|
||||
GDISP.Width = GDISP_SCREEN_WIDTH;
|
||||
if (GDISP.Height > GDISP_SCREEN_HEIGHT)
|
||||
GDISP.Height = GDISP_SCREEN_HEIGHT;
|
||||
|
||||
wc.style = CS_HREDRAW | CS_VREDRAW; // | CS_OWNDC;
|
||||
wc.lpfnWndProc = (WNDPROC)myWindowProc;
|
||||
wc.cbClsExtra = 0;
|
||||
wc.cbWndExtra = 0;
|
||||
wc.hInstance = hInstance;
|
||||
wc.hIcon = LoadIcon(NULL, IDI_APPLICATION);
|
||||
wc.hCursor = LoadCursor(NULL, IDC_ARROW);
|
||||
wc.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
wc.lpszMenuName = NULL;
|
||||
wc.lpszClassName = APP_NAME;
|
||||
RegisterClass(&wc);
|
||||
|
||||
winRootWindow = CreateWindow(APP_NAME, "", WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU, 0, 0,
|
||||
GDISP.Width, GDISP.Height, 0, 0, hInstance, NULL);
|
||||
assert(winRootWindow != NULL);
|
||||
|
||||
HDC dc = GetDC(winRootWindow);
|
||||
|
||||
GetClientRect(winRootWindow, &rect);
|
||||
dcBitmap = CreateCompatibleBitmap(dc, GDISP.Width, GDISP.Height);
|
||||
dcBuffer = CreateCompatibleDC(dc);
|
||||
dcOldBitmap = SelectObject(dcBuffer, dcBitmap);
|
||||
ReleaseDC(winRootWindow, dc);
|
||||
ShowWindow(winRootWindow, SW_SHOW);
|
||||
UpdateWindow(winRootWindow);
|
||||
|
||||
/* Initialise the GDISP structure to match */
|
||||
GDISP.Orientation = GDISP.Width > GDISP.Height ? landscape : portrait;
|
||||
GDISP.Powermode = powerOn;
|
||||
GDISP.Backlight = 100;
|
||||
GDISP.Contrast = 50;
|
||||
#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
|
||||
GDISP.clipx0 = 0;
|
||||
GDISP.clipy0 = 0;
|
||||
GDISP.clipx1 = GDISP.Width;
|
||||
GDISP.clipy1 = GDISP.Height;
|
||||
#endif
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Draws a pixel on the display.
|
||||
*
|
||||
* @param[in] x X location of the pixel
|
||||
* @param[in] y Y location of the pixel
|
||||
* @param[in] color The color of the pixel
|
||||
*
|
||||
* @notapi
|
||||
*/
|
||||
void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
|
||||
HDC dc;
|
||||
|
||||
#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
|
||||
if (x < GDISP.clipx0 || y < GDISP.clipy0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;
|
||||
#endif
|
||||
|
||||
color = COLOR2BGR(color);
|
||||
dc = GetDC(winRootWindow);
|
||||
SetPixel(dc, x, y, color);
|
||||
ReleaseDC(winRootWindow, dc);
|
||||
SetPixel(dcBuffer, x, y, color);
|
||||
}
|
||||
|
||||
/* ---- Optional Routines ---- */
|
||||
|
||||
#if GDISP_HARDWARE_LINES || defined(__DOXYGEN__)
|
||||
/**
|
||||
* @brief Draw a line.
|
||||
* @note Optional - The high level driver can emulate using software.
|
||||
*
|
||||
* @param[in] x0, y0 The start of the line
|
||||
* @param[in] x1, y1 The end of the line
|
||||
* @param[in] color The color of the line
|
||||
*
|
||||
* @notapi
|
||||
*/
|
||||
void GDISP_LLD(drawline)(coord_t x0, coord_t y0, coord_t x1, coord_t y1, color_t color) {
|
||||
POINT p;
|
||||
HPEN pen;
|
||||
HDC dc;
|
||||
HGDIOBJ old;
|
||||
HRGN clip;
|
||||
|
||||
#if GDISP_NEED_CLIP
|
||||
clip = NULL;
|
||||
if (GDISP.clipx0 != 0 || GDISP.clipy0 != 0 || GDISP.clipx1 != GDISP.Width || GDISP.clipy1 != GDISP.Height)
|
||||
clip = CreateRectRgn(GDISP.clipx0, GDISP.clipy0, GDISP.clipx1, GDISP.clipy1);
|
||||
#endif
|
||||
|
||||
color = COLOR2BGR(color);
|
||||
pen = CreatePen(PS_SOLID, 1, c);
|
||||
if (pen) {
|
||||
dc = GetDC(winRootWindow);
|
||||
#if GDISP_NEED_CLIP
|
||||
if (clip) SelectClipRgn(dc, clip);
|
||||
#endif
|
||||
old = SelectObject(dc, pen);
|
||||
MoveToEx(dc, x0, y0, &p);
|
||||
LineTo(dc, x1, y1);
|
||||
SelectObject(dc, old);
|
||||
SetPixel(dc, x1, y1, color);
|
||||
#if GDISP_NEED_CLIP
|
||||
if (clip) SelectClipRgn(dc, NULL);
|
||||
#endif
|
||||
ReleaseDC(winRootWindow, dc);
|
||||
|
||||
#if GDISP_NEED_CLIP
|
||||
if (clip) SelectClipRgn(dcBuffer, clip);
|
||||
#endif
|
||||
old = SelectObject(dcBuffer, pen);
|
||||
MoveToEx(dcBuffer, x0, y0, &p);
|
||||
LineTo(dcBuffer, x1, y1);
|
||||
SelectObject(dcBuffer, old);
|
||||
SetPixel(dcBuffer, x1, y1, color);
|
||||
#if GDISP_NEED_CLIP
|
||||
if (clip) SelectClipRgn(dcBuffer, NULL);
|
||||
#endif
|
||||
|
||||
DeleteObject(pen);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#if GDISP_HARDWARE_FILLS || defined(__DOXYGEN__)
|
||||
/**
|
||||
* @brief Fill an area with a color.
|
||||
* @note Optional - The high level driver can emulate using software.
|
||||
*
|
||||
* @param[in] x, y The start filled area
|
||||
* @param[in] cx, cy The width and height to be filled
|
||||
* @param[in] color The color of the fill
|
||||
*
|
||||
* @notapi
|
||||
*/
|
||||
void GDISP_LLD(fillarea)(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {
|
||||
RECT rect;
|
||||
HDC dc;
|
||||
HBRUSH hbr;
|
||||
|
||||
#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
|
||||
if (x < GDISP.clipx0) { cx -= GDISP.clipx0 - x; x = GDISP.clipx0; }
|
||||
if (y < GDISP.clipy0) { cy -= GDISP.clipy0 - y; y = GDISP.clipy0; }
|
||||
if (cx <= 0 || cy <= 0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;
|
||||
if (x+cx > GDISP.clipx1) cx = GDISP.clipx1 - x;
|
||||
if (y+cy > GDISP.clipy1) cy = GDISP.clipy1 - y;
|
||||
#endif
|
||||
|
||||
color = COLOR2BGR(color);
|
||||
hbr = CreateSolidBrush(color);
|
||||
|
||||
if (hbr) {
|
||||
rect.bottom = y+cy-1;
|
||||
rect.top = y;
|
||||
rect.left = x;
|
||||
rect.right = x+cx-1;
|
||||
dc = GetDC(winRootWindow);
|
||||
FillRect(dc, &rect, hbr);
|
||||
ReleaseDC(winRootWindow, dc);
|
||||
FillRect(dcBuffer, &rect, hbr);
|
||||
DeleteObject(hbr);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#if GDISP_HARDWARE_BITFILLS || defined(__DOXYGEN__)
|
||||
/**
|
||||
* @brief Fill an area with a bitmap.
|
||||
* @note Optional - The high level driver can emulate using software.
|
||||
*
|
||||
* @param[in] x, y The start filled area
|
||||
* @param[in] cx, cy The width and height to be filled
|
||||
* @param[in] srcx, srcy The bitmap position to start the fill from
|
||||
* @param[in] srccx The width of a line in the bitmap.
|
||||
* @param[in] buffer The pixels to use to fill the area.
|
||||
*
|
||||
* @notapi
|
||||
*/
|
||||
void GDISP_LLD(blitareaex)(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {
|
||||
HDC dc;
|
||||
BITMAPV4HEADER bmpInfo;
|
||||
|
||||
#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
|
||||
if (x < GDISP.clipx0) { cx -= GDISP.clipx0 - x; srcx += GDISP.clipx0 - x; x = GDISP.clipx0; }
|
||||
if (y < GDISP.clipy0) { cy -= GDISP.clipy0 - y; srcy += GDISP.clipy0 - y; y = GDISP.clipy0; }
|
||||
if (srcx+cx > srccx) cx = srccx - srcx;
|
||||
if (cx <= 0 || cy <= 0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;
|
||||
if (x+cx > GDISP.clipx1) cx = GDISP.clipx1 - x;
|
||||
if (y+cy > GDISP.clipy1) cy = GDISP.clipy1 - y;
|
||||
#endif
|
||||
|
||||
dc = GetDC(winRootWindow);
|
||||
memset(&bmpInfo, 0, sizeof(bmpInfo));
|
||||
bmpInfo.bV4Size = sizeof(bmpInfo);
|
||||
bmpInfo.bV4Width = srccx;
|
||||
bmpInfo.bV4Height = -(srcy+cy); /* top-down image */
|
||||
bmpInfo.bV4Planes = 1;
|
||||
bmpInfo.bV4BitCount = BITSPERPIXEL;
|
||||
bmpInfo.bV4SizeImage = ((srcy+cy)*srccx * BITSPERPIXEL)/8;
|
||||
bmpInfo.bV4AlphaMask = 0;
|
||||
bmpInfo.bV4RedMask = RGB2COLOR(255,0,0);
|
||||
bmpInfo.bV4GreenMask = RGB2COLOR(0,255,0);
|
||||
bmpInfo.bV4BlueMask = RGB2COLOR(0,0,255);
|
||||
bmpInfo.bV4V4Compression = BI_BITFIELDS;
|
||||
bmpInfo.bV4XPelsPerMeter = 3078;
|
||||
bmpInfo.bV4YPelsPerMeter = 3078;
|
||||
bmpInfo.bV4ClrUsed = 0;
|
||||
bmpInfo.bV4ClrImportant = 0;
|
||||
bmpInfo.bV4CSType = LCS_sRGB;
|
||||
|
||||
SetDIBitsToDevice(dc, x, y, cx, cy, srcx, srcy, 0, cy+srcy, buffer,
|
||||
(BITMAPINFO*)&bmpInfo, DIB_RGB_COLORS);
|
||||
SetDIBitsToDevice(dcBuffer, x, y, cx, cy, srcx, srcy, 0, cy+srcy, buffer,
|
||||
(BITMAPINFO*)&bmpInfo, DIB_RGB_COLORS);
|
||||
ReleaseDC(winRootWindow, dc);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if (GDISP_NEED_PIXELREAD && GDISP_HARDWARE_PIXELREAD) || defined(__DOXYGEN__)
|
||||
/**
|
||||
* @brief Get the color of a particular pixel.
|
||||
* @note Optional.
|
||||
* @note If x,y is off the screen, the result is undefined.
|
||||
* @return The color of the specified pixel.
|
||||
*
|
||||
* @param[in] x, y The start of the text
|
||||
*
|
||||
* @notapi
|
||||
*/
|
||||
color_t GDISP_LLD(getpixelcolor)(coord_t x, coord_t y) {
|
||||
color_t color;
|
||||
|
||||
#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
|
||||
if (x < 0 || x >= GDISP.Width || y < 0 || y >= GDISP.Height) return 0;
|
||||
#endif
|
||||
|
||||
color = GetPixel(dcBuffer, x, y);
|
||||
return BGR2COLOR(color);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if (GDISP_NEED_SCROLL && GDISP_HARDWARE_SCROLL) || defined(__DOXYGEN__)
|
||||
/**
|
||||
* @brief Scroll vertically a section of the screen.
|
||||
* @note Optional.
|
||||
* @note If x,y + cx,cy is off the screen, the result is undefined.
|
||||
* @note If lines is >= cy, it is equivelent to a area fill with bgcolor.
|
||||
*
|
||||
* @param[in] x, y The start of the area to be scrolled
|
||||
* @param[in] cx, cy The size of the area to be scrolled
|
||||
* @param[in] lines The number of lines to scroll (Can be positive or negative)
|
||||
* @param[in] bgcolor The color to fill the newly exposed area.
|
||||
*
|
||||
* @notapi
|
||||
*/
|
||||
void GDISP_LLD(verticalscroll)(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {
|
||||
#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
|
||||
if (x < GDISP.clipx0) { cx -= GDISP.clipx0 - x; x = GDISP.clipx0; }
|
||||
if (y < GDISP.clipy0) { cy -= GDISP.clipy0 - y; y = GDISP.clipy0; }
|
||||
if (!lines || cx <= 0 || cy <= 0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;
|
||||
if (x+cx > GDISP.clipx1) cx = GDISP.clipx1 - x;
|
||||
if (y+cy > GDISP.clipy1) cy = GDISP.clipy1 - y;
|
||||
#endif
|
||||
/* NOT IMPLEMENTED YET */
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* GFX_USE_GDISP */
|
||||
/** @} */
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
# List the required driver.
|
||||
GFXSRC += $(GFXLIB)/drivers/gdisp/Win32/gdisp_lld.c
|
||||
|
||||
# Required include directories
|
||||
GFXINC += $(GFXLIB)/drivers/gdisp/Win32
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
/*
|
||||
ChibiOS/RT - Copyright (C) 2012
|
||||
Joel Bodenmann aka Tectu <joel@unormal.org>
|
||||
|
||||
This file is part of ChibiOS-LCD-Driver.
|
||||
|
||||
ChibiOS-LCD-Driver is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
ChibiOS-LCD-Driver is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file Win32/gdisp_lld_config.h
|
||||
* @brief GDISP Graphic Driver subsystem low level driver header for Win32.
|
||||
*
|
||||
* @addtogroup GDISP
|
||||
* @{
|
||||
*/
|
||||
|
||||
#ifndef _GDISP_LLD_CONFIG_H
|
||||
#define _GDISP_LLD_CONFIG_H
|
||||
|
||||
#if GFX_USE_GDISP || defined(__DOXYGEN__)
|
||||
|
||||
/*===========================================================================*/
|
||||
/* Driver hardware support. */
|
||||
/*===========================================================================*/
|
||||
|
||||
#define GDISP_DRIVER_NAME "Win32"
|
||||
#define GDISP_LLD(x) gdisp_lld_##x##_Win32
|
||||
|
||||
#define GDISP_HARDWARE_LINES TRUE
|
||||
#define GDISP_HARDWARE_FILLS TRUE
|
||||
#define GDISP_HARDWARE_BITFILLS TRUE
|
||||
#define GDISP_HARDWARE_SCROLL FALSE
|
||||
#define GDISP_HARDWARE_PIXELREAD TRUE
|
||||
|
||||
#define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB888
|
||||
|
||||
#endif /* GFX_USE_GDISP */
|
||||
|
||||
#endif /* _GDISP_LLD_CONFIG_H */
|
||||
/** @} */
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
To use this driver:
|
||||
|
||||
1. Add in your halconf.h:
|
||||
a) #define GFX_USE_GDISP TRUE
|
||||
b) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
|
||||
c) All of the following (with appropriate values):
|
||||
#define GDISP_SCREEN_WIDTH 640
|
||||
#define GDISP_SCREEN_HEIGHT 480
|
||||
|
||||
|
||||
2. To your makefile add the following lines:
|
||||
include $(GFXLIB)/gfx.mk
|
||||
include $(GFXLIB)/drivers/gdisp/Win32/gdisp_lld.mk
|
||||
Loading…
Reference in New Issue