diff --git a/boards/addons/tdisp/HD44780/tdisp_lld_board_olimex_e407.h b/boards/addons/tdisp/HD44780/tdisp_lld_board_olimex_e407.h deleted file mode 100644 index 12407356..00000000 --- a/boards/addons/tdisp/HD44780/tdisp_lld_board_olimex_e407.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * This file is subject to the terms of the GFX License. If a copy of - * the license was not distributed with this file, you can obtain one at: - * - * http://ugfx.org/license.html - */ - -/** - * @file drivers/tdisp/HD44780/tdisp_lld_board_olimex_e407.h - * @brief TDISP driver subsystem board interface for the HD44780 display - * - * @addtogroup TDISP - * @{ - */ - -#ifndef _TDISP_LLD_BOARD_H -#define _TDISP_LLD_BOARD_H - -/* Configure these to match the hardware connections on your board */ -#define BUS_4BITS FALSE -#define PORT_DATA GPIOG -#define PORT_CTRL GPIOE -#define PIN_RS 0 -#define PIN_RW 1 -#define PIN_EN 2 - -static void init_board(void) { - palSetGroupMode(PORT_CTRL, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL); - palSetGroupMode(PORT_DATA, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL); - palClearPad(PORT_CTRL, PIN_RW); -} - -static void writeToLCD(uint8_t data) { - palWritePort(PORT_DATA, data); - palSetPad(PORT_CTRL, PIN_EN); - gfxSleepMicroseconds(1); - palClearPad(PORT_CTRL, PIN_EN); - gfxSleepMicroseconds(5); -} - -static void write_cmd(uint8_t data) { - palClearPad(PORT_CTRL, PIN_RS); - #if BUS_4BITS - writeToLCD(data>>4); - #endif - writeToLCD(data); -} - -static void write_data(uint8_t data) { - palSetPad(PORT_CTRL, PIN_RS); - #if BUS_4BITS - writeToLCD(data>>4); - #endif - writeToLCD(data); -} - -#endif /* _TDISP_LLD_BOARD_H */ -/** @} */ - diff --git a/boards/addons/tdisp/HD44780/tdisp_lld_board_st_stm32f4_discovery.h b/boards/addons/tdisp/HD44780/tdisp_lld_board_st_stm32f4_discovery.h deleted file mode 100644 index 43e161f1..00000000 --- a/boards/addons/tdisp/HD44780/tdisp_lld_board_st_stm32f4_discovery.h +++ /dev/null @@ -1,122 +0,0 @@ -/* - * This file is subject to the terms of the GFX License. If a copy of - * the license was not distributed with this file, you can obtain one at: - * - * http://ugfx.org/license.html - */ - -/** - * @file drivers/tdisp/HD44780/tdisp_lld_board_st_stm32f4_discovery.h - * @brief TDISP driver subsystem board interface for the HD44780 display - * - * @addtogroup TDISP - * @{ - */ - -#ifndef _TDISP_LLD_BOARD_H -#define _TDISP_LLD_BOARD_H - -/* Configure these to match the hardware connections on your board */ -#define BUS_4BITS TRUE - -/* Configure the bitoffset in the dataport so they match with the - * hardware pins. An offset of 0 means bit0 stays at bit0 of the dataport. - * If the offset is set to 3, bit0 of the nibble will be positioned at - * P[A..G]3 of the hardware-port. - */ -#define hardware_offset 3 - -/* The port where the data is sent to. In the - * low-leveldriver het hardware_offset is taken - * into account. If for example the hardware_offset - * is set to 3, then de data will be sent to - * PE3, PE4, PE5 en PE6, if the dataport where GPIOE. - */ -#define PORT_DATA GPIOE - -/* The port used to controle the controle lines of - * the display. - */ -#define PORT_CTRL GPIOD -/* Pin to controle the R/S-line of the display */ -#define PIN_RS 0 -/* Pin to controle the EN-line of the display */ -#define PIN_EN 1 -/* Pin to controle the R/W-pin of the display. - * If reading of the display is not used disable - * reading in the gfxconf.h and put a dummy value here - * as it will not be used. - */ -#define PIN_RW 7 - - -static void init_board(void) { - /* Initialize the ports for data and controle-lines */ - palSetGroupMode(PORT_CTRL, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL); - palSetGroupMode(PORT_DATA, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL); - /* Set alle controle pins to low */ - palClearPad(PORT_CTRL, PIN_RS); - palClearPad(PORT_CTRL, PIN_EN); - #if TDISP_NEED_READ - palClearPad(PORT_CTRL, PIN_RW); - #endif -} - -/* This is the low-level routine for sending the bits - * to the LCD-display. This routine shifts - * the bits so they match the hardware port. - */ -static void writeToLCD(uint8_t data) { - palWritePort(PORT_DATA, data<>4); - #endif - /* send the low-nibble */ - #if BUS_4BITS - /* in 4-bit mode the high-nibble is zeroed out */ - writeToLCD(data & 0x0F); - #else - writeToLCD(data); - #endif -} - -// static void write_initcmd(uint8_t data) { -// write_cmd(data); -// } - -/* Write data to the display. The - * RS-line is pulled high and than the - * data is send. - */ -static void write_data(uint8_t data) { - palSetPad(PORT_CTRL, PIN_RS); - #if BUS_4BITS - /* first send the high-nibble */ - writeToLCD(data>>4); - #endif - /* send the low-nibble */ - #if BUS_4BITS - /* in 4-bit mode the high-nibble is zeroed out */ - writeToLCD(data & 0x0F); - #else - writeToLCD(data); - #endif -} - -#endif /* _TDISP_LLD_BOARD_H */ -/** @} */ - diff --git a/demos/3rdparty/tdisp_f4_discovery/Makefile b/demos/3rdparty/tdisp_f4_discovery/Makefile deleted file mode 100644 index d4bd7aad..00000000 --- a/demos/3rdparty/tdisp_f4_discovery/Makefile +++ /dev/null @@ -1,229 +0,0 @@ -############################################################################## -# Build global options -# NOTE: Can be overridden externally. -# - -# Compiler options here. -ifeq ($(USE_OPT),) - USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16 -endif - -# C specific options here (added to USE_OPT). -ifeq ($(USE_COPT),) - USE_COPT = -endif - -# C++ specific options here (added to USE_OPT). -ifeq ($(USE_CPPOPT),) - USE_CPPOPT = -fno-rtti -endif - -# Enable this if you want the linker to remove unused code and data -ifeq ($(USE_LINK_GC),) - USE_LINK_GC = yes -endif - -# If enabled, this option allows to compile the application in THUMB mode. -ifeq ($(USE_THUMB),) - USE_THUMB = yes -endif - -# Enable this if you want to see the full log while compiling. -ifeq ($(USE_VERBOSE_COMPILE),) - USE_VERBOSE_COMPILE = no -endif - -# -# Build global options -############################################################################## - -############################################################################## -# Architecture or project specific options -# - -# Enables the use of FPU on Cortex-M4. -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FPU),) - USE_FPU = no -endif - -# Enable this if you really want to use the STM FWLib. -ifeq ($(USE_FWLIB),) - USE_FWLIB = no -endif - -# -# Architecture or project specific options -############################################################################## - -############################################################################## -# Project, sources and paths -# - -# Define project name here -PROJECT = ch - -# Imported source files and paths -CHIBIOS = ../ChibiOS_2.5.1 -GFXLIB = $(CHIBIOS)/ext/gfx -# GFXINC = $(CHIBIOS)/ext/gfx/include - -include $(CHIBIOS)/boards/ST_STM32F4_DISCOVERY/board.mk -include $(CHIBIOS)/os/hal/platforms/STM32F4xx/platform.mk -include $(CHIBIOS)/os/hal/hal.mk -include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F4xx/port.mk -include $(CHIBIOS)/os/kernel/kernel.mk -include $(CHIBIOS)/test/test.mk -include $(GFXLIB)/gfx.mk -include $(GFXLIB)/drivers/tdisp/HD44780/tdisp_lld.mk - -# Define linker script file here -LDSCRIPT= $(PORTLD)/STM32F407xG.ld -#LDSCRIPT= $(PORTLD)/STM32F407xG_CCM.ld - -# C sources that can be compiled in ARM or THUMB mode depending on the global -# setting. -CSRC = $(PORTSRC) \ - $(KERNSRC) \ - $(TESTSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(GFXSRC) \ - main.c - -# C++ sources that can be compiled in ARM or THUMB mode depending on the global -# setting. -CPPSRC = - -# C sources to be compiled in ARM mode regardless of the global setting. -# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler -# option that results in lower performance and larger code size. -ACSRC = - -# C++ sources to be compiled in ARM mode regardless of the global setting. -# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler -# option that results in lower performance and larger code size. -ACPPSRC = - -# C sources to be compiled in THUMB mode regardless of the global setting. -# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler -# option that results in lower performance and larger code size. -TCSRC = - -# C sources to be compiled in THUMB mode regardless of the global setting. -# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler -# option that results in lower performance and larger code size. -TCPPSRC = - -# List ASM source files here -ASMSRC = $(PORTASM) - -INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ - $(HALINC) $(PLATFORMINC) $(BOARDINC) \ - $(GFXINC) \ - $(CHIBIOS)/os/various/devices_lib/accel \ - $(CHIBIOS)/os/various - -# -# Project, sources and paths -############################################################################## - -############################################################################## -# Compiler settings -# - -MCU = cortex-m4 - -#TRGT = arm-elf- -TRGT = /opt/arm/bin/arm-none-eabi- -CC = $(TRGT)gcc -CPPC = $(TRGT)g++ -# Enable loading with g++ only if you need C++ runtime support. -# NOTE: You can use C++ even without C++ support if you are careful. C++ -# runtime support makes code size explode. -LD = $(TRGT)gcc -#LD = $(TRGT)g++ -CP = $(TRGT)objcopy -AS = $(TRGT)gcc -x assembler-with-cpp -OD = $(TRGT)objdump -HEX = $(CP) -O ihex -BIN = $(CP) -O binary - -# ARM-specific options here -AOPT = - -# THUMB-specific options here -TOPT = -mthumb -DTHUMB - -# Define C warning options here -CWARN = -Wall -Wextra -Wstrict-prototypes - -# Define C++ warning options here -CPPWARN = -Wall -Wextra - -# -# Compiler settings -############################################################################## - -############################################################################## -# Start of default section -# - -# List all default C defines here, like -D_DEBUG=1 -DDEFS = - -# List all default ASM defines here, like -D_DEBUG=1 -DADEFS = - -# List all default directories to look for include files here -DINCDIR = - -# List the default directory to look for the libraries here -DLIBDIR = - -# List all default libraries here -DLIBS = - -# -# End of default section -############################################################################## - -############################################################################## -# Start of user section -# - -# List all user C define here, like -D_DEBUG=1 -UDEFS = - -# Define ASM defines here -UADEFS = - -# List all user directories here -UINCDIR = - -# List the user directory to look for the libraries here -ULIBDIR = - -# List all user libraries here -ULIBS = - -# -# End of user defines -############################################################################## - -ifeq ($(USE_FPU),yes) - USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant - DDEFS += -DCORTEX_USE_FPU=TRUE -else - DDEFS += -DCORTEX_USE_FPU=FALSE -endif - -ifeq ($(USE_FWLIB),yes) - include $(CHIBIOS)/ext/stm32lib/stm32lib.mk - CSRC += $(STM32SRC) - INCDIR += $(STM32INC) - USE_OPT += -DUSE_STDPERIPH_DRIVER -endif - -include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk diff --git a/demos/3rdparty/tdisp_f4_discovery/README b/demos/3rdparty/tdisp_f4_discovery/README deleted file mode 100644 index 1d4670a1..00000000 --- a/demos/3rdparty/tdisp_f4_discovery/README +++ /dev/null @@ -1,33 +0,0 @@ - -Discription -=========== -This is a demo project for testing the TDISP/HD44780 -on a STM32F4-Discovery board. - -The first line of the display will show: ChibiOS/GFX -The second line wil show: TDISP/HD44780 with a custom charactor in front. - -If the connected display is a 4 line display: -The third line will stay empty -The forth line will show the cursor modes. - -Display type -============ -The demo is written for a 4 lines display. If have a display with less lines, change the TDISP_COLUMNS setting -gfxconf.h in the project directory to the count of your display. -The software will react upon this setting. - -Hardware connection -=================== -The datalines D4 to D7 of the HD44780 compatible display must be connected to the PE0 to PE3 output pins -of the Discovery board. The RS-line of the display must be connected to PD0 of the Discovery board -and the CS-line of the display must be connected to PD1 of the Discovery board. -The R/W-line of the display must be connected to ground, because reading from the display is not used. - -The project directory contains a custom STM32F4 Discovery board file. If you want to change the connection to -the Discovery board, change the custom board file accordingly. - -Building -======== -You have to check the provided Makefile to meet your installation of the ARM-GCC Toolchain. - diff --git a/demos/3rdparty/tdisp_f4_discovery/chconf.h b/demos/3rdparty/tdisp_f4_discovery/chconf.h deleted file mode 100644 index 8c706ab3..00000000 --- a/demos/3rdparty/tdisp_f4_discovery/chconf.h +++ /dev/null @@ -1,523 +0,0 @@ -/* - ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010, - 2011,2012 Giovanni Di Sirio. - - This file is part of ChibiOS/RT. - - ChibiOS/RT 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/RT 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 . -*/ - -#ifndef _CHCONF_H_ -#define _CHCONF_H_ - -/*===========================================================================*/ -/** - * @name Kernel parameters and options - * @{ - */ -/*===========================================================================*/ - -/** - * @brief System tick frequency. - * @details Frequency of the system timer that drives the system ticks. This - * setting also defines the system tick time unit. - */ -#if !defined(CH_FREQUENCY) || defined(__DOXYGEN__) -#define CH_FREQUENCY 1000 -#endif - -/** - * @brief Round robin interval. - * @details This constant is the number of system ticks allowed for the - * threads before preemption occurs. Setting this value to zero - * disables the preemption for threads with equal priority and the - * round robin becomes cooperative. Note that higher priority - * threads can still preempt, the kernel is always preemptive. - * - * @note Disabling the round robin preemption makes the kernel more compact - * and generally faster. - */ -#if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__) -#define CH_TIME_QUANTUM 20 -#endif - -/** - * @brief Managed RAM size. - * @details Size of the RAM area to be managed by the OS. If set to zero - * then the whole available RAM is used. The core memory is made - * available to the heap allocator and/or can be used directly through - * the simplified core memory allocator. - * - * @note In order to let the OS manage the whole RAM the linker script must - * provide the @p __heap_base__ and @p __heap_end__ symbols. - * @note Requires @p CH_USE_MEMCORE. - */ -#if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__) -#define CH_MEMCORE_SIZE 0 -#endif - -/** - * @brief Idle thread automatic spawn suppression. - * @details When this option is activated the function @p chSysInit() - * does not spawn the idle thread automatically. The application has - * then the responsibility to do one of the following: - * - Spawn a custom idle thread at priority @p IDLEPRIO. - * - Change the main() thread priority to @p IDLEPRIO then enter - * an endless loop. In this scenario the @p main() thread acts as - * the idle thread. - * . - * @note Unless an idle thread is spawned the @p main() thread must not - * enter a sleep state. - */ -#if !defined(CH_NO_IDLE_THREAD) || defined(__DOXYGEN__) -#define CH_NO_IDLE_THREAD FALSE -#endif - -/** @} */ - -/*===========================================================================*/ -/** - * @name Performance options - * @{ - */ -/*===========================================================================*/ - -/** - * @brief OS optimization. - * @details If enabled then time efficient rather than space efficient code - * is used when two possible implementations exist. - * - * @note This is not related to the compiler optimization options. - * @note The default is @p TRUE. - */ -#if !defined(CH_OPTIMIZE_SPEED) || defined(__DOXYGEN__) -#define CH_OPTIMIZE_SPEED TRUE -#endif - -/** @} */ - -/*===========================================================================*/ -/** - * @name Subsystem options - * @{ - */ -/*===========================================================================*/ - -/** - * @brief Threads registry APIs. - * @details If enabled then the registry APIs are included in the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_USE_REGISTRY) || defined(__DOXYGEN__) -#define CH_USE_REGISTRY TRUE -#endif - -/** - * @brief Threads synchronization APIs. - * @details If enabled then the @p chThdWait() function is included in - * the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_USE_WAITEXIT) || defined(__DOXYGEN__) -#define CH_USE_WAITEXIT TRUE -#endif - -/** - * @brief Semaphores APIs. - * @details If enabled then the Semaphores APIs are included in the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_USE_SEMAPHORES) || defined(__DOXYGEN__) -#define CH_USE_SEMAPHORES TRUE -#endif - -/** - * @brief Semaphores queuing mode. - * @details If enabled then the threads are enqueued on semaphores by - * priority rather than in FIFO order. - * - * @note The default is @p FALSE. Enable this if you have special requirements. - * @note Requires @p CH_USE_SEMAPHORES. - */ -#if !defined(CH_USE_SEMAPHORES_PRIORITY) || defined(__DOXYGEN__) -#define CH_USE_SEMAPHORES_PRIORITY FALSE -#endif - -/** - * @brief Atomic semaphore API. - * @details If enabled then the semaphores the @p chSemSignalWait() API - * is included in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_USE_SEMAPHORES. - */ -#if !defined(CH_USE_SEMSW) || defined(__DOXYGEN__) -#define CH_USE_SEMSW TRUE -#endif - -/** - * @brief Mutexes APIs. - * @details If enabled then the mutexes APIs are included in the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_USE_MUTEXES) || defined(__DOXYGEN__) -#define CH_USE_MUTEXES TRUE -#endif - -/** - * @brief Conditional Variables APIs. - * @details If enabled then the conditional variables APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_USE_MUTEXES. - */ -#if !defined(CH_USE_CONDVARS) || defined(__DOXYGEN__) -#define CH_USE_CONDVARS TRUE -#endif - -/** - * @brief Conditional Variables APIs with timeout. - * @details If enabled then the conditional variables APIs with timeout - * specification are included in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_USE_CONDVARS. - */ -#if !defined(CH_USE_CONDVARS_TIMEOUT) || defined(__DOXYGEN__) -#define CH_USE_CONDVARS_TIMEOUT TRUE -#endif - -/** - * @brief Events Flags APIs. - * @details If enabled then the event flags APIs are included in the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_USE_EVENTS) || defined(__DOXYGEN__) -#define CH_USE_EVENTS TRUE -#endif - -/** - * @brief Events Flags APIs with timeout. - * @details If enabled then the events APIs with timeout specification - * are included in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_USE_EVENTS. - */ -#if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__) -#define CH_USE_EVENTS_TIMEOUT TRUE -#endif - -/** - * @brief Synchronous Messages APIs. - * @details If enabled then the synchronous messages APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_USE_MESSAGES) || defined(__DOXYGEN__) -#define CH_USE_MESSAGES TRUE -#endif - -/** - * @brief Synchronous Messages queuing mode. - * @details If enabled then messages are served by priority rather than in - * FIFO order. - * - * @note The default is @p FALSE. Enable this if you have special requirements. - * @note Requires @p CH_USE_MESSAGES. - */ -#if !defined(CH_USE_MESSAGES_PRIORITY) || defined(__DOXYGEN__) -#define CH_USE_MESSAGES_PRIORITY FALSE -#endif - -/** - * @brief Mailboxes APIs. - * @details If enabled then the asynchronous messages (mailboxes) APIs are - * included in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_USE_SEMAPHORES. - */ -#if !defined(CH_USE_MAILBOXES) || defined(__DOXYGEN__) -#define CH_USE_MAILBOXES TRUE -#endif - -/** - * @brief I/O Queues APIs. - * @details If enabled then the I/O queues APIs are included in the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__) -#define CH_USE_QUEUES TRUE -#endif - -/** - * @brief Core Memory Manager APIs. - * @details If enabled then the core memory manager APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_USE_MEMCORE) || defined(__DOXYGEN__) -#define CH_USE_MEMCORE TRUE -#endif - -/** - * @brief Heap Allocator APIs. - * @details If enabled then the memory heap allocator APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_USE_MEMCORE and either @p CH_USE_MUTEXES or - * @p CH_USE_SEMAPHORES. - * @note Mutexes are recommended. - */ -#if !defined(CH_USE_HEAP) || defined(__DOXYGEN__) -#define CH_USE_HEAP TRUE -#endif - -/** - * @brief C-runtime allocator. - * @details If enabled the the heap allocator APIs just wrap the C-runtime - * @p malloc() and @p free() functions. - * - * @note The default is @p FALSE. - * @note Requires @p CH_USE_HEAP. - * @note The C-runtime may or may not require @p CH_USE_MEMCORE, see the - * appropriate documentation. - */ -#if !defined(CH_USE_MALLOC_HEAP) || defined(__DOXYGEN__) -#define CH_USE_MALLOC_HEAP FALSE -#endif - -/** - * @brief Memory Pools Allocator APIs. - * @details If enabled then the memory pools allocator APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - */ -#if !defined(CH_USE_MEMPOOLS) || defined(__DOXYGEN__) -#define CH_USE_MEMPOOLS TRUE -#endif - -/** - * @brief Dynamic Threads APIs. - * @details If enabled then the dynamic threads creation APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_USE_WAITEXIT. - * @note Requires @p CH_USE_HEAP and/or @p CH_USE_MEMPOOLS. - */ -#if !defined(CH_USE_DYNAMIC) || defined(__DOXYGEN__) -#define CH_USE_DYNAMIC TRUE -#endif - -/** @} */ - -/*===========================================================================*/ -/** - * @name Debug options - * @{ - */ -/*===========================================================================*/ - -/** - * @brief Debug option, system state check. - * @details If enabled the correct call protocol for system APIs is checked - * at runtime. - * - * @note The default is @p FALSE. - */ -#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__) -#define CH_DBG_SYSTEM_STATE_CHECK FALSE -#endif - -/** - * @brief Debug option, parameters checks. - * @details If enabled then the checks on the API functions input - * parameters are activated. - * - * @note The default is @p FALSE. - */ -#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__) -#define CH_DBG_ENABLE_CHECKS FALSE -#endif - -/** - * @brief Debug option, consistency checks. - * @details If enabled then all the assertions in the kernel code are - * activated. This includes consistency checks inside the kernel, - * runtime anomalies and port-defined checks. - * - * @note The default is @p FALSE. - */ -#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__) -#define CH_DBG_ENABLE_ASSERTS FALSE -#endif - -/** - * @brief Debug option, trace buffer. - * @details If enabled then the context switch circular trace buffer is - * activated. - * - * @note The default is @p FALSE. - */ -#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__) -#define CH_DBG_ENABLE_TRACE FALSE -#endif - -/** - * @brief Debug option, stack checks. - * @details If enabled then a runtime stack check is performed. - * - * @note The default is @p FALSE. - * @note The stack check is performed in a architecture/port dependent way. - * It may not be implemented or some ports. - * @note The default failure mode is to halt the system with the global - * @p panic_msg variable set to @p NULL. - */ -#if !defined(CH_DBG_ENABLE_STACK_CHECK) || defined(__DOXYGEN__) -#define CH_DBG_ENABLE_STACK_CHECK FALSE -#endif - -/** - * @brief Debug option, stacks initialization. - * @details If enabled then the threads working area is filled with a byte - * value when a thread is created. This can be useful for the - * runtime measurement of the used stack. - * - * @note The default is @p FALSE. - */ -#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__) -#define CH_DBG_FILL_THREADS FALSE -#endif - -/** - * @brief Debug option, threads profiling. - * @details If enabled then a field is added to the @p Thread structure that - * counts the system ticks occurred while executing the thread. - * - * @note The default is @p TRUE. - * @note This debug option is defaulted to TRUE because it is required by - * some test cases into the test suite. - */ -#if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__) -#define CH_DBG_THREADS_PROFILING TRUE -#endif - -/** @} */ - -/*===========================================================================*/ -/** - * @name Kernel hooks - * @{ - */ -/*===========================================================================*/ - -/** - * @brief Threads descriptor structure extension. - * @details User fields added to the end of the @p Thread structure. - */ -#if !defined(THREAD_EXT_FIELDS) || defined(__DOXYGEN__) -#define THREAD_EXT_FIELDS \ - /* Add threads custom fields here.*/ -#endif - -/** - * @brief Threads initialization hook. - * @details User initialization code added to the @p chThdInit() API. - * - * @note It is invoked from within @p chThdInit() and implicitly from all - * the threads creation APIs. - */ -#if !defined(THREAD_EXT_INIT_HOOK) || defined(__DOXYGEN__) -#define THREAD_EXT_INIT_HOOK(tp) { \ - /* Add threads initialization code here.*/ \ -} -#endif - -/** - * @brief Threads finalization hook. - * @details User finalization code added to the @p chThdExit() API. - * - * @note It is inserted into lock zone. - * @note It is also invoked when the threads simply return in order to - * terminate. - */ -#if !defined(THREAD_EXT_EXIT_HOOK) || defined(__DOXYGEN__) -#define THREAD_EXT_EXIT_HOOK(tp) { \ - /* Add threads finalization code here.*/ \ -} -#endif - -/** - * @brief Context switch hook. - * @details This hook is invoked just before switching between threads. - */ -#if !defined(THREAD_CONTEXT_SWITCH_HOOK) || defined(__DOXYGEN__) -#define THREAD_CONTEXT_SWITCH_HOOK(ntp, otp) { \ - /* System halt code here.*/ \ -} -#endif - -/** - * @brief Idle Loop hook. - * @details This hook is continuously invoked by the idle thread loop. - */ -#if !defined(IDLE_LOOP_HOOK) || defined(__DOXYGEN__) -#define IDLE_LOOP_HOOK() { \ - /* Idle loop code here.*/ \ -} -#endif - -/** - * @brief System tick event hook. - * @details This hook is invoked in the system tick handler immediately - * after processing the virtual timers queue. - */ -#if !defined(SYSTEM_TICK_EVENT_HOOK) || defined(__DOXYGEN__) -#define SYSTEM_TICK_EVENT_HOOK() { \ - /* System tick event code here.*/ \ -} -#endif - -/** - * @brief System halt hook. - * @details This hook is invoked in case to a system halting error before - * the system is halted. - */ -#if !defined(SYSTEM_HALT_HOOK) || defined(__DOXYGEN__) -#define SYSTEM_HALT_HOOK() { \ - /* System halt code here.*/ \ -} -#endif - -/** @} */ - -/*===========================================================================*/ -/* Port-specific settings (override port settings defaulted in chcore.h). */ -/*===========================================================================*/ - -#endif /* _CHCONF_H_ */ - diff --git a/demos/3rdparty/tdisp_f4_discovery/gfxconf.h b/demos/3rdparty/tdisp_f4_discovery/gfxconf.h deleted file mode 100644 index c00e3941..00000000 --- a/demos/3rdparty/tdisp_f4_discovery/gfxconf.h +++ /dev/null @@ -1,147 +0,0 @@ -/** - * This file has a different license to the rest of the GFX system. - * You can copy, modify and distribute this file as you see fit. - * You do not need to publish your source modifications to this file. - * The only thing you are not permitted to do is to relicense it - * under a different license. - */ - -/** - * Copy this file into your project directory and rename it as gfxconf.h - * Edit your copy to turn on the GFX features you want to use. - */ - -#ifndef _GFXCONF_H -#define _GFXCONF_H - -/* The operating system to use. One of these must be defined - preferably in your Makefile */ -//#define GFX_USE_OS_CHIBIOS FALSE -//#define GFX_USE_OS_WIN32 FALSE -//#define GFX_USE_OS_LINUX FALSE -//#define GFX_USE_OS_OSX FALSE - -/* GFX subsystems to turn on */ -#define GFX_USE_GDISP FALSE -#define GFX_USE_TDISP TRUE -#define GFX_USE_GWIN FALSE -#define GFX_USE_GEVENT FALSE -#define GFX_USE_GTIMER FALSE -#define GFX_USE_GINPUT FALSE -#define GFX_USE_GADC FALSE -#define GFX_USE_GAUDIN FALSE -#define GFX_USE_GAUDOUT FALSE -#define GFX_USE_GMISC FALSE - -/* Features for the GDISP subsystem */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT TRUE -#define GDISP_NEED_CIRCLE TRUE -#define GDISP_NEED_ELLIPSE TRUE -#define GDISP_NEED_ARC FALSE -#define GDISP_NEED_CONVEX_POLYGON FALSE -#define GDISP_NEED_SCROLL FALSE -#define GDISP_NEED_PIXELREAD FALSE -#define GDISP_NEED_CONTROL FALSE -#define GDISP_NEED_QUERY FALSE -#define GDISP_NEED_IMAGE FALSE -#define GDISP_NEED_MULTITHREAD FALSE -#define GDISP_NEED_ASYNC FALSE -#define GDISP_NEED_MSGAPI FALSE - -/* GDISP - builtin fonts */ -#define GDISP_INCLUDE_FONT_SMALL FALSE -#define GDISP_INCLUDE_FONT_LARGER FALSE -#define GDISP_INCLUDE_FONT_UI1 FALSE -#define GDISP_INCLUDE_FONT_UI2 TRUE -#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE - -/* GDISP image decoders */ -#define GDISP_NEED_IMAGE_NATIVE FALSE -#define GDISP_NEED_IMAGE_GIF FALSE -#define GDISP_NEED_IMAGE_BMP FALSE -#define GDISP_NEED_IMAGE_JPG FALSE -#define GDISP_NEED_IMAGE_PNG FALSE - -/* Optional image support that can be turned off */ -/* - #define GDISP_NEED_IMAGE_BMP_1 TRUE - #define GDISP_NEED_IMAGE_BMP_4 TRUE - #define GDISP_NEED_IMAGE_BMP_4_RLE TRUE - #define GDISP_NEED_IMAGE_BMP_8 TRUE - #define GDISP_NEED_IMAGE_BMP_8_RLE TRUE - #define GDISP_NEED_IMAGE_BMP_16 TRUE - #define GDISP_NEED_IMAGE_BMP_24 TRUE - #define GDISP_NEED_IMAGE_BMP_32 TRUE -*/ - -/* Features for the TDISP subsystem. - */ -/* Set this to TRUE if need a custom board file. - * The name of your board file must be "tdisp-lld-board.h" */ -#define TDISP_USE_CUSTOM_BOARD TRUE -/* Set to TRUE if multi threads need to read or - * write to the display. If not, set this to FALSE */ -#define TDISP_NEED_MULTITHREAD FALSE -/* If you use the busy flag or you want to read - * from the display, set this to TRUE otherwise - * leaf it to FALSE. Most users do not use the - * read function of the display */ -#define TDISP_NEED_READ FALSE -/* Number of colums of the connected display */ -#define TDISP_COLUMNS 20 -/* Number of rows of the connect display */ -#define TDISP_ROWS 4 -/* Use dimming of backlight */ -#define TDISP_USE_BACKLIGHT TRUE - -/* Features for the GWIN subsystem. */ -#define GWIN_NEED_BUTTON FALSE -#define GWIN_NEED_CONSOLE FALSE -#define GWIN_NEED_GRAPH FALSE - -/* Features for the GEVENT subsystem. */ -#define GEVENT_ASSERT_NO_RESOURCE FALSE - -/* Features for the GTIMER subsystem. */ -/* NONE */ - -/* Features for the GINPUT subsystem. */ -#define GINPUT_NEED_MOUSE FALSE -#define GINPUT_NEED_KEYBOARD FALSE -#define GINPUT_NEED_TOGGLE FALSE -#define GINPUT_NEED_DIAL FALSE - -/* Features for the GADC subsystem. */ -/* NONE */ - -/* Features for the GAUDIN subsystem. */ -/* NONE */ - -/* Features for the GAUDOUT subsystem. */ -/* NONE */ - -/* Features for the GMISC subsystem. */ -#define GMISC_NEED_ARRAYOPS FALSE - -/* Optional Parameters for various subsystems */ -/* - #define GDISP_MAX_FONT_HEIGHT 16 - #define GEVENT_MAXIMUM_SIZE 32 - #define GEVENT_MAX_SOURCE_LISTENERS 32 - #define GTIMER_THREAD_WORKAREA_SIZE 512 - #define GADC_MAX_LOWSPEED_DEVICES 4 - #define GWIN_BUTTON_LAZY_RELEASE FALSE -*/ - -/* Optional Low Level Driver Definitions */ -/* - #define GDISP_SCREEN_WIDTH 320 - #define GDISP_SCREEN_HEIGHT 240 - #define GDISP_USE_FSMC - #define GDISP_USE_GPIO - #define TDISP_COLUMNS 16 - #define TDISP_ROWS 2 -*/ - -#endif /* _GFXCONF_H */ diff --git a/demos/3rdparty/tdisp_f4_discovery/halconf.h b/demos/3rdparty/tdisp_f4_discovery/halconf.h deleted file mode 100644 index c30e285a..00000000 --- a/demos/3rdparty/tdisp_f4_discovery/halconf.h +++ /dev/null @@ -1,330 +0,0 @@ -/* - ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010, - 2011,2012 Giovanni Di Sirio. - - This file is part of ChibiOS/RT. - - ChibiOS/RT 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/RT 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 . -*/ - -#ifndef _HALCONF_H_ -#define _HALCONF_H_ - -#include "mcuconf.h" - -/** - * @brief Enables the TM subsystem. - */ -#if !defined(HAL_USE_TM) || defined(__DOXYGEN__) -#define HAL_USE_TM FALSE -#endif - -/** - * @brief Enables the PAL subsystem. - */ -#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__) -#define HAL_USE_PAL TRUE -#endif - -/** - * @brief Enables the ADC subsystem. - */ -#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__) -#define HAL_USE_ADC TRUE -#endif - -/** - * @brief Enables the CAN subsystem. - */ -#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__) -#define HAL_USE_CAN FALSE -#endif - -/** - * @brief Enables the EXT subsystem. - */ -#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__) -#define HAL_USE_EXT FALSE -#endif - -/** - * @brief Enables the GPT subsystem. - */ -#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__) -#define HAL_USE_GPT FALSE -#endif - -/** - * @brief Enables the I2C subsystem. - */ -#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__) -#define HAL_USE_I2C FALSE -#endif - -/** - * @brief Enables the ICU subsystem. - */ -#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__) -#define HAL_USE_ICU FALSE -#endif - -/** - * @brief Enables the MAC subsystem. - */ -#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__) -#define HAL_USE_MAC FALSE -#endif - -/** - * @brief Enables the MMC_SPI subsystem. - */ -#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__) -#define HAL_USE_MMC_SPI FALSE -#endif - -/** - * @brief Enables the PWM subsystem. - */ -#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__) -#define HAL_USE_PWM TRUE -#endif - -/** - * @brief Enables the RTC subsystem. - */ -#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__) -#define HAL_USE_RTC FALSE -#endif - -/** - * @brief Enables the SDC subsystem. - */ -#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__) -#define HAL_USE_SDC FALSE -#endif - -/** - * @brief Enables the SERIAL subsystem. - */ -#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__) -#define HAL_USE_SERIAL FALSE -#endif - -/** - * @brief Enables the SERIAL over USB subsystem. - */ -#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__) -#define HAL_USE_SERIAL_USB FALSE -#endif - -/** - * @brief Enables the SPI subsystem. - */ -#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__) -#define HAL_USE_SPI FALSE -#endif - -/** - * @brief Enables the UART subsystem. - */ -#if !defined(HAL_USE_UART) || defined(__DOXYGEN__) -#define HAL_USE_UART FALSE -#endif - -/** - * @brief Enables the USB subsystem. - */ -#if !defined(HAL_USE_USB) || defined(__DOXYGEN__) -#define HAL_USE_USB FALSE -#endif - -/*===========================================================================*/ -/* ADC driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables synchronous APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__) -#define ADC_USE_WAIT TRUE -#endif - -/** - * @brief Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) -#define ADC_USE_MUTUAL_EXCLUSION TRUE -#endif - -/*===========================================================================*/ -/* CAN driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Sleep mode related APIs inclusion switch. - */ -#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__) -#define CAN_USE_SLEEP_MODE TRUE -#endif - -/*===========================================================================*/ -/* I2C driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables the mutual exclusion APIs on the I2C bus. - */ -#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) -#define I2C_USE_MUTUAL_EXCLUSION TRUE -#endif - -/*===========================================================================*/ -/* MAC driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables an event sources for incoming packets. - */ -#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__) -#define MAC_USE_EVENTS TRUE -#endif - -/*===========================================================================*/ -/* MMC_SPI driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Block size for MMC transfers. - */ -#if !defined(MMC_SECTOR_SIZE) || defined(__DOXYGEN__) -#define MMC_SECTOR_SIZE 512 -#endif - -/** - * @brief Delays insertions. - * @details If enabled this options inserts delays into the MMC waiting - * routines releasing some extra CPU time for the threads with - * lower priority, this may slow down the driver a bit however. - * This option is recommended also if the SPI driver does not - * use a DMA channel and heavily loads the CPU. - */ -#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__) -#define MMC_NICE_WAITING TRUE -#endif - -/** - * @brief Number of positive insertion queries before generating the - * insertion event. - */ -#if !defined(MMC_POLLING_INTERVAL) || defined(__DOXYGEN__) -#define MMC_POLLING_INTERVAL 10 -#endif - -/** - * @brief Interval, in milliseconds, between insertion queries. - */ -#if !defined(MMC_POLLING_DELAY) || defined(__DOXYGEN__) -#define MMC_POLLING_DELAY 10 -#endif - -/** - * @brief Uses the SPI polled API for small data transfers. - * @details Polled transfers usually improve performance because it - * saves two context switches and interrupt servicing. Note - * that this option has no effect on large transfers which - * are always performed using DMAs/IRQs. - */ -#if !defined(MMC_USE_SPI_POLLING) || defined(__DOXYGEN__) -#define MMC_USE_SPI_POLLING TRUE -#endif - -/*===========================================================================*/ -/* SDC driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Number of initialization attempts before rejecting the card. - * @note Attempts are performed at 10mS intervals. - */ -#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__) -#define SDC_INIT_RETRY 100 -#endif - -/** - * @brief Include support for MMC cards. - * @note MMC support is not yet implemented so this option must be kept - * at @p FALSE. - */ -#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__) -#define SDC_MMC_SUPPORT FALSE -#endif - -/** - * @brief Delays insertions. - * @details If enabled this options inserts delays into the MMC waiting - * routines releasing some extra CPU time for the threads with - * lower priority, this may slow down the driver a bit however. - */ -#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__) -#define SDC_NICE_WAITING TRUE -#endif - -/*===========================================================================*/ -/* SERIAL driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Default bit rate. - * @details Configuration parameter, this is the baud rate selected for the - * default configuration. - */ -#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__) -#define SERIAL_DEFAULT_BITRATE 38400 -#endif - -/** - * @brief Serial buffers size. - * @details Configuration parameter, you can change the depth of the queue - * buffers depending on the requirements of your application. - * @note The default is 64 bytes for both the transmission and receive - * buffers. - */ -#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__) -#define SERIAL_BUFFERS_SIZE 16 -#endif - -/*===========================================================================*/ -/* SPI driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables synchronous APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__) -#define SPI_USE_WAIT TRUE -#endif - -/** - * @brief Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) -#define SPI_USE_MUTUAL_EXCLUSION TRUE -#endif - -#endif /* _HALCONF_H_ */ - diff --git a/demos/3rdparty/tdisp_f4_discovery/main.c b/demos/3rdparty/tdisp_f4_discovery/main.c deleted file mode 100644 index e6a7270e..00000000 --- a/demos/3rdparty/tdisp_f4_discovery/main.c +++ /dev/null @@ -1,109 +0,0 @@ -/* - ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010, - 2011,2012 Giovanni Di Sirio. - - This file is part of ChibiOS/RT. - - ChibiOS/RT 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/RT 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 . -*/ - -#include "ch.h" -#include "hal.h" -#include "gfx.h" - -int main(void) { - uint8_t charmap[8]; - uint8_t n; - - halInit(); - chSysInit(); - - tdispInit(); - - /* reset cursor position and clear the screen */ - tdispHome(); - tdispClear(); - - /* draw a string to a given location */ - tdispSetCursor(0, 0); - tdispDrawChar('C'); - chThdSleepMilliseconds(500); - tdispDrawChar('h'); - chThdSleepMilliseconds(500); - tdispDrawChar('i'); - chThdSleepMilliseconds(500); - tdispDrawChar('b'); - chThdSleepMilliseconds(500); - tdispDrawChar('i'); - chThdSleepMilliseconds(500); - tdispDrawChar('O'); - chThdSleepMilliseconds(500); - tdispDrawChar('S'); - chThdSleepMilliseconds(500); - tdispDrawChar('/'); - chThdSleepMilliseconds(500); - tdispDrawChar('G'); - chThdSleepMilliseconds(500); - tdispDrawChar('F'); - chThdSleepMilliseconds(500); - tdispDrawChar('X'); - chThdSleepMilliseconds(500); - - // After 2 seconds blank the screen and - // print tekst on the next line en - // enable the display again - chThdSleepMilliseconds(1000); - tdispDisplayMode(displayOff); - tdispSetCursor(1, 1); - tdispDrawString("TDISP/HD44780"); - chThdSleepMilliseconds(1000); - tdispDisplayMode(displayOn); - - - /* create and display a custom made character after 1S*/ - chThdSleepMilliseconds(1000); - charmap[0] = 0b00100; - charmap[1] = 0b01110; - charmap[2] = 0b01110; - charmap[3] = 0b01110; - charmap[4] = 0b11111; - charmap[5] = 0b00000; - charmap[6] = 0b00100; - charmap[7] = 0b00000; - tdispCreateChar(0, charmap); - tdispSetCursor(0, 1); - tdispDrawChar(0); - - - // after 1 second turn to 50% - chThdSleepMilliseconds(1000); - tdispSetBacklight(50); - - while(TRUE) { - tdispSetCursor(0, 3); - tdispDrawString("Cursor OFF: "); - tdispSetCursorShape(cursorOff); - chThdSleepMilliseconds(5000); - - tdispSetCursor(0, 3); - tdispDrawString("Cursor ON: "); - tdispSetCursorShape(cursorBlock); - chThdSleepMilliseconds(5000); - - tdispSetCursor(0, 3); - tdispDrawString("Cursor BLINK: "); - tdispSetCursorShape(cursorBlinkingBlock); - chThdSleepMilliseconds(5000); - } -} diff --git a/demos/3rdparty/tdisp_f4_discovery/mcuconf.h b/demos/3rdparty/tdisp_f4_discovery/mcuconf.h deleted file mode 100644 index 963432d5..00000000 --- a/demos/3rdparty/tdisp_f4_discovery/mcuconf.h +++ /dev/null @@ -1,257 +0,0 @@ -/* - ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010, - 2011,2012 Giovanni Di Sirio. - - This file is part of ChibiOS/RT. - - ChibiOS/RT 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/RT 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 . -*/ - -/* - * STM32F4xx drivers configuration. - * The following settings override the default settings present in - * the various device driver implementation headers. - * Note that the settings for each driver only have effect if the whole - * driver is enabled in halconf.h. - * - * IRQ priorities: - * 15...0 Lowest...Highest. - * - * DMA priorities: - * 0...3 Lowest...Highest. - */ - -#define STM32F4xx_MCUCONF - -/* - * HAL driver system settings. - */ -#define STM32_NO_INIT FALSE -#define STM32_HSI_ENABLED TRUE -#define STM32_LSI_ENABLED TRUE -#define STM32_HSE_ENABLED TRUE -#define STM32_LSE_ENABLED FALSE -#define STM32_CLOCK48_REQUIRED TRUE -#define STM32_SW STM32_SW_PLL -#define STM32_PLLSRC STM32_PLLSRC_HSE -#define STM32_PLLM_VALUE 8 -#define STM32_PLLN_VALUE 336 -#define STM32_PLLP_VALUE 2 -#define STM32_PLLQ_VALUE 7 -#define STM32_HPRE STM32_HPRE_DIV1 -#define STM32_PPRE1 STM32_PPRE1_DIV4 -#define STM32_PPRE2 STM32_PPRE2_DIV2 -#define STM32_RTCSEL STM32_RTCSEL_LSI -#define STM32_RTCPRE_VALUE 8 -#define STM32_MCO1SEL STM32_MCO1SEL_HSI -#define STM32_MCO1PRE STM32_MCO1PRE_DIV1 -#define STM32_MCO2SEL STM32_MCO2SEL_SYSCLK -#define STM32_MCO2PRE STM32_MCO2PRE_DIV5 -#define STM32_I2SSRC STM32_I2SSRC_CKIN -#define STM32_PLLI2SN_VALUE 192 -#define STM32_PLLI2SR_VALUE 5 -#define STM32_VOS STM32_VOS_HIGH -#define STM32_PVD_ENABLE FALSE -#define STM32_PLS STM32_PLS_LEV0 - -/* - * ADC driver system settings. - */ -#define STM32_ADC_ADCPRE ADC_CCR_ADCPRE_DIV4 -#define STM32_ADC_USE_ADC1 TRUE -#define STM32_ADC_USE_ADC2 FALSE -#define STM32_ADC_USE_ADC3 FALSE -#define STM32_ADC_ADC1_DMA_STREAM STM32_DMA_STREAM_ID(2, 4) -#define STM32_ADC_ADC2_DMA_STREAM STM32_DMA_STREAM_ID(2, 2) -#define STM32_ADC_ADC3_DMA_STREAM STM32_DMA_STREAM_ID(2, 1) -#define STM32_ADC_ADC1_DMA_PRIORITY 2 -#define STM32_ADC_ADC2_DMA_PRIORITY 2 -#define STM32_ADC_ADC3_DMA_PRIORITY 2 -#define STM32_ADC_IRQ_PRIORITY 6 -#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY 6 -#define STM32_ADC_ADC2_DMA_IRQ_PRIORITY 6 -#define STM32_ADC_ADC3_DMA_IRQ_PRIORITY 6 - -/* - * CAN driver system settings. - */ -#define STM32_CAN_USE_CAN1 FALSE -#define STM32_CAN_USE_CAN2 FALSE -#define STM32_CAN_CAN1_IRQ_PRIORITY 11 -#define STM32_CAN_CAN2_IRQ_PRIORITY 11 - -/* - * EXT driver system settings. - */ -#define STM32_EXT_EXTI0_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI1_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI2_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI3_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI4_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI5_9_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI10_15_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI16_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI17_IRQ_PRIORITY 15 -#define STM32_EXT_EXTI18_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI19_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI20_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI21_IRQ_PRIORITY 15 -#define STM32_EXT_EXTI22_IRQ_PRIORITY 15 - -/* - * GPT driver system settings. - */ -#define STM32_GPT_USE_TIM1 FALSE -#define STM32_GPT_USE_TIM2 FALSE -#define STM32_GPT_USE_TIM3 FALSE -#define STM32_GPT_USE_TIM4 FALSE -#define STM32_GPT_USE_TIM5 FALSE -#define STM32_GPT_USE_TIM8 FALSE -#define STM32_GPT_TIM1_IRQ_PRIORITY 7 -#define STM32_GPT_TIM2_IRQ_PRIORITY 7 -#define STM32_GPT_TIM3_IRQ_PRIORITY 7 -#define STM32_GPT_TIM4_IRQ_PRIORITY 7 -#define STM32_GPT_TIM5_IRQ_PRIORITY 7 -#define STM32_GPT_TIM8_IRQ_PRIORITY 7 - -/* - * I2C driver system settings. - */ -#define STM32_I2C_USE_I2C1 FALSE -#define STM32_I2C_USE_I2C2 FALSE -#define STM32_I2C_USE_I2C3 FALSE -#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0) -#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) -#define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) -#define STM32_I2C_I2C2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 7) -#define STM32_I2C_I2C3_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) -#define STM32_I2C_I2C3_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 4) -#define STM32_I2C_I2C1_IRQ_PRIORITY 5 -#define STM32_I2C_I2C2_IRQ_PRIORITY 5 -#define STM32_I2C_I2C3_IRQ_PRIORITY 5 -#define STM32_I2C_I2C1_DMA_PRIORITY 3 -#define STM32_I2C_I2C2_DMA_PRIORITY 3 -#define STM32_I2C_I2C3_DMA_PRIORITY 3 -#define STM32_I2C_I2C1_DMA_ERROR_HOOK() chSysHalt() -#define STM32_I2C_I2C2_DMA_ERROR_HOOK() chSysHalt() -#define STM32_I2C_I2C3_DMA_ERROR_HOOK() chSysHalt() - -/* - * ICU driver system settings. - */ -#define STM32_ICU_USE_TIM1 FALSE -#define STM32_ICU_USE_TIM2 FALSE -#define STM32_ICU_USE_TIM3 FALSE -#define STM32_ICU_USE_TIM4 FALSE -#define STM32_ICU_USE_TIM5 FALSE -#define STM32_ICU_USE_TIM8 FALSE -#define STM32_ICU_TIM1_IRQ_PRIORITY 7 -#define STM32_ICU_TIM2_IRQ_PRIORITY 7 -#define STM32_ICU_TIM3_IRQ_PRIORITY 7 -#define STM32_ICU_TIM4_IRQ_PRIORITY 7 -#define STM32_ICU_TIM5_IRQ_PRIORITY 7 -#define STM32_ICU_TIM8_IRQ_PRIORITY 7 - -/* - * PWM driver system settings. - */ -#define STM32_PWM_USE_ADVANCED FALSE -#define STM32_PWM_USE_TIM1 FALSE -#define STM32_PWM_USE_TIM2 FALSE -#define STM32_PWM_USE_TIM3 FALSE -#define STM32_PWM_USE_TIM4 TRUE -#define STM32_PWM_USE_TIM5 FALSE -#define STM32_PWM_USE_TIM8 FALSE -#define STM32_PWM_TIM1_IRQ_PRIORITY 7 -#define STM32_PWM_TIM2_IRQ_PRIORITY 7 -#define STM32_PWM_TIM3_IRQ_PRIORITY 7 -#define STM32_PWM_TIM4_IRQ_PRIORITY 7 -#define STM32_PWM_TIM5_IRQ_PRIORITY 7 -#define STM32_PWM_TIM8_IRQ_PRIORITY 7 - -/* - * SERIAL driver system settings. - */ -#define STM32_SERIAL_USE_USART1 FALSE -#define STM32_SERIAL_USE_USART2 FALSE -#define STM32_SERIAL_USE_USART3 FALSE -#define STM32_SERIAL_USE_UART4 FALSE -#define STM32_SERIAL_USE_UART5 FALSE -#define STM32_SERIAL_USE_USART6 FALSE -#define STM32_SERIAL_USART1_PRIORITY 12 -#define STM32_SERIAL_USART2_PRIORITY 12 -#define STM32_SERIAL_USART3_PRIORITY 12 -#define STM32_SERIAL_UART4_PRIORITY 12 -#define STM32_SERIAL_UART5_PRIORITY 12 -#define STM32_SERIAL_USART6_PRIORITY 12 - -/* - * SPI driver system settings. - */ -#define STM32_SPI_USE_SPI1 TRUE -#define STM32_SPI_USE_SPI2 FALSE -#define STM32_SPI_USE_SPI3 FALSE -#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0) -#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3) -#define STM32_SPI_SPI2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 3) -#define STM32_SPI_SPI2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 4) -#define STM32_SPI_SPI3_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0) -#define STM32_SPI_SPI3_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 7) -#define STM32_SPI_SPI1_DMA_PRIORITY 1 -#define STM32_SPI_SPI2_DMA_PRIORITY 1 -#define STM32_SPI_SPI3_DMA_PRIORITY 1 -#define STM32_SPI_SPI1_IRQ_PRIORITY 10 -#define STM32_SPI_SPI2_IRQ_PRIORITY 10 -#define STM32_SPI_SPI3_IRQ_PRIORITY 10 -#define STM32_SPI_DMA_ERROR_HOOK(spip) chSysHalt() - -/* - * UART driver system settings. - */ -#define STM32_UART_USE_USART1 FALSE -#define STM32_UART_USE_USART2 FALSE -#define STM32_UART_USE_USART3 FALSE -#define STM32_UART_USE_USART6 FALSE -#define STM32_UART_USART1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 5) -#define STM32_UART_USART1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) -#define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5) -#define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) -#define STM32_UART_USART3_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1) -#define STM32_UART_USART3_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 3) -#define STM32_UART_USART6_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 2) -#define STM32_UART_USART6_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) -#define STM32_UART_USART1_IRQ_PRIORITY 12 -#define STM32_UART_USART2_IRQ_PRIORITY 12 -#define STM32_UART_USART3_IRQ_PRIORITY 12 -#define STM32_UART_USART6_IRQ_PRIORITY 12 -#define STM32_UART_USART1_DMA_PRIORITY 0 -#define STM32_UART_USART2_DMA_PRIORITY 0 -#define STM32_UART_USART3_DMA_PRIORITY 0 -#define STM32_UART_USART6_DMA_PRIORITY 0 -#define STM32_UART_DMA_ERROR_HOOK(uartp) chSysHalt() - -/* - * USB driver system settings. - */ -#define STM32_USB_USE_OTG1 FALSE -#define STM32_USB_USE_OTG2 FALSE -#define STM32_USB_OTG1_IRQ_PRIORITY 14 -#define STM32_USB_OTG2_IRQ_PRIORITY 14 -#define STM32_USB_OTG1_RX_FIFO_SIZE 512 -#define STM32_USB_OTG2_RX_FIFO_SIZE 1024 -#define STM32_USB_OTG_THREAD_PRIO LOWPRIO -#define STM32_USB_OTG_THREAD_STACK_SIZE 128 -#define STM32_USB_OTGFIFO_FILL_BASEPRI 0 - - diff --git a/demos/3rdparty/tdisp_f4_discovery/tdisp_lld_board.h b/demos/3rdparty/tdisp_f4_discovery/tdisp_lld_board.h deleted file mode 100644 index d839d302..00000000 --- a/demos/3rdparty/tdisp_f4_discovery/tdisp_lld_board.h +++ /dev/null @@ -1,169 +0,0 @@ -/* - ChibiOS/GFX - Copyright (C) 2012, 2013 - Joel Bodenmann aka Tectu - - 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 . -*/ - -/** - * @file drivers/tdisp/HD44780/tdisp_lld_board_st_stm32f4_discovery.h - * @brief TDISP driver subsystem board interface for the HD44780 display - * - * @addtogroup TDISP - * @{ - */ - -#ifndef _TDISP_LLD_BOARD_H -#define _TDISP_LLD_BOARD_H - -/* Configure these to match the hardware connections on your board */ -#define BUS_4BITS TRUE - -/* Configure the bitoffset in the dataport so they match with the - * hardware pins. An offset of 0 means bit0 stays at bit0 of the dataport. - * If the offset is set to 3, bit0 of the nibble will be positioned at - * bit3 of the hardware-port. - */ -#define hardware_offset 0 - -/* The port where the data is sent to. In the - * low-leveldriver het hardware_offset is taken - * into account. If for example the hardware_offset - * is set to 3, then de data will be sent to - * PE3, PE4, PE5 en PE6, if the dataport where GPIOE. - */ -#define PORT_DATA GPIOE - -/* The port used to controle the controle lines of - * the display. - */ -#define PORT_CTRL GPIOD -/* Pin to controle the R/S-line of the display */ -#define PIN_RS 0 -/* Pin to controle the EN-line of the display */ -#define PIN_EN 1 -/* Pin to controle the R/W-pin of the display. - * If reading of the display is not used disable - * reading in the gfxconf.h and put a dummy value here - * as it will not be used. - */ -#define PIN_RW 7 - -#if TDISP_USE_BACKLIGHT -/* PWM configuration structure. We use timer 4 channel 2 (orange LED on board). */ -static const PWMConfig pwmcfg = { - 1000000, /* 1 MHz PWM clock frequency. */ - 100, /* PWM period is 100 cycles. */ - NULL, - { - {PWM_OUTPUT_ACTIVE_HIGH, NULL}, - {PWM_OUTPUT_ACTIVE_HIGH, NULL}, - {PWM_OUTPUT_ACTIVE_HIGH, NULL}, - {PWM_OUTPUT_ACTIVE_HIGH, NULL} - }, - 0 -}; -#endif - -/* Initializes the board. - * If you are using a specific setup, than copy the boardfile to your - * project directory and set in gfxconf.h that you are using a custom board file - * The next thing you have to do is to initialize the hardware port(s) you - * are using to communicate with the board. - */ -static void init_board(void) { - /* Initialize the ports for data and controle-lines */ - palSetGroupMode(PORT_CTRL, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL); - palSetGroupMode(PORT_DATA, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL); - /* Set alle controle pins to low */ - palClearPad(PORT_CTRL, PIN_RS); - palClearPad(PORT_CTRL, PIN_EN); - #if TDISP_NEED_READ - palClearPad(PORT_CTRL, PIN_RW); - #endif - - #if TDISP_USE_BACKLIGHT - /* Display backlight control */ - /* TIM4 is an alternate function 2 (AF2) */ - pwmStart(&PWMD4, &pwmcfg); - palSetPadMode(GPIOD, 13, PAL_MODE_ALTERNATE(2)); - pwmEnableChannel(&PWMD4, 1, 100); - #endif -} - -/* This is the low-level routine for sending the bits - * to the LCD-display. This routine shifts - * the bits so they match the hardware port. - */ -static void writeToLCD(uint8_t data) { - palWritePort(PORT_DATA, data); - palSetPad(PORT_CTRL, PIN_EN); - chThdSleepMicroseconds(5); -// chThdSleepMilliseconds(10); - palClearPad(PORT_CTRL, PIN_EN); - chThdSleepMicroseconds(5); -// chThdSleepMilliseconds(10); - /* wait a little while so that de display can process the data */ -} - -/* Writes a command to the display. The - * RS-line is pulled low and than the - * data is send. - */ -static void write_cmd(uint8_t data) { - palClearPad(PORT_CTRL, PIN_RS); - #if BUS_4BITS - /* first send the high-nibble */ - writeToLCD((data & 0xF0)>>4); - /* in 4-bit mode the high-nibble is zeroed out */ - writeToLCD((data & 0x0F)); - #else - writeToLCD(data); - #endif -} - -// static void write_initcmd(uint8_t data) { -// write_cmd(data); -// } - -/* Write data to the display. The - * RS-line is pulled high and than the - * data is send. - */ -static void write_data(uint8_t data) { - palSetPad(PORT_CTRL, PIN_RS); - #if BUS_4BITS - /* first send the high-nibble */ - writeToLCD((data & 0xF0)>>4); - /* in 4-bit mode the high-nibble is zeroed out */ - writeToLCD((data & 0x0F)); - #else - writeToLCD(data); - #endif -} - -#if TDISP_USE_BACKLIGHT - -/* Sets the brightness of the backlight of the display, using - * the PWM channel */ -static void set_backlight(uint16_t percentage) { - pwmEnableChannel(&PWMD4, 1, percentage); -} -#endif - -#endif /* _TDISP_LLD_BOARD_H */ -/** @} */ - diff --git a/demos/modules/tdisp/gfxconf.h b/demos/modules/tdisp/gfxconf.h deleted file mode 100644 index 371a9f44..00000000 --- a/demos/modules/tdisp/gfxconf.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu - * Copyright (c) 2012, 2013, Andrew Hannam aka inmarket - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _GFXCONF_H -#define _GFXCONF_H - -/* The operating system to use. One of these must be defined - preferably in your Makefile */ -//#define GFX_USE_OS_CHIBIOS FALSE -//#define GFX_USE_OS_WIN32 FALSE -//#define GFX_USE_OS_LINUX FALSE -//#define GFX_USE_OS_OSX FALSE - -/* GFX sub-systems to turn on */ -#define GFX_USE_TDISP TRUE - -#endif /* _GFXCONF_H */ - diff --git a/demos/modules/tdisp/main.c b/demos/modules/tdisp/main.c deleted file mode 100644 index 53cdced6..00000000 --- a/demos/modules/tdisp/main.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu - * Copyright (c) 2012, 2013, Andrew Hannam aka inmarket - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "gfx.h" - -int main(void) { - uint8_t charmap[8]; - - gfxInit(); - - /* set cursor position and draw single characters */ - tdispSetCursor(4, 0); - tdispDrawChar('H'); - tdispDrawChar('D'); - tdispDrawChar('4'); - tdispDrawChar('4'); - tdispDrawChar('7'); - tdispDrawChar('8'); - tdispDrawChar('0'); - - /* draw a string to a given location */ - tdispDrawStringLocation(0, 1, "chibios-gfx.com"); - - /* create and display a custom made character */ - charmap[0] = 0b00000; - charmap[1] = 0b00100; - charmap[2] = 0b00010; - charmap[3] = 0b11111; - charmap[4] = 0b00010; - charmap[5] = 0b00100; - charmap[6] = 0b00000; - charmap[7] = 0b00000; - tdispCreateChar(0, charmap); - tdispHome(); - tdispDrawChar(0); - - while(TRUE) { - gfxSleepMilliseconds(250); - } -} - diff --git a/drivers/tdisp/HD44780/tdisp_lld.c b/drivers/tdisp/HD44780/tdisp_lld.c deleted file mode 100644 index 7b731c34..00000000 --- a/drivers/tdisp/HD44780/tdisp_lld.c +++ /dev/null @@ -1,245 +0,0 @@ -/* - * This file is subject to the terms of the GFX License. If a copy of - * the license was not distributed with this file, you can obtain one at: - * - * http://ugfx.org/license.html - */ - -/** - * @file drivers/tdisp/HD44780/tdisp_lld.c - * @brief TDISP driver subsystem low level driver source for the HD44780 display - * - * @addtogroup TDISP - * @{ - */ - -#include "gfx.h" - -#if GFX_USE_TDISP /*|| defined(__DOXYGEN__)*/ - -#include "tdisp_lld_board.h" - -/* Controller Specific Properties */ -#define CUSTOM_CHAR_COUNT 8 -#define CUSTOM_CHAR_XBITS 5 -#define CUSTOM_CHAR_YBITS 8 - -/* Define the properties of our controller */ -tdispStruct TDISP = { - TDISP_COLUMNS, TDISP_ROWS, /* cols, rows */ - CUSTOM_CHAR_XBITS, CUSTOM_CHAR_YBITS, /* charBitsX, charBitsY */ - CUSTOM_CHAR_COUNT /* maxCustomChars */ -}; - -/* display control settings */ -#define TDISP_DISPLAY_ON 0x04 -#define TDISP_CURSOR_ON 0x02 -#define TDISP_CURSOR_BLINK 0x01 - -/* cursor movement settings */ -#define TDISP_SHIFT_ON 0x01 -#define TDISP_CURSOR_INC 0x02 - -/* display scroll settings */ -#define TDISP_SCROLL_DISPLAY 0x08 -#define TDISP_SCROLL_RIGHT 0x04 - -static uint8_t displaycontrol; -static uint8_t cursorcontrol; - -bool_t tdisp_lld_init(void) { - /* initialise hardware */ - init_board(); - - /* The first part is the initialing code. - * In this part only the lower nibble of the - * byte is written directly to the display, thus - * without write_cmd, which sends both high and - * low nibble. - */ - - /* Give the LCD a little time to wake up */ - gfxSleepMilliseconds(15); - - /* clear the RS-line to the display */ - palClearPad(PORT_CTRL, PIN_RS); -// #if BUS_4BITS - /* write three times 0x03 to display (4-bit mode only) - * with RS = low. - */ - writeToLCD(0x03); // 1x - gfxSleepMilliseconds(20); - writeToLCD(0x03); // 2x -// gfxSleepMilliseconds(20); - writeToLCD(0x03); // 3x -// gfxSleepMilliseconds(20); - /* Put display in 4-bit mode by - * write 0x02 to display. - */ - writeToLCD(0x02); // 4bit-modus -// gfxSleepMilliseconds(20); -// #else - /* write three times 0x30 to display (8-bit mode only) - * with RS = low. - */ -// writeToLCD(0x30); // 1x -// writeToLCD(0x30); // 2x -// writeToLCD(0x30); // 3x -// #endif - - /* From this point on, the LCD accepts - * bytes sent with highnibbel first and than - *the lownibble if working in 4-bit mode. - * In 8-bit mode bytes are written in 1 action. - */ - - /* 4-bit modus, 2 lines en 5x7 characters */ - write_cmd(0x28); -// gfxSleepMilliseconds(20); - - /* set display on, cursor off and no blinking */ - write_cmd(0x0C); -// gfxSleepMilliseconds(20); - /* set cursor increase and direction */ - write_cmd(0x06); -// gfxSleepMilliseconds(20); - - displaycontrol = TDISP_DISPLAY_ON; - cursorcontrol = TDISP_CURSOR_INC; - /* END OF INITIALISATION */ - - return TRUE; -} - -/* Clears the display. The display needs - * a long time to process this command. So - * an extra delay is insterted. - */ -void tdisp_lld_clear(void) { - write_cmd(0x01); -} - -/* Writes a character to the display */ -void tdisp_lld_draw_char(char c) { - write_data(c); -} - -/* Set cursor position */ -void tdisp_lld_set_cursor(coord_t col, coord_t row) { - static const uint8_t row_offsets[] = { 0x00, 0x40, 0x14, 0x54 }; - - /* - * Short-cut: - * - * If x and y = 0 then use the home command. - * - * Note: There is probably no advantage as both commands are a single byte - */ -// if (col == 0 && row == 0) { -// write_cmd(0x02); -// return; -// } - - write_cmd(0x80 | (col + row_offsets[row])); -// write_cmd(0x80 | (0x40 + col)); -} - -/* Create a custom character to the display */ -void tdisp_lld_create_char(uint8_t address, uint8_t *charmap) { - int i; - - write_cmd(0x40 | (address << 3)); - for(i = 0; i < CUSTOM_CHAR_YBITS; i++) { - write_data(charmap[i]); - } - -} - -/* Write display control commands to the display */ -void tdisp_lld_control(uint16_t what, uint16_t value) { - switch(what) { - case TDISP_CTRL_DISPLAY: - switch (value) { - case displayOff: - displaycontrol &= ~TDISP_DISPLAY_ON; - break; - case displayOn: - displaycontrol |= TDISP_DISPLAY_ON; - break; - } - write_cmd(0x08 | displaycontrol); - break; - case TDISP_CTRL_CURSOR: - switch (value) { - case cursorBlinkingBlock: - case cursorBlinkingUnderline: - case cursorBlinkingBar: - displaycontrol |= TDISP_CURSOR_ON + TDISP_CURSOR_BLINK; - break; - case cursorBlock: - case cursorUnderline: - case cursorBar: - displaycontrol = (displaycontrol | TDISP_CURSOR_ON) & ~TDISP_CURSOR_BLINK; - break; - case cursorOff: - default: - displaycontrol &= ~(TDISP_CURSOR_ON | TDISP_CURSOR_BLINK); // zet alleen de cursor uit. Bewaar de overige instellingen - break; - } - write_cmd(0x08 | displaycontrol); - break; - case TDISP_CTRL_MOVE: - switch (value) { - case cursorIncrease: - cursorcontrol |= TDISP_CURSOR_INC; // increase cursor position - break; - case cursorDecrease: - cursorcontrol &= ~TDISP_CURSOR_INC; // decrease cursor position - break; - } - write_cmd(0x04 | cursorcontrol); - break; - case TDISP_CTRL_SHIFT: - switch (value) { - case shiftOn: - cursorcontrol |= TDISP_SHIFT_ON; - break; - case shiftOff: - cursorcontrol &= ~TDISP_SHIFT_ON; - break; - } - write_cmd(0x04 | cursorcontrol); - break; - } -} - -/* Scrolls the display in a particular direction with an amount of characters and delays the scroll between each scroll step */ -void tdisp_lld_scroll(uint16_t direction, uint16_t amount, uint16_t delay) { - uint16_t scrollcontrol = 0; - uint16_t i; - - switch (direction) { - case displayScrollLeft: - scrollcontrol = TDISP_SCROLL_DISPLAY; - break; - case displayScrollRight: - scrollcontrol = TDISP_SCROLL_DISPLAY | TDISP_SCROLL_RIGHT; - break; - } - - for(i = 0; i < amount; i++) { - write_cmd(0x10 | scrollcontrol); - gfxSleepMilliseconds(delay); - } -} - -#if TDISP_USE_BACKLIGHT -/* sets the brightness of the display backlight */ -void tdisp_lld_set_backlight(uint16_t percentage) { - set_backlight(percentage); -} -#endif - -#endif /* GFX_USE_TDISP */ -/** @} */ - diff --git a/drivers/tdisp/HD44780/tdisp_lld.mk b/drivers/tdisp/HD44780/tdisp_lld.mk deleted file mode 100644 index 88780bea..00000000 --- a/drivers/tdisp/HD44780/tdisp_lld.mk +++ /dev/null @@ -1,6 +0,0 @@ -# List the required driver. -GFXSRC += $(GFXLIB)/drivers/tdisp/HD44780/tdisp_lld.c - -# Required include directories -GFXINC += $(GFXLIB)/drivers/tdisp/HD44780 - diff --git a/drivers/tdisp/HD44780/tdisp_lld_board_example.h b/drivers/tdisp/HD44780/tdisp_lld_board_example.h deleted file mode 100644 index 93e086db..00000000 --- a/drivers/tdisp/HD44780/tdisp_lld_board_example.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * This file is subject to the terms of the GFX License. If a copy of - * the license was not distributed with this file, you can obtain one at: - * - * http://ugfx.org/license.html - */ - -/** - * @file drivers/tdisp/HD44780/tdisp_lld_board_example.h - * @brief TDISP driver subsystem board interface for the HD44780 display - * - * @addtogroup TDISP - * @{ - */ - -#ifndef _TDISP_LLD_BOARD_H -#define _TDISP_LLD_BOARD_H - -/** - * The board may override the default display size. - * Uncomment the below if your board needs a non-standard size. - */ -/* -#ifndef TDISP_COLUMNS - #define TDISP_COLUMNS 16 -#endif -#ifndef TDISP_ROWS - #define TDISP_ROWS 2 -#endif -*/ - -static void init_board(void) { - /* Code here */ - #error "tdispHD44780: You must supply a definition for init_board for your board" -} - -static void write_cmd(uint8_t data) { - /* Code here */ - #error "tdispHD44780: You must supply a definition for write_cmd for your board" -} - -static void write_data(uint8_t data) { - /* Code here */ - #error "tdispHD44780: You must supply a definition for write_data for your board" -} - -#endif /* _TDISP_LLD_BOARD_H */ -/** @} */ - diff --git a/gfx.mk b/gfx.mk index 58387993..aaea245a 100644 --- a/gfx.mk +++ b/gfx.mk @@ -4,7 +4,6 @@ GFXSRC += $(GFXLIB)/src/gfx.c include $(GFXLIB)/src/gos/gos.mk include $(GFXLIB)/src/gqueue/gqueue.mk include $(GFXLIB)/src/gdisp/gdisp.mk -include $(GFXLIB)/src/tdisp/tdisp.mk include $(GFXLIB)/src/gevent/gevent.mk include $(GFXLIB)/src/gtimer/gtimer.mk include $(GFXLIB)/src/gwin/gwin.mk @@ -13,3 +12,4 @@ include $(GFXLIB)/src/gadc/gadc.mk include $(GFXLIB)/src/gaudin/gaudin.mk include $(GFXLIB)/src/gaudout/gaudout.mk include $(GFXLIB)/src/gmisc/gmisc.mk + diff --git a/gfxconf.example.h b/gfxconf.example.h index 72161644..9963188e 100644 --- a/gfxconf.example.h +++ b/gfxconf.example.h @@ -22,7 +22,6 @@ /* GFX subsystems to turn on */ #define GFX_USE_GDISP FALSE -#define GFX_USE_TDISP FALSE #define GFX_USE_GWIN FALSE #define GFX_USE_GEVENT FALSE #define GFX_USE_GTIMER FALSE @@ -96,9 +95,6 @@ #define GDISP_NEED_IMAGE_BMP_32 TRUE */ -/* Features for the TDISP subsystem. */ -#define TDISP_NEED_MULTITHREAD FALSE - /* Features for the GWIN subsystem. */ #define GWIN_NEED_WINDOWMANAGER FALSE #define GWIN_NEED_CONSOLE FALSE @@ -196,8 +192,7 @@ #define GDISP_DONT_WAIT_FOR_NET_DISPLAY FALSE #define GDISP_GFXNET_UNSAFE_SOCKETS FALSE #define GDISP_USE_DMA FALSE - #define TDISP_COLUMNS 16 - #define TDISP_ROWS 2 */ #endif /* _GFXCONF_H */ + diff --git a/include/gfx.h b/include/gfx.h index 4959e8c9..3a10103f 100644 --- a/include/gfx.h +++ b/include/gfx.h @@ -67,15 +67,6 @@ #ifndef GFX_USE_GDISP #define GFX_USE_GDISP FALSE #endif - /** - * @brief GFX Text Display Basic API - * @details Defaults to FALSE - * @note Also add the specific hardware driver to your makefile. - * Eg. include $(GFXLIB)/drivers/tdisp/HD44780/tdisp_lld.mk - */ - #ifndef GFX_USE_TDISP - #define GFX_USE_TDISP FALSE - #endif /** * @brief GFX Graphics Windowing API * @details Defaults to FALSE @@ -173,7 +164,6 @@ #include "gdisp/options.h" #include "gwin/options.h" #include "ginput/options.h" -#include "tdisp/options.h" #include "gadc/options.h" #include "gaudin/options.h" #include "gaudout/options.h" @@ -195,7 +185,6 @@ #include "gdisp/gdisp.h" #include "gwin/gwin.h" #include "ginput/ginput.h" -#include "tdisp/tdisp.h" #include "gadc/gadc.h" #include "gaudin/gaudin.h" #include "gaudout/gaudout.h" @@ -224,3 +213,4 @@ extern "C" { #endif /* _GFX_H */ /** @} */ + diff --git a/include/gfx_rules.h b/include/gfx_rules.h index 54fe3a1a..4dd9d499 100644 --- a/include/gfx_rules.h +++ b/include/gfx_rules.h @@ -188,9 +188,6 @@ #endif #endif -#if GFX_USE_TDISP -#endif - #if GFX_USE_GAUDIN #if GFX_USE_GEVENT && !GFX_USE_GTIMER #if GFX_DISPLAY_RULE_WARNINGS diff --git a/include/tdisp/lld/tdisp_lld.h b/include/tdisp/lld/tdisp_lld.h deleted file mode 100644 index 93c293b4..00000000 --- a/include/tdisp/lld/tdisp_lld.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * This file is subject to the terms of the GFX License. If a copy of - * the license was not distributed with this file, you can obtain one at: - * - * http://ugfx.org/license.html - */ - -/** - * @file include/tdisp/lld/tdisp_lld.h - * @brief TDISP driver subsystem low level driver header. - * - * @addtogroup TDISP - * @{ - */ - -#ifndef _TDISP_LLD_H -#define _TDISP_LLD_H - -#if GFX_USE_TDISP || defined(__DOXYGEN__) - -#ifdef __cplusplus -extern "C" { -#endif - - bool_t tdisp_lld_init(void); - void tdisp_lld_clear(void); - void tdisp_lld_draw_char(char c); - void tdisp_lld_set_cursor(coord_t col, coord_t row); - void tdisp_lld_create_char(uint8_t address, uint8_t *charmap); - void tdisp_lld_control(uint16_t what, uint16_t value); - void tdisp_lld_scroll(uint16_t direction, uint16_t amount, uint16_t delay); - void tdisp_lld_set_backlight(uint16_t percentage); - -#ifdef __cplusplus -} -#endif - -#endif /* GFX_USE_TDISP */ - -#endif /* _TDISP_LLD_H */ -/** @} */ - diff --git a/include/tdisp/options.h b/include/tdisp/options.h deleted file mode 100644 index 9aaa79d9..00000000 --- a/include/tdisp/options.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - * This file is subject to the terms of the GFX License. If a copy of - * the license was not distributed with this file, you can obtain one at: - * - * http://ugfx.org/license.html - */ - -/** - * @file include/tdisp/options.h - * @brief TDISP sub-system options header file. - * - * @addtogroup TDISP - * @{ - */ - -#ifndef _TDISP_OPTIONS_H -#define _TDISP_OPTIONS_H - -#if GFX_USE_TDISP -/** - * @name TDISP Functionality to be included - * @{ - */ - /** - * @brief Set if the display need reading from the display - * @details Defaults to FALSE - * @details If TRUE, the read function of the display wil be implemented into the source. - * @note Most users do not need reading from the display. - */ - #ifndef TDISP_NEED_READ - #define TDISP_NEED_READ FALSE - #endif -/** - * @} - * - * @name TDISP Multi-Threading Options - * @{ - */ - /** - * @brief Do the display functions need to be thread-safe. - * @details Defaults to FALSE - */ - #ifndef TDISP_NEED_MULTITHREAD - #define TDISP_NEED_MULTITHREAD FALSE - #endif -/** - * @} - * - * @name TDISP Optional Low Level Driver Defines - * @{ - */ - /** - * @brief Use a custom board definition even if a board definition exists. - * @details Defaults to FALSE - * @details If TRUE, add tdisp_lld_board.h to your project directory and customise it. - * @note Not all TDISP low level drivers currently use board definition files. - */ - #ifndef TDISP_USE_CUSTOM_BOARD - #define TDISP_USE_CUSTOM_BOARD FALSE - #endif - /** - * @brief Set the screen height and width. - * @note Ignored by some low level GDISP drivers, optional for others. - * @note Where these values are allowed, a default is always provided by the low level driver. - */ - #ifndef TDISP_COLUMNS - #define TDISP_COLUMNS 16 - #endif - #ifndef TDISP_ROWS - #define TDISP_ROWS 2 - #endif -/** @} */ - -#endif /* GFX_USE_TDISP */ - -#endif /* _TDISP_OPTIONS_H */ -/** @} */ - diff --git a/include/tdisp/tdisp.h b/include/tdisp/tdisp.h deleted file mode 100644 index 040d5bc1..00000000 --- a/include/tdisp/tdisp.h +++ /dev/null @@ -1,313 +0,0 @@ -/* - * This file is subject to the terms of the GFX License. If a copy of - * the license was not distributed with this file, you can obtain one at: - * - * http://ugfx.org/license.html - */ - -/** - * @file include/tdisp/tdisp.h - * @brief TDISP Graphic Driver subsystem header file. - * - * @addtogroup TDISP - * - * @brief Module to drive character / dot matrix based displays - * - * @details The TDISP module provides high level abstraction to interface pixel oriented graphic displays. - * Due the TDISP module is completely encapsulated from the other modules, it's very fast and lightweight. - * - * @pre GFX_USE_TDISP must be set to TRUE in gfxconf.h - * - * @{ - */ - -#ifndef _TDISP_H -#define _TDISP_H - -#include "gfx.h" - -#if GFX_USE_TDISP || defined(__DOXYGEN__) - -/** - * @brief TDISP cursor shape definitions - */ -typedef enum cursorshape_e { - cursorOff, - cursorBlock, - cursorBlinkingBlock, - cursorUnderline, - cursorBlinkingUnderline, - cursorBar, - cursorBlinkingBar -} cursorshape; - -/** - * @brief TDISP display mode - * - * @details Display on of off definitions - */ -typedef enum displaymode_e { - displayOff, - displayOn -} displaymode; - -/** - * @brief TDISP cursor movement - * - * @details Definitions for increasing or decreasing the cursor position after writing a character to - * the display. - */ -typedef enum movemode_e { - cursorIncrease, - cursorDecrease -} movemode; - -/** - * @brief TDISP cursor shift mode - * - * @details Definitions if the contents of the whole display shifts when writing a character to the display. - * The cursor stays at the same position. - */ -typedef enum cursorshiftmode_e { - shiftOn, - shiftOff -} shiftmode; - -/** - * @brief TDISP display scroll mode - * - * @details Definitions for scrolling the whole contents of the display to the right or left. - * @note Do not use this defintions with @p tdispControl, use the tdispScroll() function. That high-level - * function is easier to use, and the scrollspeed can be defined. - */ -typedef enum displayscrollmode_e { - displayScrollRight, - displayScrollLeft -} displayscrollmode; - -/** - * @name TDISP control values - * @note The low level driver may define extra control values - * @{ - */ -#define TDISP_CTRL_DISPLAY 0x0000 -#define TDISP_CTRL_CURSOR 0x0001 -#define TDISP_CTRL_MOVE 0x0002 -#define TDISP_CTRL_SHIFT 0x0003 -// #define TDISP_CTRL_SCROLL 0x0004 - -/** @} */ - -/** - * @brief The TDISP structure definition - * - * @details This structure contains the physical dimensions of the display, the - * dimensions of a character in pixels and the maximum number of - * custom characters that can be written to the display. - */ -typedef struct tdispStruct_t { - coord_t columns, rows; - coord_t charBitsX, charBitsY; - uint16_t maxCustomChars; -} tdispStruct; - -/** - * @brief The TDISP structure - */ -extern tdispStruct TDISP; - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @brief TDISP driver initialisation - * @note This function is not implicitly invoked by @p halInit(). - * It must be called manually. - * - * @return TRUE if success, FALSE otherwise - * - * @init - */ -bool_t tdispInit(void); - -/** - * @brief Clears the display - * - * @details The display gets cleared and the cursor is set in the home position ( 0, 0 ) - */ -void tdispClear(void); - -/** - * @brief Sets the cursor to it's home position ( 0, 0 ) - */ -void tdispHome(void); - -/** - * @brief Set cursor to a specified position - * - * @param[in] col The column (x) - * @param[in] row The row (y) - */ -void tdispSetCursor(coord_t col, coord_t row); - -/** - * @brief Store a custom character into the display - * - * @note This usually must be done after each power-up since most - * LCDs lose their RAM content. - * - * @param[in] address On which address to store the character from 0 up to (@p tdispGetNumCustomChars() - 1) - * @param[in] charmap The character to be stored. - * - * @note The charmap is made up of @p tdispGetCharBitHieght() data values. Each data value is - * made up of @p tdispGetCharBitWidth() bits of data. Note that bits in multiple rows are not - * packed. - */ -void tdispCreateChar(uint8_t address, uint8_t *charmap); - -/** - * @brief Draws a single character at the current cursor position and advances the cursor - * - * @param[in] c The character to be drawn - * - * @note Writing past the end of a row leaves the cursor in an undefined position. - */ -void tdispDrawChar(char c); - -/** - * @brief Draws a string at the current cursor position and advances the cursor - * - * @param[in] s The string to be drawn - * - * @note Any characters written past the end of a row may or may not be displayed on - * the next row. The cursor is also left in an undefined position. - */ -void tdispDrawString(char *s); - -/** - * @brief Scrolls the display to the left or right by an amout of positions with a certain delay between each position - * - * @param[in] direction defines which direction the display has to scroll - * displayScrollLeft: scrolls the display to the left - * displayScrollRight: scrolls the display to the right - * @param[in] amount Defines the amout of characters the display must be scrolled - * @param[in] delay Defines the delay time in milliseconds between each position of the scroll. With this option the scroll can be made - * visible to the user. If you define 0, the scroll will be to fast to observe. - */ -void tdispScroll(uint16_t direction, uint16_t amount, uint16_t delay); - -/** - * @brief Set the backlight using PWM-driver - * - * @param[in] percentage Sets the brightness of the display in %. - * 0% = backlight is off or very low - * 100% = backlight is set to full brightness - */ -void tdispSetBacklight(uint16_t percentage); - -/** - * @brief Control different display properties - * @note A wrapper macro exists for each option, please use them - * instead of this function manually unless calling a low - * level driver specific value. - * - * @param[in] what What you want to control - * @param[in] value The value to be assigned - */ -void tdispControl(uint16_t what, uint16_t value); - -/** - * @brief Set cursor move mode - * - * @param[in] mode Set if the cursor position increases or decreases everytime a character is entered. - * mode = cursorIncrease increases the cursor position - * mode = cursorDecrease decreases the cursor position - * @note cursorIncrease is default after initialisation of the display. - * - */ -#define tdispSetMoveMode(mode) tdispControl(TDISP_CTRL_MOVE, (movemode)(mode)) - -/** - * @brief Set display shift mode - * - * @param[in] mode Shifts the display when entering characters. The cursor position stays the same. - * mode = shiftOn shifts the display when writing a character to the display - * mode = shiftOff shrift the cursor when writing a character to the display - * @note shiftOff is default after initialisation of the display. - * - */ -#define tdispSetShiftMode(mode) tdispControl(TDISP_CTRL_SHIFT, (shiftmode)(mode)) - -/** - * @brief Set display mode - * - * @param[in] mode Sets the display on or off. - * mode = displayOn puts the display on - * mode = displayOff puts the display off - * @note displayOn is default after initialisation of the display - * - */ -#define tdispDisplayMode(mode) tdispControl(TDISP_CTRL_DISPLAY, (displaymode)(mode)) - -/** - * @brief Set the cursor shape. - * - * @param[in] shape The shape to set the cursor. - * Valid shapes are: - * cursorOff = hide cursor - * cursorBlock = show cursor as a block - * cursorBlinkingBlock = show cursor as a blinking block - * cursorUnderline = show a cursor as a thin line under a character - * cursorBlinkingUnderline = show a cursor as a blinking thin line under a character - * cursorBar = show a cursor as a thin vertical bar near a character - * cursorBlinkingBar = show a cursor as a blinking thin vertical bar near a character - * @note Not all shapes are necessarily supported. The driver will make a similar - * choice if the one specified is not available. - */ -#define tdispSetCursorShape(shape) tdispControl(TDISP_CTRL_CURSOR, (cursorshape)(shape)) - -/** - * @brief Get the number of columns (width) in the display - * - * @result The number of columns in the display. - */ -#define tdispGetColumns() (TDISP.columns) - -/** - * @brief Get the number of rows (height) in the display - * - * @result The number of rows in the display - */ -#define tdispGetRows() (TDISP.columns) - -/** - * @brief Get the number of bits in width of a character - * - * @result The number of bits in width of a character - */ -#define tdispGetCharBitWidth() (TDISP.charBitsX) - -/** - * @brief Get the number of bits in height of a character - * - * @result The number of bits in height of a character - */ -#define tdispGetCharBitHeight() (TDISP.charBitsY) - -/** - * @brief Get the number of custom characters - * - * @result The maximum number of custom characters that can be programmed into the display - */ -#define tdispGetNumCustomChars() (TDISP.maxCustomChars) - -#ifdef __cplusplus -} -#endif - -#endif /* GFX_USE_TDISP */ - -#endif /* _TDISP_H */ -/** @} */ - diff --git a/releases.txt b/releases.txt index 85d7c506..e5336c79 100644 --- a/releases.txt +++ b/releases.txt @@ -7,6 +7,7 @@ FIX: Significant improvements to the way the MCU touch driver works. FEATURE: Add support for edge to edge touch calibration. FEATURE: Added progressbar widget FEATURE: Added gdispGDrawThickLine() by user jpa- +DEPRECATE: TDISP module removed *** changes after 1.9 *** diff --git a/src/gfx.c b/src/gfx.c index 09d0798b..ff7b29cd 100644 --- a/src/gfx.c +++ b/src/gfx.c @@ -22,9 +22,6 @@ extern void _gosInit(void); #if GFX_USE_GDISP extern void _gdispInit(void); #endif -#if GFX_USE_TDISP - extern void _tdispInit(void); -#endif #if GFX_USE_GWIN extern void _gwinInit(void); #endif @@ -78,11 +75,6 @@ void gfxInit(void) { #if GFX_USE_GINPUT _ginputInit(); #endif - #if GFX_USE_TDISP - _tdispInit(); - tdispHome(); - tdispClear(); - #endif #if GFX_USE_GADC _gadcInit(); #endif diff --git a/src/tdisp/tdisp.c b/src/tdisp/tdisp.c deleted file mode 100644 index 5af75867..00000000 --- a/src/tdisp/tdisp.c +++ /dev/null @@ -1,119 +0,0 @@ -/* - * This file is subject to the terms of the GFX License. If a copy of - * the license was not distributed with this file, you can obtain one at: - * - * http://ugfx.org/license.html - */ - -/** - * @file src/tdisp/tdisp.c - * @brief TDISP Driver code. - * - * @addtogroup TDISP - * @{ - */ -#include "gfx.h" - -#if GFX_USE_TDISP || defined(__DOXYGEN__) - -#include "tdisp/lld/tdisp_lld.h" - -/* cursor controllers */ -#define TDISP_CURSOR 1 -#define TDISP_CURSOR_ON 0 -#define TDISP_CURSOR_OFF - -#if TDISP_NEED_MULTITHREAD - static gfxMutex tdispMutex; - - #define MUTEX_INIT() gfxMutexInit(&tdispMutex) - #define MUTEX_ENTER() gfxMutexEnter(&tdispMutex) - #define MUTEX_LEAVE() gfxMutexExit(&tdispMutex) - -#else - - #define MUTEX_INIT() - #define MUTEX_ENTER() - #define MUTEX_LEAVE() - -#endif - -bool_t tdispInit(void) { - bool_t res; - - MUTEX_INIT(); - - MUTEX_ENTER(); - res = tdisp_lld_init(); - MUTEX_LEAVE(); - - return res; -} - -void tdispClear(void) { - MUTEX_ENTER(); - tdisp_lld_clear(); - MUTEX_LEAVE(); -} - -void tdispHome(void) { - MUTEX_ENTER(); - tdisp_lld_set_cursor(0, 0); - MUTEX_LEAVE(); -} - -void tdispSetCursor(coord_t col, coord_t row) { - /* Keep the input range valid */ - if (row >= TDISP.rows) - row = TDISP.rows - 1; - MUTEX_ENTER(); - tdisp_lld_set_cursor(col, row); - MUTEX_LEAVE(); -} - -void tdispCreateChar(uint8_t address, uint8_t *charmap) { - /* make sure we don't write somewhere we're not supposed to */ - if (address < TDISP.maxCustomChars) { - MUTEX_ENTER(); - tdisp_lld_create_char(address, charmap); - MUTEX_LEAVE(); - } -} - -void tdispDrawChar(char c) { - MUTEX_ENTER(); - tdisp_lld_draw_char(c); - MUTEX_LEAVE(); -} - -void tdispDrawString(char *s) { - MUTEX_ENTER(); - while(*s) - tdisp_lld_draw_char(*s++); - MUTEX_LEAVE(); -} - -void tdispControl(uint16_t what, uint16_t value) { - MUTEX_ENTER(); - tdisp_lld_control(what, value); - MUTEX_LEAVE(); -} - -void tdispScroll(uint16_t direction, uint16_t amount, uint16_t delay) { - MUTEX_ENTER(); - tdisp_lld_scroll(direction, amount, delay); - MUTEX_LEAVE(); -} - -#if TDISP_USE_BACKLIGHT -void tdispSetBacklight(uint16_t percentage) { - if (percentage > 100) - percentage = 100; - MUTEX_ENTER(); - tdisp_lld_set_backlight(percentage); - MUTEX_LEAVE(); -} -#endif - -#endif /* GFX_USE_TDISP */ -/** @} */ diff --git a/src/tdisp/tdisp.mk b/src/tdisp/tdisp.mk deleted file mode 100644 index a33fa34a..00000000 --- a/src/tdisp/tdisp.mk +++ /dev/null @@ -1,2 +0,0 @@ -GFXSRC += $(GFXLIB)/src/tdisp/tdisp.c -