uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Merge branch 'master' into freertos

Browse source
This commit is contained in:
inmarket 2014-02-19 07:45:47 +10:00
commit 6d372f1352
180 changed files with 1385 additions and 1592 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
boards/base/Linux/example/Makefile
View file

@ -52,9 +52,11 @@ include ${GFXLIB}/gfx.mk
include ${GFXLIB}/boards/base/Linux/board.mk
# Where is our source code - alter these for your project.
MYFILES = $(GFXLIB)/demos/modules/gdisp/basics
MYCSRC = $(MYFILES)/main.c
MYDEFS =
# Either just include the demo makefile or add your own definitions
include $(GFXLIB)/demos/modules/gdisp/basics/demo.mk
#MYFILES = my-project-directory
#MYCSRC = $(MYFILES)/main.c
#MYDEFS =
# List all user C define here, like -D_DEBUG=1
UDEFS = $(MYDEFS) $(GFXDEFS)

7
boards/base/Mikromedia-STM32-M4-ILI9341/example/Makefile
View file

@ -82,8 +82,11 @@ include $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/board.mk
include $(GFXLIB)/gfx.mk
# Where is our source code - alter these for your project.
MYFILES = $(GFXLIB)/demos/modules/gdisp/basics
MYCSRC = $(MYFILES)/main.c
# Either just include the demo makefile or add your own definitions
include $(GFXLIB)/demos/modules/gdisp/basics/demo.mk
#MYFILES = my-project-directory
#MYCSRC = $(MYFILES)/main.c
#MYDEFS =
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.

7
boards/base/Olimex-SAM7EX256-GE8/example/Makefile
View file

@ -64,8 +64,11 @@ include $(GFXLIB)/gfx.mk
include $(GFXLIB)/boards/base/Olimex-SAM7EX256-GE8/board.mk
# Where is our source code - alter these for your project.
MYFILES = $(GFXLIB)/demos/modules/gdisp/basics
MYCSRC = $(MYFILES)/main.c
# Either just include the demo makefile or add your own definitions
include $(GFXLIB)/demos/modules/gdisp/basics/demo.mk
#MYFILES = my-project-directory
#MYCSRC = $(MYFILES)/main.c
#MYDEFS =
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.

7
boards/base/Win32/example/Makefile
View file

@ -76,8 +76,11 @@ else
endif
# Where is our source code - alter these for your project.
MYFILES = $(GFXLIB)/demos/modules/gdisp/basics
MYCSRC = $(MYFILES)/main.c
# Either just include the demo makefile or add your own definitions
include $(GFXLIB)/demos/modules/gdisp/basics/demo.mk
#MYFILES = my-project-directory
#MYCSRC = $(MYFILES)/main.c
#MYDEFS =
# List C source files here
SRC += ${GFXSRC} \

3
demos/3rdparty/bubbles/demo.mk vendored Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/3rdparty/bubbles
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

8
demos/3rdparty/bubbles/main.c vendored
View file

@ -60,7 +60,7 @@ void matrix (int16_t xyz[3][N], color_t col[N])
xyz[0][i] = x;
xyz[1][i] = y;
d = sqrtf(x * x + y * y); /* originally a fastsqrt() call */
d = sqrt(x * x + y * y); /* originally a fastsqrt() call */
s = sine[(t * 30) % SCALE] + SCALE;
xyz[2][i] = sine[(d + s) % SCALE] * sine[(t * 10) % SCALE] / SCALE / 2;
@ -151,11 +151,11 @@ int main (void)
gfxInit();
chThdSleepMilliseconds (10);
gfxSleepMilliseconds (10);
gdispClear (background); /* glitches.. */
chThdSleepMilliseconds (10);
gfxSleepMilliseconds (10);
gdispClear (background); /* glitches.. */
chThdSleepMilliseconds (10);
gfxSleepMilliseconds (10);
gdispClear (background); /* glitches.. */
width = (uint16_t)gdispGetWidth();

65
demos/3rdparty/doom/demo.mk vendored Normal file
View file

@ -0,0 +1,65 @@
DEMODIR = $(GFXLIB)/demos/3rdparty/doom
GFXINC += $(DEMODIR)
GFXSRC += \
$(DEMODIR)/d_main.c \
$(DEMODIR)/i_main.c \
$(DEMODIR)/i_system.c \
$(DEMODIR)/i_sound.c \
$(DEMODIR)/i_video.c \
$(DEMODIR)/i_net.c \
$(DEMODIR)/doomdef.c \
$(DEMODIR)/doomstat.c \
$(DEMODIR)/dstrings.c \
$(DEMODIR)/tables.c \
$(DEMODIR)/f_finale.c \
$(DEMODIR)/f_wipe.c \
$(DEMODIR)/d_net.c \
$(DEMODIR)/d_items.c \
$(DEMODIR)/g_game.c \
$(DEMODIR)/m_menu.c \
$(DEMODIR)/m_misc.c \
$(DEMODIR)/m_argv.c \
$(DEMODIR)/m_bbox.c \
$(DEMODIR)/m_fixed.c \
$(DEMODIR)/m_swap.c \
$(DEMODIR)/m_cheat.c \
$(DEMODIR)/m_random.c \
$(DEMODIR)/am_map.c \
$(DEMODIR)/p_ceilng.c \
$(DEMODIR)/p_doors.c \
$(DEMODIR)/p_enemy.c \
$(DEMODIR)/p_floor.c \
$(DEMODIR)/p_inter.c \
$(DEMODIR)/p_lights.c \
$(DEMODIR)/p_map.c \
$(DEMODIR)/p_maputl.c \
$(DEMODIR)/p_plats.c \
$(DEMODIR)/p_pspr.c \
$(DEMODIR)/p_setup.c \
$(DEMODIR)/p_sight.c \
$(DEMODIR)/p_spec.c \
$(DEMODIR)/p_switch.c \
$(DEMODIR)/p_mobj.c \
$(DEMODIR)/p_telept.c \
$(DEMODIR)/p_tick.c \
$(DEMODIR)/p_saveg.c \
$(DEMODIR)/p_user.c \
$(DEMODIR)/r_bsp.c \
$(DEMODIR)/r_data.c \
$(DEMODIR)/r_draw.c \
$(DEMODIR)/r_main.c \
$(DEMODIR)/r_plane.c \
$(DEMODIR)/r_segs.c \
$(DEMODIR)/r_sky.c \
$(DEMODIR)/r_things.c \
$(DEMODIR)/w_wad.c \
$(DEMODIR)/wi_stuff.c \
$(DEMODIR)/v_video.c \
$(DEMODIR)/st_lib.c \
$(DEMODIR)/st_stuff.c \
$(DEMODIR)/hu_stuff.c \
$(DEMODIR)/hu_lib.c \
$(DEMODIR)/s_sound.c \
$(DEMODIR)/z_zone.c \
$(DEMODIR)/info.c \
$(DEMODIR)/sounds.c

64
demos/3rdparty/doom/doom.mk vendored
View file

@ -1,64 +0,0 @@
MYFILES = $(GFXLIB)/demos/3rdparty/doom
MYCSRC = \
$(MYFILES)/d_main.c \
$(MYFILES)/i_main.c \
$(MYFILES)/i_system.c \
$(MYFILES)/i_sound.c \
$(MYFILES)/i_video.c \
$(MYFILES)/i_net.c \
$(MYFILES)/doomdef.c \
$(MYFILES)/doomstat.c \
$(MYFILES)/dstrings.c \
$(MYFILES)/tables.c \
$(MYFILES)/f_finale.c \
$(MYFILES)/f_wipe.c \
$(MYFILES)/d_net.c \
$(MYFILES)/d_items.c \
$(MYFILES)/g_game.c \
$(MYFILES)/m_menu.c \
$(MYFILES)/m_misc.c \
$(MYFILES)/m_argv.c \
$(MYFILES)/m_bbox.c \
$(MYFILES)/m_fixed.c \
$(MYFILES)/m_swap.c \
$(MYFILES)/m_cheat.c \
$(MYFILES)/m_random.c \
$(MYFILES)/am_map.c \
$(MYFILES)/p_ceilng.c \
$(MYFILES)/p_doors.c \
$(MYFILES)/p_enemy.c \
$(MYFILES)/p_floor.c \
$(MYFILES)/p_inter.c \
$(MYFILES)/p_lights.c \
$(MYFILES)/p_map.c \
$(MYFILES)/p_maputl.c \
$(MYFILES)/p_plats.c \
$(MYFILES)/p_pspr.c \
$(MYFILES)/p_setup.c \
$(MYFILES)/p_sight.c \
$(MYFILES)/p_spec.c \
$(MYFILES)/p_switch.c \
$(MYFILES)/p_mobj.c \
$(MYFILES)/p_telept.c \
$(MYFILES)/p_tick.c \
$(MYFILES)/p_saveg.c \
$(MYFILES)/p_user.c \
$(MYFILES)/r_bsp.c \
$(MYFILES)/r_data.c \
$(MYFILES)/r_draw.c \
$(MYFILES)/r_main.c \
$(MYFILES)/r_plane.c \
$(MYFILES)/r_segs.c \
$(MYFILES)/r_sky.c \
$(MYFILES)/r_things.c \
$(MYFILES)/w_wad.c \
$(MYFILES)/wi_stuff.c \
$(MYFILES)/v_video.c \
$(MYFILES)/st_lib.c \
$(MYFILES)/st_stuff.c \
$(MYFILES)/hu_stuff.c \
$(MYFILES)/hu_lib.c \
$(MYFILES)/s_sound.c \
$(MYFILES)/z_zone.c \
$(MYFILES)/info.c \
$(MYFILES)/sounds.c

