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).
This commit is contained in:
parent
34939386d7
commit
fa8167b94d
@ -30,8 +30,8 @@
|
||||
#include "gfx.h"
|
||||
|
||||
// We get nasty and look at some internal structures - get the relevant information
|
||||
#include "src/gdriver/sys_defs.h"
|
||||
#include "src/ginput/driver_mouse.h"
|
||||
#include "src/gdriver/gdriver.h"
|
||||
#include "src/ginput/ginput_driver_mouse.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
|
@ -30,8 +30,8 @@
|
||||
#include "gfx.h"
|
||||
|
||||
// We get nasty and look at some internal structures - get the relevant information
|
||||
#include "src/gdriver/sys_defs.h"
|
||||
#include "src/ginput/driver_mouse.h"
|
||||
#include "src/gdriver/gdriver.h"
|
||||
#include "src/ginput/ginput_driver_mouse.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gwin/sys_defs.h
|
||||
* @file src/gwin/gwin.h
|
||||
*
|
||||
* @defgroup Containers Containers
|
||||
* @ingroup GWIN
|
||||
|
@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gwin/sys_defs.h
|
||||
* @file src/gwin/gwin.h
|
||||
*
|
||||
* @defgroup Widgets Widgets
|
||||
* @ingroup GWIN
|
||||
|
@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gwin/sys_defs.h
|
||||
* @file src/gwin/gwin.h
|
||||
*
|
||||
* @defgroup Windows Windows
|
||||
* @ingroup GWIN
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
#if GFX_USE_GADC
|
||||
|
||||
#include "src/gadc/driver.h"
|
||||
#include "src/gadc/gadc_driver.h"
|
||||
|
||||
static uint32_t nextfreq;
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
#if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY
|
||||
|
||||
/* Include the driver defines */
|
||||
#include "src/gaudio/driver_play.h"
|
||||
#include "src/gaudio/gaudio_driver_play.h"
|
||||
|
||||
#undef Red
|
||||
#undef Green
|
||||
|
@ -10,7 +10,7 @@
|
||||
#if GFX_USE_GAUDIO && GAUDIO_NEED_RECORD
|
||||
|
||||
/* Include the driver defines */
|
||||
#include "src/gaudio/driver_record.h"
|
||||
#include "src/gaudio/gaudio_driver_record.h"
|
||||
|
||||
#undef Red
|
||||
#undef Green
|
||||
|
@ -16,7 +16,7 @@
|
||||
#endif
|
||||
|
||||
/* Include the driver defines */
|
||||
#include "src/gaudio/driver_record.h"
|
||||
#include "src/gaudio/gaudio_driver_record.h"
|
||||
|
||||
static void gadcCallbackI(void) {
|
||||
GDataBuffer *pd;
|
||||
|
@ -10,7 +10,7 @@
|
||||
#if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY
|
||||
|
||||
/* Include the driver defines */
|
||||
#include "src/gaudio/driver_play.h"
|
||||
#include "src/gaudio/gaudio_driver_play.h"
|
||||
|
||||
/* Forward definition */
|
||||
static void gaudio_play_pwm_timer_callbackI(void);
|
||||
|
@ -10,7 +10,7 @@
|
||||
#if GFX_USE_GAUDIO && GAUDIO_NEED_PLAY
|
||||
|
||||
/* Include the driver defines */
|
||||
#include "src/gaudio/driver_play.h"
|
||||
#include "src/gaudio/gaudio_driver_play.h"
|
||||
|
||||
/* Include the vs1053 registers */
|
||||
#include "drivers/gaudio/vs1053/vs1053.h"
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_ED060SC4
|
||||
#include "drivers/gdisp/ED060SC4/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
#include "board_ED060SC4.h"
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_HX8347D
|
||||
#include "drivers/gdisp/HX8347D/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
#include "board_HX8347D.h"
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_ILI9320
|
||||
#include "drivers/gdisp/ILI9320/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
#include "board_ILI9320.h"
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_ILI9325
|
||||
#include "drivers/gdisp/ILI9325/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
#include "board_ILI9325.h"
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_ILI9341
|
||||
#include "drivers/gdisp/ILI9341/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
#include "board_ILI9341.h"
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_ILI93xx
|
||||
#include "drivers/gdisp/ILI93xx/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
#include "board_ILI93xx.h"
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_ILI9481
|
||||
#include "drivers/gdisp/ILI9481/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
#include "board_ILI9481.h"
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_LGDP4532
|
||||
#include "gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
#include "board_LGDP4532.h"
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_Nokia6610GE12
|
||||
#include "drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
#include "board_Nokia6610GE12.h"
|
||||
|
||||
|
@ -52,7 +52,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_Nokia6610GE8
|
||||
#include "drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
#include "board_Nokia6610GE8.h"
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_PCD8544
|
||||
#include "drivers/gdisp/PCD8544/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
#include "board_PCD8544.h"
|
||||
|
||||
/*===========================================================================*/
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_PCF8812
|
||||
#include "drivers/gdisp/PCF8812/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
#include "board_PCF8812.h"
|
||||
|
||||
/*===========================================================================*/
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_R61505U
|
||||
#include "drivers/gdisp/R61505U/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
#include "board_R61505U.h"
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_RA8875
|
||||
#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 "board_RA8875.h"
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_S6D1121
|
||||
#include "drivers/gdisp/S6D1121/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
#include "board_S6D1121.h"
|
||||
|
||||
|
@ -25,7 +25,7 @@
|
||||
#endif
|
||||
|
||||
#include "drivers/gdisp/SPFD54124B/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
#include "board_SPFD54124B.h"
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_SSD1289
|
||||
#include "drivers/gdisp/SSD1289/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
#include "board_SSD1289.h"
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_SSD1306
|
||||
#include "drivers/gdisp/SSD1306/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
#include "board_SSD1306.h"
|
||||
#include <string.h> // for memset
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_SSD1963
|
||||
#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_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)
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_SSD2119
|
||||
#include "drivers/gdisp/SSD2119/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
#include "board_SSD2119.h"
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_ST7565
|
||||
#include "drivers/gdisp/ST7565/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
#include "board_ST7565.h"
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_STM32F429iDiscovery
|
||||
#include "drivers/gdisp/STM32F429iDiscovery/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
#include "stm32_ltdc.h"
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_TestStub
|
||||
#include "drivers/gdisp/TestStub/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
#ifndef GDISP_SCREEN_HEIGHT
|
||||
#define GDISP_SCREEN_HEIGHT 128
|
||||
|
@ -16,7 +16,7 @@ typedef struct fbInfo {
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_framebuffer
|
||||
#include "drivers/gdisp/framebuffer/gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
#include "board_framebuffer.h"
|
||||
|
||||
typedef struct fbPriv {
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
#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
|
||||
#error "GINPUT: Dial - GADC driver currently only supports 4 devices"
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
#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();
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
#if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE)
|
||||
|
||||
#define GMOUSE_DRIVER_VMT GMOUSEVMT_ADS7843
|
||||
#include "src/ginput/driver_mouse.h"
|
||||
#include "src/ginput/ginput_driver_mouse.h"
|
||||
|
||||
// Get the hardware interface
|
||||
#include "gmouse_lld_ADS7843_board.h"
|
||||
|
@ -10,7 +10,7 @@
|
||||
#if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
|
||||
|
||||
#define GMOUSE_DRIVER_VMT GMOUSEVMT_FT5x06
|
||||
#include "src/ginput/driver_mouse.h"
|
||||
#include "src/ginput/ginput_driver_mouse.h"
|
||||
|
||||
// Get the hardware interface
|
||||
#include "gmouse_lld_FT5x06_board.h"
|
||||
|
@ -10,7 +10,7 @@
|
||||
#if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
|
||||
|
||||
#define GMOUSE_DRIVER_VMT GMOUSEVMT_MAX11802
|
||||
#include "src/ginput/driver_mouse.h"
|
||||
#include "src/ginput/ginput_driver_mouse.h"
|
||||
|
||||
// Hardware definitions
|
||||
#include "drivers/ginput/touch/MAX11802/max11802.h"
|
||||
|
@ -10,7 +10,7 @@
|
||||
#if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
|
||||
|
||||
#define GMOUSE_DRIVER_VMT GMOUSEVMT_MCU
|
||||
#include "src/ginput/driver_mouse.h"
|
||||
#include "src/ginput/ginput_driver_mouse.h"
|
||||
|
||||
// Get the hardware interface
|
||||
#include "gmouse_lld_MCU_board.h"
|
||||
|
@ -10,7 +10,7 @@
|
||||
#if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
|
||||
|
||||
#define GMOUSE_DRIVER_VMT GMOUSEVMT_STMPE811
|
||||
#include "src/ginput/driver_mouse.h"
|
||||
#include "src/ginput/ginput_driver_mouse.h"
|
||||
|
||||
// Hardware definitions
|
||||
#include "drivers/ginput/touch/STMPE811/stmpe811.h"
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_Win32
|
||||
#include "gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
// Configuration parameters for this driver
|
||||
#ifndef GDISP_SCREEN_WIDTH
|
||||
@ -79,13 +79,13 @@
|
||||
|
||||
#if GINPUT_NEED_TOGGLE
|
||||
/* Include toggle support code */
|
||||
#include "src/ginput/driver_toggle.h"
|
||||
#include "src/ginput/ginput_driver_toggle.h"
|
||||
#endif
|
||||
|
||||
#if GINPUT_NEED_MOUSE
|
||||
// Include mouse support code
|
||||
#define GMOUSE_DRIVER_VMT GMOUSEVMT_Win32
|
||||
#include "src/ginput/driver_mouse.h"
|
||||
#include "src/ginput/ginput_driver_mouse.h"
|
||||
|
||||
// Forward definitions
|
||||
static bool_t Win32MouseInit(GMouse *m, unsigned driverinstance);
|
||||
@ -126,14 +126,14 @@
|
||||
|
||||
#if GINPUT_NEED_KEYBOARD
|
||||
#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_LAYOUT_OFF
|
||||
#error "The Win32 keyboard driver is using the layout engine. Please set GKEYBOARD_LAYOUT_OFF=FALSE or GKEYBOARD_WIN32_NO_LAYOUT=TRUE."
|
||||
#endif
|
||||
|
||||
#include "src/ginput/keyboard_microcode.h"
|
||||
#include "src/ginput/ginput_keyboard_microcode.h"
|
||||
|
||||
// Forward definitions
|
||||
extern uint8_t GKEYBOARD_WIN32_DEFAULT_LAYOUT[];
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_X11
|
||||
#include "gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
|
||||
// Configuration parameters for this driver
|
||||
#ifndef GDISP_FORCE_24BIT
|
||||
@ -53,7 +53,7 @@
|
||||
#if GINPUT_NEED_MOUSE
|
||||
// Include mouse support code
|
||||
#define GMOUSE_DRIVER_VMT GMOUSEVMT_X11
|
||||
#include "src/ginput/driver_mouse.h"
|
||||
#include "src/ginput/ginput_driver_mouse.h"
|
||||
|
||||
// Forward definitions
|
||||
static bool_t XMouseInit(GMouse *m, unsigned driverinstance);
|
||||
@ -95,7 +95,7 @@
|
||||
#if GINPUT_NEED_KEYBOARD
|
||||
// Include mouse support code
|
||||
#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_LAYOUT_OFF
|
||||
@ -105,7 +105,7 @@
|
||||
// Forward definitions
|
||||
extern uint8_t GKEYBOARD_X_DEFAULT_LAYOUT[];
|
||||
|
||||
#include "src/ginput/keyboard_microcode.h"
|
||||
#include "src/ginput/ginput_keyboard_microcode.h"
|
||||
#include <X11/keysym.h>
|
||||
|
||||
// This is the layout code for the English US keyboard.
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
#define GDISP_DRIVER_VMT GDISPVMT_uGFXnet
|
||||
#include "gdisp_lld_config.h"
|
||||
#include "src/gdisp/driver.h"
|
||||
#include "src/gdisp/gdisp_driver.h"
|
||||
#include "uGFXnetProtocol.h"
|
||||
|
||||
#ifndef GDISP_SCREEN_WIDTH
|
||||
@ -36,7 +36,7 @@
|
||||
#if GINPUT_NEED_MOUSE
|
||||
// Include mouse support code
|
||||
#define GMOUSE_DRIVER_VMT GMOUSEVMT_uGFXnet
|
||||
#include "src/ginput/driver_mouse.h"
|
||||
#include "src/ginput/ginput_driver_mouse.h"
|
||||
|
||||
// Forward definitions
|
||||
static bool_t NMouseInit(GMouse *m, unsigned driverinstance);
|
||||
|
72
gfx.h
72
gfx.h
@ -161,18 +161,18 @@
|
||||
* Get all the options for each sub-system.
|
||||
*
|
||||
*/
|
||||
#include "src/gos/sys_options.h"
|
||||
#include "src/gdriver/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/gaudio/sys_options.h"
|
||||
#include "src/gos/gos_options.h"
|
||||
#include "src/gdriver/gdriver_options.h"
|
||||
#include "src/gfile/gfile_options.h"
|
||||
#include "src/gmisc/gmisc_options.h"
|
||||
#include "src/gqueue/gqueue_options.h"
|
||||
#include "src/gevent/gevent_options.h"
|
||||
#include "src/gtimer/gtimer_options.h"
|
||||
#include "src/gdisp/gdisp_options.h"
|
||||
#include "src/gwin/gwin_options.h"
|
||||
#include "src/ginput/ginput_options.h"
|
||||
#include "src/gadc/gadc_options.h"
|
||||
#include "src/gaudio/gaudio_options.h"
|
||||
|
||||
/**
|
||||
* Interdependency safety checks on the sub-systems.
|
||||
@ -182,34 +182,34 @@
|
||||
#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/gaudio/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/gdriver/sys_rules.h"
|
||||
#include "src/gos/sys_rules.h"
|
||||
#include "src/gwin/gwin_rules.h"
|
||||
#include "src/ginput/ginput_rules.h"
|
||||
#include "src/gdisp/gdisp_rules.h"
|
||||
#include "src/gaudio/gaudio_rules.h"
|
||||
#include "src/gadc/gadc_rules.h"
|
||||
#include "src/gevent/gevent_rules.h"
|
||||
#include "src/gtimer/gtimer_rules.h"
|
||||
#include "src/gqueue/gqueue_rules.h"
|
||||
#include "src/gmisc/gmisc_rules.h"
|
||||
#include "src/gfile/gfile_rules.h"
|
||||
#include "src/gdriver/gdriver_rules.h"
|
||||
#include "src/gos/gos_rules.h"
|
||||
|
||||
/**
|
||||
* Include the sub-system header files
|
||||
*/
|
||||
#include "src/gos/sys_defs.h"
|
||||
//#include "src/gdriver/sys_defs.h" // This module is only included by source that needs it.
|
||||
#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/gaudio/sys_defs.h"
|
||||
#include "src/gos/gos.h"
|
||||
//#include "src/gdriver/gdriver.h" // This module is only included by source that needs it.
|
||||
#include "src/gfile/gfile.h"
|
||||
#include "src/gmisc/gmisc.h"
|
||||
#include "src/gqueue/gqueue.h"
|
||||
#include "src/gevent/gevent.h"
|
||||
#include "src/gtimer/gtimer.h"
|
||||
#include "src/gdisp/gdisp.h"
|
||||
#include "src/gwin/gwin.h"
|
||||
#include "src/ginput/ginput.h"
|
||||
#include "src/gadc/gadc.h"
|
||||
#include "src/gaudio/gaudio.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
24
gfx.mk
24
gfx.mk
@ -1,18 +1,18 @@
|
||||
GFXINC += $(GFXLIB)
|
||||
GFXSRC += $(GFXLIB)/src/gfx.c
|
||||
|
||||
include $(GFXLIB)/src/gos/sys_make.mk
|
||||
include $(GFXLIB)/src/gdriver/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/gaudio/sys_make.mk
|
||||
include $(GFXLIB)/src/gmisc/sys_make.mk
|
||||
include $(GFXLIB)/src/gfile/sys_make.mk
|
||||
include $(GFXLIB)/src/gos/gos.mk
|
||||
include $(GFXLIB)/src/gdriver/gdriver.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/gaudio/gaudio.mk
|
||||
include $(GFXLIB)/src/gmisc/gmisc.mk
|
||||
include $(GFXLIB)/src/gfile/gfile.mk
|
||||
|
||||
# Include the boards and drivers
|
||||
ifneq ($(GFXBOARD),)
|
||||
|
@ -5,19 +5,12 @@
|
||||
* http://ugfx.org/license.html
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gadc/gadc_gadc.c
|
||||
* @brief GADC sub-system code.
|
||||
*
|
||||
* @addtogroup GADC
|
||||
* @{
|
||||
*/
|
||||
#include "gfx.h"
|
||||
|
||||
#if GFX_USE_GADC
|
||||
|
||||
/* Include the driver defines */
|
||||
#include "driver.h"
|
||||
#include "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"
|
||||
@ -358,5 +351,3 @@ bool_t gadcLowSpeedStart(uint32_t physdev, adcsample_t *buffer, GADCCallbackFunc
|
||||
}
|
||||
|
||||
#endif /* GFX_USE_GADC */
|
||||
/** @} */
|
||||
|
@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gadc/sys_defs.h
|
||||
* @file src/gadc/gadc.h
|
||||
*
|
||||
* @addtogroup GADC
|
||||
*
|
1
src/gadc/gadc.mk
Normal file
1
src/gadc/gadc.mk
Normal file
@ -0,0 +1 @@
|
||||
GFXSRC += $(GFXLIB)/src/gadc/gadc.c
|
@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gadc/driver.h
|
||||
* @file src/gadc/gadc_driver.h
|
||||
* @brief GADC - Periodic ADC driver header file.
|
||||
*
|
||||
* @defgroup Driver Driver
|
@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gadc/sys_options.h
|
||||
* @file src/gadc/gadc_options.h
|
||||
* @brief GADC - Periodic ADC subsystem options header file.
|
||||
*
|
||||
* @addtogroup GADC
|
@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gadc/sys_rules.h
|
||||
* @file src/gadc/gadc_rules.h
|
||||
* @brief GADC safety rules header file.
|
||||
*
|
||||
* @addtogroup GADC
|
@ -1 +0,0 @@
|
||||
GFXSRC += $(GFXLIB)/src/gadc/gadc_gadc.c
|
@ -5,19 +5,12 @@
|
||||
* http://ugfx.org/license.html
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gaudio/gaudio_gaudio.c
|
||||
* @brief GAUDIO sub-system code.
|
||||
*
|
||||
* @addtogroup GAUDIO
|
||||
* @{
|
||||
*/
|
||||
#include "gfx.h"
|
||||
|
||||
#if GFX_USE_GAUDIO
|
||||
|
||||
#if GAUDIO_NEED_PLAY
|
||||
#include "driver_play.h"
|
||||
#include "gaudio_driver_play.h"
|
||||
|
||||
static gfxQueueASync playList;
|
||||
static gfxSem playComplete;
|
||||
@ -32,7 +25,7 @@
|
||||
#endif
|
||||
|
||||
#if GAUDIO_NEED_RECORD
|
||||
#include "driver_record.h"
|
||||
#include "gaudio_driver_record.h"
|
||||
|
||||
static gfxQueueGSync recordList;
|
||||
static uint16_t recordFlags;
|
||||
@ -280,4 +273,3 @@ void _gaudioDeinit(void)
|
||||
#endif
|
||||
|
||||
#endif /* GFX_USE_GAUDIO */
|
||||
/** @} */
|
@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gaudio/sys_defs.h
|
||||
* @file src/gaudio/gaudio.h
|
||||
*
|
||||
* @addtogroup GAUDIO
|
||||
*
|
1
src/gaudio/gaudio.mk
Normal file
1
src/gaudio/gaudio.mk
Normal file
@ -0,0 +1 @@
|
||||
GFXSRC += $(GFXLIB)/src/gaudio/gaudio.c
|
@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gaudio/driver_play.h
|
||||
* @file src/gaudio/gaudio_driver_play.h
|
||||
* @brief GAUDIO - Audio play driver header file.
|
||||
*
|
||||
* @defgroup Driver Driver
|
@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gaudio/driver_record.h
|
||||
* @file src/gaudio/gaudio_driver_record.h
|
||||
* @brief GAUDIO - Audio Recording driver header file.
|
||||
*
|
||||
* @defgroup Driver Driver
|
@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gaudio/sys_options.h
|
||||
* @file src/gaudio/gaudio_options.h
|
||||
* @brief GAUDIO - Audio subsystem options header file.
|
||||
*
|
||||
* @addtogroup GAUDIO
|
@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gaudio/sys_rules.h
|
||||
* @file src/gaudio/gaudio_rules.h
|
||||
* @brief GAUDIO safety rules header file.
|
||||
*
|
||||
* @addtogroup GAUDIO
|
@ -1 +0,0 @@
|
||||
GFXSRC += $(GFXLIB)/src/gaudio/gaudio_gaudio.c
|
@ -5,19 +5,12 @@
|
||||
* http://ugfx.org/license.html
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gdisp/gdisp_gdisp.c
|
||||
* @brief GDISP Driver code.
|
||||
*
|
||||
* @addtogroup GDISP
|
||||
* @{
|
||||
*/
|
||||
#include "gfx.h"
|
||||
|
||||
#if GFX_USE_GDISP
|
||||
|
||||
/* Include the low level driver information */
|
||||
#include "driver.h"
|
||||
#include "gdisp_driver.h"
|
||||
|
||||
#if 1
|
||||
#undef INLINE
|
||||
@ -3375,4 +3368,3 @@ color_t gdispContrastColor(color_t color) {
|
||||
#endif
|
||||
|
||||
#endif /* GFX_USE_GDISP */
|
||||
/** @} */
|
@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gdisp/sys_defs.h
|
||||
* @file src/gdisp/gdisp.h
|
||||
* @brief GDISP Graphic Driver subsystem header file.
|
||||
*
|
||||
* @addtogroup GDISP
|
@ -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_pixmap.c \
|
||||
$(GFXLIB)/src/gdisp/gdisp_image.c \
|
@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gdisp/driver.h
|
||||
* @file src/gdisp/gdisp_driver.h
|
||||
* @brief GDISP Graphic Driver subsystem low level driver header.
|
||||
*
|
||||
* @addtogroup GDISP
|
||||
@ -19,7 +19,7 @@
|
||||
#if GFX_USE_GDISP
|
||||
|
||||
// Include the GDRIVER infrastructure
|
||||
#include "src/gdriver/sys_defs.h"
|
||||
#include "src/gdriver/gdriver.h"
|
||||
|
||||
// Are we currently compiling the driver itself?
|
||||
#if defined(GDISP_DRIVER_VMT)
|
@ -5,14 +5,6 @@
|
||||
* http://ugfx.org/license.html
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gdisp/gdisp_fonts.c
|
||||
* @brief GDISP Font Handling.
|
||||
*
|
||||
* @addtogroup GDISP
|
||||
* @{
|
||||
*/
|
||||
|
||||
#include "gfx.h"
|
||||
|
||||
#if GFX_USE_GDISP && GDISP_NEED_TEXT
|
||||
@ -93,4 +85,3 @@ const char *gdispGetFontName(font_t font) {
|
||||
}
|
||||
|
||||
#endif /* GFX_USE_GDISP && GDISP_NEED_TEXT */
|
||||
/** @} */
|
||||
|
@ -5,13 +5,6 @@
|
||||
* http://ugfx.org/license.html
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gdisp/gdisp_image.c
|
||||
* @brief GDISP generic image code.
|
||||
*
|
||||
* @defgroup Image Image
|
||||
* @ingroup GDISP
|
||||
*/
|
||||
#include "gfx.h"
|
||||
|
||||
#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 */
|
||||
/** @} */
|
||||
|
@ -5,42 +5,10 @@
|
||||
* 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"
|
||||
|
||||
#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
|
||||
*/
|
||||
@ -901,4 +869,3 @@ delaytime_t gdispImageNext_BMP(gdispImage *img) {
|
||||
}
|
||||
|
||||
#endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_BMP */
|
||||
/** @} */
|
||||
|
@ -5,13 +5,6 @@
|
||||
* 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"
|
||||
|
||||
#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 */
|
||||
/** @} */
|
||||
|
@ -5,10 +5,6 @@
|
||||
* http://ugfx.org/license.html
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gdisp/gdisp_image_jpg.c
|
||||
* @brief GDISP native image code.
|
||||
*/
|
||||
#include "gfx.h"
|
||||
|
||||
#if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_JPG
|
||||
@ -16,4 +12,3 @@
|
||||
#error "JPG support not implemented yet"
|
||||
|
||||
#endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_JPG */
|
||||
/** @} */
|
||||
|
@ -5,10 +5,6 @@
|
||||
* http://ugfx.org/license.html
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gdisp/gdisp_image_native.c
|
||||
* @brief GDISP native image code.
|
||||
*/
|
||||
#include "gfx.h"
|
||||
|
||||
#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 */
|
||||
/** @} */
|
||||
|
@ -5,10 +5,6 @@
|
||||
* http://ugfx.org/license.html
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file src/gdisp/gdisp_image_png.c
|
||||
* @brief GDISP native image code.
|
||||
*/
|
||||
#include "gfx.h"
|
||||
|
||||