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

Big file rename to reduce problems with brain-dead IDE's that don't handle project file hierarchies well. 

Naming is more consistent with the new scheme.
May affect some third party drivers (header file renames).
ugfx_release_2.6
inmarket 2015-01-21 17:26:24 +10:00
parent 34939386d7
commit fa8167b94d
149 changed files with 251 additions and 360 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/tools/touch_driver_test/main.c
View File

@ -30,8 +30,8 @@
#include "gfx.h" #include "gfx.h"
// We get nasty and look at some internal structures - get the relevant information // We get nasty and look at some internal structures - get the relevant information
#include "src/gdriver/sys_defs.h" #include "src/gdriver/gdriver.h"
#include "src/ginput/driver_mouse.h" #include "src/ginput/ginput_driver_mouse.h"
#include <string.h> #include <string.h>

4
demos/tools/touch_raw_readings/main.c
View File

@ -30,8 +30,8 @@
#include "gfx.h" #include "gfx.h"
// We get nasty and look at some internal structures - get the relevant information // We get nasty and look at some internal structures - get the relevant information
#include "src/gdriver/sys_defs.h" #include "src/gdriver/gdriver.h"
#include "src/ginput/driver_mouse.h" #include "src/ginput/ginput_driver_mouse.h"
#include <string.h> #include <string.h>

2
docs/src/containers.dox
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/sys_defs.h * @file src/gwin/gwin.h
* *
* @defgroup Containers Containers * @defgroup Containers Containers
* @ingroup GWIN * @ingroup GWIN

2
docs/src/widgets.dox
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/sys_defs.h * @file src/gwin/gwin.h
* *
* @defgroup Widgets Widgets * @defgroup Widgets Widgets
* @ingroup GWIN * @ingroup GWIN

2
docs/src/windows.dox
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/sys_defs.h * @file src/gwin/gwin.h
* *
* @defgroup Windows Windows * @defgroup Windows Windows
* @ingroup GWIN * @ingroup GWIN

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

@ -14,7 +14,7 @@
#if GFX_USE_GADC #if GFX_USE_GADC
#include "src/gadc/driver.h" #include "src/gadc/gadc_driver.h"
static uint32_t nextfreq; static uint32_t nextfreq;

2
drivers/gaudio/Win32/gaudio_play_lld.c
View File

@ -10,7 +10,7 @@
#if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY #if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY
/* Include the driver defines */ /* Include the driver defines */
#include "src/gaudio/driver_play.h" #include "src/gaudio/gaudio_driver_play.h"
#undef Red #undef Red
#undef Green #undef Green

2
drivers/gaudio/Win32/gaudio_record_lld.c
View File

@ -10,7 +10,7 @@
#if GFX_USE_GAUDIO && GAUDIO_NEED_RECORD #if GFX_USE_GAUDIO && GAUDIO_NEED_RECORD
/* Include the driver defines */ /* Include the driver defines */
#include "src/gaudio/driver_record.h" #include "src/gaudio/gaudio_driver_record.h"
#undef Red #undef Red
#undef Green #undef Green

2
drivers/gaudio/gadc/gaudio_record_lld.c
View File

