diff options
Diffstat (limited to 'drivers')
29 files changed, 1085 insertions, 219 deletions
diff --git a/drivers/gdisp/ILI9320/gdisp_lld.c b/drivers/gdisp/ILI9320/gdisp_lld.c index ada0f27d..202f06dd 100644 --- a/drivers/gdisp/ILI9320/gdisp_lld.c +++ b/drivers/gdisp/ILI9320/gdisp_lld.c @@ -28,12 +28,12 @@ #include "ch.h"
#include "hal.h"
-#include "gdisp.h"
+#include "gfx.h"
#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
/* Include the emulation code for things we don't support */
-#include "lld/gdisp/emulation.c"
+#include "gdisp/lld/emulation.c"
#if defined(GDISP_USE_CUSTOM_BOARD) && GDISP_USE_CUSTOM_BOARD
/* Include the user supplied board definitions */
@@ -50,9 +50,11 @@ /* This controller is only ever used with a 240 x 320 display */
#if defined(GDISP_SCREEN_HEIGHT)
+ #warning "GDISP: This low level driver does not support setting a screen size. It is being ignored."
#undef GDISP_SCREEN_HEIGHT
#endif
#if defined(GDISP_SCREEN_WIDTH)
+ #warning "GDISP: This low level driver does not support setting a screen size. It is being ignored."
#undef GDISP_SCREEN_WIDTH
#endif
diff --git a/drivers/gdisp/Nokia6610/gdisp_lld.mk b/drivers/gdisp/Nokia6610/gdisp_lld.mk deleted file mode 100644 index f378c02e..00000000 --- a/drivers/gdisp/Nokia6610/gdisp_lld.mk +++ /dev/null @@ -1,5 +0,0 @@ -# List the required driver.
-GFXSRC += $(GFXLIB)/drivers/gdisp/Nokia6610/gdisp_lld.c
-
-# Required include directories
-GFXINC += $(GFXLIB)/drivers/gdisp/Nokia6610
diff --git a/drivers/gdisp/Nokia6610/GE12.h b/drivers/gdisp/Nokia6610GE12/GE12.h index 6c980e2e..6c980e2e 100644 --- a/drivers/gdisp/Nokia6610/GE12.h +++ b/drivers/gdisp/Nokia6610GE12/GE12.h diff --git a/drivers/gdisp/Nokia6610/gdisp_lld.c b/drivers/gdisp/Nokia6610GE12/gdisp_lld.c index 47df5bb2..7e5e1215 100644 --- a/drivers/gdisp/Nokia6610/gdisp_lld.c +++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld.c @@ -19,8 +19,8 @@ */
/**
- * @file drivers/gdisp/Nokia6610/gdisp_lld.c
- * @brief GDISP Graphics Driver subsystem low level driver source for the Nokia6610 display.
+ * @file drivers/gdisp/Nokia6610GE12/gdisp_lld.c
+ * @brief GDISP Graphics Driver subsystem low level driver source for the Nokia6610 GE12 display.
*
* @addtogroup GDISP
* @{
@@ -28,31 +28,27 @@ #include "ch.h"
#include "hal.h"
-#include "gdisp.h"
+#include "gfx.h"
#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
/* Include the emulation code for things we don't support */
-#include "lld/gdisp/emulation.c"
+#include "gdisp/lld/emulation.c"
/*===========================================================================*/
/* Driver local definitions. */
/*===========================================================================*/
/* Controller definitions */
-#if defined(GDISP_USE_GE8)
- #include "GE8.h"
-#elif defined(GDISP_USE_GE12)
- #include "GE12.h"
-#else
- #error "gdispNokia6610: Either GDISP_USE_GE8 or GDISP_USE_GE12 must be defined depending on your controller"
-#endif
+#include "GE12.h"
/* This controller is only ever used with a 132 x 132 display */
#if defined(GDISP_SCREEN_HEIGHT)
+ #warning "GDISP: This low level driver does not support setting a screen size. It is being ignored."
#undef GDISP_SCREEN_HEIGHT
#endif
#if defined(GDISP_SCREEN_WIDTH)
+ #warning "GDISP: This low level driver does not support setting a screen size. It is being ignored."
#undef GDISP_SCREEN_WIDTH
#endif
#define GDISP_SCREEN_HEIGHT 132
@@ -130,87 +126,66 @@ bool_t GDISP_LLD(init)(void) { // Get the bus for the following initialisation commands
acquire_bus();
- #if defined(GDISP_USE_GE8)
- write_cmd3(DISCTL, 0x00, 0x20, 0x00); // Display control
- // P1: 0x00 = 2 divisions, switching period=8 (default)
- // P2: 0x20 = nlines/4 - 1 = 132/4 - 1 = 32)
- // P3: 0x00 = no inversely highlighted lines
- write_cmd1(COMSCN, 0x01); // COM scan P1: 0x01 = Scan 1->80, 160<-81
- write_cmd(OSCON); // Internal oscilator ON
- write_cmd(SLPOUT); // Sleep out
- write_cmd1(PWRCTR, 0x0F); // Power control - reference voltage regulator on, circuit voltage follower on, BOOST ON
- write_cmd3(DATCTL, 0x48, 0x00, 0x02); // Data control
- // P1: 0x01 = page address inverted, column address normal, address scan in column direction
- // P2: 0x00 = RGB sequence (default value)
- // P3: 0x02 = Grayscale -> 16 (selects 12-bit color, type A)
- write_cmd2(VOLCTR, GDISP_INITIAL_CONTRAST, 0x03); // Voltage control (contrast setting)
- // P1 = Contrast
- // P2 = 3 resistance ratio (only value that works)
- delayms(100); // allow power supply to stabilize
- write_cmd(DISON); // Turn on the display
-
- #elif defined(GDISP_USE_GE12)
- // UNTESTED
- #if 1
- write_cmd(SLEEPOUT); // Sleep out
- write_cmd(INVON); // Inversion on: seems to be required for this controller
- write_cmd1(COLMOD, 0x03); // Color Interface Pixel Format - 0x03 = 12 bits-per-pixel
- write_cmd1(MADCTL, 0xC8); // Memory access controler - 0xC0 = mirror x and y, reverse rgb
- write_cmd1(SETCON, GDISP_INITIAL_CONTRAST); // Write contrast
- delayms(20);
- write_cmd(DISPON); // Display On
- #else
- // Alternative
- write_cmd(SOFTRST); // Software Reset
- delayms(20);
- write_cmd(INITESC); // Initial escape
- delayms(20);
- write_cmd1(REFSET, 0x00); // Refresh set
- write_cmd(DISPCTRL); // Set Display control - really 7 bytes of data
- write_data(128); // Set the lenght of one selection term
- write_data(128); // Set N inversion -> no N inversion
- write_data(134); // Set frame frequence and bias rate -> 2 devision of frequency and 1/8 bias, 1/67 duty, 96x67 size
- write_data(84); // Set duty parameter
- write_data(69); // Set duty parameter
- write_data(82); // Set duty parameter
- write_data(67); // Set duty parameter
- write_cmd(GRAYSCALE0); // Grey scale 0 position set - really 15 bytes of data
- write_data(1); // GCP1 - gray lavel to be output when the RAM data is "0001"
- write_data(2); // GCP2 - gray lavel to be output when the RAM data is "0010"
- write_data(4); // GCP3 - gray lavel to be output when the RAM data is "0011"
- write_data(8); // GCP4 - gray lavel to be output when the RAM data is "0100"
- write_data(16); // GCP5 - gray lavel to be output when the RAM data is "0101"
- write_data(30); // GCP6 - gray lavel to be output when the RAM data is "0110"
- write_data(40); // GCP7 - gray lavel to be output when the RAM data is "0111"
- write_data(50); // GCP8 - gray lavel to be output when the RAM data is "1000"
- write_data(60); // GCP9 - gray lavel to be output when the RAM data is "1001"
- write_data(70); // GCP10 - gray lavel to be output when the RAM data is "1010"
- write_data(80); // GCP11 - gray lavel to be output when the RAM data is "1011"
- write_data(90); // GCP12 - gray lavel to be output when the RAM data is "1100"
- write_data(100); // GCP13 - gray lavel to be output when the RAM data is "1101"
- write_data(110); // GCP14 - gray lavel to be output when the RAM data is "1110"
- write_data(127); // GCP15 - gray lavel to be output when the RAM data is "1111"
- write_cmd1(GAMMA, 0x01); // Gamma curve set - select gray scale - GRAYSCALE 0 or GREYSCALE 1 - Select grey scale 0
- write_cmd1(COMMONDRV, 0x00); // Command driver output - Set COM1-COM41 side come first, normal mod
- write_cmd(NORMALMODE); // Set Normal mode (my)
- // write_cmd(INVERSIONOFF); // Inversion off
- write_cmd2(COLADDRSET, 0, 131); // Column address set
- write_cmd2(PAGEADDRSET, 0, 131); // Page address set
- write_cmd1(ACCESSCTRL, 0x40); // Memory access controler - 0x40 horizontal
- // write_data(0x20); // vertical
- write_cmd1(PWRCTRL, 0x04); // Power control - Internal resistance, V1OUT -> high power mode, oscilator devision rate
- write_cmd(SLEEPOUT); // Sleep out
- write_cmd(VOLTCTRL); // Voltage control - voltage control and write contrast define LCD electronic volume
- // write_data(0x7f); // full voltage control
- // write_data(0x03); // must be "1"
- write_cmd1(CONTRAST, GDISP_INITIAL_CONTRAST); // Write contrast
- delayms(20);
- write_cmd(TEMPGRADIENT); // Temperature gradient - really 14 bytes of data
- for(i=0; i<14; i++)
- write_data(0);
- write_cmd(BOOSTVON); // Booster voltage ON
- write_cmd(DISPLAYON); // Finally - Display On
- #endif
+ // UNTESTED
+ #if 1
+ write_cmd(SLEEPOUT); // Sleep out
+ write_cmd(INVON); // Inversion on: seems to be required for this controller
+ write_cmd1(COLMOD, 0x03); // Color Interface Pixel Format - 0x03 = 12 bits-per-pixel
+ write_cmd1(MADCTL, 0xC8); // Memory access controler - 0xC0 = mirror x and y, reverse rgb
+ write_cmd1(SETCON, GDISP_INITIAL_CONTRAST); // Write contrast
+ delayms(20);
+ write_cmd(DISPON); // Display On
+ #else
+ // Alternative
+ write_cmd(SOFTRST); // Software Reset
+ delayms(20);
+ write_cmd(INITESC); // Initial escape
+ delayms(20);
+ write_cmd1(REFSET, 0x00); // Refresh set
+ write_cmd(DISPCTRL); // Set Display control - really 7 bytes of data
+ write_data(128); // Set the lenght of one selection term
+ write_data(128); // Set N inversion -> no N inversion
+ write_data(134); // Set frame frequence and bias rate -> 2 devision of frequency and 1/8 bias, 1/67 duty, 96x67 size
+ write_data(84); // Set duty parameter
+ write_data(69); // Set duty parameter
+ write_data(82); // Set duty parameter
+ write_data(67); // Set duty parameter
+ write_cmd(GRAYSCALE0); // Grey scale 0 position set - really 15 bytes of data
+ write_data(1); // GCP1 - gray lavel to be output when the RAM data is "0001"
+ write_data(2); // GCP2 - gray lavel to be output when the RAM data is "0010"
+ write_data(4); // GCP3 - gray lavel to be output when the RAM data is "0011"
+ write_data(8); // GCP4 - gray lavel to be output when the RAM data is "0100"
+ write_data(16); // GCP5 - gray lavel to be output when the RAM data is "0101"
+ write_data(30); // GCP6 - gray lavel to be output when the RAM data is "0110"
+ write_data(40); // GCP7 - gray lavel to be output when the RAM data is "0111"
+ write_data(50); // GCP8 - gray lavel to be output when the RAM data is "1000"
+ write_data(60); // GCP9 - gray lavel to be output when the RAM data is "1001"
+ write_data(70); // GCP10 - gray lavel to be output when the RAM data is "1010"
+ write_data(80); // GCP11 - gray lavel to be output when the RAM data is "1011"
+ write_data(90); // GCP12 - gray lavel to be output when the RAM data is "1100"
+ write_data(100); // GCP13 - gray lavel to be output when the RAM data is "1101"
+ write_data(110); // GCP14 - gray lavel to be output when the RAM data is "1110"
+ write_data(127); // GCP15 - gray lavel to be output when the RAM data is "1111"
+ write_cmd1(GAMMA, 0x01); // Gamma curve set - select gray scale - GRAYSCALE 0 or GREYSCALE 1 - Select grey scale 0
+ write_cmd1(COMMONDRV, 0x00); // Command driver output - Set COM1-COM41 side come first, normal mod
+ write_cmd(NORMALMODE); // Set Normal mode (my)
+ // write_cmd(INVERSIONOFF); // Inversion off
+ write_cmd2(COLADDRSET, 0, 131); // Column address set
+ write_cmd2(PAGEADDRSET, 0, 131); // Page address set
+ write_cmd1(ACCESSCTRL, 0x40); // Memory access controler - 0x40 horizontal
+ // write_data(0x20); // vertical
+ write_cmd1(PWRCTRL, 0x04); // Power control - Internal resistance, V1OUT -> high power mode, oscilator devision rate
+ write_cmd(SLEEPOUT); // Sleep out
+ write_cmd(VOLTCTRL); // Voltage control - voltage control and write contrast define LCD electronic volume
+ // write_data(0x7f); // full voltage control
+ // write_data(0x03); // must be "1"
+ write_cmd1(CONTRAST, GDISP_INITIAL_CONTRAST); // Write contrast
+ delayms(20);
+ write_cmd(TEMPGRADIENT); // Temperature gradient - really 14 bytes of data
+ for(i=0; i<14; i++)
+ write_data(0);
+ write_cmd(BOOSTVON); // Booster voltage ON
+ write_cmd(DISPLAYON); // Finally - Display On
#endif
// Release the bus
@@ -541,11 +516,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { case GDISP_CONTROL_CONTRAST:
if ((unsigned)value > 100) value = (void *)100;
acquire_bus();
-#if defined(GDISP_USE_GE8)
- write_cmd2(VOLCTR, (unsigned)value, 0x03);
-#elif defined(GDISP_USE_GE12)
write_cmd1(CONTRAST,(unsigned)value);
-#endif
release_bus();
GDISP.Contrast = (unsigned)value;
return;
diff --git a/drivers/gdisp/Nokia6610GE12/gdisp_lld.mk b/drivers/gdisp/Nokia6610GE12/gdisp_lld.mk new file mode 100644 index 00000000..575d52a3 --- /dev/null +++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld.mk @@ -0,0 +1,5 @@ +# List the required driver.
+GFXSRC += $(GFXLIB)/drivers/gdisp/Nokia6610GE12/gdisp_lld.c
+
+# Required include directories
+GFXINC += $(GFXLIB)/drivers/gdisp/Nokia6610GE12
diff --git a/drivers/gdisp/Nokia6610GE12/gdisp_lld_board_example.h b/drivers/gdisp/Nokia6610GE12/gdisp_lld_board_example.h new file mode 100644 index 00000000..1885f07c --- /dev/null +++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld_board_example.h @@ -0,0 +1,135 @@ +/*
+ ChibiOS/GFX - Copyright (C) 2012
+ Joel Bodenmann aka Tectu <joel@unormal.org>
+
+ This file is part of ChibiOS/GFX.
+
+ ChibiOS/GFX 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/GFX 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 drivers/gdisp/Nokia6610GE12/gdisp_lld_board_example.h
+ * @brief GDISP Graphic Driver subsystem board interface for the Nokia6610 GE12 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 init_board(void) {
+ /* Code here */
+ #error "gdispNokia6610GE12: You must supply a definition for init_board for your board"
+}
+
+/**
+ * @brief Set or clear the lcd reset pin.
+ *
+ * @param[in] state TRUE = lcd in reset, FALSE = normal operation
+ *
+ * @notapi
+ */
+static __inline void setpin_reset(bool_t state) {
+ /* Code here */
+ #error "gdispNokia6610GE12: You must supply a definition for setpin_reset for your board"
+}
+
+/**
+ * @brief Set the lcd back-light level.
+ * @note For now 0% turns the backlight off, anything else the backlight is on.
+ * While the hardware supports PWM backlight control, we are not using it
+ * yet.
+ *
+ * @param[in] percent 0 to 100%
+ *
+ * @notapi
+ */
+static __inline void set_backlight(uint8_t percent) {
+ /* Code here */
+ #error "gdispNokia6610GE12: You must supply a definition for set_backlight for your board"
+}
+
+/**
+ * @brief Take exclusive control of the bus
+ *
+ * @notapi
+ */
+static __inline void acquire_bus(void) {
+ /* Code here */
+ #error "gdispNokia6610GE12: You must supply a definition for acquire_bus for your board"
+}
+
+/**
+ * @brief Release exclusive control of the bus
+ *
+ * @notapi
+ */
+static __inline void release_bus(void) {
+ /* Code here */
+ #error "gdispNokia6610GE12: You must supply a definition for release_bus for your board"
+}
+
+/**
+ * @brief Send an 8 bit command to the lcd.
+ *
+ * @param[in] cmd The command to send
+ *
+ * @notapi
+ */
+static __inline void write_cmd(uint16_t cmd) {
+ /* Code here */
+ #error "gdispNokia6610GE12: You must supply a definition for write_cmd for your board"
+}
+
+/**
+ * @brief Send an 8 bit data to the lcd.
+ *
+ * @param[in] data The data to send
+ *
+ * @notapi
+ */
+static __inline void write_data(uint16_t data) {
+ /* Code here */
+ #error "gdispNokia6610GE12: You must supply a definition for write_data for your board"
+}
+
+#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 read_data(void) {
+ /* Code here */
+ #error "gdispNokia6610GE12: You must supply a definition for read_data for your board"
+}
+#endif
+
+#endif /* _GDISP_LLD_BOARD_H */
+/** @} */
diff --git a/drivers/gdisp/Nokia6610GE12/gdisp_lld_board_olimexsam7ex256.h b/drivers/gdisp/Nokia6610GE12/gdisp_lld_board_olimexsam7ex256.h new file mode 100644 index 00000000..c161a9a3 --- /dev/null +++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld_board_olimexsam7ex256.h @@ -0,0 +1,196 @@ +/*
+ ChibiOS/GFX - Copyright (C) 2012
+ Joel Bodenmann aka Tectu <joel@unormal.org>
+
+ This file is part of ChibiOS/GFX.
+
+ ChibiOS/GFX 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/GFX 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 drivers/gdisp/Nokia6610GE12/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
+
+// ******************************************************
+// 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 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 = 1<<12; // Set PA2 to HIGH
+ // pPIOA->PIO_OER = 1<<12; // 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 = (1<<12) | (1<<16) | (1<<17) | (1<<18);
+ pPIOA->PIO_ASR = (1<<12) | (1<<16) | (1<<17) | (1<<18);
+ 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 setpin_reset(bool_t state) {
+ if (state)
+ palClearPad(IOPORT1, PIOA_LCD_RESET);
+ else
+ palSetPad(IOPORT1, PIOA_LCD_RESET);
+}
+
+/**
+ * @brief Set the lcd back-light level.
+ * @note For now 0% turns the backlight off, anything else the backlight is on.
+ * While the hardware supports PWM backlight control, we are not using it
+ * yet.
+ *
+ * @param[in] percent 0 to 100%
+ *
+ * @notapi
+ */
+static __inline void set_backlight(uint8_t percent) {
+ if (percent)
+ palSetPad(IOPORT2, PIOB_LCD_BL);
+ else
+ palClearPad(IOPORT2, PIOB_LCD_BL);
+}
+
+/**
+ * @brief Take exclusive control of the bus
+ *
+ * @notapi
+ */
+static __inline void acquire_bus(void) {
+ /* Nothing to do for this board as the LCD is the only device on the SPI port */
+}
+
+/**
+ * @brief Release exclusive control of the bus
+ *
+ * @notapi
+ */
+static __inline void release_bus(void) {
+ // Nothing to do for this board as the LCD is the only device on the SPI port
+}
+
+/**
+ * @brief Send an 8 bit command to the lcd.
+ *
+ * @param[in] cmd The command to send
+ *
+ * @notapi
+ */
+static __inline void write_cmd(uint16_t cmd) {
+ // wait for the previous transfer to complete
+ while((pSPI->SPI_SR & AT91C_SPI_TXEMPTY) == 0);
+ // send the command
+ pSPI->SPI_TDR = cmd & 0xFF;
+}
+
+/**
+ * @brief Send an 8 bit data to the lcd.
+ *
+ * @param[in] data The data to send
+ *
+ * @notapi
+ */
+static __inline void write_data(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 | 0x0100;
+}
+
+#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 read_data(void) {
+ #error "gdispNokia6610GE12: GDISP_HARDWARE_READPIXEL and GDISP_HARDWARE_SCROLL are not supported on this board"
+ return 0;
+}
+#endif
+
+#endif /* _GDISP_LLD_BOARD_H */
+/** @} */
diff --git a/drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h b/drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h new file mode 100644 index 00000000..ab9d35e7 --- /dev/null +++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h @@ -0,0 +1,58 @@ +/*
+ ChibiOS/GFX - Copyright (C) 2012
+ Joel Bodenmann aka Tectu <joel@unormal.org>
+
+ This file is part of ChibiOS/GFX.
+
+ ChibiOS/GFX 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/GFX 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 drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h
+ * @brief GDISP Graphic Driver subsystem low level driver header for the Nokia6610 GE12 display.
+ *
+ * @addtogroup GDISP
+ * @{
+ */
+
+#ifndef _GDISP_LLD_CONFIG_H
+#define _GDISP_LLD_CONFIG_H
+
+#if GFX_USE_GDISP
+
+/*===========================================================================*/
+/* Driver hardware support. */
+/*===========================================================================*/
+
+#define GDISP_DRIVER_NAME "Nokia6610GE12"
+#define GDISP_LLD(x) gdisp_lld_##x##_Nokia6610GE12
+
+#define GDISP_HARDWARE_FILLS TRUE
+#define GDISP_HARDWARE_BITFILLS TRUE
+#define GDISP_HARDWARE_CONTROL TRUE
+
+#define GDISP_SOFTWARE_TEXTFILLDRAW FALSE
+#define GDISP_SOFTWARE_TEXTBLITCOLUMN FALSE
+
+#define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB444
+/* This driver supports both packed and unpacked pixel formats and line formats.
+ * By default we leave these as FALSE.
+ */
+#define GDISP_PACKED_PIXELS FALSE
+#define GDISP_PACKED_LINES FALSE
+
+#endif /* GFX_USE_GDISP */
+
+#endif /* _GDISP_LLD_CONFIG_H */
+/** @} */
diff --git a/drivers/gdisp/Nokia6610/readme.txt b/drivers/gdisp/Nokia6610GE12/readme.txt index cd3722fb..54c4570f 100644 --- a/drivers/gdisp/Nokia6610/readme.txt +++ b/drivers/gdisp/Nokia6610GE12/readme.txt @@ -1,16 +1,15 @@ +This driver is for the Nokia6610 Philips (GE12) controller
+
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) One (only) of:
- #define GDISP_USE_GE8 /* The Epson controller */
- #define GDISP_USE_GE12 /* The Philips controller */
- d) If you are not using a known board then create a gdisp_lld_board.h file
+ c) 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 $(GFXLIB)/drivers/gdisp/Nokia6610/gdisp_lld.mk
+ include $(GFXLIB)/drivers/gdisp/Nokia6610GE12/gdisp_lld.mk
diff --git a/drivers/gdisp/Nokia6610/GE8.h b/drivers/gdisp/Nokia6610GE8/GE8.h index 789308a9..789308a9 100644 --- a/drivers/gdisp/Nokia6610/GE8.h +++ b/drivers/gdisp/Nokia6610GE8/GE8.h diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld.c b/drivers/gdisp/Nokia6610GE8/gdisp_lld.c new file mode 100644 index 00000000..beba41a9 --- /dev/null +++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld.c @@ -0,0 +1,483 @@ +/*
+ ChibiOS/GFX - Copyright (C) 2012
+ Joel Bodenmann aka Tectu <joel@unormal.org>
+
+ This file is part of ChibiOS/GFX.
+
+ ChibiOS/GFX 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/GFX 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 drivers/gdisp/Nokia6610GE8/gdisp_lld.c
+ * @brief GDISP Graphics Driver subsystem low level driver source for the Nokia6610 GE8 display.
+ *
+ * @addtogroup GDISP
+ * @{
+ */
+
+#include "ch.h"
+#include "hal.h"
+#include "gfx.h"
+
+#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
+
+/* Include the emulation code for things we don't support */
+#include "gdisp/lld/emulation.c"
+
+/*===========================================================================*/
+/* Driver local definitions. */
+/*===========================================================================*/
+
+#include "GE8.h"
+
+/* This controller is only ever used with a 132 x 132 display */
+#if defined(GDISP_SCREEN_HEIGHT)
+ #warning "GDISP: This low level driver does not support setting a screen size. It is being ignored."
+ #undef GDISP_SCREEN_HEIGHT
+#endif
+#if defined(GDISP_SCREEN_WIDTH)
+ #warning "GDISP: This low level driver does not support setting a screen size. It is being ignored."
+ #undef GDISP_SCREEN_WIDTH
+#endif
+#define GDISP_SCREEN_HEIGHT 132
+#define GDISP_SCREEN_WIDTH 132
+
+#define GDISP_INITIAL_CONTRAST 38
+#define GDISP_INITIAL_BACKLIGHT 100
+
+/*===========================================================================*/
+/* Driver exported variables. */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver local variables. */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver local functions. */
+/*===========================================================================*/
+
+#if defined(GDISP_USE_CUSTOM_BOARD) && GDISP_USE_CUSTOM_BOARD
+ /* Include the user supplied board definitions */
+ #include "gdisp_lld_board.h"
+#elif defined(BOARD_OLIMEX_SAM7_EX256)
+ #include "gdisp_lld_board_olimexsam7ex256.h"
+#else
+ /* Include the user supplied board definitions */
+ #include "gdisp_lld_board.h"
+#endif
+
+// Some macros just to make reading the code easier
+#define delayms(ms) chThdSleepMilliseconds(ms)
+#define write_data2(d1, d2) { write_data(d1); write_data(d2); }
+#define write_data3(d1, d2, d3) { write_data(d1); write_data(d2); write_data(d3); }
+#define write_cmd1(cmd, d1) { write_cmd(cmd); write_data(d1); }
+#define write_cmd2(cmd, d1, d2) { write_cmd(cmd); write_data2(d1, d2); }
+#define write_cmd3(cmd, d1, d2, d3) { write_cmd(cmd); write_data3(d1, d2, d3); }
+
+// A very common thing to do.
+// An inline function has been used here incase the parameters have side effects with the internal calculations.
+static __inline void setviewport(coord_t x, coord_t y, coord_t cx, coord_t cy) {
+ write_cmd2(CASET, x, x+cx-1); // Column address set
+ write_cmd2(PASET, y, y+cy-1); // Page address set
+}
+
+/*===========================================================================*/
+/* 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 */
+ init_board();
+
+ // Hardware reset
+ setpin_reset(TRUE);
+ delayms(20);
+ setpin_reset(FALSE);
+ delayms(20);
+
+ // Get the bus for the following initialisation commands
+ acquire_bus();
+
+ write_cmd3(DISCTL, 0x00, 0x20, 0x00); // Display control
+ // P1: 0x00 = 2 divisions, switching period=8 (default)
+ // P2: 0x20 = nlines/4 - 1 = 132/4 - 1 = 32)
+ // P3: 0x00 = no inversely highlighted lines
+ write_cmd1(COMSCN, 0x01); // COM scan P1: 0x01 = Scan 1->80, 160<-81
+ write_cmd(OSCON); // Internal oscilator ON
+ write_cmd(SLPOUT); // Sleep out
+ write_cmd1(PWRCTR, 0x0F); // Power control - reference voltage regulator on, circuit voltage follower on, BOOST ON
+ write_cmd3(DATCTL, 0x48, 0x00, 0x02); // Data control
+ // P1: 0x01 = page address inverted, column address normal, address scan in column direction
+ // P2: 0x00 = RGB sequence (default value)
+ // P3: 0x02 = Grayscale -> 16 (selects 12-bit color, type A)
+ write_cmd2(VOLCTR, GDISP_INITIAL_CONTRAST, 0x03); // Voltage control (contrast setting)
+ // P1 = Contrast
+ // P2 = 3 resistance ratio (only value that works)
+ delayms(100); // allow power supply to stabilize
+ write_cmd(DISON); // Turn on the display
+
+ // Release the bus
+ release_bus();
+
+ /* Turn on the back-light */
+ set_backlight(GDISP_INITIAL_BACKLIGHT);
+
+ /* Initialise the GDISP structure to match */
+ GDISP.Width = GDISP_SCREEN_WIDTH;
+ GDISP.Height = GDISP_SCREEN_HEIGHT;
+ GDISP.Orientation = GDISP_ROTATE_0;
+ GDISP.Powermode = powerOn;
+ GDISP.Backlight = GDISP_INITIAL_BACKLIGHT;
+ GDISP.Contrast = GDISP_INITIAL_CONTRAST;
+ #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) {
+ #if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
+ if (x < GDISP.clipx0 || y < GDISP.clipy0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;
+ #endif
+ acquire_bus();
+ setviewport(x, y, 1, 1);
+ write_cmd3(RAMWR, 0, (color>>8) & 0x0F, color & 0xFF);
+ release_bus();
+}
+
+/* ---- Optional Routines ---- */
+
+#if GDISP_HARDWARE_FILLS || defined(__DOXYGEN__)
+ /**
+ * @brief Fill an area with a color.
+ *
+ * @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 || 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
+
+ tuples = (cx*cy+1)/2; // With an odd sized area we over-print by one pixel.
+ // This extra pixel is ignored by the controller.
+
+ acquire_bus();
+ setviewport(x, y, cx, cy);
+ write_cmd(RAMWR);
+ for(i=0; i < tuples; i++)
+ write_data3(((color >> 4) & 0xFF), (((color << 4) & 0xF0)|((color >> 8) & 0x0F)), (color & 0xFF));
+ release_bus();
+ }
+#endif
+
+#if GDISP_HARDWARE_BITFILLS || defined(__DOXYGEN__)
+ /**
+ * @brief Fill an area with a bitmap.
+ *
+ * @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) {
+ coord_t endx, endy, lg;
+ color_t c1, c2;
+ #if GDISP_PACKED_PIXELS
+ coord_t pos;
+ const uint8_t *p;
+ #endif
+
+ #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
+
+ /* What are our end points */
+ endx = srcx + cx;
+ endy = y + cy;
+
+ acquire_bus();
+ setviewport(x, y, cx, cy);
+ write_cmd(RAMWR);
+
+ #if !GDISP_PACKED_PIXELS
+ // 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.
+ lg = srccx - cx;
+ buffer += srcy * srccx + srcx;
+ x = srcx;
+ while (1) {
+ /* Get a pixel */
+ c1 = *buffer++;
+ if (++x >= endx) {
+ if (++y >= endy) {
+ /* Odd pixel at end */
+ write_data3(0, ((c1 >> 8) & 0x0F), (c1 & 0xFF));
+ break;
+ }
+ x = srcx;
+ buffer += lg;
+ }
+ /* Get the next pixel */
+ c2 = *buffer++;
+ write_data3(((c1 >> 4) & 0xFF), (((c1 << 4) & 0xF0)|((c2 >> 8) & 0x0F)), (c2 & 0xFF));
+ if (++x >= endx) {
+ if (++y >= endy)
+ break;
+ x = srcx;
+ buffer += lg;
+ }
+ }
+
+ #else
+
+ // Although this controller uses packed pixels, we may have to feed it into
+ // the controller with different packing to the source bitmap
+ #if !GDISP_PACKED_LINES
+ srccx = (srccx + 1) & ~1;
+ #endif
+ pos = srcy*srccx;
+ lg = (srccx - cx)/2*3;
+ p = ((const uint8_t *)buffer) + ((pos+srcx)/2 * 3);
+
+ x = srcx;
+ while (1) {
+ /* Get a pixel */
+ switch((pos+x)&1) {
+ case 0: c1 = (((color_t)p[0]) << 4)|(((color_t)p[1])>>4); break;
+ case 1: c1 = (((color_t)p[1]&0x0F) << 8)|((color_t)p[1]); break;
+ }
+ if (++x >= endx) {
+ if (++y >= endy) {
+ /* Odd pixel at end */
+ write_data3(0, ((c1 >> 8) & 0x0F), (c1 & 0xFF));
+ break;
+ }
+ x = srcx;
+ p += lg;
+ pos += srccx;
+ }
+ /* Get the next pixel */
+ switch((pos+x)&1) {
+ case 0: c2 = (((color_t)p[0]) << 4)|(((color_t)p[1])>>4); break;
+ case 1: c2 = (((color_t)p[1]&0x0F) << 8)|((color_t)p[1]); break;
+ }
+ write_data3(((c1 >> 4) & 0xFF), (((c1 << 4) & 0xF0)|((c2 >> 8) & 0x0F)), (c2 & 0xFF));
+ if (++x >= endx) {
+ if (++y >= endy)
+ break;
+ x = srcx;
+ p += lg;
+ pos += srccx;
+ }
+ }
+ #endif
+ release_bus();
+ }
+#endif
+
+#if (GDISP_NEED_PIXELREAD && GDISP_HARDWARE_PIXELREAD)
+ /**
+ * @brief Get the color of a particular pixel.
+ * @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 */
+ /* Some board hardware might support this in the future.
+ * The Olimex board doesn't.
+ */
+ }
+#endif
+
+#if (GDISP_NEED_SCROLL && GDISP_HARDWARE_SCROLL)
+ /**
+ * @brief Scroll vertically a section of the screen.
+ * @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 */
+ /* The hardware seems capable of doing this.
+ * It is just really complex so we leave it out for now.
+ */
+ }
+#endif
+
+#if GDISP_HARDWARE_CONTROL || defined(__DOXYGEN__)
+ /**
+ * @brief Driver Control
+ * @details 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)(unsigned what, void *value) {
+ /* The hardware is capable of supporting...
+ * GDISP_CONTROL_POWER - not implemented yet
+ * GDISP_CONTROL_ORIENTATION - not implemented yet
+ * GDISP_CONTROL_BACKLIGHT - supported (the OlimexSAM7EX256 board.h currently only implements off/on although PWM is supported by the hardware)
+ * GDISP_CONTROL_CONTRAST - supported
+ */
+ switch(what) {
+#if 0
+ // NOT IMPLEMENTED YET
+ 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;
+#endif
+#if 0
+ // NOT IMPLEMENTED YET
+ 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 GDISP_ROTATE_0:
+ // Code here
+ GDISP.Height = GDISP_SCREEN_HEIGHT;
+ GDISP.Width = GDISP_SCREEN_WIDTH;
+ break;
+ case GDISP_ROTATE_90:
+ // Code here
+ GDISP.Height = GDISP_SCREEN_WIDTH;
+ GDISP.Width = GDISP_SCREEN_HEIGHT;
+ break;
+ case GDISP_ROTATE_180:
+ // Code here
+ GDISP.Height = GDISP_SCREEN_HEIGHT;
+ GDISP.Width = GDISP_SCREEN_WIDTH;
+ break;
+ case GDISP_ROTATE_270:
+ // Code here
+ GDISP.Height = GDISP_SCREEN_WIDTH;
+ GDISP.Width = GDISP_SCREEN_HEIGHT;
+ break;
+ default:
+ return;
+ }
+ #if GDISP_NEED_CLIP || GDISP_NEED_VALIDATION
+ GDISP.clipx0 = 0;
+ GDISP.clipy0 = 0;
+ GDISP.clipx1 = GDISP.Width;
+ GDISP.clipy1 = GDISP.Height;
+ #endif
+ GDISP.Orientation = (gdisp_orientation_t)value;
+ return;
+#endif
+ case GDISP_CONTROL_BACKLIGHT:
+ if ((unsigned)value > 100) value = (void *)100;
+ set_backlight((unsigned)value);
+ GDISP.Backlight = (unsigned)value;
+ return;
+ case GDISP_CONTROL_CONTRAST:
+ if ((unsigned)value > 100) value = (void *)100;
+ acquire_bus();
+ write_cmd2(VOLCTR, (unsigned)value, 0x03);
+ release_bus();
+ GDISP.Contrast = (unsigned)value;
+ return;
+ }
+ }
+#endif
+
+#endif /* GFX_USE_GDISP */
+/** @} */
diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld.mk b/drivers/gdisp/Nokia6610GE8/gdisp_lld.mk new file mode 100644 index 00000000..3a1adec9 --- /dev/null +++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld.mk @@ -0,0 +1,5 @@ +# List the required driver.
+GFXSRC += $(GFXLIB)/drivers/gdisp/Nokia6610GE8/gdisp_lld.c
+
+# Required include directories
+GFXINC += $(GFXLIB)/drivers/gdisp/Nokia6610GE8
diff --git a/drivers/gdisp/Nokia6610/gdisp_lld_board_example.h b/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_example.h index c8528f9e..fd330590 100644 --- a/drivers/gdisp/Nokia6610/gdisp_lld_board_example.h +++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_example.h @@ -19,8 +19,8 @@ */
/**
- * @file drivers/gdisp/Nokia6610/gdisp_lld_board_example.h
- * @brief GDISP Graphic Driver subsystem board interface for the Nokia6610 display.
+ * @file drivers/gdisp/Nokia6610GE8/gdisp_lld_board_example.h
+ * @brief GDISP Graphic Driver subsystem board interface for the Nokia6610 GE8 display.
*
* @addtogroup GDISP
* @{
@@ -41,7 +41,7 @@ */
static __inline void init_board(void) {
/* Code here */
-#error "gdispNokia6610: You must supply a definition for init_board for your board"
+ #error "gdispNokia6610GE8: You must supply a definition for init_board for your board"
}
/**
@@ -53,7 +53,7 @@ static __inline void init_board(void) { */
static __inline void setpin_reset(bool_t state) {
/* Code here */
-#error "gdispNokia6610: You must supply a definition for setpin_reset for your board"
+ #error "gdispNokia6610GE8: You must supply a definition for setpin_reset for your board"
}
/**
@@ -68,7 +68,7 @@ static __inline void setpin_reset(bool_t state) { */
static __inline void set_backlight(uint8_t percent) {
/* Code here */
-#error "gdispNokia6610: You must supply a definition for set_backlight for your board"
+ #error "gdispNokia6610GE8: You must supply a definition for set_backlight for your board"
}
/**
@@ -77,7 +77,8 @@ static __inline void set_backlight(uint8_t percent) { * @notapi
*/
static __inline void acquire_bus(void) {
-#error "gdispNokia6610: You must supply a definition for acquire_bus for your board"
+ /* Code here */
+ #error "gdispNokia6610GE8: You must supply a definition for acquire_bus for your board"
}
/**
@@ -86,7 +87,8 @@ static __inline void acquire_bus(void) { * @notapi
*/
static __inline void release_bus(void) {
-#error "gdispNokia6610: You must supply a definition for release_bus for your board"
+ /* Code here */
+ #error "gdispNokia6610GE8: You must supply a definition for release_bus for your board"
}
/**
@@ -98,7 +100,7 @@ static __inline void release_bus(void) { */
static __inline void write_cmd(uint16_t cmd) {
/* Code here */
-#error "gdispNokia6610: You must supply a definition for write_cmd for your board"
+ #error "gdispNokia6610GE8: You must supply a definition for write_cmd for your board"
}
/**
@@ -110,7 +112,7 @@ static __inline void write_cmd(uint16_t cmd) { */
static __inline void write_data(uint16_t data) {
/* Code here */
-#error "gdispNokia6610: You must supply a definition for write_data for your board"
+ #error "gdispNokia6610GE8: You must supply a definition for write_data for your board"
}
#if GDISP_HARDWARE_READPIXEL || GDISP_HARDWARE_SCROLL || defined(__DOXYGEN__)
@@ -125,7 +127,7 @@ static __inline void write_data(uint16_t data) { */
static __inline uint16_t read_data(void) {
/* Code here */
-#error "gdispNokia6610: You must supply a definition for read_data for your board"
+ #error "gdispNokia6610GE8: You must supply a definition for read_data for your board"
}
#endif
diff --git a/drivers/gdisp/Nokia6610/gdisp_lld_board_olimexsam7ex256.h b/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_olimexsam7ex256.h index 0b5756d0..f3b32b3a 100644 --- a/drivers/gdisp/Nokia6610/gdisp_lld_board_olimexsam7ex256.h +++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_olimexsam7ex256.h @@ -19,7 +19,7 @@ */
/**
- * @file drivers/gdisp/Nokia6610/gdisp_lld_board_olimexsam7ex256.h
+ * @file drivers/gdisp/Nokia6610GE8/gdisp_lld_board_olimexsam7ex256.h
* @brief GDISP Graphic Driver subsystem board interface for the Olimex SAM7-EX256 board.
*
* @addtogroup GDISP
@@ -187,7 +187,7 @@ static __inline void write_data(uint16_t data) { * @notapi
*/
static __inline uint16_t read_data(void) {
- #error "gdispNokia6610: GDISP_HARDWARE_READPIXEL and GDISP_HARDWARE_SCROLL are not supported on this board"
+ #error "gdispNokia6610GE8: GDISP_HARDWARE_READPIXEL and GDISP_HARDWARE_SCROLL are not supported on this board"
return 0;
}
#endif
diff --git a/drivers/gdisp/Nokia6610/gdisp_lld_config.h b/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h index e7583b54..87bdb824 100644 --- a/drivers/gdisp/Nokia6610/gdisp_lld_config.h +++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h @@ -19,8 +19,8 @@ */
/**
- * @file drivers/gdisp/Nokia6610/gdisp_lld_config.h
- * @brief GDISP Graphic Driver subsystem low level driver header for the Nokia6610 display.
+ * @file drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h
+ * @brief GDISP Graphic Driver subsystem low level driver header for the Nokia6610 GE8 display.
*
* @addtogroup GDISP
* @{
@@ -35,8 +35,8 @@ /* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_DRIVER_NAME "Nokia6610"
-#define GDISP_LLD(x) gdisp_lld_##x##_Nokia6610
+#define GDISP_DRIVER_NAME "Nokia6610GE8"
+#define GDISP_LLD(x) gdisp_lld_##x##_Nokia6610GE8
#define GDISP_HARDWARE_FILLS TRUE
#define GDISP_HARDWARE_BITFILLS TRUE
diff --git a/drivers/gdisp/Nokia6610GE8/readme.txt b/drivers/gdisp/Nokia6610GE8/readme.txt new file mode 100644 index 00000000..c8ad8faa --- /dev/null +++ b/drivers/gdisp/Nokia6610GE8/readme.txt @@ -0,0 +1,15 @@ +This driver is for the Nokia6610 Epson (GE8) controller
+
+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) 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 $(GFXLIB)/drivers/gdisp/Nokia6610GE8/gdisp_lld.mk
diff --git a/drivers/gdisp/S6D1121/gdisp_lld.c b/drivers/gdisp/S6D1121/gdisp_lld.c index 5fac4b29..e690456a 100644 --- a/drivers/gdisp/S6D1121/gdisp_lld.c +++ b/drivers/gdisp/S6D1121/gdisp_lld.c @@ -28,21 +28,23 @@ #include "ch.h"
#include "hal.h"
-#include "gdisp.h"
+#include "gfx.h"
#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
/* Include the emulation code for things we don't support */
-#include "lld/gdisp/emulation.c"
+#include "gdisp/lld/emulation.c"
/*===========================================================================*/
/* Driver local definitions. */
/*===========================================================================*/
#if defined(GDISP_SCREEN_HEIGHT)
+ #warning "GDISP: This low level driver does not support setting a screen size. It is being ignored."
#undef GISP_SCREEN_HEIGHT
#endif
#if defined(GDISP_SCREEN_WIDTH)
+ #warning "GDISP: This low level driver does not support setting a screen size. It is being ignored."
#undef GDISP_SCREEN_WIDTH
#endif
diff --git a/drivers/gdisp/SSD1289/gdisp_lld.c b/drivers/gdisp/SSD1289/gdisp_lld.c index abcc4736..49600349 100644 --- a/drivers/gdisp/SSD1289/gdisp_lld.c +++ b/drivers/gdisp/SSD1289/gdisp_lld.c @@ -28,12 +28,12 @@ #include "ch.h"
#include "hal.h"
-#include "gdisp.h"
+#include "gfx.h"
#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
/* Include the emulation code for things we don't support */
-#include "lld/gdisp/emulation.c"
+#include "gdisp/lld/emulation.c"
/*===========================================================================*/
/* Driver local definitions. */
diff --git a/drivers/gdisp/SSD1963/gdisp_lld.c b/drivers/gdisp/SSD1963/gdisp_lld.c index cc8e776e..41cbd969 100644 --- a/drivers/gdisp/SSD1963/gdisp_lld.c +++ b/drivers/gdisp/SSD1963/gdisp_lld.c @@ -28,12 +28,19 @@ #include "ch.h"
#include "hal.h"
-#include "gdisp.h"
+#include "gfx.h"
#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
/* Include the emulation code for things we don't support */
-#include "lld/gdisp/emulation.c"
+#include "gdisp/lld/emulation.c"
+
+#ifndef GDISP_SCREEN_HEIGHT
+ #define GDISP_SCREEN_HEIGHT 320
+#endif
+#ifndef GDISP_SCREEN_WIDTH
+ #define GDISP_SCREEN_WIDTH 240
+#endif
/* All the board specific code should go in these include file so the driver
* can be ported to another board just by creating a suitable file.
diff --git a/drivers/gdisp/TestStub/gdisp_lld.c b/drivers/gdisp/TestStub/gdisp_lld.c index 79181036..83049aa2 100644 --- a/drivers/gdisp/TestStub/gdisp_lld.c +++ b/drivers/gdisp/TestStub/gdisp_lld.c @@ -28,12 +28,19 @@ #include "ch.h"
#include "hal.h"
-#include "gdisp.h"
+#include "gfx.h"
#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
/* Include the emulation code for things we don't support */
-#include "lld/gdisp/emulation.c"
+#include "gdisp/lld/emulation.c"
+
+#ifndef GDISP_SCREEN_HEIGHT
+ #define GDISP_SCREEN_HEIGHT 128
+#endif
+#ifndef GDISP_SCREEN_WIDTH
+ #define GDISP_SCREEN_WIDTH 128
+#endif
/* ---- Required Routines ---- */
/*
@@ -48,8 +55,8 @@ */
bool_t GDISP_LLD(init)(void) {
/* Initialise the GDISP structure */
- GDISP.Width = 128;
- GDISP.Height = 128;
+ GDISP.Width = GDISP_SCREEN_WIDTH;
+ GDISP.Height = GDISP_SCREEN_HEIGHT;
GDISP.Orientation = GDISP_ROTATE_0;
GDISP.Powermode = powerOff;
GDISP.Backlight = 100;
diff --git a/drivers/gdisp/VMT/gdisp_lld.c b/drivers/gdisp/VMT/gdisp_lld.c index 1bacf1a7..9d9c7382 100644 --- a/drivers/gdisp/VMT/gdisp_lld.c +++ b/drivers/gdisp/VMT/gdisp_lld.c @@ -28,14 +28,14 @@ #include "ch.h"
#include "hal.h"
-#include "gdisp.h"
+#include "gfx.h"
#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
#define GDISP_LLD_NO_STRUCT
/* Include the emulation code for things we don't support */
-#include "lld/gdisp/emulation.c"
+#include "gdisp/lld/emulation.c"
/*===========================================================================*/
/* Driver local definitions. */
@@ -46,6 +46,7 @@ /* Prototypes for lld driver functions */
bool_t GDISP_LLD1(init)(void);
+void *GDISP_LLD1(query)(unsigned what);
void GDISP_LLD1(clear)(color_t color);
void GDISP_LLD1(drawpixel)(coord_t x, coord_t y, color_t color);
void GDISP_LLD1(fillarea)(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color);
@@ -79,11 +80,9 @@ void GDISP_LLD1(drawline)(coord_t x0, coord_t y0, coord_t x1, coord_t y1, color_ #if GDISP_NEED_CONTROL
void GDISP_LLD1(control)(unsigned what, void *value);
#endif
-#if GDISP_NEED_QUERY
- void *GDISP_LLD1(query)(unsigned what);
-#endif
bool_t GDISP_LLD2(init)(void);
+void *GDISP_LLD2(query)(unsigned what);
void GDISP_LLD2(clear)(color_t color);
void GDISP_LLD2(drawpixel)(coord_t x, coord_t y, color_t color);
void GDISP_LLD2(fillarea)(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color);
@@ -117,15 +116,13 @@ void GDISP_LLD2(drawline)(coord_t x0, coord_t y0, coord_t x1, coord_t y1, color_ #if GDISP_NEED_CONTROL
void GDISP_LLD2(control)(unsigned what, void *value);
#endif
-#if GDISP_NEED_QUERY
- void *GDISP_LLD2(query)(unsigned what);
-#endif
/*===========================================================================*/
/* Driver exported variables. */
/*===========================================================================*/
/* Our VMT table variables */
+void *GDISP_LLD_VMT(query)(unsigned what);
void GDISP_LLD_VMT(clear)(color_t color);
void GDISP_LLD_VMT(drawpixel)(coord_t x, coord_t y, color_t color);
void GDISP_LLD_VMT(fillarea)(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color);
@@ -162,10 +159,6 @@ void GDISP_LLD_VMT(verticalscroll)(coord_t x, coord_t y, coord_t cx, coord_t cy, #if GDISP_NEED_CONTROL
void GDISP_LLD_VMT(control)(unsigned what, void *value);
#endif
-/* Set driver specific control */
-#if GDISP_NEED_QUERY
-void *GDISP_LLD_VMT(query)(unsigned what);
-#endif
/* Clipping Functions */
#if GDISP_NEED_CLIP
void GDISP_LLD_VMT(setclip)(coord_t x, coord_t y, coord_t cx, coord_t cy);
@@ -194,6 +187,7 @@ void GDISP_LLD_VMT(setclip)(coord_t x, coord_t y, coord_t cx, coord_t cy); bool_t gdisp_lld_init_VMT(void) {
if (GDISP_VMT_NAME1(gdisp_lld_init_)()) {
+ gdisp_lld_query_VMT = GDISP_VMT_NAME1(gdisp_lld_query_);
gdisp_lld_clear_VMT = GDISP_VMT_NAME1(gdisp_lld_clear_);
gdisp_lld_drawpixel_VMT = GDISP_VMT_NAME1(gdisp_lld_drawpixel_);
gdisp_lld_fillarea_VMT = GDISP_VMT_NAME1(gdisp_lld_fillarea_);
@@ -224,9 +218,6 @@ bool_t gdisp_lld_init_VMT(void) { #if GDISP_NEED_CONTROL
gdisp_lld_control_VMT = GDISP_VMT_NAME1(gdisp_lld_control_);
#endif
- #if GDISP_NEED_QUERY
- gdisp_lld_query_VMT = GDISP_VMT_NAME1(gdisp_lld_query_);
- #endif
#if GDISP_NEED_CLIP
gdisp_lld_setclip_VMT = GDISP_VMT_NAME1(gdisp_lld_setclip_);
#endif
@@ -235,6 +226,7 @@ bool_t gdisp_lld_init_VMT(void) { }
if (GDISP_VMT_NAME2(gdisp_lld_init_)()) {
+ gdisp_lld_query_VMT = GDISP_VMT_NAME2(gdisp_lld_query_);
gdisp_lld_clear_VMT = GDISP_VMT_NAME2(gdisp_lld_clear_);
gdisp_lld_drawpixel_VMT = GDISP_VMT_NAME2(gdisp_lld_drawpixel_);
gdisp_lld_fillarea_VMT = GDISP_VMT_NAME2(gdisp_lld_fillarea_);
@@ -265,9 +257,6 @@ bool_t gdisp_lld_init_VMT(void) { #if GDISP_NEED_CONTROL
gdisp_lld_control_VMT = GDISP_VMT_NAME2(gdisp_lld_control_);
#endif
- #if GDISP_NEED_QUERY
- gdisp_lld_query_VMT = GDISP_VMT_NAME2(gdisp_lld_query_);
- #endif
#if GDISP_NEED_CLIP
gdisp_lld_setclip_VMT = GDISP_VMT_NAME2(gdisp_lld_setclip_);
#endif
diff --git a/drivers/gdisp/VMT/gdisp_lld_driver1.c b/drivers/gdisp/VMT/gdisp_lld_driver1.c index 06dadc54..01fd4cf0 100644 --- a/drivers/gdisp/VMT/gdisp_lld_driver1.c +++ b/drivers/gdisp/VMT/gdisp_lld_driver1.c @@ -42,7 +42,7 @@ #include CONFIGFILE()
/* Bring in our API */
-#include "gdisp.h"
+#include "gfx.h"
/* Add the low level driver */
#include DRIVERFILE()
diff --git a/drivers/gdisp/VMT/gdisp_lld_driver2.c b/drivers/gdisp/VMT/gdisp_lld_driver2.c index 5dca0b27..ed0e8555 100644 --- a/drivers/gdisp/VMT/gdisp_lld_driver2.c +++ b/drivers/gdisp/VMT/gdisp_lld_driver2.c @@ -42,7 +42,7 @@ #include CONFIGFILE()
/* Bring in our API */
-#include "gdisp.h"
+#include "gfx.h"
/* Add the low level driver */
#include DRIVERFILE()
diff --git a/drivers/ginput/toggle/Pal/ginput_lld_toggle.c b/drivers/ginput/toggle/Pal/ginput_lld_toggle.c index 560d11b9..a3a360d8 100644 --- a/drivers/ginput/toggle/Pal/ginput_lld_toggle.c +++ b/drivers/ginput/toggle/Pal/ginput_lld_toggle.c @@ -28,13 +28,13 @@ #include "ch.h"
#include "hal.h"
+#include "gfx.h"
#if (GFX_USE_GINPUT && GINPUT_NEED_TOGGLE) /*|| defined(__DOXYGEN__)*/
-// Declare the static members in the following include file
-#define GINPUT_TOGGLE_DECLARE_CONFIG
+#include "ginput/lld/toggle.h"
-#include "lld/ginput/toggle.h"
+GINPUT_TOGGLE_DECLARE_STRUCTURE();
/**
* @brief Initialise the port.
diff --git a/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h b/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h index 46d32b47..a96178b0 100644 --- a/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h +++ b/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h @@ -29,37 +29,32 @@ #ifndef _GDISP_LLD_TOGGLE_BOARD_H
#define _GDISP_LLD_TOGGLE_BOARD_H
-#ifndef _GINPUT_LLD_TOGGLE_CONFIG_H
- // Visible in ginput.h
-
- #define GINPUT_TOGGLE_SW1 0 // Switch 1
- #define GINPUT_TOGGLE_SW2 1 // Switch 2
- #define GINPUT_TOGGLE_UP 2 // Joystick Up
- #define GINPUT_TOGGLE_DOWN 3 // Joystick Down
- #define GINPUT_TOGGLE_LEFT 4 // Joystick Left
- #define GINPUT_TOGGLE_RIGHT 5 // Joystick Right
- #define GINPUT_TOGGLE_CENTER 6 // Joystick Center
-
-#elif !defined(GINPUT_TOGGLE_DECLARE_CONFIG)
- // Visible in ginput_lld.h
-
- #define GINPUT_TOGGLE_NUM_PORTS 7 // The total number of toggle inputs
-
-#else
- // Visible in ginput_lld_toggle.c
-
- GToggleConfig GInputToggleConfigTable[] = {
- {AT91C_BASE_PIOB, // Switch 1 and Switch 2
- PIOB_SW1_MASK|PIOB_SW2_MASK,
- PIOB_SW1_MASK|PIOB_SW2_MASK,
- PAL_MODE_INPUT},
- {AT91C_BASE_PIOA, // B1..4 Joystick
- PIOA_B1_MASK|PIOA_B2_MASK|PIOA_B3_MASK|PIOA_B4_MASK|PIOA_B5_MASK,
- PIOA_B1_MASK|PIOA_B2_MASK|PIOA_B3_MASK|PIOA_B4_MASK|PIOA_B5_MASK,
- PAL_MODE_INPUT},
- };
-
-#endif
+#error "GINPUT Toggle Pal Driver: You need to define your board definitions"
+
+// The below are example values
+
+#define GINPUT_TOGGLE_NUM_PORTS 7 // The total number of toggle inputs
+#define GINPUT_TOGGLE_CONFIG_ENTRIES 2 // The total number of GToggleConfig entries
+
+#define GINPUT_TOGGLE_SW1 0 // Switch 1
+#define GINPUT_TOGGLE_SW2 1 // Switch 2
+#define GINPUT_TOGGLE_UP 2 // Joystick Up
+#define GINPUT_TOGGLE_DOWN 3 // Joystick Down
+#define GINPUT_TOGGLE_LEFT 4 // Joystick Left
+#define GINPUT_TOGGLE_RIGHT 5 // Joystick Right
+#define GINPUT_TOGGLE_CENTER 6 // Joystick Center
+
+#define GINPUT_TOGGLE_DECLARE_STRUCTURE() \
+ const GToggleConfig GInputToggleConfigTable[GINPUT_TOGGLE_CONFIG_ENTRIES] = { \
+ {AT91C_BASE_PIOB, /* Switch 1 and Switch 2 */ \
+ PIOB_SW1_MASK|PIOB_SW2_MASK, \
+ PIOB_SW1_MASK|PIOB_SW2_MASK, \
+ PAL_MODE_INPUT}, \
+ {AT91C_BASE_PIOA, /* B1..4 Joystick */ \
+ PIOA_B1_MASK|PIOA_B2_MASK|PIOA_B3_MASK|PIOA_B4_MASK|PIOA_B5_MASK, \
+ PIOA_B1_MASK|PIOA_B2_MASK|PIOA_B3_MASK|PIOA_B4_MASK|PIOA_B5_MASK, \
+ PAL_MODE_INPUT}, \
+ }
#endif /* _GDISP_LLD_TOGGLE_BOARD_H */
/** @} */
diff --git a/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_olimexsam7ex256.h b/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_olimexsam7ex256.h index b767f32c..3ba5858d 100644 --- a/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_olimexsam7ex256.h +++ b/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_olimexsam7ex256.h @@ -40,21 +40,17 @@ #define GINPUT_TOGGLE_RIGHT 5 // Joystick Right
#define GINPUT_TOGGLE_CENTER 6 // Joystick Center
-#ifdef GINPUT_TOGGLE_DECLARE_CONFIG
- // Visible in ginput_lld_toggle.c
-
- const GToggleConfig GInputToggleConfigTable[GINPUT_TOGGLE_CONFIG_ENTRIES] = {
- {AT91C_BASE_PIOB, // Switch 1 and Switch 2
- PIOB_SW1_MASK|PIOB_SW2_MASK,
- PIOB_SW1_MASK|PIOB_SW2_MASK,
- PAL_MODE_INPUT},
- {AT91C_BASE_PIOA, // B1..4 Joystick
- PIOA_B1_MASK|PIOA_B2_MASK|PIOA_B3_MASK|PIOA_B4_MASK|PIOA_B5_MASK,
- PIOA_B1_MASK|PIOA_B2_MASK|PIOA_B3_MASK|PIOA_B4_MASK|PIOA_B5_MASK,
- PAL_MODE_INPUT},
- };
-
-#endif
+#define GINPUT_TOGGLE_DECLARE_STRUCTURE() \
+ const GToggleConfig GInputToggleConfigTable[GINPUT_TOGGLE_CONFIG_ENTRIES] = { \
+ {AT91C_BASE_PIOB, /* Switch 1 and Switch 2 */ \
+ PIOB_SW1_MASK|PIOB_SW2_MASK, \
+ PIOB_SW1_MASK|PIOB_SW2_MASK, \
+ PAL_MODE_INPUT}, \
+ {AT91C_BASE_PIOA, /* B1..4 Joystick */ \
+ PIOA_B1_MASK|PIOA_B2_MASK|PIOA_B3_MASK|PIOA_B4_MASK|PIOA_B5_MASK, \
+ PIOA_B1_MASK|PIOA_B2_MASK|PIOA_B3_MASK|PIOA_B4_MASK|PIOA_B5_MASK, \
+ PAL_MODE_INPUT}, \
+ }
#endif /* _GDISP_LLD_TOGGLE_BOARD_H */
/** @} */
diff --git a/drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h b/drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h index a3fcf22e..774be200 100644 --- a/drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h +++ b/drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h @@ -31,7 +31,10 @@ #if GFX_USE_GINPUT && GINPUT_NEED_TOGGLE
-#if defined(BOARD_OLIMEX_SAM7_EX256)
+#if GINPUT_TOGGLE_USE_CUSTOM_BOARD
+ /* Include the user supplied board definitions */
+ #include "ginput_lld_toggle_board.h"
+#elif defined(BOARD_OLIMEX_SAM7_EX256)
#include "ginput_lld_toggle_board_olimexsam7ex256.h"
#else
/* Include the user supplied board definitions */
diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h index fa3dca7e..2fa6fe44 100644 --- a/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h +++ b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h @@ -105,7 +105,7 @@ static __inline void release_bus(void) { *
* @notapi
*/
-static uint16_t read_x_value(void) {
+static __inline uint16_t read_x_value(void) {
uint16_t val1, val2;
adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH];
@@ -113,7 +113,7 @@ static uint16_t read_x_value(void) { palSetPadMode(GPIOC, 1, PAL_MODE_INPUT_ANALOG);
palSetPadMode(GPIOC, 2, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOC, 3, PAL_MODE_OUTPUT_PUSHPULL);
-
+
palSetPad(GPIOC, 2);
palClearPad(GPIOC, 3);
chThdSleepMilliseconds(1);
@@ -135,7 +135,7 @@ static uint16_t read_x_value(void) { *
* @notapi
*/
-static uint16_t read_y_value(void) {
+static __inline uint16_t read_y_value(void) {
uint16_t val1, val2;
adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH];
@@ -143,8 +143,8 @@ static uint16_t read_y_value(void) { palSetPadMode(GPIOC, 3, PAL_MODE_INPUT_ANALOG);
palSetPadMode(GPIOC, 0, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOC, 1, PAL_MODE_OUTPUT_PUSHPULL);
-
- palSetPad(GPIOC, 1);
+
+ palSetPad(GPIOC, 1);
palClearPad(GPIOC, 0);
chThdSleepMilliseconds(1);
adcConvert(&ADCD1, &adc_y_config, samples, ADC_BUF_DEPTH);
diff --git a/drivers/multiple/Win32/gdisp_lld.c b/drivers/multiple/Win32/gdisp_lld.c index 5a741038..d44bbfad 100644 --- a/drivers/multiple/Win32/gdisp_lld.c +++ b/drivers/multiple/Win32/gdisp_lld.c @@ -28,7 +28,7 @@ #include "ch.h"
#include "hal.h"
-#include "gdisp.h"
+#include "gfx.h"
#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
@@ -39,16 +39,16 @@ #include <wingdi.h>
#include <assert.h>
-#ifndef GINPUT_NEED_TOGGLE
- #define GINPUT_NEED_TOGGLE FALSE
+#ifndef GDISP_SCREEN_WIDTH
+ #define GDISP_SCREEN_WIDTH 640
#endif
-#ifndef GINPUT_NEED_MOUSE
- #define GINPUT_NEED_MOUSE FALSE
+#ifndef GDISP_SCREEN_HEIGHT
+ #define GDISP_SCREEN_HEIGHT 480
#endif
#if GINPUT_NEED_TOGGLE
/* Include toggle support code */
- #include "lld/ginput/toggle.h"
+ #include "ginput/lld/toggle.h"
const GToggleConfig GInputToggleConfigTable[GINPUT_TOGGLE_CONFIG_ENTRIES] = {
{0, 0xFF, 0x00, PAL_MODE_INPUT},
@@ -57,12 +57,11 @@ #if GINPUT_NEED_MOUSE
/* Include mouse support code */
- #include "ginput.h"
- #include "lld/ginput/mouse.h"
+ #include "ginput/lld/mouse.h"
#endif
/* Include the emulation code for things we don't support */
-#include "lld/gdisp/emulation.c"
+#include "gdisp/lld/emulation.c"
/*===========================================================================*/
/* Driver local routines . */
@@ -621,7 +620,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { }
#endif
-#if GDISP_HARDWARE_BITFILLS || defined(__DOXYGEN__)
+#if (GDISP_HARDWARE_BITFILLS && GDISP_NEED_CONTROL) || defined(__DOXYGEN__)
static pixel_t *rotateimg(coord_t cx, coord_t cy, coord_t srcx, coord_t srccx, const pixel_t *buffer) {
pixel_t *dstbuf;
pixel_t *dst;
@@ -667,7 +666,9 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { }
return dstbuf;
}
+#endif
+#if GDISP_HARDWARE_BITFILLS || defined(__DOXYGEN__)
/**
* @brief Fill an area with a bitmap.
* @note Optional - The high level driver can emulate using software.
|