diff options
| author | Tectu <joel@unormal.org> | 2012-08-13 04:11:03 +0200 |
|---|---|---|
| committer | Tectu <joel@unormal.org> | 2012-08-13 04:11:03 +0200 |
| commit | 54229cbdaaf585b5adf9b085229a22c9824c112c (patch) | |
| tree | 846e654318f88d309bf6f7f0aadbf640d8cdd04b /halext/drivers/gdispNokia6610 | |
| parent | e7f0c8e2c2791fd2e571c762f03e277161f98a4b (diff) | |
| download | uGFX-54229cbdaaf585b5adf9b085229a22c9824c112c.tar.gz uGFX-54229cbdaaf585b5adf9b085229a22c9824c112c.tar.bz2 uGFX-54229cbdaaf585b5adf9b085229a22c9824c112c.zip | |
restructure
Diffstat (limited to 'halext/drivers/gdispNokia6610')
| -rw-r--r-- | halext/drivers/gdispNokia6610/GE12.h | 81 | ||||
| -rw-r--r-- | halext/drivers/gdispNokia6610/GE8.h | 67 | ||||
| -rw-r--r-- | halext/drivers/gdispNokia6610/gdisp_lld.c | 688 | ||||
| -rw-r--r-- | halext/drivers/gdispNokia6610/gdisp_lld.mk | 5 | ||||
| -rw-r--r-- | halext/drivers/gdispNokia6610/gdisp_lld_board_example.h | 97 | ||||
| -rw-r--r-- | halext/drivers/gdispNokia6610/gdisp_lld_board_olimexsam7ex256.h | 199 | ||||
| -rw-r--r-- | halext/drivers/gdispNokia6610/gdisp_lld_config.h | 66 | ||||
| -rw-r--r-- | halext/drivers/gdispNokia6610/readme.txt | 17 |
8 files changed, 0 insertions, 1220 deletions
diff --git a/halext/drivers/gdispNokia6610/GE12.h b/halext/drivers/gdispNokia6610/GE12.h deleted file mode 100644 index 7f438d9a..00000000 --- a/halext/drivers/gdispNokia6610/GE12.h +++ /dev/null @@ -1,81 +0,0 @@ -/*
- 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/>.
-*/
-
-#ifndef GE12_H
-#define GE12_H
-
-// *************************************************************************************
-// LCD Include File for Philips PCF8833 STN RGB- 132x132x3 Driver (GE12)
-//
-// Taken from Philips data sheet Feb 14, 2003
-// *************************************************************************************
-
-// Philips PCF8833 LCD controller command codes
-#define NOP 0x00 // nop
-#define SWRESET 0x01 // software reset
-#define BSTROFF 0x02 // booster voltage OFF
-#define BSTRON 0x03 // booster voltage ON
-#define RDDIDIF 0x04 // read display identification
-#define RDDST 0x09 // read display status
-#define SLEEPIN 0x10 // sleep in
-#define SLEEPOUT 0x11 // sleep out
-#define PTLON 0x12 // partial display mode
-#define NORON 0x13 // display normal mode
-#define INVOFF 0x20 // inversion OFF
-#define INVON 0x21 // inversion ON
-#define DALO 0x22 // all pixel OFF
-#define DAL 0x23 // all pixel ON
-#define SETCON 0x25 // write contrast
-#define DISPOFF 0x28 // display OFF
-#define DISPON 0x29 // display ON
-#define CASET 0x2A // column address set
-#define PASET 0x2B // page address set
-#define RAMWR 0x2C // memory write
-#define RGBSET 0x2D // colour set
-#define PTLAR 0x30 // partial area
-#define VSCRDEF 0x33 // vertical scrolling definition
-#define TEOFF 0x34 // test mode
-#define TEON 0x35 // test mode
-#define MADCTL 0x36 // memory access control
-#define SEP 0x37 // vertical scrolling start address
-#define IDMOFF 0x38 // idle mode OFF
-#define IDMON 0x39 // idle mode ON
-#define COLMOD 0x3A // interface pixel format
-#define SETVOP 0xB0 // set Vop
-#define BRS 0xB4 // bottom row swap
-#define TRS 0xB6 // top row swap
-#define DISCTR 0xB9 // display control
-#define DOR 0xBA // data order
-#define TCDFE 0xBD // enable/disable DF temperature compensation
-#define TCVOPE 0xBF // enable/disable Vop temp comp
-#define EC 0xC0 // internal or external oscillator
-#define SETMUL 0xC2 // set multiplication factor
-#define TCVOPAB 0xC3 // set TCVOP slopes A and B
-#define TCVOPCD 0xC4 // set TCVOP slopes c and d
-#define TCDF 0xC5 // set divider frequency
-#define DF8COLOR 0xC6 // set divider frequency 8-color mode
-#define SETBS 0xC7 // set bias system
-#define RDTEMP 0xC8 // temperature read back
-#define NLI 0xC9 // n-line inversion
-#define RDID1 0xDA // read ID1
-#define RDID2 0xDB // read ID2
-#define RDID3 0xDC // read ID3
-
-#endif /* GE12_H */
diff --git a/halext/drivers/gdispNokia6610/GE8.h b/halext/drivers/gdispNokia6610/GE8.h deleted file mode 100644 index 3ae0be77..00000000 --- a/halext/drivers/gdispNokia6610/GE8.h +++ /dev/null @@ -1,67 +0,0 @@ -/*
- 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/>.
-*/
-
-#ifndef GE8_H
-#define GE8_H
-
-// *****************************************************************************
-// Include file for Epson S1D15G00 LCD Controller (GE8)
-//
-// Author: James P Lynch August 30, 2007
-// Modified for GDISP: Andrew Hannam August 2, 2012
-//
-// *****************************************************************************
-
-#define DISON 0xAF // Display on
-#define DISOFF 0xAE // Display off
-#define DISNOR 0xA6 // Normal display
-#define DISINV 0xA7 // Inverse display
-#define COMSCN 0xBB // Common scan direction
-#define DISCTL 0xCA // Display control
-#define SLPIN 0x95 // Sleep in
-#define SLPOUT 0x94 // Sleep out
-#define PASET 0x75 // Page address set
-#define CASET 0x15 // Column address set
-#define DATCTL 0xBC // Data scan direction, etc.
-#define RGBSET8 0xCE // 256-color position set
-#define RAMWR 0x5C // Writing to memory
-#define RAMRD 0x5D // Reading from memory
-#define PTLIN 0xA8 // Partial display in
-#define PTLOUT 0xA9 // Partial display out
-#define RMWIN 0xE0 // Read and modify write
-#define RMWOUT 0xEE // End
-#define ASCSET 0xAA // Area scroll set
-#define SCSTART 0xAB // Scroll start set
-#define OSCON 0xD1 // Internal oscillation on
-#define OSCOFF 0xD2 // Internal oscillation off
-#define PWRCTR 0x20 // Power control
-#define VOLCTR 0x81 // Electronic volume control
-#define VOLUP 0xD6 // Increment electronic control by 1
-#define VOLDOWN 0xD7 // Decrement electronic control by 1
-#define TMPGRD 0x82 // Temperature gradient set
-#define EPCTIN 0xCD // Control EEPROM
-#define EPCOUT 0xCC // Cancel EEPROM control
-#define EPMWR 0xFC // Write into EEPROM
-#define EPMRD 0xFD // Read from EEPROM
-#define EPSRRD1 0x7C // Read register 1
-#define EPSRRD2 0x7D // Read register 2
-#define NOP 0x25 // NOP instruction
-
-#endif /* GE8_H */
diff --git a/halext/drivers/gdispNokia6610/gdisp_lld.c b/halext/drivers/gdispNokia6610/gdisp_lld.c deleted file mode 100644 index 5ebe2177..00000000 --- a/halext/drivers/gdispNokia6610/gdisp_lld.c +++ /dev/null @@ -1,688 +0,0 @@ -/*
- 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 gdispNokia6610/gdisp_lld.c
- * @brief GDISP Graphics Driver subsystem low level driver source for the Nokia6610 display.
- *
- * @addtogroup GDISP
- * @{
- */
-
-#include "ch.h"
-#include "hal.h"
-#include "gdisp.h"
-
-#if HAL_USE_GDISP || defined(__DOXYGEN__)
-
-/* Include the emulation code for things we don't support */
-#include "gdisp_emulation.c"
-
-/*===========================================================================*/
-/* Driver local definitions. */
-/*===========================================================================*/
-
-/* Controller definitions */
-#if defined(LCD_USE_GE8)
- #include "GE8.h"
-#elif defined(LCD_USE_GE12)
- #include "GE12.h"
-#else
- #error "gdispNokia6610: Either LCD_USE_GE8 or LCD_USE_GE12 must be defined depending on your controller"
-#endif
-
-/*===========================================================================*/
-/* Driver exported variables. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver local variables. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver local functions. */
-/*===========================================================================*/
-
-#include "gdisp_fonts.h"
-
-#if defined(BOARD_OLIMEX_SAM7_EX256)
- #include "gdisp_lld_board_olimexsam7ex256.h"
-#else
- /* Include the user supplied board definitions */
- #include "gdisp_lld_board.h"
-#endif
-
-#define gdisp_lld_write_command(cmd) GDISP_LLD(write_spi)((cmd) & ~0x0100)
-#define gdisp_lld_write_data(data) GDISP_LLD(write_spi)((data) | 0x0100)
-
-static __inline void gdisp_lld_setviewport(coord_t x, coord_t y, coord_t cx, coord_t cy) {
- gdisp_lld_write_command(CASET); // Column address set
- gdisp_lld_write_data(x);
- gdisp_lld_write_data(x+cx-1);
- gdisp_lld_write_command(PASET); // Page address set
- gdisp_lld_write_data(y);
- gdisp_lld_write_data(y+cy-1);
-}
-
-/*===========================================================================*/
-/* Driver interrupt handlers. */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver exported functions. */
-/*===========================================================================*/
-
-/* ---- Required Routines ---- */
-/*
- The following 2 routines are required.
- All other routines are optional.
-*/
-
-/**
- * @brief Low level GDISP driver initialization.
- *
- * @notapi
- */
-bool_t GDISP_LLD(init)(void) {
- /* Initialise your display */
- GDISP_LLD(init_board)();
-
- // Hardware reset
- GDISP_LLD(setpin_reset)(TRUE);
- chThdSleepMilliseconds(20);
- GDISP_LLD(setpin_reset)(FALSE);
- chThdSleepMilliseconds(20);
-
- #if defined(LCD_USE_GE8)
- #if 1
- gdisp_lld_write_command(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)
- gdisp_lld_write_data(0x00); // P3: 0x00 = no inversely highlighted lines
- gdisp_lld_write_command(COMSCN); // COM scan
- gdisp_lld_write_data(1); // P1: 0x01 = Scan 1->80, 160<-81
- gdisp_lld_write_command(OSCON); // Internal oscilator ON
- gdisp_lld_write_command(SLPOUT); // Sleep out
- gdisp_lld_write_command(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_command(DISINV); // Inverse display
- gdisp_lld_write_command(DATCTL); // Data control
- gdisp_lld_write_data(0x01); // 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_command(VOLCTR); // Voltage control (contrast setting)
- gdisp_lld_write_data(32); // P1 = 32 volume value (experiment with this value to get the best contrast)
- gdisp_lld_write_data(3); // P2 = 3 resistance ratio (only value that works)
- chThdSleepMilliseconds(100); // allow power supply to stabilize
- gdisp_lld_write_command(DISON); // Turn on the display
- #else
- // Alternative
- gdisp_lld_write_command(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_command(COMSCN); // COM scan
- gdisp_lld_write_data(0x00); // Scan 1-80
- gdisp_lld_write_command(OSCON); // Internal oscilator ON
- chThdSleepMilliseconds(100); // wait aproximetly 100ms
- gdisp_lld_write_command(SLPOUT); // Sleep out
- gdisp_lld_write_command(VOLCTR); // Voltage control
- gdisp_lld_write_data(0x1F); // middle value of V1
- gdisp_lld_write_data(0x03); // middle value of resistance value
- gdisp_lld_write_command(TMPGRD); // Temperature gradient
- gdisp_lld_write_data(0x00); // default
- gdisp_lld_write_command(PWRCTR); // Power control
- gdisp_lld_write_data(0x0f); // referance voltage regulator on, circuit voltage follower on, BOOST ON
- gdisp_lld_write_command(DISNOR); // Normal display
- gdisp_lld_write_command(DISINV); // Inverse display
- gdisp_lld_write_command(PTLOUT); // Partial area off
- // gdisp_lld_write_command(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_command(SCSTART); // Vertical scrool address start
- // gdisp_lld_write_data(0);
- gdisp_lld_write_command(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_command(PASET); // Page Address set
- gdisp_lld_write_data(0);
- gdisp_lld_write_data(131);
- gdisp_lld_write_command(CASET); // Page Column set
- gdisp_lld_write_data(0);
- gdisp_lld_write_data(131);
- gdisp_lld_write_command(DISON); // Turn on the display
- #endif
-
- #elif defined(LCD_USE_GE12)
- #if 1
- gdisp_lld_write_command(SLEEPOUT); // Sleep out
- gdisp_lld_write_command(INVON); // Inversion on: seems to be required for this controller
- gdisp_lld_write_command(COLMOD); // Color Interface Pixel Format
- gdisp_lld_write_data(0x03); // 0x03 = 12 bits-per-pixel
- gdisp_lld_write_command(MADCTL); // Memory access controler
- gdisp_lld_write_data(0xC8); // 0xC0 = mirror x and y, reverse rgb
- gdisp_lld_write_command(SETCON); // Write contrast
- gdisp_lld_write_data(0x30); // contrast - experiental value
- chThdSleepMilliseconds(20);
- gdisp_lld_write_command(DISPON); // Display On
- #else
- // Alternative
- // Hardware reset commented out
- gdisp_lld_write_command(SOFTRST); // Software Reset
- chThdSleepMilliseconds(20);
- gdisp_lld_write_command(INITESC); // Initial escape
- chThdSleepMilliseconds(20);
- gdisp_lld_write_command(REFSET); // Refresh set
- gdisp_lld_write_data(0);
- gdisp_lld_write_command(DISPCTRL); // Set Display control
- gdisp_lld_write_data(128); // Set the lenght of one selection term
- gdisp_lld_write_data(128); // Set N inversion -> no N inversion
- gdisp_lld_write_data(134); // Set frame frequence and bias rate -> 2 devision of frequency and 1/8 bias, 1/67 duty, 96x67 size
- gdisp_lld_write_data(84); // Set duty parameter
- gdisp_lld_write_data(69); // Set duty parameter
- gdisp_lld_write_data(82); // Set duty parameter
- gdisp_lld_write_data(67); // Set duty parameter
- gdisp_lld_write_command(GRAYSCALE0); // Grey scale 0 position set - 15 parameters
- gdisp_lld_write_data(1); // GCP1 - gray lavel to be output when the RAM data is "0001"
- gdisp_lld_write_data(2); // GCP2 - gray lavel to be output when the RAM data is "0010"
- gdisp_lld_write_data(4); // GCP3 - gray lavel to be output when the RAM data is "0011"
- gdisp_lld_write_data(8); // GCP4 - gray lavel to be output when the RAM data is "0100"
- gdisp_lld_write_data(16); // GCP5 - gray lavel to be output when the RAM data is "0101"
- gdisp_lld_write_data(30); // GCP6 - gray lavel to be output when the RAM data is "0110"
- gdisp_lld_write_data(40); // GCP7 - gray lavel to be output when the RAM data is "0111"
- gdisp_lld_write_data(50); // GCP8 - gray lavel to be output when the RAM data is "1000"
- gdisp_lld_write_data(60); // GCP9 - gray lavel to be output when the RAM data is "1001"
- gdisp_lld_write_data(70); // GCP10 - gray lavel to be output when the RAM data is "1010"
- gdisp_lld_write_data(80); // GCP11 - gray lavel to be output when the RAM data is "1011"
- gdisp_lld_write_data(90); // GCP12 - gray lavel to be output when the RAM data is "1100"
- gdisp_lld_write_data(100); // GCP13 - gray lavel to be output when the RAM data is "1101"
- gdisp_lld_write_data(110); // GCP14 - gray lavel to be output when the RAM data is "1110"
- gdisp_lld_write_data(127); // GCP15 - gray lavel to be output when the RAM data is "1111"
- gdisp_lld_write_command(GAMMA); // Gamma curve set - select gray scale - GRAYSCALE 0 or GREYSCALE 1
- gdisp_lld_write_data(1); // Select grey scale 0
- gdisp_lld_write_command(COMMONDRV); // Command driver output
- gdisp_lld_write_data(0); // Set COM1-COM41 side come first, normal mod
- gdisp_lld_write_command(NORMALMODE); // Set Normal mode (my)
- // gdisp_lld_write_command(INVERSIONOFF); // Inversion off
- gdisp_lld_write_command(COLADDRSET); // Column address set
- gdisp_lld_write_data(0);
- gdisp_lld_write_data(131);
- gdisp_lld_write_command(PAGEADDRSET); // Page address set
- gdisp_lld_write_data(0);
- gdisp_lld_write_data(131);
- gdisp_lld_write_command(ACCESSCTRL); // Memory access controler
- gdisp_lld_write_data(0x40); // horizontal
- //gdisp_lld_write_data(0x20); // vertical
- gdisp_lld_write_command(PWRCTRL); // Power control
- gdisp_lld_write_data(4); // Internal resistance, V1OUT -> high power mode, oscilator devision rate
- gdisp_lld_write_command(SLEEPOUT); // Sleep out
- gdisp_lld_write_command(VOLTCTRL); // Voltage control - voltage control and write contrast define LCD electronic volume
- //gdisp_lld_write_data(0x7f); // full voltage control
- //gdisp_lld_write_data(0x03); // must be "1"
- gdisp_lld_write_command(CONTRAST); // Write contrast
- gdisp_lld_write_data(0x3b); // contrast
- chThdSleepMilliseconds(20);
- gdisp_lld_write_command(TEMPGRADIENT); // Temperature gradient
- for(i=0; i<14; i++) gdisp_lld_write_data(0);
- gdisp_lld_write_command(BOOSTVON); // Booster voltage ON
- gdisp_lld_write_command(DISPLAYON); // Finally - Display On
- #endif
- #endif
-
- /* Turn on the back-light */
- GDISP_LLD(setpin_backlight)(TRUE);
-
- /* Initialise the GDISP structure to match */
- GDISP.Width = 132;
- GDISP.Height = 132;
- GDISP.Orientation = portrait;
- GDISP.Powermode = powerOn;
- GDISP.Backlight = 100;
- GDISP.Contrast = 50;
- 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) {
- #if GDISP_NEED_VALIDATION
- if (x >= GDISP.Width || y >= GDISP.Height) return;
- #endif
- gdisp_lld_setviewport(x, y, 1, 1);
- gdisp_lld_write_command(RAMWR);
- gdisp_lld_write_data((color >> 4) & 0xFF);
- gdisp_lld_write_data((color << 4) & 0xF0);
- gdisp_lld_write_command(NOP);
-}
-
-/* ---- Optional Routines ---- */
-/*
- All the below routines are optional.
- Defining them will increase speed but everything
- will work if they are not defined.
- If you are not using a routine - turn it off using
- the appropriate GDISP_HARDWARE_XXXX macro.
- Don't bother coding for obvious similar routines if
- there is no performance penalty as the emulation software
- makes a good job of using similar routines.
- eg. If fillarea() is defined there is little
- point in defining clear() unless the
- performance bonus is significant.
- For good performance it is suggested to implement
- fillarea() and blitarea().
-*/
-
-#if GDISP_HARDWARE_CLEARS || defined(__DOXYGEN__)
- /**
- * @brief Clear the display.
- * @note Optional - The high level driver can emulate using software.
- *
- * @param[in] color The color of the pixel
- *
- * @notapi
- */
- void GDISP_LLD(clear(color_t color) {
- /* NOT IMPLEMENTED */
- /* Nothing to be gained by implementing this
- * as fillarea is just as fast.
- */
- }
-#endif
-
-#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) {
- /* NOT IMPLEMENTED */
- }
-#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) {
- unsigned i, tuples;
-
- #if GDISP_NEED_VALIDATION
- if (cx < 1 || cy < 1 || x >= GDISP.Width || y >= GDISP.Height) return;
- if (x+cx > GDISP.Width) cx = GDISP.Width - x;
- if (y+cy > GDISP.Height) cy = GDISP.Height - y;
- #endif
-
- tuples = (cx*cy+1)/2; // With an odd sized area we over-print by one pixel.
- // This extra pixel is ignored by the controller.
-
- gdisp_lld_setviewport(x, y, cx, cy);
- gdisp_lld_write_command(RAMWR);
- for(i=0; i < tuples; i++) {
- gdisp_lld_write_data((color >> 4) & 0xFF);
- gdisp_lld_write_data(((color << 4) & 0xF0)|((color >> 8) & 0x0F));
- gdisp_lld_write_data(color & 0xFF);
- }
- }
-#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] buffer The pixels to use to fill the area.
- *
- * @notapi
- */
- void GDISP_LLD(blitarea)(coord_t x, coord_t y, coord_t cx, coord_t cy, const pixel_t *buffer) {
- unsigned i, area, tuples;
- #ifndef GDISP_PACKED_PIXELS
- color_t c1, c2;
- #endif
-
- #if GDISP_NEED_VALIDATION
- if (cx < 1 || cy < 1 || x >= GDISP.Width || y >= GDISP.Height) return;
- if (x+cx > GDISP.Width) return;
- if (y+cy > GDISP.Height) cy = GDISP.Height - y;
- #endif
-
- area = cx*cy;
-
- gdisp_lld_setviewport(x, y, cx, cy);
- gdisp_lld_write_command(RAMWR);
-
- #ifdef GDISP_PACKED_PIXELS
- // 3 bytes per 2 pixels + an extra 2 bytes if the total size is odd.
- // Note we can't just over-estimate this and let the controller handle the extra pixel
- // as that might over-run our source buffer (very bad in some circumstances).
- tuples = (area/2)*3+(area & 0x01)*2;
- for(i=0; i < tuples; i++)
- gdisp_lld_write_data(*buffer++);
- if (area & 0x01)
- gdisp_lld_write_command(NOP);
- #else
- // Although this controller uses packed pixels we support unpacked pixel
- // formats in this blit by packing the data as we feed it to the controller.
- tuples = area/2;
- for(i=0; i < tuples; i++) {
- c1 = *buffer++;
- c2 = *buffer++;
- gdisp_lld_write_data((c1 >> 4) & 0xFF);
- gdisp_lld_write_data(((c1 << 4) & 0xF0)|((c2 >> 8) & 0x0F));
- gdisp_lld_write_data(c2 & 0xFF);
- }
- if (area & 0x01) {
- c1 = *buffer++;
- gdisp_lld_write_data((c1 >> 4) & 0xFF);
- gdisp_lld_write_data((c1 << 4) & 0xF0);
- gdisp_lld_write_command(NOP);
- }
- #endif
- }
-#endif
-
-/* Circular Drawing Functions */
-#if (GDISP_NEED_CIRCLE && GDISP_HARDWARE_CIRCLES) || defined(__DOXYGEN__)
- /**
- * @brief Draw a circle.
- * @note Optional - The high level driver can emulate using software.
- * @note If GDISP_NEED_CLIPPING is defined this routine MUST behave
- * correctly if the circle is over the edges of the screen.
- *
- * @param[in] x, y The centre of the circle
- * @param[in] radius The radius of the circle
- * @param[in] color The color of the circle
- *
- * @notapi
- */
- void GDISP_LLD(drawcircle)(coord_t x, coord_t y, coord_t radius, color_t color) {
- /* NOT IMPLEMENTED */
- }
-#endif
-
-#if (GDISP_NEED_CIRCLE && GDISP_HARDWARE_CIRCLEFILLS) || defined(__DOXYGEN__)
- /**
- * @brief Create a filled circle.
- * @note Optional - The high level driver can emulate using software.
- * @note If GDISP_NEED_CLIPPING is defined this routine MUST behave
- * correctly if the circle is over the edges of the screen.
- *
- * @param[in] x, y The centre of the circle
- * @param[in] radius The radius of the circle
- * @param[in] color The color of the circle
- *
- * @notapi
- */
- void GDISP_LLD(fillcircle)(coord_t x, coord_t y, coord_t radius, color_t color) {
- /* NOT IMPLEMENTED */
- }
-#endif
-
-#if (GDISP_NEED_ELLIPSE && GDISP_HARDWARE_ELLIPSES) || defined(__DOXYGEN__)
- /**
- * @brief Draw an ellipse.
- * @note Optional - The high level driver can emulate using software.
- * @note If GDISP_NEED_CLIPPING is defined this routine MUST behave
- * correctly if the ellipse is over the edges of the screen.
- *
- * @param[in] x, y The centre of the ellipse
- * @param[in] a, b The dimensions of the ellipse
- * @param[in] color The color of the ellipse
- *
- * @notapi
- */
- void GDISP_LLD(drawellipse)(coord_t x, coord_t y, coord_t a, coord_t b, color_t color) {
- /* NOT IMPLEMENTED */
- }
-#endif
-
-#if (GDISP_NEED_ELLIPSE && GDISP_HARDWARE_ELLIPSEFILLS) || defined(__DOXYGEN__)
- /**
- * @brief Create a filled ellipse.
- * @note Optional - The high level driver can emulate using software.
- * @note If GDISP_NEED_CLIPPING is defined this routine MUST behave
- * correctly if the ellipse is over the edges of the screen.
- *
- * @param[in] x, y The centre of the ellipse
- * @param[in] a, b The dimensions of the ellipse
- * @param[in] color The color of the ellipse
- *
- * @notapi
- */
- void GDISP_LLD(fillellipse)(coord_t x, coord_t y, coord_t a, coord_t b, color_t color) {
- /* NOT IMPLEMENTED */
- }
-#endif
-
-#if (GDISP_NEED_TEXT && GDISP_HARDWARE_TEXT) || defined(__DOXYGEN__)
- #include "gdisp_fonts.h"
-#endif
-
-#if (GDISP_NEED_TEXT && GDISP_HARDWARE_TEXT) || defined(__DOXYGEN__)
- /**
- * @brief Draw a character using a transparent background.
- * @note Optional - The high level driver can emulate using software.
- *
- * @param[in] x, y The top-left corner of the text
- * @param[in] c The character to print
- * @param[in] color The color of the character
- *
- * @notapi
- */
- void GDISP_LLD(drawchar)(coord_t x, coord_t y, char c, font_t font, color_t color) {
- /* NOT IMPLEMENTED */
- }
-#endif
-
-#if (GDISP_NEED_TEXT && GDISP_HARDWARE_TEXTFILLS) || defined(__DOXYGEN__)
- /**
- * @brief Draw a character using a filled background.
- * @note Optional - The high level driver can emulate using software.
- *
- * @param[in] x, y The top-left corner of the text
- * @param[in] c The character to print
- * @param[in] color The color of the character
- * @param[in] bgcolor The background color
- *
- * @notapi
- */
- void GDISP_LLD(fillchar)(coord_t x, coord_t y, char c, font_t font, color_t color, color_t bgcolor) {
- /* NOT IMPLEMENTED */
- }
-#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.
- *
- * @param[in] x, y The start of the text
- *
- * @notapi
- */
- color_t GDISP_LLD(getpixelcolor)(coord_t x, coord_t y) {
- /* NOT IMPLEMENTED */
- }
-#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) {
- /* NOT IMPLEMENTED */
- }
-#endif
-
-#if GDISP_HARDWARE_CONTROL || defined(__DOXYGEN__)
- /**
- * @brief Driver Control
- * @detail Unsupported control codes are ignored.
- * @note The value parameter should always be typecast to (void *).
- * @note There are some predefined and some specific to the low level driver.
- * @note GDISP_CONTROL_POWER - Takes a gdisp_powermode_t
- * GDISP_CONTROL_ORIENTATION - Takes a gdisp_orientation_t
- * GDISP_CONTROL_BACKLIGHT - Takes an int from 0 to 100. For a driver
- * that only supports off/on anything other
- * than zero is on.
- * GDISP_CONTROL_CONTRAST - Takes an int from 0 to 100.
- * GDISP_CONTROL_LLD - Low level driver control constants start at
- * this value.
- *
- * @param[in] what What to do.
- * @param[in] value The value to use (always cast to a void *).
- *
- * @notapi
- */
- void GDISP_LLD(control)(int what, void *value) {
- /* NOT IMPLEMENTED YET */
- switch(what) {
- case GDISP_CONTROL_POWER:
- if (GDISP.Powermode == (gdisp_powermode_t)value)
- return;
- switch((gdisp_powermode_t)value) {
- case powerOff:
- /* Code here */
- break;
- case powerOn:
- /* Code here */
- /* You may need this ---
- if (GDISP.Powermode != powerSleep)
- GDISP_LLD(init();
- */
- break;
- case powerSleep:
- /* Code here */
- break;
- default:
- return;
- }
- GDISP.Powermode = (gdisp_powermode_t)value;
- return;
- case GDISP_CONTROL_ORIENTATION:
- if (GDISP.Orientation == (gdisp_orientation_t)value)
- return;
- // WriteSpiData(0x48); // no mirror Y (temporary to satisfy Olimex bmptoarray utility)
- // WriteSpiData(0xC8); // restore to (mirror x and y, reverse rgb)
- switch((gdisp_orientation_t)value) {
- case portrait:
- /* Code here */
- GDISP.Height = SCREEN_HEIGHT;
- GDISP.Width = SCREEN_WIDTH;
- break;
- case landscape:
- /* Code here */
- GDISP.Height = SCREEN_WIDTH;
- GDISP.Width = SCREEN_HEIGHT;
- break;
- case portraitInv:
- /* Code here */
- GDISP.Height = SCREEN_HEIGHT;
- GDISP.Width = SCREEN_WIDTH;
- break;
- case landscapeInv:
- /* Code here */
- GDISP.Height = SCREEN_WIDTH;
- GDISP.Width = SCREEN_HEIGHT;
- break;
- default:
- return;
- }
- GDISP.Orientation = (gdisp_orientation_t)value;
- return;
-/*
- case GDISP_CONTROL_BACKLIGHT:
- case GDISP_CONTROL_CONTRAST:
-*/
- }
- }
-#endif
-
-#if (GDISP_NEED_QUERY && GDISP_HARDWARE_QUERY) || defined(__DOXYGEN__)
-/**
- * @brief Query a driver value.
- * @detail Typecase the result to the type you want.
- * @note GDISP_QUERY_WIDTH - (coord_t) Gets the width of the screen
- * GDISP_QUERY_HEIGHT - (coord_t) Gets the height of the screen
- * GDISP_QUERY_POWER - (gdisp_powermode_t) Get the current powermode
- * GDISP_QUERY_ORIENTATION - (gdisp_orientation_t) Get the current screen orientation
- * GDISP_QUERY_BACKLIGHT - (coord_t) Get the backlight state (0 to 100)
- * GDISP_QUERY_CONTRAST - (coord_t) Get the contrast (0 to 100).
- * GDISP_QUERY_LLD - Low level driver control constants start at
- * this value.
- *
- * @param[in] what What to Query
- *
- * @notapi
- */
-void *GDISP_LLD(query)(unsigned what) {
- switch(what) {
- case GDISP_QUERY_WIDTH: return (void *)(unsigned)GDISP.Width;
- case GDISP_QUERY_HEIGHT: return (void *)(unsigned)GDISP.Height;
- case GDISP_QUERY_POWER: return (void *)(unsigned)GDISP.Powermode;
- case GDISP_QUERY_ORIENTATION: return (void *)(unsigned)GDISP.Orientation;
- case GDISP_QUERY_BACKLIGHT: return (void *)(unsigned)GDISP.Backlight;
- case GDISP_QUERY_CONTRAST: return (void *)(unsigned)GDISP.Contrast;
- case GDISP_QUERY_LLD+0:
- /* Code here */
- default: return (void *)-1;
- }
-}
-#endif
-
-#endif /* HAL_USE_GDISP */
-/** @} */
diff --git a/halext/drivers/gdispNokia6610/gdisp_lld.mk b/halext/drivers/gdispNokia6610/gdisp_lld.mk deleted file mode 100644 index 43ed7581..00000000 --- a/halext/drivers/gdispNokia6610/gdisp_lld.mk +++ /dev/null @@ -1,5 +0,0 @@ -# List the required driver.
-HALSRC += $(LCDLIB)/halext/drivers/gdispNokia6610/gdisp_lld.c
-
-# Required include directories
-HALINC += $(LCDLIB)/halext/drivers/gdispNokia6610
diff --git a/halext/drivers/gdispNokia6610/gdisp_lld_board_example.h b/halext/drivers/gdispNokia6610/gdisp_lld_board_example.h deleted file mode 100644 index 0e2b806e..00000000 --- a/halext/drivers/gdispNokia6610/gdisp_lld_board_example.h +++ /dev/null @@ -1,97 +0,0 @@ -/*
- 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 gdispNokia6610/gdisp_lld_board_example.h
- * @brief GDISP Graphic Driver subsystem board interface for the Nokia6610 display.
- *
- * @addtogroup GDISP
- * @{
- */
-
-#ifndef _GDISP_LLD_BOARD_H
-#define _GDISP_LLD_BOARD_H
-
-/**
- * @brief Initialise the board for the display.
- * @notes Performs the following functions:
- * 1. initialise the spi port used by your display
- * 2. initialise the reset pin (initial state not-in-reset)
- * 3. initialise the chip select pin (initial state not-active)
- * 4. initialise the backlight pin (initial state back-light off)
- *
- * @notapi
- */
-static __inline void GDISP_LLD(init_board)(void) {
- /* Code here */
-}
-
-/**
- * @brief Set or clear the lcd reset pin.
- *
- * @param[in] state TRUE = lcd in reset, FALSE = normal operation
- *
- * @notapi
- */
-static __inline void GDISP_LLD(setpin_reset)(bool_t state) {
- /* Code here */
-}
-
-/**
- * @brief Set or clear the lcd back-light pin.
- *
- * @param[in] state TRUE = lcd back-light on, FALSE = lcd back-light off
- *
- * @notapi
- */
-static __inline void GDISP_LLD(setpin_backlight)(bool_t state) {
- /* Code here */
-}
-
-/**
- * @brief Send a 9 bit command/data to the lcd.
- * @note The chip select may need to be asserted/de-asserted
- * around the actual spi write
- *
- * @param[in] data The data to send
- *
- * @notapi
- */
-static __inline void GDISP_LLD(write_spi)(uint16_t data) {
- /* Code here */
-}
-
-#if GDISP_HARDWARE_READPIXEL || GDISP_HARDWARE_SCROLL || defined(__DOXYGEN__)
-/**
- * @brief Read data from the lcd.
- *
- * @return The data from the lcd
- * @note The chip select may need to be asserted/de-asserted
- * around the actual spi read
- *
- * @notapi
- */
-static __inline uint16_t GDISP_LLD(read_spi)(void) {
- /* Code here */
-}
-#endif
-
-#endif /* _GDISP_LLD_BOARD_H */
-/** @} */
diff --git a/halext/drivers/gdispNokia6610/gdisp_lld_board_olimexsam7ex256.h b/halext/drivers/gdispNokia6610/gdisp_lld_board_olimexsam7ex256.h deleted file mode 100644 index b5b4b1d5..00000000 --- a/halext/drivers/gdispNokia6610/gdisp_lld_board_olimexsam7ex256.h +++ /dev/null @@ -1,199 +0,0 @@ -/*
- 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 gdispNokia6610/gdisp_lld_board_olimexsam7ex256.h
- * @brief GDISP Graphic Driver subsystem board interface for the Olimex SAM7-EX256 board.
- *
- * @addtogroup GDISP
- * @{
- */
-
-#ifndef _GDISP_LLD_BOARD_H
-#define _GDISP_LLD_BOARD_H
-
-// mask definitions
-#define BIT0 0x00000001
-#define BIT1 0x00000002
-#define BIT2 0x00000004
-#define BIT3 0x00000008
-#define BIT4 0x00000010
-#define BIT5 0x00000020
-#define BIT6 0x00000040
-#define BIT7 0x00000080
-#define BIT8 0x00000100
-#define BIT9 0x00000200
-#define BIT10 0x00000400
-#define BIT11 0x00000800
-#define BIT12 0x00001000
-#define BIT13 0x00002000
-#define BIT14 0x00004000
-#define BIT15 0x00008000
-#define BIT16 0x00010000
-#define BIT17 0x00020000
-#define BIT18 0x00040000
-#define BIT19 0x00080000
-#define BIT20 0x00100000
-#define BIT21 0x00200000
-#define BIT22 0x00400000
-#define BIT23 0x00800000
-#define BIT24 0x01000000
-#define BIT25 0x02000000
-#define BIT26 0x04000000
-#define BIT27 0x08000000
-#define BIT28 0x10000000
-#define BIT29 0x20000000
-#define BIT30 0x40000000
-#define BIT31 0x80000000
-
-// ******************************************************
-// Pointers to AT91SAM7X256 peripheral data structures
-// ******************************************************
-volatile AT91PS_PIO pPIOA = AT91C_BASE_PIOA;
-volatile AT91PS_PIO pPIOB = AT91C_BASE_PIOB;
-volatile AT91PS_SPI pSPI = AT91C_BASE_SPI0;
-volatile AT91PS_PMC pPMC = AT91C_BASE_PMC;
-volatile AT91PS_PDC pPDC = AT91C_BASE_PDC_SPI0;
-
-/**
- * @brief Initialise the board for the display.
- * @notes Performs the following functions:
- * 1. initialise the spi port used by your display
- * 2. initialise the reset pin (initial state not-in-reset)
- * 3. initialise the chip select pin (initial state not-active)
- * 4. initialise the backlight pin (initial state back-light off)
- *
- * @notapi
- */
-static __inline void GDISP_LLD(init_board)(void) {
- // *********************************************************************************************
- // InitSpi( )
- //
- // Sets up SPI channel 0 for communications to Nokia 6610 LCD Display
- //
- // I/O ports used: PA2 = LCD Reset (set to low to reset)
- // PA12 = LCD chip select (set to low to select the LCD chip)
- // PA16 = SPI0_MISO Master In - Slave Out (not used in LCD interface)
- // PA17 = SPI0_MOSI Master Out - Slave In pin (Serial Data to LCD slave)
- // PA18 = SPI0_SPCK Serial Clock (to LCD slave)
- // PB20 = backlight control (normally PWM control, 1 = full on)
- //
- // *********************************************************************************************}
-
- /* This code should really use the ChibiOS driver for these functions */
-
- // Pin for backlight
- 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_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
- // pPIOA->PIO_OER = BIT12; // Configure PA2 as output
-
- // Init SPI0
- // Disable the following pins from PIO control (will be used instead by the SPI0 peripheral)
- // BIT12 = PA12 -> SPI0_NPCS0 chip select
- // BIT16 = PA16 -> SPI0_MISO Master In - Slave Out (not used in LCD interface)
- // BIT17 = PA17 -> SPI0_MOSI Master Out - Slave In pin (Serial Data to LCD slave)
- // BIT18 = PA18 -> SPI0_SPCK Serial Clock (to LCD slave)
- pPIOA->PIO_PDR = BIT12 | BIT16 | BIT17 | BIT18;
- pPIOA->PIO_ASR = BIT12 | BIT16 | BIT17 | BIT18;
- pPIOA->PIO_BSR = 0;
-
- //enable the clock of SPI
- pPMC->PMC_PCER = 1 << AT91C_ID_SPI0;
-
- // Fixed mode
- pSPI->SPI_CR = 0x81; //SPI Enable, Sowtware reset
- pSPI->SPI_CR = 0x01; //SPI Enable
-
- //pSPI->SPI_MR = 0xE0019; //Master mode, fixed select, disable decoder, FDIV=1 (MCK), PCS=1110
- pSPI->SPI_MR = 0xE0011; //Master mode, fixed select, disable decoder, FDIV=0 (MCK), PCS=1110
-
- //pSPI->SPI_CSR[0] = 0x01010C11; //9bit, CPOL=1, ClockPhase=0, SCLK = 48Mhz/32*12 = 125kHz
- pSPI->SPI_CSR[0] = 0x01010311; //9bit, CPOL=1, ClockPhase=0, SCLK = 48Mhz/8 = 6MHz if using commented MR line above
-}
-
-/**
- * @brief Set or clear the lcd reset pin.
- *
- * @param[in] state TRUE = lcd in reset, FALSE = normal operation
- *
- * @notapi
- */
-static __inline void GDISP_LLD(setpin_reset)(bool_t state) {
- if (state)
- palClearPad(IOPORT1, PIOA_LCD_RESET);
-// pPIOA->PIO_CODR = PIOA_LCD_RESET_MASK;
- else
- palSetPad(IOPORT1, PIOA_LCD_RESET);
-// pPIOA->PIO_SODR = PIOA_LCD_RESET_MASK;
-}
-
-/**
- * @brief Set or clear the lcd back-light pin.
- *
- * @param[in] state TRUE = lcd back-light on, FALSE = lcd back-light off
- *
- * @notapi
- */
-static __inline void GDISP_LLD(setpin_backlight)(bool_t state) {
- if (state)
- palSetPad(IOPORT2, PIOB_LCD_BL);
-// pPIOB->PIO_SODR = PIOB_LCD_BL_MASK;
- else
- palClearPad(IOPORT2, PIOB_LCD_BL);
-// pPIOB->PIO_CODR = PIOB_LCD_BL_MASK;
-}
-
-/**
- * @brief Send a 9 bit command/data to the lcd.
- *
- * @param[in] data The data to send
- *
- * @notapi
- */
-static __inline void GDISP_LLD(write_spi)(uint16_t data) {
- // wait for the previous transfer to complete
- while((pSPI->SPI_SR & AT91C_SPI_TXEMPTY) == 0);
- // send the data
- pSPI->SPI_TDR = data;
-}
-
-#if GDISP_HARDWARE_READPIXEL || GDISP_HARDWARE_SCROLL || defined(__DOXYGEN__)
-/**
- * @brief Read data from the lcd.
- *
- * @return The data from the lcd
- *
- * @notapi
- */
-static __inline uint16_t GDISP_LLD(read_spi)(void) {
- #error "gdispNokia6610: GDISP_HARDWARE_READPIXEL and GDISP_HARDWARE_SCROLL are not supported on this board"
- return 0;
-}
-#endif
-
-#endif /* _GDISP_LLD_BOARD_H */
-/** @} */
diff --git a/halext/drivers/gdispNokia6610/gdisp_lld_config.h b/halext/drivers/gdispNokia6610/gdisp_lld_config.h deleted file mode 100644 index 9e2d1258..00000000 --- a/halext/drivers/gdispNokia6610/gdisp_lld_config.h +++ /dev/null @@ -1,66 +0,0 @@ -/*
- 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 gdispNokia6610/gdisp_lld_config.h
- * @brief GDISP Graphic Driver subsystem low level driver header for the Nokia6610 display.
- *
- * @addtogroup GDISP
- * @{
- */
-
-#ifndef _GDISP_LLD_CONFIG_H
-#define _GDISP_LLD_CONFIG_H
-
-#if HAL_USE_GDISP
-
-/*===========================================================================*/
-/* Driver hardware support. */
-/*===========================================================================*/
-
-#define GDISP_DRIVER_NAME "Nokia6610"
-#define GDISP_LLD(x) gdisp_lld_##x##_Nokia6610
-
-#define GDISP_HARDWARE_LINES FALSE
-#define GDISP_HARDWARE_CLEARS FALSE
-#define GDISP_HARDWARE_FILLS TRUE
-#define GDISP_HARDWARE_BITFILLS TRUE
-#define GDISP_HARDWARE_CIRCLES FALSE
-#define GDISP_HARDWARE_CIRCLEFILLS FALSE
-#define GDISP_HARDWARE_ELLIPSES FALSE
-#define GDISP_HARDWARE_ELLIPSEFILLS FALSE
-#define GDISP_HARDWARE_TEXT FALSE
-#define GDISP_HARDWARE_TEXTFILLS FALSE
-#define GDISP_HARDWARE_SCROLL FALSE
-#define GDISP_HARDWARE_PIXELREAD FALSE
-#define GDISP_HARDWARE_CONTROL FALSE
-#define GDISP_HARDWARE_QUERY FALSE
-
-#define GDISP_SOFTWARE_TEXTFILLDRAW TRUE
-#define GDISP_SOFTWARE_TEXTBLITCOLUMN FALSE
-
-#define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB444
-#define GDISP_PACKED_PIXELS FALSE
-#define GDISP_PACKED_LINES FALSE
-
-#endif /* HAL_USE_GDISP */
-
-#endif /* _GDISP_LLD_CONFIG_H */
-/** @} */
diff --git a/halext/drivers/gdispNokia6610/readme.txt b/halext/drivers/gdispNokia6610/readme.txt deleted file mode 100644 index facb400f..00000000 --- a/halext/drivers/gdispNokia6610/readme.txt +++ /dev/null @@ -1,17 +0,0 @@ -To use this driver:
-
-1. Add in your halconf.h:
- a) #define HAL_USE_GDISP TRUE
- b) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
- c) One (only) of:
- #define LCD_USE_GE8 /* The Epson controller */
- #define LCD_USE_GE12 /* The Philips controller */
- d) If you are not using a known board then create a gdisp_lld_board.h file
- and ensure it is on your include path.
- Use the gdisp_lld_board_example.h file as a basis.
- Currently known boards are:
- Olimex SAM7-EX256
-
-2. To your makefile add the following lines:
- include $(CHIBIOS)/os/halext/halext.mk
- include $(CHIBIOS)/os/halext/drivers/gdispXXXXX/gdisp_lld.mk
|