@ -16,7 +16,7 @@
#endif #endif
/* Include the driver defines */ /* Include the driver defines */
#include "src/gaudio/driver_record.h" #include "src/gaudio/gaudio_driver_record.h"
static void gadcCallbackI(void) { static void gadcCallbackI(void) {
GDataBuffer *pd; GDataBuffer *pd;

2
drivers/gaudio/pwm/gaudio_play_lld.c
View File

@ -10,7 +10,7 @@
#if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY #if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY
/* Include the driver defines */ /* Include the driver defines */
#include "src/gaudio/driver_play.h" #include "src/gaudio/gaudio_driver_play.h"
/* Forward definition */ /* Forward definition */
static void gaudio_play_pwm_timer_callbackI(void); static void gaudio_play_pwm_timer_callbackI(void);

2
drivers/gaudio/vs1053/gaudio_play_lld.c
View File

@ -10,7 +10,7 @@
#if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY #if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY
/* Include the driver defines */ /* Include the driver defines */
#include "src/gaudio/driver_play.h" #include "src/gaudio/gaudio_driver_play.h"
/* Include the vs1053 registers */ /* Include the vs1053 registers */
#include "drivers/gaudio/vs1053/vs1053.h" #include "drivers/gaudio/vs1053/vs1053.h"

2
drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c
View File

@ -11,7 +11,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_ED060SC4 #define GDISP_DRIVER_VMT GDISPVMT_ED060SC4
#include "drivers/gdisp/ED060SC4/gdisp_lld_config.h" #include "drivers/gdisp/ED060SC4/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_ED060SC4.h" #include "board_ED060SC4.h"

2
drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c
View File

@ -11,7 +11,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_HX8347D #define GDISP_DRIVER_VMT GDISPVMT_HX8347D
#include "drivers/gdisp/HX8347D/gdisp_lld_config.h" #include "drivers/gdisp/HX8347D/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_HX8347D.h" #include "board_HX8347D.h"

2
drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c
View File

@ -21,7 +21,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_ILI9320 #define GDISP_DRIVER_VMT GDISPVMT_ILI9320
#include "drivers/gdisp/ILI9320/gdisp_lld_config.h" #include "drivers/gdisp/ILI9320/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_ILI9320.h" #include "board_ILI9320.h"

2
drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c
View File

@ -21,7 +21,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_ILI9325 #define GDISP_DRIVER_VMT GDISPVMT_ILI9325
#include "drivers/gdisp/ILI9325/gdisp_lld_config.h" #include "drivers/gdisp/ILI9325/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_ILI9325.h" #include "board_ILI9325.h"

2
drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c
View File

@ -20,7 +20,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_ILI9341 #define GDISP_DRIVER_VMT GDISPVMT_ILI9341
#include "drivers/gdisp/ILI9341/gdisp_lld_config.h" #include "drivers/gdisp/ILI9341/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_ILI9341.h" #include "board_ILI9341.h"

2
drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c
View File

@ -21,7 +21,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_ILI93xx #define GDISP_DRIVER_VMT GDISPVMT_ILI93xx
#include "drivers/gdisp/ILI93xx/gdisp_lld_config.h" #include "drivers/gdisp/ILI93xx/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_ILI93xx.h" #include "board_ILI93xx.h"

2
drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c
View File

@ -20,7 +20,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_ILI9481 #define GDISP_DRIVER_VMT GDISPVMT_ILI9481
#include "drivers/gdisp/ILI9481/gdisp_lld_config.h" #include "drivers/gdisp/ILI9481/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_ILI9481.h" #include "board_ILI9481.h"

2
drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c
View File

@ -21,7 +21,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_LGDP4532 #define GDISP_DRIVER_VMT GDISPVMT_LGDP4532
#include "gdisp_lld_config.h" #include "gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_LGDP4532.h" #include "board_LGDP4532.h"

2
drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c
View File

@ -20,7 +20,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_Nokia6610GE12 #define GDISP_DRIVER_VMT GDISPVMT_Nokia6610GE12
#include "drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h" #include "drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_Nokia6610GE12.h" #include "board_Nokia6610GE12.h"

2
drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
View File

@ -52,7 +52,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_Nokia6610GE8 #define GDISP_DRIVER_VMT GDISPVMT_Nokia6610GE8
#include "drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h" #include "drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_Nokia6610GE8.h" #include "board_Nokia6610GE8.h"

2
drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c
View File

@ -11,7 +11,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_PCD8544 #define GDISP_DRIVER_VMT GDISPVMT_PCD8544
#include "drivers/gdisp/PCD8544/gdisp_lld_config.h" #include "drivers/gdisp/PCD8544/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_PCD8544.h" #include "board_PCD8544.h"
/*===========================================================================*/ /*===========================================================================*/

2
drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c
View File

@ -11,7 +11,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_PCF8812 #define GDISP_DRIVER_VMT GDISPVMT_PCF8812
#include "drivers/gdisp/PCF8812/gdisp_lld_config.h" #include "drivers/gdisp/PCF8812/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_PCF8812.h" #include "board_PCF8812.h"
/*===========================================================================*/ /*===========================================================================*/

2
drivers/gdisp/R61505U/gdisp_lld_R61505U.c
View File

@ -21,7 +21,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_R61505U #define GDISP_DRIVER_VMT GDISPVMT_R61505U
#include "drivers/gdisp/R61505U/gdisp_lld_config.h" #include "drivers/gdisp/R61505U/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_R61505U.h" #include "board_R61505U.h"

2
drivers/gdisp/RA8875/gdisp_lld_RA8875.c
View File

@ -11,7 +11,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_RA8875 #define GDISP_DRIVER_VMT GDISPVMT_RA8875
#include "drivers/gdisp/RA8875/gdisp_lld_config.h" #include "drivers/gdisp/RA8875/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
/* include the users board interface */ /* include the users board interface */
#include "board_RA8875.h" #include "board_RA8875.h"

2
drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c
View File

@ -20,7 +20,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_S6D1121 #define GDISP_DRIVER_VMT GDISPVMT_S6D1121
#include "drivers/gdisp/S6D1121/gdisp_lld_config.h" #include "drivers/gdisp/S6D1121/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_S6D1121.h" #include "board_S6D1121.h"

2
drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c
View File

@ -25,7 +25,7 @@
#endif #endif
#include "drivers/gdisp/SPFD54124B/gdisp_lld_config.h" #include "drivers/gdisp/SPFD54124B/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_SPFD54124B.h" #include "board_SPFD54124B.h"

2
drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c
View File

@ -11,7 +11,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_SSD1289 #define GDISP_DRIVER_VMT GDISPVMT_SSD1289
#include "drivers/gdisp/SSD1289/gdisp_lld_config.h" #include "drivers/gdisp/SSD1289/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_SSD1289.h" #include "board_SSD1289.h"

2
drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c
View File

@ -11,7 +11,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_SSD1306 #define GDISP_DRIVER_VMT GDISPVMT_SSD1306
#include "drivers/gdisp/SSD1306/gdisp_lld_config.h" #include "drivers/gdisp/SSD1306/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_SSD1306.h" #include "board_SSD1306.h"
#include <string.h> // for memset #include <string.h> // for memset

2
drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
View File

@ -11,7 +11,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_SSD1963 #define GDISP_DRIVER_VMT GDISPVMT_SSD1963
#include "drivers/gdisp/SSD1963/gdisp_lld_config.h" #include "drivers/gdisp/SSD1963/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#define CALC_PERIOD(w,b,f,p) (p+b+w+f) #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) #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)

2
drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c
View File

@ -11,7 +11,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_SSD2119 #define GDISP_DRIVER_VMT GDISPVMT_SSD2119
#include "drivers/gdisp/SSD2119/gdisp_lld_config.h" #include "drivers/gdisp/SSD2119/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_SSD2119.h" #include "board_SSD2119.h"

2
drivers/gdisp/ST7565/gdisp_lld_ST7565.c
View File

@ -11,7 +11,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_ST7565 #define GDISP_DRIVER_VMT GDISPVMT_ST7565
#include "drivers/gdisp/ST7565/gdisp_lld_config.h" #include "drivers/gdisp/ST7565/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_ST7565.h" #include "board_ST7565.h"

2
drivers/gdisp/STM32F429iDiscovery/gdisp_lld_STM32F429iDiscovery.c
View File

@ -20,7 +20,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_STM32F429iDiscovery #define GDISP_DRIVER_VMT GDISPVMT_STM32F429iDiscovery
#include "drivers/gdisp/STM32F429iDiscovery/gdisp_lld_config.h" #include "drivers/gdisp/STM32F429iDiscovery/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "stm32_ltdc.h" #include "stm32_ltdc.h"

2
drivers/gdisp/TestStub/gdisp_lld_TestStub.c
View File

@ -11,7 +11,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_TestStub #define GDISP_DRIVER_VMT GDISPVMT_TestStub
#include "drivers/gdisp/TestStub/gdisp_lld_config.h" #include "drivers/gdisp/TestStub/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#ifndef GDISP_SCREEN_HEIGHT #ifndef GDISP_SCREEN_HEIGHT
#define GDISP_SCREEN_HEIGHT 128 #define GDISP_SCREEN_HEIGHT 128

2
drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c
View File

@ -16,7 +16,7 @@ typedef struct fbInfo {
#define GDISP_DRIVER_VMT GDISPVMT_framebuffer #define GDISP_DRIVER_VMT GDISPVMT_framebuffer
#include "drivers/gdisp/framebuffer/gdisp_lld_config.h" #include "drivers/gdisp/framebuffer/gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "board_framebuffer.h" #include "board_framebuffer.h"
typedef struct fbPriv { typedef struct fbPriv {

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

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

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

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

2
drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c
View File

@ -10,7 +10,7 @@
#if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) #if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE)
#define GMOUSE_DRIVER_VMT GMOUSEVMT_ADS7843 #define GMOUSE_DRIVER_VMT GMOUSEVMT_ADS7843
#include "src/ginput/driver_mouse.h" #include "src/ginput/ginput_driver_mouse.h"
// Get the hardware interface // Get the hardware interface
#include "gmouse_lld_ADS7843_board.h" #include "gmouse_lld_ADS7843_board.h"

2
drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c
View File

@ -10,7 +10,7 @@
#if GFX_USE_GINPUT && GINPUT_NEED_MOUSE #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
#define GMOUSE_DRIVER_VMT GMOUSEVMT_FT5x06 #define GMOUSE_DRIVER_VMT GMOUSEVMT_FT5x06
#include "src/ginput/driver_mouse.h" #include "src/ginput/ginput_driver_mouse.h"
// Get the hardware interface // Get the hardware interface
#include "gmouse_lld_FT5x06_board.h" #include "gmouse_lld_FT5x06_board.h"

2
drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c
View File

@ -10,7 +10,7 @@
#if GFX_USE_GINPUT && GINPUT_NEED_MOUSE #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
#define GMOUSE_DRIVER_VMT GMOUSEVMT_MAX11802 #define GMOUSE_DRIVER_VMT GMOUSEVMT_MAX11802
#include "src/ginput/driver_mouse.h" #include "src/ginput/ginput_driver_mouse.h"
// Hardware definitions // Hardware definitions
#include "drivers/ginput/touch/MAX11802/max11802.h" #include "drivers/ginput/touch/MAX11802/max11802.h"

2
drivers/ginput/touch/MCU/gmouse_lld_MCU.c
View File

@ -10,7 +10,7 @@
#if GFX_USE_GINPUT && GINPUT_NEED_MOUSE #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
#define GMOUSE_DRIVER_VMT GMOUSEVMT_MCU #define GMOUSE_DRIVER_VMT GMOUSEVMT_MCU
#include "src/ginput/driver_mouse.h" #include "src/ginput/ginput_driver_mouse.h"
// Get the hardware interface // Get the hardware interface
#include "gmouse_lld_MCU_board.h" #include "gmouse_lld_MCU_board.h"

2
drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c
View File

@ -10,7 +10,7 @@
#if GFX_USE_GINPUT && GINPUT_NEED_MOUSE #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
#define GMOUSE_DRIVER_VMT GMOUSEVMT_STMPE811 #define GMOUSE_DRIVER_VMT GMOUSEVMT_STMPE811
#include "src/ginput/driver_mouse.h" #include "src/ginput/ginput_driver_mouse.h"
// Hardware definitions // Hardware definitions
#include "drivers/ginput/touch/STMPE811/stmpe811.h" #include "drivers/ginput/touch/STMPE811/stmpe811.h"

10
drivers/multiple/Win32/gdisp_lld_Win32.c
View File

@ -11,7 +11,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_Win32 #define GDISP_DRIVER_VMT GDISPVMT_Win32
#include "gdisp_lld_config.h" #include "gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
// Configuration parameters for this driver // Configuration parameters for this driver
#ifndef GDISP_SCREEN_WIDTH #ifndef GDISP_SCREEN_WIDTH
@ -79,13 +79,13 @@
#if GINPUT_NEED_TOGGLE #if GINPUT_NEED_TOGGLE
/* Include toggle support code */ /* Include toggle support code */
#include "src/ginput/driver_toggle.h" #include "src/ginput/ginput_driver_toggle.h"
#endif #endif
#if GINPUT_NEED_MOUSE #if GINPUT_NEED_MOUSE
// Include mouse support code // Include mouse support code
#define GMOUSE_DRIVER_VMT GMOUSEVMT_Win32 #define GMOUSE_DRIVER_VMT GMOUSEVMT_Win32
#include "src/ginput/driver_mouse.h" #include "src/ginput/ginput_driver_mouse.h"
// Forward definitions // Forward definitions
static bool_t Win32MouseInit(GMouse *m, unsigned driverinstance); static bool_t Win32MouseInit(GMouse *m, unsigned driverinstance);
@ -126,14 +126,14 @@
#if GINPUT_NEED_KEYBOARD #if GINPUT_NEED_KEYBOARD
#define GKEYBOARD_DRIVER_VMT GKEYBOARDVMT_Win32 #define GKEYBOARD_DRIVER_VMT GKEYBOARDVMT_Win32
#include "src/ginput/driver_keyboard.h" #include "src/ginput/ginput_driver_keyboard.h"
#if !GKEYBOARD_WIN32_NO_LAYOUT #if !GKEYBOARD_WIN32_NO_LAYOUT
#if GKEYBOARD_LAYOUT_OFF #if GKEYBOARD_LAYOUT_OFF
#error "The Win32 keyboard driver is using the layout engine. Please set GKEYBOARD_LAYOUT_OFF=FALSE or GKEYBOARD_WIN32_NO_LAYOUT=TRUE." #error "The Win32 keyboard driver is using the layout engine. Please set GKEYBOARD_LAYOUT_OFF=FALSE or GKEYBOARD_WIN32_NO_LAYOUT=TRUE."
#endif #endif
#include "src/ginput/keyboard_microcode.h" #include "src/ginput/ginput_keyboard_microcode.h"
// Forward definitions // Forward definitions
extern uint8_t GKEYBOARD_WIN32_DEFAULT_LAYOUT[]; extern uint8_t GKEYBOARD_WIN32_DEFAULT_LAYOUT[];

8
drivers/multiple/X/gdisp_lld_X.c
View File

@ -17,7 +17,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_X11 #define GDISP_DRIVER_VMT GDISPVMT_X11
#include "gdisp_lld_config.h" #include "gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
// Configuration parameters for this driver // Configuration parameters for this driver
#ifndef GDISP_FORCE_24BIT #ifndef GDISP_FORCE_24BIT
@ -53,7 +53,7 @@
#if GINPUT_NEED_MOUSE #if GINPUT_NEED_MOUSE
// Include mouse support code // Include mouse support code
#define GMOUSE_DRIVER_VMT GMOUSEVMT_X11 #define GMOUSE_DRIVER_VMT GMOUSEVMT_X11
#include "src/ginput/driver_mouse.h" #include "src/ginput/ginput_driver_mouse.h"
// Forward definitions // Forward definitions
static bool_t XMouseInit(GMouse *m, unsigned driverinstance); static bool_t XMouseInit(GMouse *m, unsigned driverinstance);
@ -95,7 +95,7 @@
#if GINPUT_NEED_KEYBOARD #if GINPUT_NEED_KEYBOARD
// Include mouse support code // Include mouse support code
#define GKEYBOARD_DRIVER_VMT GKEYBOARDVMT_X #define GKEYBOARD_DRIVER_VMT GKEYBOARDVMT_X
#include "src/ginput/driver_keyboard.h" #include "src/ginput/ginput_driver_keyboard.h"
#if !GKEYBOARD_X_NO_LAYOUT #if !GKEYBOARD_X_NO_LAYOUT
#if GKEYBOARD_LAYOUT_OFF #if GKEYBOARD_LAYOUT_OFF
@ -105,7 +105,7 @@
// Forward definitions // Forward definitions
extern uint8_t GKEYBOARD_X_DEFAULT_LAYOUT[]; extern uint8_t GKEYBOARD_X_DEFAULT_LAYOUT[];
#include "src/ginput/keyboard_microcode.h" #include "src/ginput/ginput_keyboard_microcode.h"
#include <X11/keysym.h> #include <X11/keysym.h>
// This is the layout code for the English US keyboard. // This is the layout code for the English US keyboard.

4
drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
View File

@ -11,7 +11,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_uGFXnet #define GDISP_DRIVER_VMT GDISPVMT_uGFXnet
#include "gdisp_lld_config.h" #include "gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "uGFXnetProtocol.h" #include "uGFXnetProtocol.h"
#ifndef GDISP_SCREEN_WIDTH #ifndef GDISP_SCREEN_WIDTH
@ -36,7 +36,7 @@
#if GINPUT_NEED_MOUSE #if GINPUT_NEED_MOUSE
// Include mouse support code // Include mouse support code
#define GMOUSE_DRIVER_VMT GMOUSEVMT_uGFXnet #define GMOUSE_DRIVER_VMT GMOUSEVMT_uGFXnet
#include "src/ginput/driver_mouse.h" #include "src/ginput/ginput_driver_mouse.h"
// Forward definitions // Forward definitions
static bool_t NMouseInit(GMouse *m, unsigned driverinstance); static bool_t NMouseInit(GMouse *m, unsigned driverinstance);

72
gfx.h
View File

@ -161,18 +161,18 @@
* Get all the options for each sub-system. * Get all the options for each sub-system.
* *
*/ */
#include "src/gos/sys_options.h" #include "src/gos/gos_options.h"
#include "src/gdriver/sys_options.h" #include "src/gdriver/gdriver_options.h"
#include "src/gfile/sys_options.h" #include "src/gfile/gfile_options.h"
#include "src/gmisc/sys_options.h" #include "src/gmisc/gmisc_options.h"
#include "src/gqueue/sys_options.h" #include "src/gqueue/gqueue_options.h"
#include "src/gevent/sys_options.h" #include "src/gevent/gevent_options.h"
#include "src/gtimer/sys_options.h" #include "src/gtimer/gtimer_options.h"
#include "src/gdisp/sys_options.h" #include "src/gdisp/gdisp_options.h"
#include "src/gwin/sys_options.h" #include "src/gwin/gwin_options.h"
#include "src/ginput/sys_options.h" #include "src/ginput/ginput_options.h"
#include "src/gadc/sys_options.h" #include "src/gadc/gadc_options.h"
#include "src/gaudio/sys_options.h" #include "src/gaudio/gaudio_options.h"
/** /**
* Interdependency safety checks on the sub-systems. * Interdependency safety checks on the sub-systems.
@ -182,34 +182,34 @@
#ifndef GFX_DISPLAY_RULE_WARNINGS #ifndef GFX_DISPLAY_RULE_WARNINGS
#define GFX_DISPLAY_RULE_WARNINGS FALSE #define GFX_DISPLAY_RULE_WARNINGS FALSE
#endif #endif
#include "src/gwin/sys_rules.h" #include "src/gwin/gwin_rules.h"
#include "src/ginput/sys_rules.h" #include "src/ginput/ginput_rules.h"
#include "src/gdisp/sys_rules.h" #include "src/gdisp/gdisp_rules.h"
#include "src/gaudio/sys_rules.h" #include "src/gaudio/gaudio_rules.h"
#include "src/gadc/sys_rules.h" #include "src/gadc/gadc_rules.h"
#include "src/gevent/sys_rules.h" #include "src/gevent/gevent_rules.h"
#include "src/gtimer/sys_rules.h" #include "src/gtimer/gtimer_rules.h"
#include "src/gqueue/sys_rules.h" #include "src/gqueue/gqueue_rules.h"
#include "src/gmisc/sys_rules.h" #include "src/gmisc/gmisc_rules.h"
#include "src/gfile/sys_rules.h" #include "src/gfile/gfile_rules.h"
#include "src/gdriver/sys_rules.h" #include "src/gdriver/gdriver_rules.h"
#include "src/gos/sys_rules.h" #include "src/gos/gos_rules.h"
/** /**
* Include the sub-system header files * Include the sub-system header files
*/ */
#include "src/gos/sys_defs.h" #include "src/gos/gos.h"
//#include "src/gdriver/sys_defs.h" // This module is only included by source that needs it. //#include "src/gdriver/gdriver.h" // This module is only included by source that needs it.
#include "src/gfile/sys_defs.h" #include "src/gfile/gfile.h"
#include "src/gmisc/sys_defs.h" #include "src/gmisc/gmisc.h"
#include "src/gqueue/sys_defs.h" #include "src/gqueue/gqueue.h"
#include "src/gevent/sys_defs.h" #include "src/gevent/gevent.h"
#include "src/gtimer/sys_defs.h" #include "src/gtimer/gtimer.h"
#include "src/gdisp/sys_defs.h" #include "src/gdisp/gdisp.h"
#include "src/gwin/sys_defs.h" #include "src/gwin/gwin.h"
#include "src/ginput/sys_defs.h" #include "src/ginput/ginput.h"
#include "src/gadc/sys_defs.h" #include "src/gadc/gadc.h"
#include "src/gaudio/sys_defs.h" #include "src/gaudio/gaudio.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

24
gfx.mk
View File

@ -1,18 +1,18 @@
GFXINC += $(GFXLIB) GFXINC += $(GFXLIB)
GFXSRC += $(GFXLIB)/src/gfx.c GFXSRC += $(GFXLIB)/src/gfx.c
include $(GFXLIB)/src/gos/sys_make.mk include $(GFXLIB)/src/gos/gos.mk
include $(GFXLIB)/src/gdriver/sys_make.mk include $(GFXLIB)/src/gdriver/gdriver.mk
include $(GFXLIB)/src/gqueue/sys_make.mk include $(GFXLIB)/src/gqueue/gqueue.mk
include $(GFXLIB)/src/gdisp/sys_make.mk include $(GFXLIB)/src/gdisp/gdisp.mk
include $(GFXLIB)/src/gevent/sys_make.mk include $(GFXLIB)/src/gevent/gevent.mk
include $(GFXLIB)/src/gtimer/sys_make.mk include $(GFXLIB)/src/gtimer/gtimer.mk
include $(GFXLIB)/src/gwin/sys_make.mk include $(GFXLIB)/src/gwin/gwin.mk
include $(GFXLIB)/src/ginput/sys_make.mk include $(GFXLIB)/src/ginput/ginput.mk
include $(GFXLIB)/src/gadc/sys_make.mk include $(GFXLIB)/src/gadc/gadc.mk
include $(GFXLIB)/src/gaudio/sys_make.mk include $(GFXLIB)/src/gaudio/gaudio.mk
include $(GFXLIB)/src/gmisc/sys_make.mk include $(GFXLIB)/src/gmisc/gmisc.mk
include $(GFXLIB)/src/gfile/sys_make.mk include $(GFXLIB)/src/gfile/gfile.mk
# Include the boards and drivers # Include the boards and drivers
ifneq ($(GFXBOARD),) ifneq ($(GFXBOARD),)

11
src/gadc/gadc_gadc.c → src/gadc/gadc.c
View File

@ -5,19 +5,12 @@
* http://ugfx.org/license.html * http://ugfx.org/license.html
*/ */
/**
* @file src/gadc/gadc_gadc.c
* @brief GADC sub-system code.
*
* @addtogroup GADC
* @{
*/
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GADC #if GFX_USE_GADC
/* Include the driver defines */ /* Include the driver defines */
#include "driver.h" #include "gadc_driver.h"
#if GADC_MAX_HIGH_SPEED_SAMPLERATE > GADC_MAX_SAMPLE_FREQUENCY/2 #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" #error "GADC: GADC_MAX_HIGH_SPEED_SAMPLERATE has been set too high. It must be less than half the maximum CPU rate"
@ -358,5 +351,3 @@ bool_t gadcLowSpeedStart(uint32_t physdev, adcsample_t *buffer, GADCCallbackFunc
} }
#endif /* GFX_USE_GADC */ #endif /* GFX_USE_GADC */
/** @} */

2
src/gadc/sys_defs.h → src/gadc/gadc.h
View File

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

1
src/gadc/gadc.mk 100644
View File

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

2
src/gadc/driver.h → src/gadc/gadc_driver.h
View File

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

2
src/gadc/sys_options.h → src/gadc/gadc_options.h
View File

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

2
src/gadc/sys_rules.h → src/gadc/gadc_rules.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gadc/sys_rules.h * @file src/gadc/gadc_rules.h
* @brief GADC safety rules header file. * @brief GADC safety rules header file.
* *
* @addtogroup GADC * @addtogroup GADC

1
src/gadc/sys_make.mk
View File

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

12
src/gaudio/gaudio_gaudio.c → src/gaudio/gaudio.c
View File

@ -5,19 +5,12 @@
* http://ugfx.org/license.html * http://ugfx.org/license.html
*/ */
/**
* @file src/gaudio/gaudio_gaudio.c
* @brief GAUDIO sub-system code.
*
* @addtogroup GAUDIO
* @{
*/
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GAUDIO #if GFX_USE_GAUDIO
#if GAUDIO_NEED_PLAY #if GAUDIO_NEED_PLAY
#include "driver_play.h" #include "gaudio_driver_play.h"
static gfxQueueASync playList; static gfxQueueASync playList;
static gfxSem playComplete; static gfxSem playComplete;
@ -32,7 +25,7 @@
#endif #endif
#if GAUDIO_NEED_RECORD #if GAUDIO_NEED_RECORD
#include "driver_record.h" #include "gaudio_driver_record.h"
static gfxQueueGSync recordList; static gfxQueueGSync recordList;
static uint16_t recordFlags; static uint16_t recordFlags;
@ -280,4 +273,3 @@ void _gaudioDeinit(void)
#endif #endif
#endif /* GFX_USE_GAUDIO */ #endif /* GFX_USE_GAUDIO */
/** @} */

2
src/gaudio/sys_defs.h → src/gaudio/gaudio.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gaudio/sys_defs.h * @file src/gaudio/gaudio.h
* *
* @addtogroup GAUDIO * @addtogroup GAUDIO
* *

1
src/gaudio/gaudio.mk 100644
View File

@ -0,0 +1 @@
GFXSRC += $(GFXLIB)/src/gaudio/gaudio.c

2
src/gaudio/driver_play.h → src/gaudio/gaudio_driver_play.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gaudio/driver_play.h * @file src/gaudio/gaudio_driver_play.h
* @brief GAUDIO - Audio play driver header file. * @brief GAUDIO - Audio play driver header file.
* *
* @defgroup Driver Driver * @defgroup Driver Driver

2
src/gaudio/driver_record.h → src/gaudio/gaudio_driver_record.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gaudio/driver_record.h * @file src/gaudio/gaudio_driver_record.h
* @brief GAUDIO - Audio Recording driver header file. * @brief GAUDIO - Audio Recording driver header file.
* *
* @defgroup Driver Driver * @defgroup Driver Driver

2
src/gaudio/sys_options.h → src/gaudio/gaudio_options.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gaudio/sys_options.h * @file src/gaudio/gaudio_options.h
* @brief GAUDIO - Audio subsystem options header file. * @brief GAUDIO - Audio subsystem options header file.
* *
* @addtogroup GAUDIO * @addtogroup GAUDIO

2
src/gaudio/sys_rules.h → src/gaudio/gaudio_rules.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gaudio/sys_rules.h * @file src/gaudio/gaudio_rules.h
* @brief GAUDIO safety rules header file. * @brief GAUDIO safety rules header file.
* *
* @addtogroup GAUDIO * @addtogroup GAUDIO

1
src/gaudio/sys_make.mk
View File

@ -1 +0,0 @@
GFXSRC += $(GFXLIB)/src/gaudio/gaudio_gaudio.c

10
src/gdisp/gdisp_gdisp.c → src/gdisp/gdisp.c
View File

@ -5,19 +5,12 @@
* http://ugfx.org/license.html * http://ugfx.org/license.html
*/ */
/**
* @file src/gdisp/gdisp_gdisp.c
* @brief GDISP Driver code.
*
* @addtogroup GDISP
* @{
*/
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GDISP #if GFX_USE_GDISP
/* Include the low level driver information */ /* Include the low level driver information */
#include "driver.h" #include "gdisp_driver.h"
#if 1 #if 1
#undef INLINE #undef INLINE
@ -3375,4 +3368,3 @@ color_t gdispContrastColor(color_t color) {
#endif #endif
#endif /* GFX_USE_GDISP */ #endif /* GFX_USE_GDISP */
/** @} */

2
src/gdisp/sys_defs.h → src/gdisp/gdisp.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gdisp/sys_defs.h * @file src/gdisp/gdisp.h
* @brief GDISP Graphic Driver subsystem header file. * @brief GDISP Graphic Driver subsystem header file.
* *
* @addtogroup GDISP * @addtogroup GDISP

2
src/gdisp/sys_make.mk → src/gdisp/gdisp.mk
View File

@ -1,4 +1,4 @@
GFXSRC += $(GFXLIB)/src/gdisp/gdisp_gdisp.c \ GFXSRC += $(GFXLIB)/src/gdisp/gdisp.c \
$(GFXLIB)/src/gdisp/gdisp_fonts.c \ $(GFXLIB)/src/gdisp/gdisp_fonts.c \
$(GFXLIB)/src/gdisp/gdisp_pixmap.c \ $(GFXLIB)/src/gdisp/gdisp_pixmap.c \
$(GFXLIB)/src/gdisp/gdisp_image.c \ $(GFXLIB)/src/gdisp/gdisp_image.c \

4
src/gdisp/driver.h → src/gdisp/gdisp_driver.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gdisp/driver.h * @file src/gdisp/gdisp_driver.h
* @brief GDISP Graphic Driver subsystem low level driver header. * @brief GDISP Graphic Driver subsystem low level driver header.
* *
* @addtogroup GDISP * @addtogroup GDISP
@ -19,7 +19,7 @@
#if GFX_USE_GDISP #if GFX_USE_GDISP
// Include the GDRIVER infrastructure // Include the GDRIVER infrastructure
#include "src/gdriver/sys_defs.h" #include "src/gdriver/gdriver.h"
// Are we currently compiling the driver itself? // Are we currently compiling the driver itself?
#if defined(GDISP_DRIVER_VMT) #if defined(GDISP_DRIVER_VMT)

9
src/gdisp/gdisp_fonts.c
View File

@ -5,14 +5,6 @@
* http://ugfx.org/license.html * http://ugfx.org/license.html
*/ */
/**
* @file src/gdisp/gdisp_fonts.c
* @brief GDISP Font Handling.
*
* @addtogroup GDISP
* @{
*/
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GDISP && GDISP_NEED_TEXT #if GFX_USE_GDISP && GDISP_NEED_TEXT
@ -93,4 +85,3 @@ const char *gdispGetFontName(font_t font) {
} }
#endif /* GFX_USE_GDISP && GDISP_NEED_TEXT */ #endif /* GFX_USE_GDISP && GDISP_NEED_TEXT */
/** @} */

8
src/gdisp/gdisp_image.c
View File

@ -5,13 +5,6 @@
* http://ugfx.org/license.html * http://ugfx.org/license.html
*/ */
/**
* @file src/gdisp/gdisp_image.c
* @brief GDISP generic image code.
*
* @defgroup Image Image
* @ingroup GDISP
*/
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GDISP && GDISP_NEED_IMAGE #if GFX_USE_GDISP && GDISP_NEED_IMAGE
@ -230,4 +223,3 @@ void gdispImageFree(gdispImage *img, void *ptr, size_t sz) {
} }
#endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE */ #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE */
/** @} */

33
src/gdisp/gdisp_image_bmp.c
View File

@ -5,42 +5,10 @@
* http://ugfx.org/license.html * http://ugfx.org/license.html
*/ */
/**
* @file src/gdisp/gdisp_image_bmp.c
* @brief GDISP native image code.
*
* @defgroup Image Image
* @ingroup GDISP
*/
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_BMP #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_BMP
#ifndef GDISP_NEED_IMAGE_BMP_1
#define GDISP_NEED_IMAGE_BMP_1 TRUE
#endif
#ifndef GDISP_NEED_IMAGE_BMP_4
#define GDISP_NEED_IMAGE_BMP_4 TRUE
#endif
#ifndef GDISP_NEED_IMAGE_BMP_4_RLE
#define GDISP_NEED_IMAGE_BMP_4_RLE TRUE
#endif
#ifndef GDISP_NEED_IMAGE_BMP_8
#define GDISP_NEED_IMAGE_BMP_8 TRUE
#endif
#ifndef GDISP_NEED_IMAGE_BMP_8_RLE
#define GDISP_NEED_IMAGE_BMP_8_RLE TRUE
#endif
#ifndef GDISP_NEED_IMAGE_BMP_16
#define GDISP_NEED_IMAGE_BMP_16 TRUE
#endif
#ifndef GDISP_NEED_IMAGE_BMP_24
#define GDISP_NEED_IMAGE_BMP_24 TRUE
#endif
#ifndef GDISP_NEED_IMAGE_BMP_32
#define GDISP_NEED_IMAGE_BMP_32 TRUE
#endif
/** /**
* Helper Routines Needed * Helper Routines Needed
*/ */
@ -901,4 +869,3 @@ delaytime_t gdispImageNext_BMP(gdispImage *img) {
} }
#endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_BMP */ #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_BMP */
/** @} */

8
src/gdisp/gdisp_image_gif.c
View File

@ -5,13 +5,6 @@
* http://ugfx.org/license.html * http://ugfx.org/license.html
*/ */
/**
* @file src/gdisp/gdisp_image_gif.c
* @brief GDISP native image code.
*
* @defgroup Image Image
* @ingroup GDISP
*/
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_GIF #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_GIF
@ -1205,4 +1198,3 @@ delaytime_t gdispImageNext_GIF(gdispImage *img) {
} }
#endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_GIF */ #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_GIF */
/** @} */

5
src/gdisp/gdisp_image_jpg.c
View File

@ -5,10 +5,6 @@
* http://ugfx.org/license.html * http://ugfx.org/license.html
*/ */
/**
* @file src/gdisp/gdisp_image_jpg.c
* @brief GDISP native image code.
*/
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_JPG #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_JPG
@ -16,4 +12,3 @@
#error "JPG support not implemented yet" #error "JPG support not implemented yet"
#endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_JPG */ #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_JPG */
/** @} */

5
src/gdisp/gdisp_image_native.c
View File

@ -5,10 +5,6 @@
* http://ugfx.org/license.html * http://ugfx.org/license.html
*/ */
/**
* @file src/gdisp/gdisp_image_native.c
* @brief GDISP native image code.
*/
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_NATIVE #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_NATIVE
@ -142,4 +138,3 @@ delaytime_t gdispImageNext_NATIVE(gdispImage *img) {
} }
#endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_NATIVE */ #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_NATIVE */
/** @} */