5
demos/3rdparty/notepad-2/demo.mk vendored Normal file
View file

@ -0,0 +1,5 @@
DEMODIR = $(GFXLIB)/demos/3rdparty/notepad-2
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c \
$(DEMODIR)/notepadApp.c \
$(DEMODIR)/notepadCore.c

3
demos/applications/mandelbrot/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/applications/mandelbrot
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

3
demos/applications/notepad/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/applications/notepad
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

1
demos/applications/notepad/gfxconf.h
View file

@ -47,7 +47,6 @@
#define GDISP_NEED_CLIP TRUE
#define GDISP_NEED_TEXT TRUE
#define GDISP_NEED_CIRCLE TRUE
#define GDISP_NEED_CONTROL TRUE
#define GDISP_NEED_MULTITHREAD TRUE
/* Builtin Fonts */

1
demos/applications/notepad/main.c
View file

@ -79,7 +79,6 @@ int main(void) {
gfxInit();
ginputGetMouse(0);
gdispSetOrientation(GDISP_ROTATE_90);
drawScreen();

3
demos/benchmarks/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/benchmarks
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

3
demos/modules/gadc/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gadc
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c $(DEMODIR)/gwinosc.c

2
demos/modules/gadc/gwinosc.c
View file

@ -36,7 +36,7 @@
#include "gwinosc.h"
/* Include internal GWIN routines so we can build our own superset class */
#include "gwin/class_gwin.h"
#include "src/gwin/class_gwin.h"
/* The size of our dynamically allocated audio buffer */
#define AUDIOBUFSZ 64*2

3
demos/modules/gaudin/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gaudin
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c $(DEMODIR)/gwinosc.c

2
demos/modules/gaudin/gwinosc.c
View file

@ -43,7 +43,7 @@
#include "gwinosc.h"
/* Include internal GWIN routines so we can build our own superset class */
#include "gwin/class_gwin.h"
#include "src/gwin/class_gwin.h"
/* The size of our dynamically allocated audio buffer */
#define AUDIOBUFSZ 64*2

3
demos/modules/gdisp/basics/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gdisp/basics
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

3
demos/modules/gdisp/circles/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gdisp/circles
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

3
demos/modules/gdisp/fonts/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gdisp/fonts
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

3
demos/modules/gdisp/fonts_cyrillic/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gdisp/fonts_cyrillic
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

3
demos/modules/gdisp/images/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gdisp/images
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

3
demos/modules/gdisp/images_animated/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gdisp/images_animated
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

3
demos/modules/gdisp/multiple_displays/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gdisp/multiple_displays
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

3
demos/modules/gdisp/streaming/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gdisp/streaming
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

3
demos/modules/gtimer/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gtimer
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

3
demos/modules/gwin/basic/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gwin/basic
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

3
demos/modules/gwin/button/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gwin/button
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

1
demos/modules/gwin/button/gfxconf.h
View file

@ -48,6 +48,7 @@
#define GDISP_NEED_CLIP TRUE
#define GDISP_NEED_CIRCLE TRUE
#define GDISP_NEED_TEXT TRUE
#define GDISP_NEED_CONTROL TRUE
/* GDISP fonts to include */
#define GDISP_INCLUDE_FONT_UI2 TRUE

16
demos/modules/gwin/button/main.c
View file

@ -54,10 +54,16 @@ static void createWidgets(void) {
int main(void) {
GEvent* pe;
static const orientation_t orients[] = { GDISP_ROTATE_0, GDISP_ROTATE_90, GDISP_ROTATE_180, GDISP_ROTATE_270 };
unsigned which;
// Initialize the display
gfxInit();
// We are currently at GDISP_ROTATE_0
which = 0;
gdispSetOrientation(orients[which]);
// Set the widget defaults
gwinSetDefaultFont(gdispOpenFont("UI2"));
gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
@ -81,7 +87,15 @@ int main(void) {
case GEVENT_GWIN_BUTTON:
if (((GEventGWinButton*)pe)->button == ghButton1) {
// Our button has been pressed
printf("Button clicked\r\n");
if (++which >= sizeof(orients)/sizeof(orients[0]))
which = 0;
// Setting the orientation during run-time is a bit naughty particularly with
// GWIN windows. In this case however we know that the button is in the top-left
// corner which should translate safely into any orientation.
gdispSetOrientation(orients[which]);
gdispClear(White);
gwinRedrawDisplay(GDISP, FALSE);
}
break;

3
demos/modules/gwin/checkbox/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gwin/checkbox
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

2
demos/modules/gwin/checkbox/main.c
View file

@ -81,7 +81,7 @@ int main(void) {
case GEVENT_GWIN_CHECKBOX:
if (((GEventGWinCheckbox*)pe)->checkbox == ghCheckbox1) {
// The state of our checkbox has changed
printf("Checkbox state: %d\r\n", ((GEventGWinCheckbox*)pe)->isChecked);
//printf("Checkbox state: %d\r\n", ((GEventGWinCheckbox*)pe)->isChecked);
}
break;

3
demos/modules/gwin/console/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gwin/console
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

3
demos/modules/gwin/graph/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gwin/graph
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

4
demos/modules/gwin/graph/gfxconf.h
View file

@ -39,6 +39,7 @@
/* GFX sub-systems to turn on */
#define GFX_USE_GDISP TRUE
#define GFX_USE_GWIN TRUE
#define GFX_USE_GMISC TRUE
/* Features for the GDISP sub-system. */
#define GDISP_NEED_VALIDATION TRUE
@ -48,5 +49,8 @@
#define GWIN_NEED_WINDOWMANAGER TRUE
#define GWIN_NEED_GRAPH TRUE
/* Features for the GMISC subsystem. */
#define GMISC_NEED_FASTTRIG TRUE
#endif /* _GFXCONF_H */

3
demos/modules/gwin/list/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gwin/list
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

1
demos/modules/gwin/list/gfxconf.h
View file

@ -43,6 +43,7 @@
#define GWIN_NEED_WINDOWMANAGER TRUE
#define GWIN_NEED_WIDGET TRUE
#define GWIN_NEED_LABEL TRUE
#define GWIN_NEED_LIST TRUE
#define GWIN_NEED_LIST_IMAGES TRUE

3
demos/modules/gwin/progressbar/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gwin/progressbar
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

3
demos/modules/gwin/radio/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gwin/radio
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

2
demos/modules/gwin/radio/main.c
View file

@ -101,7 +101,7 @@ int main(void) {
switch(pe->type) {
case GEVENT_GWIN_RADIO:
printf("group: %u radio: %s\n", ((GEventGWinRadio *)pe)->group, gwinGetText(((GEventGWinRadio *)pe)->radio));
//printf("group: %u radio: %s\n", ((GEventGWinRadio *)pe)->group, gwinGetText(((GEventGWinRadio *)pe)->radio));
break;
default:

3
demos/modules/gwin/slider/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gwin/slider
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

2
demos/modules/gwin/slider/main.c
View file

@ -77,7 +77,7 @@ int main(void) {
switch(pe->type) {
case GEVENT_GWIN_SLIDER:
printf("Slider %s = %d\n", gwinGetText(((GEventGWinSlider *)pe)->slider), ((GEventGWinSlider *)pe)->position);
//printf("Slider %s = %d\n", gwinGetText(((GEventGWinSlider *)pe)->slider), ((GEventGWinSlider *)pe)->position);
break;
default:

3
demos/modules/gwin/widgets/demo.mk Normal file
View file

@ -0,0 +1,3 @@
DEMODIR = $(GFXLIB)/demos/modules/gwin/widgets
GFXINC += $(DEMODIR)
GFXSRC += $(DEMODIR)/main.c

2
drivers/gadc/AT91SAM7/gadc_lld.c
View file

@ -18,7 +18,7 @@
#if GFX_USE_GADC
#include "gadc/lld/gadc_lld.h"
#include "src/gadc/driver.h"
static ADCConversionGroup acg = {
FALSE, // circular

2
drivers/gaudin/Win32/gaudin_lld.c
View file

@ -15,7 +15,7 @@
#if GFX_USE_GAUDIN
/* Include the driver defines */
#include "gaudin/lld/gaudin_lld.h"
#include "src/gaudin/driver.h"
#undef Red
#undef Green

2
drivers/gaudin/gadc/gaudin_lld.c
View file

@ -31,7 +31,7 @@
#endif
/* Include the driver defines */
#include "gaudin/lld/gaudin_lld.h"
#include "src/gaudin/driver.h"
/*===========================================================================*/
/* External declarations. */

606
drivers/gdisp/ED060SC4/gdisp_lld.c
View file

@ -1,606 +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
*/
/* Low-level E-ink panel driver routines for ED060SC4. */
#include "gfx.h"
#include "ed060sc4.h"
#if GFX_USE_GDISP
#include "gdisp/lld/emulation.c"
/* =================================
* Default configuration
* ================================= */
#ifndef GDISP_SCREEN_HEIGHT
# define GDISP_SCREEN_HEIGHT 600
#endif
#ifndef GDISP_SCREEN_WIDTH
# define GDISP_SCREEN_WIDTH 800
#endif
/* Number of pixels per byte */
#ifndef EINK_PPB
# define EINK_PPB 4
#endif
/* Delay for generating clock pulses.
* Unit is approximate clock cycles of the CPU (0 to 15).
* This should be atleast 50 ns.
*/
#ifndef EINK_CLOCKDELAY
# define EINK_CLOCKDELAY 0
#endif
/* Width of one framebuffer block.
* Must be divisible by EINK_PPB and evenly divide GDISP_SCREEN_WIDTH. */
#ifndef EINK_BLOCKWIDTH
# define EINK_BLOCKWIDTH 20
#endif
/* Height of one framebuffer block.
* Must evenly divide GDISP_SCREEN_WIDTH. */
#ifndef EINK_BLOCKHEIGHT
# define EINK_BLOCKHEIGHT 20
#endif
/* Number of block buffers to use for framebuffer emulation. */
#ifndef EINK_NUMBUFFERS
# define EINK_NUMBUFFERS 40
#endif
/* Do a "blinking" clear, i.e. clear to opposite polarity first.
* This reduces the image persistence. */
#ifndef EINK_BLINKCLEAR
# define EINK_BLINKCLEAR TRUE
#endif
/* Number of passes to use when clearing the display */
#ifndef EINK_CLEARCOUNT
# define EINK_CLEARCOUNT 10
#endif
/* Number of passes to use when writing to the display */
#ifndef EINK_WRITECOUNT
# define EINK_WRITECOUNT 4
#endif
/* ====================================
* Lower level driver functions
* ==================================== */
#include "gdisp_lld_board.h"
/** Delay between signal changes, to give time for IO pins to change state. */
static inline void clockdelay()
{
#if EINK_CLOCKDELAY & 1
asm("nop");
#endif
#if EINK_CLOCKDELAY & 2
asm("nop");
asm("nop");
#endif
#if EINK_CLOCKDELAY & 4
asm("nop");
asm("nop");
asm("nop");
asm("nop");
#endif
#if EINK_CLOCKDELAY & 8
asm("nop");
asm("nop");
asm("nop");
asm("nop");
asm("nop");
asm("nop");
asm("nop");
asm("nop");
#endif
}
/** Fast vertical clock pulse for gate driver, used during initializations */
static void vclock_quick()
{
setpin_ckv(TRUE);
eink_delay(1);
setpin_ckv(FALSE);
eink_delay(4);
}
/** Horizontal clock pulse for clocking data into source driver */
static void hclock()
{
clockdelay();
setpin_cl(TRUE);
clockdelay();
setpin_cl(FALSE);
}
/** Start a new vertical gate driver scan from top.
* Note: Does not clear any previous bits in the shift register,
* so you should always scan through the whole display before
* starting a new scan.
*/
static void vscan_start()
{
setpin_gmode(TRUE);
vclock_quick();
setpin_spv(FALSE);
vclock_quick();
setpin_spv(TRUE);
vclock_quick();
}
/** Waveform for strobing a row of data onto the display.
* Attempts to minimize the leaking of color to other rows by having
* a long idle period after a medium-length strobe period.
*/
static void vscan_write()
{
setpin_ckv(TRUE);
setpin_oe(TRUE);
eink_delay(5);
setpin_oe(FALSE);
setpin_ckv(FALSE);
eink_delay(200);
}
/** Waveform used when clearing the display. Strobes a row of data to the
* screen, but does not mind some of it leaking to other rows.
*/
static void vscan_bulkwrite()
{
setpin_ckv(TRUE);
eink_delay(20);
setpin_ckv(FALSE);
eink_delay(200);
}
/** Waveform for skipping a vertical row without writing anything.
* Attempts to minimize the amount of change in any row.
*/
static void vscan_skip()
{
setpin_ckv(TRUE);
eink_delay(1);
setpin_ckv(FALSE);
eink_delay(100);
}
/** Stop the vertical scan. The significance of this escapes me, but it seems
* necessary or the next vertical scan may be corrupted.
*/
static void vscan_stop()
{
setpin_gmode(FALSE);
vclock_quick();
vclock_quick();
vclock_quick();
vclock_quick();
vclock_quick();
}
/** Start updating the source driver data (from left to right). */
static void hscan_start()
{
/* Disable latching and output enable while we are modifying the row. */
setpin_le(FALSE);
setpin_oe(FALSE);
/* The start pulse should remain low for the duration of the row. */
setpin_sph(FALSE);
}
/** Write data to the horizontal row. */
static void hscan_write(const uint8_t *data, int count)
{
while (count--)
{
/* Set the next byte on the data pins */
setpins_data(*data++);
/* Give a clock pulse to the shift register */
hclock();
}
}
/** Finish and transfer the row to the source drivers.
* Does not set the output enable, so the drivers are not yet active. */
static void hscan_stop()
{
/* End the scan */
setpin_sph(TRUE);
hclock();
/* Latch the new data */
setpin_le(TRUE);
clockdelay();
setpin_le(FALSE);
}
/** Turn on the power to the E-Ink panel, observing proper power sequencing. */
static void power_on()
{
unsigned i;
/* First the digital power supply and signal levels. */
setpower_vdd(TRUE);
setpin_le(FALSE);
setpin_oe(FALSE);
setpin_cl(FALSE);
setpin_sph(TRUE);
setpins_data(0);
setpin_ckv(FALSE);
setpin_gmode(FALSE);
setpin_spv(TRUE);
/* Min. 100 microsecond delay after digital supply */
gfxSleepMicroseconds(100);
/* Then negative voltages and min. 1000 microsecond delay. */
setpower_vneg(TRUE);
gfxSleepMicroseconds(1000);
/* Finally the positive voltages. */
setpower_vpos(TRUE);
/* Clear the vscan shift register */
vscan_start();
for (i = 0; i < GDISP_SCREEN_HEIGHT; i++)
vclock_quick();
vscan_stop();
}
/** Turn off the power, observing proper power sequencing. */
static void power_off()
{
/* First the high voltages */
setpower_vpos(FALSE);
setpower_vneg(FALSE);
/* Wait for any capacitors to drain */
gfxSleepMilliseconds(100);
/* Then put all signals and digital supply to ground. */
setpin_le(FALSE);
setpin_oe(FALSE);
setpin_cl(FALSE);
setpin_sph(FALSE);
setpins_data(0);
setpin_ckv(FALSE);
setpin_gmode(FALSE);
setpin_spv(FALSE);
setpower_vdd(FALSE);
}
/* ====================================
* Framebuffer emulation layer
* ==================================== */
#if EINK_PPB == 4
#define PIXELMASK 3
#define PIXEL_WHITE 2
#define PIXEL_BLACK 1
#define BYTE_WHITE 0xAA
#define BYTE_BLACK 0x55
#else
#error Unsupported EINK_PPB value.
#endif
#if GDISP_SCREEN_HEIGHT % EINK_BLOCKHEIGHT != 0
#error GDISP_SCREEN_HEIGHT must be evenly divisible by EINK_BLOCKHEIGHT
#endif
#if GDISP_SCREEN_WIDTH % EINK_BLOCKWIDTH != 0
#error GDISP_SCREEN_WIDTH must be evenly divisible by EINK_BLOCKWIDTH
#endif
#if EINK_BLOCKWIDTH % EINK_PPB != 0
#error EINK_BLOCKWIDTH must be evenly divisible by EINK_PPB
#endif
#if EINK_NUMBUFFERS > 254
#error EINK_NUMBUFFERS must be at most 254.
#endif
#define BLOCKS_Y (GDISP_SCREEN_HEIGHT / EINK_BLOCKHEIGHT)
#define BLOCKS_X (GDISP_SCREEN_WIDTH / EINK_BLOCKWIDTH)
#define WIDTH_BYTES (EINK_BLOCKWIDTH / EINK_PPB)
/* Buffers that store the data for a small area of the display. */
typedef struct {
uint8_t data[EINK_BLOCKHEIGHT][WIDTH_BYTES];
} block_t;
static uint8_t g_next_block; /* Index of the next free block buffer. */
static block_t g_blocks[EINK_NUMBUFFERS];
/* Map that stores the buffers associated to each area of the display.
* Value of 0 means that the block is not allocated.
* Other values are the index in g_blocks + 1.
*/
static uint8_t g_blockmap[BLOCKS_Y][BLOCKS_X];
/** Check if the row contains any allocated blocks. */
static bool_t blocks_on_row(unsigned by)
{
unsigned bx;
for (bx = 0; bx < BLOCKS_X; bx++)
{
if (g_blockmap[by][bx] != 0)
{
return TRUE;
}
}
return FALSE;
}
/** Write out a block row. */
static void write_block_row(unsigned by)
{
unsigned bx, dy, dx;
for (dy = 0; dy < EINK_BLOCKHEIGHT; dy++)
{
hscan_start();
for (bx = 0; bx < BLOCKS_X; bx++)
{
if (g_blockmap[by][bx] == 0)
{
for (dx = 0; dx < WIDTH_BYTES; dx++)
{
const uint8_t dummy = 0;
hscan_write(&dummy, 1);
}
}
else
{
block_t *block = &g_blocks[g_blockmap[by][bx] - 1];
hscan_write(&block->data[dy][0], WIDTH_BYTES);
}
}
hscan_stop();
vscan_write();
}
}
/** Clear the block map, i.e. deallocate all blocks */
static void clear_block_map()
{
unsigned bx, by;
for (by = 0; by < BLOCKS_Y; by++)
{
for (bx = 0; bx < BLOCKS_X; bx++)
{
g_blockmap[by][bx] = 0;
}
}
g_next_block = 0;
}
/** Flush all the buffered rows to display. */
static void flush_buffers()
{
unsigned by, dy, i;
for (i = 0; i < EINK_WRITECOUNT; i++)
{
vscan_start();
for (by = 0; by < BLOCKS_Y; by++)
{
if (!blocks_on_row(by))
{
/* Skip the whole row of blocks. */
for (dy = 0; dy < EINK_BLOCKHEIGHT; dy++)
{
vscan_skip();
}
}
else
{
/* Write out the blocks. */
write_block_row(by);
}
}
vscan_stop();
}
clear_block_map();
}
/** Initialize a newly allocated block. */
static void zero_block(block_t *block)
{
unsigned dx, dy;
for (dy = 0; dy < EINK_BLOCKHEIGHT; dy++)
{
for (dx = 0; dx < WIDTH_BYTES; dx++)
{
block->data[dy][dx] = 0;
}
}
}
/** Allocate a buffer
* Automatically flushes if all buffers are full. */
static block_t *alloc_buffer(unsigned bx, unsigned by)
{
block_t *result;
if (g_blockmap[by][bx] == 0)
{
if (g_next_block >= EINK_NUMBUFFERS)
{
flush_buffers();
}
result = &g_blocks[g_next_block];
g_blockmap[by][bx] = g_next_block + 1;
g_next_block++;
zero_block(result);
return result;
}
else
{
result = &g_blocks[g_blockmap[by][bx] - 1];
return result;
}
}
/* ===============================
* Public functions
* =============================== */
bool_t gdisp_lld_init(void)
{
init_board();
/* Make sure that all the pins are in "off" state.
* Having any pin high could cause voltage leaking to the
* display, which in turn causes the image to leak slowly away.
*/
power_off();
clear_block_map();
/* Initialize the global GDISP structure */
GDISP.Width = GDISP_SCREEN_WIDTH;
GDISP.Height = GDISP_SCREEN_HEIGHT;
GDISP.Orientation = GDISP_ROTATE_0;
GDISP.Powermode = powerOff;
GDISP.Backlight = 0;
GDISP.Contrast = 0;
#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
GDISP.clipx0 = 0;
GDISP.clipy0 = 0;
GDISP.clipx1 = GDISP.Width;
GDISP.clipy1 = GDISP.Height;
#endif
return TRUE;
}
void gdisp_lld_draw_pixel(coord_t x, coord_t y, color_t color)
{
block_t *block;
uint8_t byte;
unsigned bx, by, dx, dy;
uint8_t bitpos;
bx = x / EINK_BLOCKWIDTH;
by = y / EINK_BLOCKHEIGHT;
dx = x % EINK_BLOCKWIDTH;
dy = y % EINK_BLOCKHEIGHT;
if (bx < 0 || bx >= BLOCKS_X || by < 0 || by >= BLOCKS_Y)
return;
block = alloc_buffer(bx, by);
bitpos = (6 - 2 * (dx % EINK_PPB));
byte = block->data[dy][dx / EINK_PPB];
byte &= ~(PIXELMASK << bitpos);
if (color)
{
byte |= PIXEL_WHITE << bitpos;
}
else
{
byte |= PIXEL_BLACK << bitpos;
}
block->data[dy][dx / EINK_PPB] = byte;
}
#if !GDISP_NEED_CONTROL
#error You must enable GDISP_NEED_CONTROL for the E-Ink driver.
#endif
void gdisp_lld_control(unsigned what, void *value) {
gdisp_powermode_t newmode;
switch(what)
{
case GDISP_CONTROL_POWER:
newmode = (gdisp_powermode_t)value;
if (GDISP.Powermode == newmode)
return;
if (newmode == powerOn)
{
power_on();
}
else
{
flush_buffers();
power_off();
}
GDISP.Powermode = newmode;
break;
case GDISP_CONTROL_FLUSH:
flush_buffers();
break;
}
}
/* ===============================
* Accelerated routines
* =============================== */
#if GDISP_HARDWARE_CLEARS
static void subclear(color_t color)
{
unsigned x, y;
uint8_t byte;
hscan_start();
byte = color ? BYTE_WHITE : BYTE_BLACK;
for (x = 0; x < GDISP_SCREEN_WIDTH; x++)
{
hscan_write(&byte, 1);
}
hscan_stop();
setpin_oe(TRUE);
vscan_start();
for (y = 0; y < GDISP_SCREEN_HEIGHT; y++)
{
vscan_bulkwrite();
}
vscan_stop();
setpin_oe(FALSE);
}
void gdisp_lld_clear(color_t color)
{
unsigned i;
clear_block_map();
if (EINK_BLINKCLEAR)
{
subclear(!color);
gfxSleepMilliseconds(50);
}
for (i = 0; i < EINK_CLEARCOUNT; i++)
{
subclear(color);
gfxSleepMilliseconds(10);
}
}
#endif
#endif

4
drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c
View file

@ -15,8 +15,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_ED060SC4
#include "../drivers/gdisp/ED060SC4/gdisp_lld_config.h"
#include "gdisp/lld/gdisp_lld.h"
#include "drivers/gdisp/ED060SC4/gdisp_lld_config.h"
#include "src/gdisp/driver.h"
#include "board_ED060SC4.h"

4
drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c
View file

@ -15,8 +15,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_HX8347D
#include "../drivers/gdisp/HX8347D/gdisp_lld_config.h"
#include "gdisp/lld/gdisp_lld.h"
#include "drivers/gdisp/HX8347D/gdisp_lld_config.h"
#include "src/gdisp/driver.h"
#include "board_HX8347D.h"

4
drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c
View file

@ -25,8 +25,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_ILI9320
#include "../drivers/gdisp/ILI9320/gdisp_lld_config.h"
#include "gdisp/lld/gdisp_lld.h"
#include "drivers/gdisp/ILI9320/gdisp_lld_config.h"
#include "src/gdisp/driver.h"
#include "board_ILI9320.h"

4
drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c
View file

@ -25,8 +25,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_ILI9325
#include "../drivers/gdisp/ILI9325/gdisp_lld_config.h"
#include "gdisp/lld/gdisp_lld.h"
#include "drivers/gdisp/ILI9325/gdisp_lld_config.h"
#include "src/gdisp/driver.h"
#include "board_ILI9325.h"

6
drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c
View file

@ -25,8 +25,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_ILI9341
#include "../drivers/gdisp/ILI9341/gdisp_lld_config.h"
#include "gdisp/lld/gdisp_lld.h"
#include "drivers/gdisp/ILI9341/gdisp_lld_config.h"
#include "src/gdisp/driver.h"
#include "board_ILI9341.h"
@ -304,7 +304,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
switch((orientation_t)g->p.ptr) {
case GDISP_ROTATE_0:
acquire_bus(g);
write_reg(g, 0x36, 0x00); /* X and Y axes non-inverted */
write_reg(g, 0x36, 0x48); /* X and Y axes non-inverted */
release_bus(g);
g->g.Height = GDISP_SCREEN_HEIGHT;
g->g.Width = GDISP_SCREEN_WIDTH;

4
drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c
View file

@ -25,8 +25,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_ILI9481
#include "../drivers/gdisp/ILI9481/gdisp_lld_config.h"
#include "gdisp/lld/gdisp_lld.h"
#include "drivers/gdisp/ILI9481/gdisp_lld_config.h"
#include "src/gdisp/driver.h"
#include "board_ILI9481.h"

6
drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c
View file

@ -24,8 +24,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_Nokia6610GE12
#include "../drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h"
#include "gdisp/lld/gdisp_lld.h"
#include "drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h"
#include "src/gdisp/driver.h"
#include "board_Nokia6610GE12.h"
@ -33,7 +33,7 @@
/* Driver local definitions. */
/*===========================================================================*/
#include "GE12.h"
#include "drivers/gdisp/Nokia6610GE12/GE12.h"
#define GDISP_SCAN_LINES 132
#define GDISP_SLEEP_SIZE 32 /* Sleep mode window lines - this must be 32 on this controller */

6
drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
View file

@ -59,8 +59,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_Nokia6610GE8
#include "../drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h"
#include "gdisp/lld/gdisp_lld.h"
#include "drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h"
#include "src/gdisp/driver.h"
#include "board_Nokia6610GE8.h"
@ -68,7 +68,7 @@
/* Driver local definitions. */
/*===========================================================================*/
#include "GE8.h"
#include "drivers/gdisp/Nokia6610GE8/GE8.h"
#define GDISP_SCAN_LINES 132

4
drivers/gdisp/RA8875/gdisp_lld_RA8875.c
View file

@ -15,8 +15,8 @@
#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
#define GDISP_DRIVER_VMT GDISPVMT_RA8875
#include "../drivers/gdisp/RA8875/gdisp_lld_config.h"
#include "gdisp/lld/gdisp_lld.h"
#include "drivers/gdisp/RA8875/gdisp_lld_config.h"
#include "src/gdisp/driver.h"
/* include the users board interface */
#include "board_RA8875.h"

4
drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c
View file

@ -27,8 +27,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_S6D1121
#include "../drivers/gdisp/S6D1121/gdisp_lld_config.h"
#include "gdisp/lld/gdisp_lld.h"
#include "drivers/gdisp/S6D1121/gdisp_lld_config.h"
#include "src/gdisp/driver.h"
#include "board_S6D1121.h"

4
drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c
View file

@ -15,8 +15,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_SSD1289
#include "../drivers/gdisp/SSD1289/gdisp_lld_config.h"
#include "gdisp/lld/gdisp_lld.h"
#include "drivers/gdisp/SSD1289/gdisp_lld_config.h"
#include "src/gdisp/driver.h"
#include "board_SSD1289.h"

6
drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c
View file

@ -15,8 +15,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_SSD1306
#include "../drivers/gdisp/SSD1306/gdisp_lld_config.h"
#include "gdisp/lld/gdisp_lld.h"
#include "drivers/gdisp/SSD1306/gdisp_lld_config.h"
#include "src/gdisp/driver.h"
#include "board_SSD1306.h"
@ -46,7 +46,7 @@
#define GDISP_FLG_NEEDFLUSH (GDISP_FLG_DRIVER<<0)
#include "SSD1306.h"
#include "drivers/gdisp/SSD1306/SSD1306.h"
/*===========================================================================*/
/* Driver local functions. */

6
drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
View file

@ -15,8 +15,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_SSD1963
#include "../drivers/gdisp/SSD1963/gdisp_lld_config.h"
#include "gdisp/lld/gdisp_lld.h"
#include "drivers/gdisp/SSD1963/gdisp_lld_config.h"
#include "src/gdisp/driver.h"
#define CALC_PERIOD(w,b,f,p) (p+b+w+f)
#define CALC_FPR(w,h,hb,hf,hp,vb,vf,vp,fps) ((fps * CALC_PERIOD(w,hb,hf,hp) * CALC_PERIOD(h,vb,vf,vp) * 1048576)/100000000)
@ -51,7 +51,7 @@ typedef struct LCD_Parameters {
/* Driver local functions. */
/*===========================================================================*/
#include "ssd1963.h"
#include "drivers/gdisp/SSD1963/ssd1963.h"
#define write_reg(g, reg, data) { write_index(g, reg); write_data(g, data); }
#define write_data16(g, data) { write_data(g, (data)>>8); write_data(g, (data) & 0xFF); }

6
drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c
View file

@ -15,8 +15,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_SSD2119
#include "../drivers/gdisp/SSD2119/gdisp_lld_config.h"
#include "gdisp/lld/gdisp_lld.h"
#include "drivers/gdisp/SSD2119/gdisp_lld_config.h"
#include "src/gdisp/driver.h"
#include "board_SSD2119.h"
@ -37,7 +37,7 @@
#define GDISP_INITIAL_BACKLIGHT 100
#endif
#include "ssd2119.h"
#include "drivers/gdisp/SSD2119/ssd2119.h"
/*===========================================================================*/
/* Driver local functions. */

6
drivers/gdisp/ST7565/gdisp_lld_ST7565.c
View file

@ -15,8 +15,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_ST7565
#include "../drivers/gdisp/ST7565/gdisp_lld_config.h"
#include "gdisp/lld/gdisp_lld.h"
#include "drivers/gdisp/ST7565/gdisp_lld_config.h"
#include "src/gdisp/driver.h"
#include "board_ST7565.h"
@ -39,7 +39,7 @@
#define GDISP_FLG_NEEDFLUSH (GDISP_FLG_DRIVER<<0)
#include "st7565.h"
#include "drivers/gdisp/ST7565/st7565.h"
/*===========================================================================*/
/* Driver config defaults for backward compatibility. */

4
drivers/gdisp/TestStub/gdisp_lld_TestStub.c
View file

@ -15,8 +15,8 @@
#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
#define GDISP_DRIVER_VMT GDISPVMT_TestStub
#include "../drivers/gdisp/TestStub/gdisp_lld_config.h"
#include "gdisp/lld/gdisp_lld.h"
#include "drivers/gdisp/TestStub/gdisp_lld_config.h"
#include "src/gdisp/driver.h"
#ifndef GDISP_SCREEN_HEIGHT
#define GDISP_SCREEN_HEIGHT 128

2
drivers/ginput/dial/GADC/ginput_lld_dial.c
View file

@ -18,7 +18,7 @@
#if GFX_USE_GINPUT && GINPUT_NEED_DIAL
#include "ginput/lld/dial.h"
#include "src/ginput/driver_dial.h"
#if GINPUT_DIAL_NUM_PORTS >= 5
#error "GINPUT: Dial - GADC driver currently only supports 4 devices"

2
drivers/ginput/toggle/Pal/ginput_lld_toggle.c
View file

@ -18,7 +18,7 @@
#if (GFX_USE_GINPUT && GINPUT_NEED_TOGGLE) /*|| defined(__DOXYGEN__)*/
#include "ginput/lld/toggle.h"
#include "src/ginput/driver_toggle.h"
GINPUT_TOGGLE_DECLARE_STRUCTURE();

2
drivers/ginput/touch/ADS7843/ginput_lld_mouse.c
View file

@ -18,7 +18,7 @@
#if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) /*|| defined(__DOXYGEN__)*/
#include "ginput/lld/mouse.h"
#include "src/ginput/driver_mouse.h"
#include "ginput_lld_mouse_board.h"

8
drivers/ginput/touch/FT5x06/ginput_lld_mouse.c
View file

@ -14,15 +14,13 @@
* @{
*/
#include "ch.h"
#include "hal.h"
#include "gfx.h"
#include "ft5x06.h"
#if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) /*|| defined(__DOXYGEN__)*/
#include "ginput/lld/mouse.h"
#include "src/ginput/driver_mouse.h"
#include "drivers/ginput/touch/FT5x06/ft5x06.h"
// include board abstraction
#include "ginput_lld_mouse_board.h"

2
drivers/ginput/touch/MCU/ginput_lld_mouse.c
View file

@ -19,7 +19,7 @@
#if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) /*|| defined(__DOXYGEN__)*/
#include "ginput/lld/mouse.h"
#include "src/ginput/driver_mouse.h"
#include "ginput_lld_mouse_board.h"

6
drivers/ginput/touch/STMPE811/ginput_lld_mouse.c
View file

@ -16,11 +16,11 @@
#include "gfx.h"
#include "stmpe811.h"
#if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) /*|| defined(__DOXYGEN__)*/
#include "ginput/lld/mouse.h"
#include "src/ginput/driver_mouse.h"
#include "drivers/ginput/touch/STMPE811/stmpe811.h"
#include "ginput_lld_mouse_board.h"

8
drivers/multiple/Win32/gdisp_lld_Win32.c
View file

@ -14,8 +14,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_Win32
#include "../drivers/multiple/Win32/gdisp_lld_config.h"
#include "gdisp/lld/gdisp_lld.h"
#include "drivers/multiple/Win32/gdisp_lld_config.h"
#include "src/gdisp/driver.h"
#ifndef GDISP_SCREEN_WIDTH
#define GDISP_SCREEN_WIDTH 640
@ -64,12 +64,12 @@
#if GINPUT_NEED_TOGGLE
/* Include toggle support code */
#include "ginput/lld/toggle.h"
#include "src/ginput/driver_toggle.h"
#endif
#if GINPUT_NEED_MOUSE
/* Include mouse support code */
#include "ginput/lld/mouse.h"
#include "src/ginput/driver_mouse.h"
#endif
static DWORD winThreadId;

6
drivers/multiple/X/gdisp_lld_X.c
View file

@ -15,8 +15,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_X11
#include "../drivers/multiple/X/gdisp_lld_config.h"
#include "gdisp/lld/gdisp_lld.h"
#include "drivers/multiple/X/gdisp_lld_config.h"
#include "src/gdisp/driver.h"
/**
* Our color model - Default or 24 bit only.
@ -40,7 +40,7 @@
#if GINPUT_NEED_MOUSE
/* Include mouse support code */
#include "ginput/lld/mouse.h"
#include "src/ginput/driver_mouse.h"
#endif
#include <X11/Xlib.h>

8
drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
View file

@ -14,9 +14,9 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_uGFXnet
#include "../drivers/multiple/uGFXnet/gdisp_lld_config.h"
#include "gdisp/lld/gdisp_lld.h"
#include "../drivers/multiple/uGFXnet/uGFXnetProtocol.h"
#include "drivers/multiple/uGFXnet/gdisp_lld_config.h"
#include "src/gdisp/driver.h"
#include "drivers/multiple/uGFXnet/uGFXnetProtocol.h"
#ifndef GDISP_SCREEN_WIDTH
#define GDISP_SCREEN_WIDTH 640
@ -107,7 +107,7 @@
#if GINPUT_NEED_MOUSE
/* Include mouse support code */
#include "ginput/lld/mouse.h"
#include "src/ginput/driver_mouse.h"
#endif
/*===========================================================================*/

67
include/gfx.h → gfx.h
View file

@ -6,7 +6,7 @@
*/
/**
* @file include/gfx.h
* @file gfx.h
* @brief GFX system header file.
*
* @addtogroup GFX
@ -163,40 +163,55 @@
* Get all the options for each sub-system.
*
*/
#include "gos/options.h"
#include "gfile/options.h"
#include "gmisc/options.h"
#include "gqueue/options.h"
#include "gevent/options.h"
#include "gtimer/options.h"
#include "gdisp/options.h"
#include "gwin/options.h"
#include "ginput/options.h"
#include "gadc/options.h"
#include "gaudin/options.h"
#include "gaudout/options.h"
#include "src/gos/sys_options.h"
#include "src/gfile/sys_options.h"
#include "src/gmisc/sys_options.h"
#include "src/gqueue/sys_options.h"
#include "src/gevent/sys_options.h"
#include "src/gtimer/sys_options.h"
#include "src/gdisp/sys_options.h"
#include "src/gwin/sys_options.h"
#include "src/ginput/sys_options.h"
#include "src/gadc/sys_options.h"
#include "src/gaudin/sys_options.h"
#include "src/gaudout/sys_options.h"
/**
* Interdependency safety checks on the sub-systems.
* These must be in dependency order.
*
*/
#include "gfx_rules.h"
#ifndef GFX_DISPLAY_RULE_WARNINGS
#define GFX_DISPLAY_RULE_WARNINGS FALSE
#endif
#include "src/gwin/sys_rules.h"
#include "src/ginput/sys_rules.h"
#include "src/gdisp/sys_rules.h"
#include "src/gaudout/sys_rules.h"
#include "src/gaudin/sys_rules.h"
#include "src/gadc/sys_rules.h"
#include "src/gevent/sys_rules.h"
#include "src/gtimer/sys_rules.h"
#include "src/gqueue/sys_rules.h"
#include "src/gmisc/sys_rules.h"
#include "src/gfile/sys_rules.h"
#include "src/gos/sys_rules.h"
/**
* Include the sub-system header files
*/
#include "gos/gos.h"
#include "gfile/gfile.h"
#include "gmisc/gmisc.h"
#include "gqueue/gqueue.h"
#include "gevent/gevent.h"
#include "gtimer/gtimer.h"
#include "gdisp/gdisp.h"
#include "gwin/gwin.h"
#include "ginput/ginput.h"
#include "gadc/gadc.h"
#include "gaudin/gaudin.h"
#include "gaudout/gaudout.h"
#include "src/gos/sys_defs.h"
#include "src/gfile/sys_defs.h"
#include "src/gmisc/sys_defs.h"
#include "src/gqueue/sys_defs.h"
#include "src/gevent/sys_defs.h"
#include "src/gtimer/sys_defs.h"
#include "src/gdisp/sys_defs.h"
#include "src/gwin/sys_defs.h"
#include "src/ginput/sys_defs.h"
#include "src/gadc/sys_defs.h"
#include "src/gaudin/sys_defs.h"
#include "src/gaudout/sys_defs.h"
#ifdef __cplusplus
extern "C" {

26
gfx.mk
View file

@ -1,15 +1,15 @@
GFXINC += $(GFXLIB)/include
GFXINC += $(GFXLIB)
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/gevent/gevent.mk
include $(GFXLIB)/src/gtimer/gtimer.mk
include $(GFXLIB)/src/gwin/gwin.mk
include $(GFXLIB)/src/ginput/ginput.mk
include $(GFXLIB)/src/gadc/gadc.mk
include $(GFXLIB)/src/gaudin/gaudin.mk
include $(GFXLIB)/src/gaudout/gaudout.mk
include $(GFXLIB)/src/gmisc/gmisc.mk
include $(GFXLIB)/src/gfile/gfile.mk
include $(GFXLIB)/src/gos/sys_make.mk
include $(GFXLIB)/src/gqueue/sys_make.mk
include $(GFXLIB)/src/gdisp/sys_make.mk
include $(GFXLIB)/src/gevent/sys_make.mk
include $(GFXLIB)/src/gtimer/sys_make.mk
include $(GFXLIB)/src/gwin/sys_make.mk
include $(GFXLIB)/src/ginput/sys_make.mk
include $(GFXLIB)/src/gadc/sys_make.mk
include $(GFXLIB)/src/gaudin/sys_make.mk
include $(GFXLIB)/src/gaudout/sys_make.mk
include $(GFXLIB)/src/gmisc/sys_make.mk
include $(GFXLIB)/src/gfile/sys_make.mk

246
include/gfx_rules.h
View file

@ -1,246 +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/gfx_rules.h
* @brief GFX system safety rules header file.
*
* @addtogroup GFX
* @{
*/
#ifndef _GFX_RULES_H
#define _GFX_RULES_H
/**
* Safety checks on all the defines.
*
* These are defined in the order of their inter-dependancies.
*/
#ifndef GFX_DISPLAY_RULE_WARNINGS
#define GFX_DISPLAY_RULE_WARNINGS FALSE
#endif
#if !GFX_USE_OS_CHIBIOS && !GFX_USE_OS_WIN32 && !GFX_USE_OS_LINUX && !GFX_USE_OS_OSX && !GFX_USE_OS_RAW32
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GOS: No Operating System has been defined. ChibiOS (GFX_USE_OS_CHIBIOS) has been turned on for you."
#endif
#undef GFX_USE_OS_CHIBIOS
#define GFX_USE_OS_CHIBIOS TRUE
#endif
#if GFX_USE_OS_CHIBIOS + GFX_USE_OS_WIN32 + GFX_USE_OS_LINUX + GFX_USE_OS_OSX + GFX_USE_OS_RAW32 != 1 * TRUE
#error "GOS: More than one operation system has been defined as TRUE."
#endif
#if GFX_USE_GWIN
#if !GFX_USE_GDISP
#error "GWIN: GFX_USE_GDISP must be TRUE when using GWIN"
#endif
#if !GDISP_NEED_CLIP
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GWIN: Drawing can occur outside the defined windows as GDISP_NEED_CLIP is FALSE"
#endif
#endif
#if GWIN_NEED_IMAGE
#if !GDISP_NEED_IMAGE
#error "GWIN: GDISP_NEED_IMAGE is required when GWIN_NEED_IMAGE is TRUE."
#endif
#endif
#if GWIN_NEED_RADIO
#if !GDISP_NEED_CIRCLE
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GWIN: GDISP_NEED_CIRCLE should be set to TRUE for much nicer radio button widgets."
#endif
#endif
#endif
#if GWIN_NEED_BUTTON || GWIN_NEED_SLIDER || GWIN_NEED_CHECKBOX || GWIN_NEED_LABEL || GWIN_NEED_RADIO || GWIN_NEED_LIST || \
GWIN_NEED_IMAGE || GWIN_NEED_CHECKBOX || GWIN_NEED_PROGRESSBAR
#if !GWIN_NEED_WIDGET
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GWIN: GWIN_NEED_WIDGET is required when a Widget is used. It has been turned on for you."
#endif
#undef GWIN_NEED_WIDGET
#define GWIN_NEED_WIDGET TRUE
#endif
#endif
#if GWIN_NEED_LIST
#if !GDISP_NEED_TEXT
#error "GWIN: GDISP_NEED_TEXT is required when GWIN_NEED_LIST is TRUE."
#endif
#endif
#if GWIN_NEED_WIDGET
#if !GDISP_NEED_TEXT
#error "GWIN: GDISP_NEED_TEXT is required if GWIN_NEED_WIDGET is TRUE."
#endif
#if !GFX_USE_GINPUT
// This test also ensures that GFX_USE_GEVENT is set
#error "GWIN: GFX_USE_GINPUT (and one or more input sources) is required if GWIN_NEED_WIDGET is TRUE"
#endif
#if !GWIN_NEED_WINDOWMANAGER
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GWIN: GWIN_NEED_WINDOWMANAGER is required if GWIN_NEED_WIDGET is TRUE. It has been turned on for you."
#endif
#undef GWIN_NEED_WINDOWMANAGER
#define GWIN_NEED_WINDOWMANAGER TRUE
#endif
#if !GDISP_NEED_MULTITHREAD
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GWIN: GDISP_NEED_MULTITHREAD is required if GWIN_NEED_WIDGET is TRUE. It has been turned on for you"
#endif
#undef GDISP_NEED_MULTITHREAD
#define GDISP_NEED_MULTITHREAD TRUE
#endif
#endif
#if GWIN_NEED_WINDOWMANAGER
#if !GFX_USE_GQUEUE || !GQUEUE_NEED_ASYNC
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GWIN: GFX_USE_GQUEUE and GQUEUE_NEED_ASYNC is required if GWIN_NEED_WINDOWMANAGER is TRUE. It has been turned on for you."
#endif
#undef GFX_USE_GQUEUE
#undef GQUEUE_NEED_ASYNC
#define GFX_USE_GQUEUE TRUE
#define GQUEUE_NEED_ASYNC TRUE
#endif
#endif
#if GWIN_NEED_CONSOLE
#if !GDISP_NEED_TEXT
#error "GWIN: GDISP_NEED_TEXT is required if GWIN_NEED_CONSOLE is TRUE."
#endif
#endif
#if GWIN_NEED_GRAPH
#endif
#endif
#if GFX_USE_GINPUT
#if !GFX_USE_GEVENT
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GINPUT: GFX_USE_GEVENT is required if GFX_USE_GINPUT is TRUE. It has been turned on for you."
#endif
#undef GFX_USE_GEVENT
#define GFX_USE_GEVENT TRUE
#endif
#if !GFX_USE_GTIMER
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GINPUT: GFX_USE_GTIMER is required if GFX_USE_GINPUT is TRUE. It has been turned on for you."
#endif
#undef GFX_USE_GTIMER
#define GFX_USE_GTIMER TRUE
#endif
#endif
#if GFX_USE_GDISP
#if GDISP_TOTAL_CONTROLLERS > 1
#ifndef GDISP_CONTROLLER_LIST
#error "GDISP Multiple Controllers: You must specify a value for GDISP_CONTROLLER_LIST"
#endif
#ifndef GDISP_CONTROLLER_DISPLAYS
#error "GDISP Multiple Controllers: You must specify a value for GDISP_CONTROLLER_DISPLAYS"
#endif
#ifndef GDISP_PIXELFORMAT
#error "GDISP Multiple Controllers: You must specify a value for GDISP_PIXELFORMAT"
#endif
#endif
#if GDISP_NEED_AUTOFLUSH && GDISP_NEED_TIMERFLUSH
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GDISP: Both GDISP_NEED_AUTOFLUSH and GDISP_NEED_TIMERFLUSH has been set. GDISP_NEED_TIMERFLUSH has disabled for you."
#endif
#undef GDISP_NEED_TIMERFLUSH
#define GDISP_NEED_TIMERFLUSH FALSE
#endif
#if GDISP_NEED_TIMERFLUSH
#if GDISP_NEED_TIMERFLUSH < 50 || GDISP_NEED_TIMERFLUSH > 1200
#error "GDISP: GDISP_NEED_TIMERFLUSH has been set to an invalid value (FALSE, 50-1200)."
#endif
#if !GFX_USE_GTIMER
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GDISP: GDISP_NEED_TIMERFLUSH has been set but GFX_USE_GTIMER has not been set. It has been turned on for you."
#endif
#undef GFX_USE_GTIMER
#define GFX_USE_GTIMER TRUE
#undef GDISP_NEED_MULTITHREAD
#define GDISP_NEED_MULTITHREAD TRUE
#endif
#endif
#if GDISP_NEED_ANTIALIAS && !GDISP_NEED_PIXELREAD
#if GDISP_HARDWARE_PIXELREAD
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GDISP: GDISP_NEED_ANTIALIAS has been set but GDISP_NEED_PIXELREAD has not. It has been turned on for you."
#endif
#undef GDISP_NEED_PIXELREAD
#define GDISP_NEED_PIXELREAD TRUE
#else
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GDISP: GDISP_NEED_ANTIALIAS has been set but your hardware does not support reading back pixels. Anti-aliasing will only occur for filled characters."
#endif
#endif
#endif
#if (defined(GDISP_INCLUDE_FONT_SMALL) && GDISP_INCLUDE_FONT_SMALL) || (defined(GDISP_INCLUDE_FONT_LARGER) && GDISP_INCLUDE_FONT_LARGER)
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GDISP: An old font (Small or Larger) has been defined. A single default font of UI2 has been added instead."
#warning "GDISP: Please see <$(GFXLIB)/include/gdisp/fonts/fonts.h> for a list of available font names."
#endif
#undef GDISP_INCLUDE_FONT_UI2
#define GDISP_INCLUDE_FONT_UI2 TRUE
#endif
#if GDISP_NEED_IMAGE
#if !GFX_USE_GFILE
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GDISP: GFX_USE_GFILE is required when GDISP_NEED_IMAGE is TRUE. It has been turned on for you."
#endif
#undef GFX_USE_GFILE
#define GFX_USE_GFILE TRUE
#endif
#endif
#endif
#if GFX_USE_GAUDIN
#if GFX_USE_GEVENT && !GFX_USE_GTIMER
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GAUDIN: GFX_USE_GTIMER is required if GFX_USE_GAUDIN and GFX_USE_GEVENT are TRUE. It has been turned on for you."
#endif
#undef GFX_USE_GTIMER
#define GFX_USE_GTIMER TRUE
#endif
#endif
#if GFX_USE_GADC
#if !GFX_USE_GTIMER
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GADC: GFX_USE_GTIMER is required if GFX_USE_GADC is TRUE. It has been turned on for you."
#endif
#undef GFX_USE_GTIMER
#define GFX_USE_GTIMER TRUE
#endif
#endif
#if GFX_USE_GEVENT
#endif
#if GFX_USE_GTIMER
#if GFX_USE_GDISP && !GDISP_NEED_MULTITHREAD
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GTIMER: GDISP_NEED_MULTITHREAD has not been specified."
#warning "GTIMER: Make sure you are not performing any GDISP/GWIN drawing operations in the timer callback!"
#endif
#endif
#endif
#if GFX_USE_GAUDOUT
#endif
#if GFX_USE_GQUEUE
#endif
#if GFX_USE_GMISC
#endif
#if GFX_USE_GFILE
#endif
#endif /* _GFX_H */
/** @} */

5
releases.txt
View file

@ -15,6 +15,11 @@ FEATURE: Added smooth scrolling to list widget
FEATURE: Increased performance of gwinListAddItem()
FEATURE: Added FreeRTOS port
FEATURE: Added gfxDeinit()
FEATURE: Allow touch screen calibration in any display orientation
FEATURE: New GFILE module to abstract File IO.
FEATURE: Image file handling changed to use new GFILE module.
DEPRECTATE: Old image opening functions deprecated.
FEATURE: Restructure and simplify the include path for GFX
*** changes after 1.9 ***

2
include/gadc/lld/gadc_lld.h → src/gadc/driver.h
View file

@ -6,7 +6,7 @@
*/
/**
* @file include/gadc/lld/gadc_lld.h
* @file src/gadc/driver.h
* @brief GADC - Periodic ADC driver header file.
*
* @defgroup Driver Driver

2
src/gadc/gadc.c
View file

@ -17,7 +17,7 @@
#if GFX_USE_GADC
/* Include the driver defines */
#include "gadc/lld/gadc_lld.h"
#include "src/gadc/driver.h"
#if GADC_MAX_HIGH_SPEED_SAMPLERATE > GADC_MAX_SAMPLE_FREQUENCY/2
#error "GADC: GADC_MAX_HIGH_SPEED_SAMPLERATE has been set too high. It must be less than half the maximum CPU rate"

2
include/gadc/gadc.h → src/gadc/sys_defs.h
View file

@ -6,7 +6,7 @@
*/
/**
* @file include/gadc/gadc.h
* @file src/gadc/sys_defs.h
*
* @addtogroup GADC
*

2
src/gadc/gadc.mk → src/gadc/sys_make.mk
View file

@ -1 +1 @@
GFXSRC += $(GFXLIB)/src/gadc/gadc.c
GFXSRC += $(GFXLIB)/src/gadc/gadc.c

2
include/gadc/options.h → src/gadc/sys_options.h
View file

@ -6,7 +6,7 @@
*/
/**
* @file include/gadc/options.h
* @file src/gadc/sys_options.h
* @brief GADC - Periodic ADC subsystem options header file.
*
* @addtogroup GADC

30
src/gadc/sys_rules.h Normal file
View file

@ -0,0 +1,30 @@
/*
* 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/gadc/sys_rules.h
* @brief GADC safety rules header file.
*
* @addtogroup GADC
* @{
*/
#ifndef _GADC_RULES_H
#define _GADC_RULES_H
#if GFX_USE_GADC
#if !GFX_USE_GTIMER
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GADC: GFX_USE_GTIMER is required if GFX_USE_GADC is TRUE. It has been turned on for you."
#endif
#undef GFX_USE_GTIMER
#define GFX_USE_GTIMER TRUE
#endif
#endif
#endif /* _GADC_RULES_H */
/** @} */

2
include/gaudin/lld/gaudin_lld.h → src/gaudin/driver.h
View file

@ -6,7 +6,7 @@
*/
/**
* @file include/gaudin/lld/gaudin_lld.h
* @file src/gaudin/driver.h
* @brief GAUDIN - Audio Input driver header file.
*
* @defgroup Driver Driver

2
src/gaudin/gaudin.c
View file

@ -17,7 +17,7 @@
#if GFX_USE_GAUDIN
/* Include the driver defines */
#include "gaudin/lld/gaudin_lld.h"
#include "src/gaudin/driver.h"
static gaudin_params aud;
static gfxSem *paudSem;

4
include/gaudin/gaudin.h → src/gaudin/sys_defs.h
View file

@ -6,11 +6,11 @@
*/
/**
* @file include/gaudin/gaudin.h
* @file src/gaudin/sys_defs.h
*
* @addtogroup GAUDIN
*
* @brief Module to read audio inputs (under development)
* @brief Module to read audio inputs
*
* @{
*/

2
src/gaudin/gaudin.mk → src/gaudin/sys_make.mk
View file

@ -1 +1 @@
GFXSRC += $(GFXLIB)/src/gaudin/gaudin.c
GFXSRC += $(GFXLIB)/src/gaudin/gaudin.c

52
include/gaudin/options.h → src/gaudin/sys_options.h
View file

@ -4,29 +4,29 @@
*
* http://ugfx.org/license.html
*/
/**
* @file include/gaudin/options.h
* @brief GAUDIN - Audio Input subsystem options header file.
*
* @addtogroup GAUDIN
* @{
*/
#ifndef _GAUDIN_OPTIONS_H
#define _GAUDIN_OPTIONS_H
/**
* @name GAUDIN Functionality to be included
* @{
*/
/**
* @}
*
* @name GAUDIN Optional Sizing Parameters
* @{
*/
/** @} */
#endif /* _GAUDIN_OPTIONS_H */
/** @} */
/**
* @file src/gaudin/sys_options.h
* @brief GAUDIN - Audio Input subsystem options header file.
*
* @addtogroup GAUDIN
* @{
*/
#ifndef _GAUDIN_OPTIONS_H
#define _GAUDIN_OPTIONS_H
/**
* @name GAUDIN Functionality to be included
* @{
*/
/**
* @}
*
* @name GAUDIN Optional Sizing Parameters
* @{
*/
/** @} */
#endif /* _GAUDIN_OPTIONS_H */
/** @} */

30
src/gaudin/sys_rules.h Normal file
View file

@ -0,0 +1,30 @@
/*
* 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/gaudin/sys_rules.h
* @brief GAUDIN safety rules header file.
*
* @addtogroup GAUDIN
* @{
*/
#ifndef _GAUDIN_RULES_H
#define _GAUDIN_RULES_H
#if GFX_USE_GAUDIN
#if GFX_USE_GEVENT && !GFX_USE_GTIMER
#if GFX_DISPLAY_RULE_WARNINGS
#warning "GAUDIN: GFX_USE_GTIMER is required if GFX_USE_GAUDIN and GFX_USE_GEVENT are TRUE. It has been turned on for you."
#endif
#undef GFX_USE_GTIMER
#define GFX_USE_GTIMER TRUE
#endif
#endif
#endif /* _GAUDIN_RULES_H */
/** @} */

2
include/gaudout/gaudout.h → src/gaudout/sys_defs.h
View file

@ -6,7 +6,7 @@
*/
/**
* @file include/gaudout/gaudout.h
* @file src/gaudout/sys_defs.h
*
* @addtogroup GAUDOUT
*

2
src/gaudout/gaudout.mk → src/gaudout/sys_make.mk
View file

@ -1 +1 @@
GFXSRC += $(GFXLIB)/src/gaudout/gaudout.c
GFXSRC += $(GFXLIB)/src/gaudout/gaudout.c

52
include/gaudout/options.h → src/gaudout/sys_options.h
View file

@ -4,29 +4,29 @@
*
* http://ugfx.org/license.html
*/
/**
* @file include/gaudout/options.h
* @brief GAUDOUT - Audio Output subsystem options header file.
*
* @addtogroup GAUDOUT
* @{
*/
#ifndef _GAUDOUT_OPTIONS_H
#define _GAUDOUT_OPTIONS_H
/**
* @name GAUDOUT Functionality to be included
* @{
*/
/**
* @}
*
* @name GAUDOUT Optional Sizing Parameters
* @{
*/
/** @} */
#endif /* _GAUDOUT_OPTIONS_H */
/** @} */
/**
* @file src/gaudout/sys_options.h
* @brief GAUDOUT - Audio Output subsystem options header file.
*
* @addtogroup GAUDOUT
* @{
*/
#ifndef _GAUDOUT_OPTIONS_H
#define _GAUDOUT_OPTIONS_H
/**
* @name GAUDOUT Functionality to be included
* @{
*/
/**
* @}
*
* @name GAUDOUT Optional Sizing Parameters
* @{
*/
/** @} */
#endif /* _GAUDOUT_OPTIONS_H */
/** @} */

23
src/gaudout/sys_rules.h Normal file
View file

@ -0,0 +1,23 @@
/*
* 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/gaudout/sys_rules.h
* @brief GAUDOUT safety rules header file.
*
* @addtogroup GAUDOUT
* @{
*/
#ifndef _GAUDOUT_RULES_H
#define _GAUDOUT_RULES_H
#if GFX_USE_GAUDOUT
#endif
#endif /* _GAUDOUT_RULES_H */
/** @} */

0
include/gdisp/colors.h → src/gdisp/colors.h
View file

2
include/gdisp/lld/gdisp_lld.h → src/gdisp/driver.h
View file

@ -6,7 +6,7 @@
*/
/**
* @file include/gdisp/lld/gdisp_lld.h
* @file src/gdisp/driver.h
* @brief GDISP Graphic Driver subsystem low level driver header.
*
* @addtogroup GDISP

2
src/gdisp/fonts/build_fonts.sh
View file

@ -72,7 +72,7 @@ for file in *.c; do
defname='GDISP_INCLUDE_FONT_'$upper
echo '#if defined('$defname') && '$defname >> fonts.h
echo '#define GDISP_FONT_FOUND' >> fonts.h
echo '#include "../src/gdisp/fonts/'$file'"' >> fonts.h
echo '#include "src/gdisp/fonts/'$file'"' >> fonts.h
echo '#endif' >> fonts.h
done

34
src/gdisp/fonts/fonts.h
View file

@ -3,87 +3,87 @@
#if defined(GDISP_INCLUDE_FONT_DEJAVUSANS10) && GDISP_INCLUDE_FONT_DEJAVUSANS10
#define GDISP_FONT_FOUND
#include "../src/gdisp/fonts/DejaVuSans10.c"
#include "src/gdisp/fonts/DejaVuSans10.c"
#endif
#if defined(GDISP_INCLUDE_FONT_DEJAVUSANS12_AA) && GDISP_INCLUDE_FONT_DEJAVUSANS12_AA
#define GDISP_FONT_FOUND
#include "../src/gdisp/fonts/DejaVuSans12_aa.c"
#include "src/gdisp/fonts/DejaVuSans12_aa.c"
#endif
#if defined(GDISP_INCLUDE_FONT_DEJAVUSANS12) && GDISP_INCLUDE_FONT_DEJAVUSANS12
#define GDISP_FONT_FOUND
#include "../src/gdisp/fonts/DejaVuSans12.c"
#include "src/gdisp/fonts/DejaVuSans12.c"
#endif
#if defined(GDISP_INCLUDE_FONT_DEJAVUSANS16_AA) && GDISP_INCLUDE_FONT_DEJAVUSANS16_AA
#define GDISP_FONT_FOUND
#include "../src/gdisp/fonts/DejaVuSans16_aa.c"
#include "src/gdisp/fonts/DejaVuSans16_aa.c"
#endif
#if defined(GDISP_INCLUDE_FONT_DEJAVUSANS16) && GDISP_INCLUDE_FONT_DEJAVUSANS16
#define GDISP_FONT_FOUND
#include "../src/gdisp/fonts/DejaVuSans16.c"
#include "src/gdisp/fonts/DejaVuSans16.c"
#endif
#if defined(GDISP_INCLUDE_FONT_DEJAVUSANS24_AA) && GDISP_INCLUDE_FONT_DEJAVUSANS24_AA
#define GDISP_FONT_FOUND
#include "../src/gdisp/fonts/DejaVuSans24_aa.c"
#include "src/gdisp/fonts/DejaVuSans24_aa.c"
#endif
#if defined(GDISP_INCLUDE_FONT_DEJAVUSANS24) && GDISP_INCLUDE_FONT_DEJAVUSANS24
#define GDISP_FONT_FOUND
#include "../src/gdisp/fonts/DejaVuSans24.c"
#include "src/gdisp/fonts/DejaVuSans24.c"
#endif
#if defined(GDISP_INCLUDE_FONT_DEJAVUSANS32_AA) && GDISP_INCLUDE_FONT_DEJAVUSANS32_AA
#define GDISP_FONT_FOUND
#include "../src/gdisp/fonts/DejaVuSans32_aa.c"
#include "src/gdisp/fonts/DejaVuSans32_aa.c"
#endif
#if defined(GDISP_INCLUDE_FONT_DEJAVUSANS32) && GDISP_INCLUDE_FONT_DEJAVUSANS32
#define GDISP_FONT_FOUND
#include "../src/gdisp/fonts/DejaVuSans32.c"
#include "src/gdisp/fonts/DejaVuSans32.c"
#endif
#if defined(GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA) && GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA
#define GDISP_FONT_FOUND
#include "../src/gdisp/fonts/DejaVuSansBold12_aa.c"
#include "src/gdisp/fonts/DejaVuSansBold12_aa.c"
#endif
#if defined(GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12) && GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12
#define GDISP_FONT_FOUND
#include "../src/gdisp/fonts/DejaVuSansBold12.c"
#include "src/gdisp/fonts/DejaVuSansBold12.c"
#endif
#if defined(GDISP_INCLUDE_FONT_FIXED_10X20) && GDISP_INCLUDE_FONT_FIXED_10X20
#define GDISP_FONT_FOUND
#include "../src/gdisp/fonts/fixed_10x20.c"
#include "src/gdisp/fonts/fixed_10x20.c"
#endif
#if defined(GDISP_INCLUDE_FONT_FIXED_5X8) && GDISP_INCLUDE_FONT_FIXED_5X8
#define GDISP_FONT_FOUND
#include "../src/gdisp/fonts/fixed_5x8.c"
#include "src/gdisp/fonts/fixed_5x8.c"
#endif
#if defined(GDISP_INCLUDE_FONT_FIXED_7X14) && GDISP_INCLUDE_FONT_FIXED_7X14
#define GDISP_FONT_FOUND
#include "../src/gdisp/fonts/fixed_7x14.c"
#include "src/gdisp/fonts/fixed_7x14.c"
#endif
#if defined(GDISP_INCLUDE_FONT_LARGENUMBERS) && GDISP_INCLUDE_FONT_LARGENUMBERS
#define GDISP_FONT_FOUND
#include "../src/gdisp/fonts/LargeNumbers.c"
#include "src/gdisp/fonts/LargeNumbers.c"
#endif
#if defined(GDISP_INCLUDE_FONT_UI1) && GDISP_INCLUDE_FONT_UI1
#define GDISP_FONT_FOUND
#include "../src/gdisp/fonts/UI1.c"
#include "src/gdisp/fonts/UI1.c"
#endif
#if defined(GDISP_INCLUDE_FONT_UI2) && GDISP_INCLUDE_FONT_UI2
#define GDISP_FONT_FOUND
#include "../src/gdisp/fonts/UI2.c"
#include "src/gdisp/fonts/UI2.c"
#endif
#if defined(GDISP_INCLUDE_USER_FONTS) && GDISP_INCLUDE_USER_FONTS

2
src/gdisp/gdisp.c
View file

@ -17,7 +17,7 @@
#if GFX_USE_GDISP
/* Include the low level driver information */
#include "gdisp/lld/gdisp_lld.h"
#include "src/gdisp/driver.h"
#if 1
#undef INLINE

0
include/gdisp/image.h → src/gdisp/image.h
View file

4
src/gdisp/mcufont/mf_config.h
View file

@ -14,7 +14,7 @@
* Configuration settings related to GFX *
*******************************************************/
#include <gfx.h>
#include "gfx.h"
#if !GFX_USE_GDISP || !GDISP_NEED_TEXT
#define MF_NO_COMPILE // Don't compile any font code
@ -31,7 +31,7 @@
#endif
#define MF_USE_KERNING GDISP_NEED_TEXT_KERNING
#define MF_FONT_FILE_NAME "../src/gdisp/fonts/fonts.h"
#define MF_FONT_FILE_NAME "src/gdisp/fonts/fonts.h"
/* These are not used for now */
#define MF_USE_ADVANCED_WORDWRAP 0

Some files were not shown because too many files have changed in this diff Show more