5
src/gdisp/gdisp_image_png.c
View File

@ -5,10 +5,6 @@
* http://ugfx.org/license.html * http://ugfx.org/license.html
*/ */
/**
* @file src/gdisp/gdisp_image_png.c
* @brief GDISP native image code.
*/
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_PNG #if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_PNG
@ -16,4 +12,3 @@
#error "PNG support not implemented yet" #error "PNG support not implemented yet"
#endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_PNG */ #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_PNG */
/** @} */

65
src/gdisp/sys_options.h → src/gdisp/gdisp_options.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gdisp/sys_options.h * @file src/gdisp/gdisp_options.h
* @brief GDISP sub-system options header file. * @brief GDISP sub-system options header file.
* *
* @addtogroup GDISP * @addtogroup GDISP
@ -317,6 +317,69 @@
#ifndef GDISP_NEED_IMAGE_ACCOUNTING #ifndef GDISP_NEED_IMAGE_ACCOUNTING
#define GDISP_NEED_IMAGE_ACCOUNTING FALSE #define GDISP_NEED_IMAGE_ACCOUNTING FALSE
#endif #endif
/**
* @}
*
* @name GDISP BMP Image Options
* @pre GDISP_NEED_IMAGE and GDISP_NEED_IMAGE_BMP must be TRUE
* @{
*/
/**
* @brief Is BMP 1 bit per pixel (monochrome/2 color) image decoding required.
* @details Defaults to TRUE
*/
#ifndef GDISP_NEED_IMAGE_BMP_1
#define GDISP_NEED_IMAGE_BMP_1 TRUE
#endif
/**
* @brief Is BMP 4 bits per pixel (16 color) image decoding required.
* @details Defaults to TRUE
*/
#ifndef GDISP_NEED_IMAGE_BMP_4
#define GDISP_NEED_IMAGE_BMP_4 TRUE
#endif
/**
* @brief Is BMP 4 bits per pixel (16 color) with RLE compression image decoding required.
* @details Defaults to TRUE
*/
#ifndef GDISP_NEED_IMAGE_BMP_4_RLE
#define GDISP_NEED_IMAGE_BMP_4_RLE TRUE
#endif
/**
* @brief Is BMP 8 bits per pixel (256 color) image decoding required.
* @details Defaults to TRUE
*/
#ifndef GDISP_NEED_IMAGE_BMP_8
#define GDISP_NEED_IMAGE_BMP_8 TRUE
#endif
/**
* @brief Is BMP 8 bits per pixel (256 color) with RLE compression image decoding required.
* @details Defaults to TRUE
*/
#ifndef GDISP_NEED_IMAGE_BMP_8_RLE
#define GDISP_NEED_IMAGE_BMP_8_RLE TRUE
#endif
/**
* @brief Is BMP 16 bits per pixel (65536 color) image decoding required.
* @details Defaults to TRUE
*/
#ifndef GDISP_NEED_IMAGE_BMP_16
#define GDISP_NEED_IMAGE_BMP_16 TRUE
#endif
/**
* @brief Is BMP 24 bits per pixel (true-color) image decoding required.
* @details Defaults to TRUE
*/
#ifndef GDISP_NEED_IMAGE_BMP_24
#define GDISP_NEED_IMAGE_BMP_24 TRUE
#endif
/**
* @brief Is BMP 32 bits per pixel (true-color) image decoding required.
* @details Defaults to TRUE
*/
#ifndef GDISP_NEED_IMAGE_BMP_32
#define GDISP_NEED_IMAGE_BMP_32 TRUE
#endif
/** /**
* @} * @}
* *

4
src/gdisp/gdisp_pixmap.c
View File

@ -39,8 +39,8 @@
#error "GDISP Pixmap: Pixmap's do not currently support the specified GDISP_LLD_PIXELFORMAT" #error "GDISP Pixmap: Pixmap's do not currently support the specified GDISP_LLD_PIXELFORMAT"
#endif #endif
#include "src/gdisp/driver.h" #include "src/gdisp/gdisp_driver.h"
#include "src/gdriver/sys_defs.h" #include "src/gdriver/gdriver.h"
typedef struct pixmap { typedef struct pixmap {
#if GDISP_NEED_PIXMAP_IMAGE #if GDISP_NEED_PIXMAP_IMAGE

2
src/gdisp/sys_rules.h → src/gdisp/gdisp_rules.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gdisp/sys_rules.h * @file src/gdisp/gdisp_rules.h
* @brief GDISP safety rules header file. * @brief GDISP safety rules header file.
* *
* @addtogroup GDISP * @addtogroup GDISP

2
src/gdriver/gdriver_gdriver.c → src/gdriver/gdriver.c
View File

@ -9,7 +9,7 @@
#if GFX_USE_GDRIVER #if GFX_USE_GDRIVER
#include "sys_defs.h" #include "gdriver.h"
#include <string.h> // For memset #include <string.h> // For memset

4
src/gdriver/sys_defs.h → src/gdriver/gdriver.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gdriver/sys_defs.h * @file src/gdriver/gdriver.h
* *
* @addtogroup GDRIVER * @addtogroup GDRIVER
* *
@ -23,7 +23,7 @@
* @note If there is only a single device of a particular type it will automatically * @note If there is only a single device of a particular type it will automatically
* register that device (it only needs to be included in the build, no special * register that device (it only needs to be included in the build, no special
* configuration is required) * configuration is required)
* @note This module sys_defs.h file is NOT included in the general gfx.h file. * @note This module gdriver.h file is NOT included in the general gfx.h file.
* Instead it is included in each driver type's driver API. * Instead it is included in each driver type's driver API.
* *
* @pre GFX_USE_GDRIVER must be set to TRUE in your gfxconf.h * @pre GFX_USE_GDRIVER must be set to TRUE in your gfxconf.h

1
src/gdriver/gdriver.mk 100644
View File

@ -0,0 +1 @@
GFXSRC += $(GFXLIB)/src/gdriver/gdriver.c

2
src/gdriver/sys_options.h → src/gdriver/gdriver_options.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gdriver/sys_options.h * @file src/gdriver/gdriver_options.h
* @brief GDRIVER - Driver options header file. * @brief GDRIVER - Driver options header file.
* *
* @addtogroup GDRIVER * @addtogroup GDRIVER

2
src/gdriver/sys_rules.h → src/gdriver/gdriver_rules.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gdriver/sys_rules.h * @file src/gdriver/gdriver_rules.h
* @brief GDRIVER safety rules header file. * @brief GDRIVER safety rules header file.
* *
* @addtogroup GFILE * @addtogroup GFILE

1
src/gdriver/sys_make.mk
View File

@ -1 +0,0 @@
GFXSRC += $(GFXLIB)/src/gdriver/gdriver_gdriver.c

8
src/gevent/gevent_gevent.c → src/gevent/gevent.c
View File

@ -5,13 +5,6 @@
* http://ugfx.org/license.html * http://ugfx.org/license.html
*/ */
/**
* @file src/gevent/gevent_gevent.c
* @brief GEVENT Driver code.
*
* @addtogroup GEVENT
* @{
*/
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GEVENT || defined(__DOXYGEN__) #if GFX_USE_GEVENT || defined(__DOXYGEN__)
@ -243,4 +236,3 @@ void geventDetachSourceListeners(GSourceHandle gsh) {
} }
#endif /* GFX_USE_GEVENT */ #endif /* GFX_USE_GEVENT */
/** @} */

2
src/gevent/sys_defs.h → src/gevent/gevent.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gevent/sys_defs.h * @file src/gevent/gevent.h
* *
* @addtogroup GEVENT * @addtogroup GEVENT
* *

1
src/gevent/gevent.mk 100644
View File

@ -0,0 +1 @@
GFXSRC += $(GFXLIB)/src/gevent/gevent.c

2
src/gevent/sys_options.h → src/gevent/gevent_options.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gevent/sys_options.h * @file src/gevent/gevent_options.h
* @brief GEVENT sub-system options header file. * @brief GEVENT sub-system options header file.
* *
* @addtogroup GEVENT * @addtogroup GEVENT

2
src/gevent/sys_rules.h → src/gevent/gevent_rules.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gevent/sys_rules.h * @file src/gevent/gevent_rules.h
* @brief GEVENT safety rules header file. * @brief GEVENT safety rules header file.
* *
* @addtogroup GEVENT * @addtogroup GEVENT

1
src/gevent/sys_make.mk
View File

@ -1 +0,0 @@
GFXSRC += $(GFXLIB)/src/gevent/gevent_gevent.c

6
src/gfile/gfile_gfile.c → src/gfile/gfile.c
View File

@ -5,12 +5,6 @@
* http://ugfx.org/license.html * http://ugfx.org/license.html
*/ */
/**
* @file src/gfile/gfile_gfile.c
* @brief GFILE code.
*
*/
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GFILE #if GFX_USE_GFILE

2
src/gfile/sys_defs.h → src/gfile/gfile.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gfile/sys_defs.h * @file src/gfile/gfile.h
* @brief GFILE - File IO Routines header file. * @brief GFILE - File IO Routines header file.
* *
* @addtogroup GFILE * @addtogroup GFILE

2
src/gfile/sys_make.mk → src/gfile/gfile.mk
View File

@ -1,4 +1,4 @@
GFXSRC += $(GFXLIB)/src/gfile/gfile_gfile.c \ GFXSRC += $(GFXLIB)/src/gfile/gfile.c \
$(GFXLIB)/src/gfile/gfile_fs_native.c \ $(GFXLIB)/src/gfile/gfile_fs_native.c \
$(GFXLIB)/src/gfile/gfile_fs_ram.c \ $(GFXLIB)/src/gfile/gfile_fs_ram.c \
$(GFXLIB)/src/gfile/gfile_fs_rom.c \ $(GFXLIB)/src/gfile/gfile_fs_rom.c \

6
src/gfile/gfile_fatfs_diskio_chibios.c
View File

@ -5,12 +5,6 @@
/* disk I/O modules and attach it to FatFs module with common interface. */ /* disk I/O modules and attach it to FatFs module with common interface. */
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
/**
* @file src/gfile/gfile_fatfs_diskio_chibios.c
* @brief GFILE FATFS wrapper.
*
*/
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GFILE && GFILE_NEED_FATFS && GFX_USE_OS_CHIBIOS #if GFX_USE_GFILE && GFILE_NEED_FATFS && GFX_USE_OS_CHIBIOS

6
src/gfile/gfile_fatfs_wrapper.c
View File

@ -5,12 +5,6 @@
* http://ugfx.org/license.html * http://ugfx.org/license.html
*/ */
/**
* @file src/gfile/gfile_fatfs_wrapper.c
* @brief GFILE FATFS wrapper.
*
*/
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GFILE && GFILE_NEED_FATFS #if GFX_USE_GFILE && GFILE_NEED_FATFS

2
src/gfile/sys_options.h → src/gfile/gfile_options.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gfile/sys_options.h * @file src/gfile/gfile_options.h
* @brief GFILE - File IO options header file. * @brief GFILE - File IO options header file.
* *
* @addtogroup GFILE * @addtogroup GFILE

6
src/gfile/gfile_petitfs_diskio_chibios.c
View File

@ -5,12 +5,6 @@
/* disk I/O modules and attach it to FatFs module with common interface. */ /* disk I/O modules and attach it to FatFs module with common interface. */
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
/**
* @file src/gfile/gfile_petitfs_diskio_chibios.c
* @brief GFILE FATFS wrapper.
*
*/
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GFILE && GFILE_NEED_PETITFS && GFX_USE_OS_CHIBIOS #if GFX_USE_GFILE && GFILE_NEED_PETITFS && GFX_USE_OS_CHIBIOS

6
src/gfile/gfile_petitfs_wrapper.c
View File

@ -5,12 +5,6 @@
* http://ugfx.org/license.html * http://ugfx.org/license.html
*/ */
/**
* @file src/gfile/gfile_petitfs_wrapper.c
* @brief GFILE PETITFS wrapper.
*
*/
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GFILE && GFILE_NEED_PETITFS #if GFX_USE_GFILE && GFILE_NEED_PETITFS

2
src/gfile/sys_rules.h → src/gfile/gfile_rules.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gfile/sys_rules.h * @file src/gfile/gfile_rules.h
* @brief GFILE safety rules header file. * @brief GFILE safety rules header file.
* *
* @addtogroup GFILE * @addtogroup GFILE

0
src/ginput/ginput_ginput.c → src/ginput/ginput.c
View File

2
src/ginput/sys_defs.h → src/ginput/ginput.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/ginput/sys_defs.h * @file src/ginput/ginput.h
* *
* @addtogroup GINPUT * @addtogroup GINPUT
* *

4
src/ginput/sys_make.mk → src/ginput/ginput.mk
View File

@ -1,6 +1,6 @@
GFXSRC += $(GFXLIB)/src/ginput/ginput_ginput.c \ GFXSRC += $(GFXLIB)/src/ginput/ginput.c \
$(GFXLIB)/src/ginput/ginput_mouse.c \ $(GFXLIB)/src/ginput/ginput_mouse.c \
$(GFXLIB)/src/ginput/ginput_keyboard.c \ $(GFXLIB)/src/ginput/ginput_keyboard.c \
$(GFXLIB)/src/ginput/keyboard_microcode.c \ $(GFXLIB)/src/ginput/ginput_keyboard_microcode.c \
$(GFXLIB)/src/ginput/ginput_toggle.c \ $(GFXLIB)/src/ginput/ginput_toggle.c \
$(GFXLIB)/src/ginput/ginput_dial.c $(GFXLIB)/src/ginput/ginput_dial.c

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