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

Rename lots of files to help prevent compile time name conflicts.

ugfx_release_2.6
inmarket 2014-08-20 17:42:53 +10:00
parent fcbb66a939
commit 0f3f8f68f8
94 changed files with 857 additions and 828 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@
#include "gwinosc.h" #include "gwinosc.h"
/* Include internal GWIN routines so we can build our own superset class */ /* Include internal GWIN routines so we can build our own superset class */
#include "src/gwin/class_gwin.h" #include "src/gwin/gwin_class.h"
/* How many flat-line sample before we trigger */ /* How many flat-line sample before we trigger */
#define FLATLINE_SAMPLES 8 #define FLATLINE_SAMPLES 8

2
demos/modules/gaudio/oscilloscope/gwinosc.c
View File

@ -43,7 +43,7 @@
#include "gwinosc.h" #include "gwinosc.h"
/* Include internal GWIN routines so we can build our own superset class */ /* Include internal GWIN routines so we can build our own superset class */
#include "src/gwin/class_gwin.h" #include "src/gwin/gwin_class.h"
/* How many flat-line sample before we trigger */ /* How many flat-line sample before we trigger */
#define FLATLINE_SAMPLES 8 #define FLATLINE_SAMPLES 8

2
drivers/gaudio/vs1053/driver.mk
View File

@ -4,4 +4,4 @@ GFXSRC += $(GFXLIB)/drivers/gaudio/vs1053/gaudio_play_lld.c
# Required include directories # Required include directories
GFXINC += $(GFXLIB)/drivers/gaudio/vs1053 GFXINC += $(GFXLIB)/drivers/gaudio/vs1053
GFXDEFS += -DGFX_USE_GTIMER=GFX_USE_GAUDIO #GFXDEFS += -DGFX_USE_GTIMER=GFX_USE_GAUDIO

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

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gadc/gadc.c * @file src/gadc/gadc_gadc.c
* @brief GADC sub-system code. * @brief GADC sub-system code.
* *
* @addtogroup GADC * @addtogroup GADC
@ -17,7 +17,7 @@
#if GFX_USE_GADC #if GFX_USE_GADC
/* Include the driver defines */ /* Include the driver defines */
#include "src/gadc/driver.h" #include "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"

2
src/gadc/sys_make.mk
View File

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

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

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gaudio/gaudio.c * @file src/gaudio/gaudio_gaudio.c
* @brief GAUDIO sub-system code. * @brief GAUDIO sub-system code.
* *
* @addtogroup GAUDIO * @addtogroup GAUDIO
@ -17,7 +17,7 @@
#if GFX_USE_GAUDIO #if GFX_USE_GAUDIO
#if GAUDIO_NEED_PLAY #if GAUDIO_NEED_PLAY
#include "src/gaudio/driver_play.h" #include "driver_play.h"
static gfxQueueASync playList; static gfxQueueASync playList;
static gfxSem playComplete; static gfxSem playComplete;
@ -32,7 +32,7 @@
#endif #endif
#if GAUDIO_NEED_RECORD #if GAUDIO_NEED_RECORD
#include "src/gaudio/driver_record.h" #include "driver_record.h"
static gfxQueueGSync recordList; static gfxQueueGSync recordList;
static uint16_t recordFlags; static uint16_t recordFlags;

2
src/gaudio/sys_make.mk
View File

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

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

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

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

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

2
src/gdisp/colors.h → src/gdisp/gdisp_colors.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gdisp/colors.h * @file src/gdisp/gdisp_colors.h
* @brief GDISP color definitions header file. * @brief GDISP color definitions header file.
* *
* @defgroup Colors Colors * @defgroup Colors Colors

4
src/gdisp/fonts.c → src/gdisp/gdisp_fonts.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gdisp/fonts.c * @file src/gdisp/gdisp_fonts.c
* @brief GDISP Font Handling. * @brief GDISP Font Handling.
* *
* @addtogroup GDISP * @addtogroup GDISP
@ -17,7 +17,7 @@
#if GFX_USE_GDISP && GDISP_NEED_TEXT #if GFX_USE_GDISP && GDISP_NEED_TEXT
#include "mcufont.h" #include "mcufont/mcufont.h"
/* Custom flag to indicate dynamically allocated font */ /* Custom flag to indicate dynamically allocated font */
#define FONT_FLAG_DYNAMIC 0x80 #define FONT_FLAG_DYNAMIC 0x80

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

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gdisp/gdisp.c * @file src/gdisp/gdisp_gdisp.c
* @brief GDISP Driver code. * @brief GDISP Driver code.
* *
* @addtogroup GDISP * @addtogroup GDISP
@ -17,7 +17,7 @@
#if GFX_USE_GDISP #if GFX_USE_GDISP
/* Include the low level driver information */ /* Include the low level driver information */
#include "src/gdisp/driver.h" #include "driver.h"
#if 1 #if 1
#undef INLINE #undef INLINE
@ -2768,7 +2768,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
#endif #endif
#if GDISP_NEED_TEXT #if GDISP_NEED_TEXT
#include "mcufont.h" #include "mcufont/mcufont.h"
#if GDISP_NEED_ANTIALIAS && GDISP_HARDWARE_PIXELREAD #if GDISP_NEED_ANTIALIAS && GDISP_HARDWARE_PIXELREAD
static void drawcharline(int16_t x, int16_t y, uint8_t count, uint8_t alpha, void *state) { static void drawcharline(int16_t x, int16_t y, uint8_t count, uint8_t alpha, void *state) {

2
src/gdisp/image.c → src/gdisp/gdisp_image.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gdisp/image.c * @file src/gdisp/gdisp_image.c
* @brief GDISP generic image code. * @brief GDISP generic image code.
* *
* @defgroup Image Image * @defgroup Image Image

2
src/gdisp/image.h → src/gdisp/gdisp_image.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gdisp/image.h * @file src/gdisp/gdisp_image.h
* @brief GDISP image header file. * @brief GDISP image header file.
* *
* @defgroup Image Image * @defgroup Image Image

0
src/gdisp/image_bmp.c → src/gdisp/gdisp_image_bmp.c
View File

0
src/gdisp/image_gif.c → src/gdisp/gdisp_image_gif.c
View File

0
src/gdisp/image_jpg.c → src/gdisp/gdisp_image_jpg.c
View File

0
src/gdisp/image_native.c → src/gdisp/gdisp_image_native.c
View File

0
src/gdisp/image_png.c → src/gdisp/gdisp_image_png.c
View File

4
src/gdisp/sys_defs.h
View File

@ -185,7 +185,7 @@ extern GDisplay *GDISP;
/*===========================================================================*/ /*===========================================================================*/
/* Load our color definitions and pixel formats */ /* Load our color definitions and pixel formats */
#include "colors.h" #include "gdisp_colors.h"
/** /**
* @brief The type of a pixel. * @brief The type of a pixel.
@ -995,7 +995,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
#endif #endif
#if GDISP_NEED_IMAGE || defined(__DOXYGEN__) #if GDISP_NEED_IMAGE || defined(__DOXYGEN__)
#include "src/gdisp/image.h" #include "gdisp_image.h"
#endif #endif
#endif /* GFX_USE_GDISP */ #endif /* GFX_USE_GDISP */

16
src/gdisp/sys_make.mk
View File

@ -1,11 +1,11 @@
GFXSRC += $(GFXLIB)/src/gdisp/gdisp.c \ GFXSRC += $(GFXLIB)/src/gdisp/gdisp_gdisp.c \
$(GFXLIB)/src/gdisp/fonts.c \ $(GFXLIB)/src/gdisp/gdisp_fonts.c \
$(GFXLIB)/src/gdisp/image.c \ $(GFXLIB)/src/gdisp/gdisp_image.c \
$(GFXLIB)/src/gdisp/image_native.c \ $(GFXLIB)/src/gdisp/gdisp_image_native.c \
$(GFXLIB)/src/gdisp/image_gif.c \ $(GFXLIB)/src/gdisp/gdisp_image_gif.c \
$(GFXLIB)/src/gdisp/image_bmp.c \ $(GFXLIB)/src/gdisp/gdisp_image_bmp.c \
$(GFXLIB)/src/gdisp/image_jpg.c \ $(GFXLIB)/src/gdisp/gdisp_image_jpg.c \
$(GFXLIB)/src/gdisp/image_png.c $(GFXLIB)/src/gdisp/gdisp_image_png.c
MFDIR = $(GFXLIB)/src/gdisp/mcufont MFDIR = $(GFXLIB)/src/gdisp/mcufont
include $(GFXLIB)/src/gdisp/mcufont/mcufont.mk include $(GFXLIB)/src/gdisp/mcufont/mcufont.mk

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

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gevent/gevent.c * @file src/gevent/gevent_gevent.c
* @brief GEVENT Driver code. * @brief GEVENT Driver code.
* *
* @addtogroup GEVENT * @addtogroup GEVENT

2
src/gevent/sys_make.mk
View File

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

8
src/gfile/fatfs_chibios_diskio.c → src/gfile/gfile_fatfs_diskio_chibios.c
View File

@ -5,11 +5,17 @@
/* 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
#include "fatfs_wrapper.h" #include "gfile_fatfs_wrapper.h"
#if HAL_USE_MMC_SPI && HAL_USE_SDC #if HAL_USE_MMC_SPI && HAL_USE_SDC
#error "cannot specify both MMC_SPI and SDC drivers" #error "cannot specify both MMC_SPI and SDC drivers"

4
src/gfile/fatfs_wrapper.c → src/gfile/gfile_fatfs_wrapper.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gfile/fatfs_wrapper.c * @file src/gfile/gfile_fatfs_wrapper.c
* @brief GFILE FATFS wrapper. * @brief GFILE FATFS wrapper.
* *
*/ */
@ -15,7 +15,7 @@
#if GFX_USE_GFILE && GFILE_NEED_FATFS #if GFX_USE_GFILE && GFILE_NEED_FATFS
#include "fatfs_wrapper.h" #include "gfile_fatfs_wrapper.h"
// Include the source we want // Include the source we want
#include "3rdparty/fatfs-0.10b/src/ff.c" #include "3rdparty/fatfs-0.10b/src/ff.c"

2
src/gfile/fatfs_wrapper.h → src/gfile/gfile_fatfs_wrapper.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gfile/fatfs_wrapper.h * @file src/gfile/gfile_fatfs_wrapper.h
* @brief GFILE FATFS wrapper. * @brief GFILE FATFS wrapper.
* *
*/ */

0
src/gfile/inc_chibiosfs.c → src/gfile/gfile_fs_chibios.c
View File

0
src/gfile/inc_fatfs.c → src/gfile/gfile_fs_fatfs.c
View File

0
src/gfile/inc_memfs.c → src/gfile/gfile_fs_mem.c
View File

1
src/gfile/inc_nativefs.c → src/gfile/gfile_fs_native.c
View File

@ -18,7 +18,6 @@
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
//#include <unistd.h>
static bool_t NativeDel(const char *fname); static bool_t NativeDel(const char *fname);
static bool_t NativeExists(const char *fname); static bool_t NativeExists(const char *fname);

0
src/gfile/inc_petitfs.c → src/gfile/gfile_fs_petitfs.c
View File

0
src/gfile/inc_ramfs.c → src/gfile/gfile_fs_ram.c
View File

0
src/gfile/inc_romfs.c → src/gfile/gfile_fs_rom.c
View File

0
src/gfile/inc_strings.c → src/gfile/gfile_fs_strings.c
View File

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

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gfile/gfile.c * @file src/gfile/gfile_gfile.c
* @brief GFILE code. * @brief GFILE code.
* *
*/ */

8
src/gfile/petitfs_chibios_diskio.c → src/gfile/gfile_petitfs_diskio_chibios.c
View File

@ -5,11 +5,17 @@
/* 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
#include "petitfs_wrapper.h" #include "gfile_petitfs_wrapper.h"
#include <string.h> #include <string.h>

4
src/gfile/petitfs_wrapper.c → src/gfile/gfile_petitfs_wrapper.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gfile/petitfs_wrapper.c * @file src/gfile/gfile_petitfs_wrapper.c
* @brief GFILE PETITFS wrapper. * @brief GFILE PETITFS wrapper.
* *
*/ */
@ -15,7 +15,7 @@
#if GFX_USE_GFILE && GFILE_NEED_PETITFS #if GFX_USE_GFILE && GFILE_NEED_PETITFS
#include "petitfs_wrapper.h" #include "gfile_petitfs_wrapper.h"
// Include the source we want // Include the source we want
#include "3rdparty/petitfs-0.03/src/pff.c" #include "3rdparty/petitfs-0.03/src/pff.c"

2
src/gfile/petitfs_wrapper.h → src/gfile/gfile_petitfs_wrapper.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gfile/petitfs_wrapper.h * @file src/gfile/gfile_petitfs_wrapper.h
* @brief GFILE PETITFS wrapper. * @brief GFILE PETITFS wrapper.
* *
*/ */

0
src/gfile/inc_printg.c → src/gfile/gfile_printg.c
View File

0
src/gfile/inc_scang.c → src/gfile/gfile_scang.c
View File

0
src/gfile/inc_stdio.c → src/gfile/gfile_stdio.c
View File

32
src/gfile/sys_make.mk
View File

@ -1,18 +1,18 @@
GFXSRC += $(GFXLIB)/src/gfile/gfile.c \ GFXSRC += $(GFXLIB)/src/gfile/gfile_gfile.c \
$(GFXLIB)/src/gfile/inc_nativefs.c \ $(GFXLIB)/src/gfile/gfile_fs_native.c \
$(GFXLIB)/src/gfile/inc_ramfs.c \ $(GFXLIB)/src/gfile/gfile_fs_ram.c \
$(GFXLIB)/src/gfile/inc_romfs.c \ $(GFXLIB)/src/gfile/gfile_fs_rom.c \
$(GFXLIB)/src/gfile/inc_fatfs.c \ $(GFXLIB)/src/gfile/gfile_fs_fatfs.c \
$(GFXLIB)/src/gfile/inc_petitfs.c \ $(GFXLIB)/src/gfile/gfile_fs_petitfs.c \
$(GFXLIB)/src/gfile/inc_memfs.c \ $(GFXLIB)/src/gfile/gfile_fs_mem.c \
$(GFXLIB)/src/gfile/inc_chibiosfs.c \ $(GFXLIB)/src/gfile/gfile_fs_chibios.c \
$(GFXLIB)/src/gfile/inc_strings.c \ $(GFXLIB)/src/gfile/gfile_fs_strings.c \
$(GFXLIB)/src/gfile/inc_printg.c \ $(GFXLIB)/src/gfile/gfile_printg.c \
$(GFXLIB)/src/gfile/inc_scang.c \ $(GFXLIB)/src/gfile/gfile_scang.c \
$(GFXLIB)/src/gfile/inc_stdio.c \ $(GFXLIB)/src/gfile/gfile_stdio.c \
$(GFXLIB)/src/gfile/fatfs_wrapper.c \ $(GFXLIB)/src/gfile/gfile_fatfs_wrapper.c \
$(GFXLIB)/src/gfile/fatfs_chibios_diskio.c \ $(GFXLIB)/src/gfile/gfile_fatfs_diskio_chibios.c \
$(GFXLIB)/src/gfile/petitfs_wrapper.c \ $(GFXLIB)/src/gfile/gfile_petitfs_wrapper.c \
$(GFXLIB)/src/gfile/petitfs_chibios_diskio.c \ $(GFXLIB)/src/gfile/gfile_petitfs_diskio_chibios.c \

4
src/ginput/dial.c → src/ginput/ginput_dial.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/ginput/dial.c * @file src/ginput/ginput_dial.c
* @brief GINPUT dial code. * @brief GINPUT dial code.
* *
* @defgroup Dial Dial * @defgroup Dial Dial
@ -17,7 +17,7 @@
#if GFX_USE_GINPUT && GINPUT_NEED_DIAL #if GFX_USE_GINPUT && GINPUT_NEED_DIAL
#include "src/ginput/driver_dial.h" #include "driver_dial.h"
static GTIMER_DECL(DialTimer); static GTIMER_DECL(DialTimer);
static struct DialStatus_t { static struct DialStatus_t {

2
src/ginput/dial.h → src/ginput/ginput_dial.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/ginput/dial.h * @file src/ginput/ginput_dial.h
* @brief GINPUT GFX User Input subsystem header file. * @brief GINPUT GFX User Input subsystem header file.
* *
* @defgroup Dial Dial * @defgroup Dial Dial

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

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/ginput/ginput.c * @file src/ginput/ginput_ginput.c
* @brief GINPUT subsystem common code. * @brief GINPUT subsystem common code.
* *
* @addtogroup GINPUT * @addtogroup GINPUT

2
src/ginput/keyboard.c → src/ginput/ginput_keyboard.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/ginput/keyboard.c * @file src/ginput/ginput_keyboard.c
* @brief GINPUT keyboard code. * @brief GINPUT keyboard code.
* *
* @defgroup Keyboard Keyboard * @defgroup Keyboard Keyboard

2
src/ginput/keyboard.h → src/ginput/ginput_keyboard.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/ginput/keyboard.h * @file src/ginput/ginput_keyboard.h
* @brief GINPUT GFX User Input subsystem header file. * @brief GINPUT GFX User Input subsystem header file.
* *
* @defgroup Keyboard Keyboard * @defgroup Keyboard Keyboard

4
src/ginput/mouse.c → src/ginput/ginput_mouse.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/ginput/mouse.c * @file src/ginput/ginput_mouse.c
* @brief GINPUT mouse/touch code. * @brief GINPUT mouse/touch code.
* *
* @defgroup Mouse Mouse * @defgroup Mouse Mouse
@ -17,7 +17,7 @@
#if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) || defined(__DOXYGEN__) #if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) || defined(__DOXYGEN__)
#include "src/ginput/driver_mouse.h" #include "driver_mouse.h"
#if GINPUT_MOUSE_NEED_CALIBRATION #if GINPUT_MOUSE_NEED_CALIBRATION
#if !defined(GFX_USE_GDISP) || !GFX_USE_GDISP #if !defined(GFX_USE_GDISP) || !GFX_USE_GDISP

2
src/ginput/mouse.h → src/ginput/ginput_mouse.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/ginput/mouse.h * @file src/ginput/ginput_mouse.h
* @brief GINPUT GFX User Input subsystem header file for mouse and touch. * @brief GINPUT GFX User Input subsystem header file for mouse and touch.
* *
* @defgroup Mouse Mouse * @defgroup Mouse Mouse

4
src/ginput/toggle.c → src/ginput/ginput_toggle.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/ginput/toggle.c * @file src/ginput/ginput_toggle.c
* @brief GINPUT toggle code. * @brief GINPUT toggle code.
* *
* @defgroup Toggle Toggle * @defgroup Toggle Toggle
@ -17,7 +17,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 "driver_toggle.h"
#define GINPUT_TOGGLE_ISON 0x01 #define GINPUT_TOGGLE_ISON 0x01
#define GINPUT_TOGGLE_INVERT 0x02 #define GINPUT_TOGGLE_INVERT 0x02

2
src/ginput/toggle.h → src/ginput/ginput_toggle.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/ginput/toggle.h * @file src/ginput/ginput_toggle.h
* @brief GINPUT GFX User Input subsystem header file. * @brief GINPUT GFX User Input subsystem header file.
* *
* @defgroup Toggle Toggle * @defgroup Toggle Toggle

8
src/ginput/sys_defs.h
View File

@ -39,10 +39,10 @@
*/ */
// Include various ginput types // Include various ginput types
#include "src/ginput/mouse.h" #include "ginput_mouse.h"
#include "src/ginput/keyboard.h" #include "ginput_keyboard.h"
#include "src/ginput/toggle.h" #include "ginput_toggle.h"
#include "src/ginput/dial.h" #include "ginput_dial.h"
#endif /* GFX_USE_GINPUT */ #endif /* GFX_USE_GINPUT */

10
src/ginput/sys_make.mk
View File

@ -1,5 +1,5 @@
GFXSRC += $(GFXLIB)/src/ginput/ginput.c \ GFXSRC += $(GFXLIB)/src/ginput/ginput_ginput.c \
$(GFXLIB)/src/ginput/mouse.c \ $(GFXLIB)/src/ginput/ginput_mouse.c \
$(GFXLIB)/src/ginput/keyboard.c \ $(GFXLIB)/src/ginput/ginput_keyboard.c \
$(GFXLIB)/src/ginput/toggle.c \ $(GFXLIB)/src/ginput/ginput_toggle.c \
$(GFXLIB)/src/ginput/dial.c $(GFXLIB)/src/ginput/ginput_dial.c

2
src/gmisc/arrayops.c → src/gmisc/gmisc_arrayops.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gmisc/arrayops.c * @file src/gmisc/gmisc_arrayops.c
* @brief GMISC Array Operations code. * @brief GMISC Array Operations code.
* *
* @addtogroup GMISC * @addtogroup GMISC

2
src/gmisc/gmisc.c → src/gmisc/gmisc_gmisc.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gmisc/gmisc.c * @file src/gmisc/gmisc_gmisc.c
* @brief GMISC Functions. * @brief GMISC Functions.
* *
*/ */

2
src/gmisc/trig.c → src/gmisc/gmisc_trig.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gmisc/trig.c * @file src/gmisc/gmisc_trig.c
* @brief GMISC Trig Functions. * @brief GMISC Trig Functions.
* *
* @addtogroup GMISC * @addtogroup GMISC

6
src/gmisc/sys_make.mk
View File

@ -1,3 +1,3 @@
GFXSRC += $(GFXLIB)/src/gmisc/gmisc.c \ GFXSRC += $(GFXLIB)/src/gmisc/gmisc_gmisc.c \
$(GFXLIB)/src/gmisc/arrayops.c \ $(GFXLIB)/src/gmisc/gmisc_arrayops.c \
$(GFXLIB)/src/gmisc/trig.c $(GFXLIB)/src/gmisc/gmisc_trig.c

2
src/gqueue/gqueue.c → src/gqueue/gqueue_gqueue.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gqueue/gqueue.c * @file src/gqueue/gqueue_gqueue.c
* @brief GQUEUE source file. * @brief GQUEUE source file.
*/ */

2
src/gqueue/sys_make.mk
View File

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

2
src/gtimer/gtimer.c → src/gtimer/gtimer_gtimer.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gtimer/gtimer.c * @file src/gtimer/gtimer_gtimer.c
* @brief GTIMER sub-system code. * @brief GTIMER sub-system code.
* *
* @addtogroup GTIMER * @addtogroup GTIMER

2
src/gtimer/sys_make.mk
View File

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

4
src/gwin/button.c → src/gwin/gwin_button.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/button.c * @file src/gwin/gwin_button.c
* @brief GWIN sub-system button code * @brief GWIN sub-system button code
*/ */
@ -14,7 +14,7 @@
#if GFX_USE_GWIN && GWIN_NEED_BUTTON #if GFX_USE_GWIN && GWIN_NEED_BUTTON
#include "src/gwin/class_gwin.h" #include "gwin_class.h"
// Parameters for various shapes // Parameters for various shapes
#define RND_CNR_SIZE 5 // Rounded corner size for rounded buttons #define RND_CNR_SIZE 5 // Rounded corner size for rounded buttons

4
src/gwin/button.h → src/gwin/gwin_button.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/button.h * @file src/gwin/gwin_button.h
* @brief GWIN Graphic window subsystem header file. * @brief GWIN Graphic window subsystem header file.
* *
* @defgroup Button Button * @defgroup Button Button
@ -24,7 +24,7 @@
#ifndef _GWIN_BUTTON_H #ifndef _GWIN_BUTTON_H
#define _GWIN_BUTTON_H #define _GWIN_BUTTON_H
/* This file is included within "gwin/gwidget.h" */ /* This file is included within "src/gwin/gwin_widget.h" */
/** /**
* @brief The Event Type for a Button Event * @brief The Event Type for a Button Event

4
src/gwin/checkbox.c → src/gwin/gwin_checkbox.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/checkbox.c * @file src/gwin/gwin_checkbox.c
* @brief GWIN sub-system button code * @brief GWIN sub-system button code
*/ */
@ -14,7 +14,7 @@
#if (GFX_USE_GWIN && GWIN_NEED_CHECKBOX) || defined(__DOXYGEN__) #if (GFX_USE_GWIN && GWIN_NEED_CHECKBOX) || defined(__DOXYGEN__)
#include "src/gwin/class_gwin.h" #include "gwin_class.h"
// Our checked state // Our checked state
#define GCHECKBOX_FLG_CHECKED (GWIN_FIRST_CONTROL_FLAG<<0) #define GCHECKBOX_FLG_CHECKED (GWIN_FIRST_CONTROL_FLAG<<0)

4
src/gwin/checkbox.h → src/gwin/gwin_checkbox.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/checkbox.h * @file src/gwin/gwin_checkbox.h
* @brief GWIN Graphic window subsystem header file. * @brief GWIN Graphic window subsystem header file.
* *
* @defgroup Checkbox Checkbox * @defgroup Checkbox Checkbox
@ -22,7 +22,7 @@
#ifndef _GWIN_CHECKBOX_H #ifndef _GWIN_CHECKBOX_H
#define _GWIN_CHECKBOX_H #define _GWIN_CHECKBOX_H
/* This file is included within "gwin/gwidget.h" */ /* This file is included within "src/gwin/gwin_widget.h" */
/*===========================================================================*/ /*===========================================================================*/
/* Driver constants. */ /* Driver constants. */

4
src/gwin/class_gwin.h → src/gwin/gwin_class.h
View File

@ -6,7 +6,7 @@
*/ */
/* /*
* @file src/gwin/class_gwin.h * @file src/gwin/gwin_class.h
* @brief GWIN Graphic window subsystem header file. * @brief GWIN Graphic window subsystem header file.
* *
* @defgroup Internal Internal * @defgroup Internal Internal
@ -14,7 +14,7 @@
* *
* @note These definitions are normally not used by an application program. They are useful * @note These definitions are normally not used by an application program. They are useful
* only if you want to create your own custom GWIN window or widget. * only if you want to create your own custom GWIN window or widget.
* @note To access these definitions you must include "gwin/class_gwin.h" in your source file. * @note To access these definitions you must include "src/gwin/gwin_class.h" in your source file.
* *
* @{ * @{
*/ */

4
src/gwin/console.c → src/gwin/gwin_console.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/console.c * @file src/gwin/gwin_console.c
* @brief GWIN sub-system console code. * @brief GWIN sub-system console code.
*/ */
@ -16,7 +16,7 @@
#include <string.h> #include <string.h>
#include "src/gwin/class_gwin.h" #include "gwin_class.h"
#define GWIN_CONSOLE_USE_CLEAR_LINES TRUE // Clear each line before using it #define GWIN_CONSOLE_USE_CLEAR_LINES TRUE // Clear each line before using it
#define GWIN_CONSOLE_USE_FILLED_CHARS FALSE // Use filled characters instead of drawn characters #define GWIN_CONSOLE_USE_FILLED_CHARS FALSE // Use filled characters instead of drawn characters

4
src/gwin/console.h → src/gwin/gwin_console.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/console.h * @file src/gwin/gwin_console.h
* @brief GWIN Graphic window subsystem header file. * @brief GWIN Graphic window subsystem header file.
* *
* @defgroup Console Console * @defgroup Console Console
@ -24,7 +24,7 @@
#ifndef _GWIN_CONSOLE_H #ifndef _GWIN_CONSOLE_H
#define _GWIN_CONSOLE_H #define _GWIN_CONSOLE_H
/* This file is included within "gwin/gwin.h" */ /* This file is included within "src/gwin/sys_defs.h" */
// A console window. Supports wrapped text writing and a cursor. // A console window. Supports wrapped text writing and a cursor.
typedef struct GConsoleObject { typedef struct GConsoleObject {

4
src/gwin/gcontainer.c → src/gwin/gwin_container.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/gcontainer.c * @file src/gwin/gwin_container.c
* @brief GWIN sub-system container code * @brief GWIN sub-system container code
*/ */
@ -14,7 +14,7 @@
#if GFX_USE_GWIN && GWIN_NEED_CONTAINERS #if GFX_USE_GWIN && GWIN_NEED_CONTAINERS
#include "src/gwin/class_gwin.h" #include "gwin_class.h"
void _gcontainerInit(void) void _gcontainerInit(void)
{ {

6
src/gwin/gcontainer.h → src/gwin/gwin_container.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/gcontainer.h * @file src/gwin/gwin_container.h
* *
* @defgroup Container Container * @defgroup Container Container
* @ingroup Containers * @ingroup Containers
@ -21,7 +21,7 @@
#ifndef _GCONTAINER_H #ifndef _GCONTAINER_H
#define _GCONTAINER_H #define _GCONTAINER_H
/* This file is included within "gwin/gwin.h" */ /* This file is included within "src/gwin/sys_defs.h" */
// Forward definition // Forward definition
struct GContainerObject; struct GContainerObject;
@ -154,7 +154,7 @@ extern "C" {
/* Include extra container types */ /* Include extra container types */
#if GWIN_NEED_FRAME || defined(__DOXYGEN__) #if GWIN_NEED_FRAME || defined(__DOXYGEN__)
#include "src/gwin/frame.h" #include "gwin_frame.h"
#endif #endif
#endif /* _GCONTAINER_H */ #endif /* _GCONTAINER_H */

4
src/gwin/frame.c → src/gwin/gwin_frame.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/frame.c * @file src/gwin/gwin_frame.c
* @brief GWIN sub-system frame code. * @brief GWIN sub-system frame code.
*/ */
@ -14,7 +14,7 @@
#if GFX_USE_GWIN && GWIN_NEED_FRAME #if GFX_USE_GWIN && GWIN_NEED_FRAME
#include "src/gwin/class_gwin.h" #include "gwin_class.h"
/* Some position values */ /* Some position values */
#define BUTTON_X 18 // Button Width #define BUTTON_X 18 // Button Width

4
src/gwin/frame.h → src/gwin/gwin_frame.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/frame.h * @file src/gwin/gwin_frame.h
* @brief GWIN Graphic window subsystem header file. * @brief GWIN Graphic window subsystem header file.
* *
* @defgroup Frame Frame * @defgroup Frame Frame
@ -23,6 +23,8 @@
#ifndef _GWIN_FRAME_H #ifndef _GWIN_FRAME_H
#define _GWIN_FRAME_H #define _GWIN_FRAME_H
/* This file is included from src/gwin/gwin_container.h */
/** /**
* @brief Flags for gwinFrameCreate() * @brief Flags for gwinFrameCreate()
* @{ * @{

2
src/gwin/gwin_gl3d.c
View File

@ -18,7 +18,7 @@
#error "GWIN: GL3D only support GDISP_PIXELFORMAT_RGB565 color format (TinyGL limitation)" #error "GWIN: GL3D only support GDISP_PIXELFORMAT_RGB565 color format (TinyGL limitation)"
#endif #endif
#include "src/gwin/class_gwin.h" #include "gwin_class.h"
#include "3rdparty/tinygl-0.4-ugfx/src/zgl.h" #include "3rdparty/tinygl-0.4-ugfx/src/zgl.h"

2
src/gwin/gwin_gl3d.h
View File

@ -22,7 +22,7 @@
#ifndef _GWIN_GL3D_H #ifndef _GWIN_GL3D_H
#define _GWIN_GL3D_H #define _GWIN_GL3D_H
/* This file is included within "gwin/gwin.h" */ /* This file is included within "src/gwin/sys_defs.h" */
// A gl3d window // A gl3d window

4
src/gwin/graph.c → src/gwin/gwin_graph.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/graph.c * @file src/gwin/gwin_graph.c
* @brief GWIN sub-system button code * @brief GWIN sub-system button code
*/ */
@ -14,7 +14,7 @@
#if GFX_USE_GWIN && GWIN_NEED_GRAPH #if GFX_USE_GWIN && GWIN_NEED_GRAPH
#include "src/gwin/class_gwin.h" #include "gwin_class.h"
#define GGRAPH_FLG_CONNECTPOINTS (GWIN_FIRST_CONTROL_FLAG<<0) #define GGRAPH_FLG_CONNECTPOINTS (GWIN_FIRST_CONTROL_FLAG<<0)
#define GGRAPH_ARROW_SIZE 5 #define GGRAPH_ARROW_SIZE 5

4
src/gwin/graph.h → src/gwin/gwin_graph.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/graph.h * @file src/gwin/gwin_graph.h
* @brief GWIN GRAPH module header file * @brief GWIN GRAPH module header file
* *
* @defgroup Graph Graph * @defgroup Graph Graph
@ -22,7 +22,7 @@
#ifndef _GWIN_GRAPH_H #ifndef _GWIN_GRAPH_H
#define _GWIN_GRAPH_H #define _GWIN_GRAPH_H
/* This file is included within "gwin/gwin.h" */ /* This file is included within "src/gwin/sys_defs.h" */
typedef enum GGraphPointType_e { typedef enum GGraphPointType_e {
GGRAPH_POINT_NONE, GGRAPH_POINT_DOT, GGRAPH_POINT_SQUARE, GGRAPH_POINT_CIRCLE GGRAPH_POINT_NONE, GGRAPH_POINT_DOT, GGRAPH_POINT_SQUARE, GGRAPH_POINT_CIRCLE

7
src/gwin/gwin.c → src/gwin/gwin_gwin.c
View File

@ -5,11 +5,16 @@
* http://ugfx.org/license.html * http://ugfx.org/license.html
*/ */
/**
* @file src/gwin/gwin_gwin.c
* @brief GWIN sub-system code
*/
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GWIN #if GFX_USE_GWIN
#include "src/gwin/class_gwin.h" #include "gwin_class.h"
/*----------------------------------------------- /*-----------------------------------------------
* Data * Data

4
src/gwin/gimage.c → src/gwin/gwin_image.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/gimage.c * @file src/gwin/gwin_image.c
* @brief GWIN sub-system image code * @brief GWIN sub-system image code
*/ */
@ -14,7 +14,7 @@
#if GFX_USE_GWIN && GWIN_NEED_IMAGE #if GFX_USE_GWIN && GWIN_NEED_IMAGE
#include "src/gwin/class_gwin.h" #include "gwin_class.h"
#define widget(gh) ((GImageObject *)gh) #define widget(gh) ((GImageObject *)gh)

4
src/gwin/gimage.h → src/gwin/gwin_image.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/gimage.h * @file src/gwin/gwin_image.h
* @brief GWIN image widget header file. * @brief GWIN image widget header file.
* *
* @defgroup ImageBox ImageBox * @defgroup ImageBox ImageBox
@ -27,7 +27,7 @@
#ifndef _GWIN_IMAGE_H #ifndef _GWIN_IMAGE_H
#define _GWIN_IMAGE_H #define _GWIN_IMAGE_H
// This file is included within "gwin/gwin.h" // This file is included within "src/gwin/sys_defs.h"
// An image window // An image window
typedef struct GImageObject { typedef struct GImageObject {

4
src/gwin/label.c → src/gwin/gwin_label.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/label.c * @file src/gwin/gwin_label.c
* @brief GWIN label widget header file * @brief GWIN label widget header file
*/ */
@ -14,7 +14,7 @@
#if GFX_USE_GWIN && GWIN_NEED_LABEL #if GFX_USE_GWIN && GWIN_NEED_LABEL
#include "src/gwin/class_gwin.h" #include "gwin_class.h"
// macros to assist in data type conversions // macros to assist in data type conversions
#define gh2obj ((GLabelObject *)gh) #define gh2obj ((GLabelObject *)gh)

4
src/gwin/label.h → src/gwin/gwin_label.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/label.h * @file src/gwin/gwin_label.h
* @brief GWIN label widget header file * @brief GWIN label widget header file
* *
* @defgroup Label Label * @defgroup Label Label
@ -27,7 +27,7 @@
#ifndef _GWIN_LABEL_H #ifndef _GWIN_LABEL_H
#define _GWIN_LABEL_H #define _GWIN_LABEL_H
// This file is included within "gwin/gwin.h" // This file is included within "src/gwin/gwin_widget.h"
// An label window // An label window
typedef struct GLabelObject { typedef struct GLabelObject {

4
src/gwin/list.c → src/gwin/gwin_list.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/list.c * @file src/gwin/gwin_list.c
* @brief GWIN list widget header file * @brief GWIN list widget header file
*/ */
@ -14,7 +14,7 @@
#if GFX_USE_GWIN && GWIN_NEED_LIST #if GFX_USE_GWIN && GWIN_NEED_LIST
#include "src/gwin/class_gwin.h" #include "gwin_class.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>

4
src/gwin/list.h → src/gwin/gwin_list.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/list.h * @file src/gwin/gwin_list.h
* @brief GWIN list widget header file * @brief GWIN list widget header file
* *
* @defgroup List List * @defgroup List List
@ -26,7 +26,7 @@
#ifndef _GWIN_LIST_H #ifndef _GWIN_LIST_H
#define _GWIN_LIST_H #define _GWIN_LIST_H
// This file is included within "gwin/gwin.h" // This file is included within "src/gwin/gwin_widget.h"
/** /**
* @brief The event type for a list event * @brief The event type for a list event

4
src/gwin/progressbar.c → src/gwin/gwin_progressbar.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/progressbar.c * @file src/gwin/gwin_progressbar.c
* @brief GWIN sub-system progressbar code * @brief GWIN sub-system progressbar code
*/ */
@ -14,7 +14,7 @@
#if (GFX_USE_GWIN && GWIN_NEED_PROGRESSBAR) || defined(__DOXYGEN__) #if (GFX_USE_GWIN && GWIN_NEED_PROGRESSBAR) || defined(__DOXYGEN__)
#include "src/gwin/class_gwin.h" #include "gwin_class.h"
// Reset the display position back to the value predicted by the saved progressbar position // Reset the display position back to the value predicted by the saved progressbar position
static void ResetDisplayPos(GProgressbarObject *gsw) { static void ResetDisplayPos(GProgressbarObject *gsw) {

3
src/gwin/progressbar.h → src/gwin/gwin_progressbar.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/progressbar.h * @file src/gwin/gwin_progressbar.h
* @brief GWIN Graphic window subsystem header file. * @brief GWIN Graphic window subsystem header file.
* *
* @defgroup Progressbar Progressbar * @defgroup Progressbar Progressbar
@ -22,6 +22,7 @@
#ifndef _GWIN_PROGRESSBAR_H #ifndef _GWIN_PROGRESSBAR_H
#define _GWIN_PROGRESSBAR_H #define _GWIN_PROGRESSBAR_H
/* This file is included within src/gwin/gwin_widget.h */
// A progressbar window // A progressbar window
typedef struct GProgressbarObject { typedef struct GProgressbarObject {
GWidgetObject w; GWidgetObject w;

4
src/gwin/radio.c → src/gwin/gwin_radio.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/radio.c * @file src/gwin/gwin_radio.c
* @brief GWIN sub-system radio button code * @brief GWIN sub-system radio button code
*/ */
@ -14,7 +14,7 @@
#if GFX_USE_GWIN && GWIN_NEED_RADIO #if GFX_USE_GWIN && GWIN_NEED_RADIO
#include "src/gwin/class_gwin.h" #include "gwin_class.h"
#define GRADIO_TAB_CNR 8 // Diagonal corner on active tab #define GRADIO_TAB_CNR 8 // Diagonal corner on active tab
#define GRADIO_TOP_FADE 50 // (GRADIO_TOP_FADE/255)% fade to white for top of tab/button #define GRADIO_TOP_FADE 50 // (GRADIO_TOP_FADE/255)% fade to white for top of tab/button

4
src/gwin/radio.h → src/gwin/gwin_radio.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/radio.h * @file src/gwin/gwin_radio.h
* @brief GWIN Graphic window subsystem header file. * @brief GWIN Graphic window subsystem header file.
* *
* @defgroup RadioButton RadioButton * @defgroup RadioButton RadioButton
@ -22,7 +22,7 @@
#ifndef _GWIN_RADIO_H #ifndef _GWIN_RADIO_H
#define _GWIN_RADIO_H #define _GWIN_RADIO_H
/* This file is included within "gwin/gwidget.h" */ /* This file is included within "src/gwin/gwin_widget.h" */
/** /**
* @brief The Event Type for a Radio Event * @brief The Event Type for a Radio Event

4
src/gwin/slider.c → src/gwin/gwin_slider.c
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/slider.c * @file src/gwin/gwin_slider.c
* @brief GWIN sub-system slider code * @brief GWIN sub-system slider code
*/ */
@ -14,7 +14,7 @@
#if (GFX_USE_GWIN && GWIN_NEED_SLIDER) || defined(__DOXYGEN__) #if (GFX_USE_GWIN && GWIN_NEED_SLIDER) || defined(__DOXYGEN__)
#include "src/gwin/class_gwin.h" #include "gwin_class.h"
#ifndef GWIN_SLIDER_DEAD_BAND #ifndef GWIN_SLIDER_DEAD_BAND
#define GWIN_SLIDER_DEAD_BAND 5 #define GWIN_SLIDER_DEAD_BAND 5

4
src/gwin/slider.h → src/gwin/gwin_slider.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/slider.h * @file src/gwin/gwin_slider.h
* @brief GWIN Graphic window subsystem header file. * @brief GWIN Graphic window subsystem header file.
* *
* @defgroup Slider Slider * @defgroup Slider Slider
@ -22,7 +22,7 @@
#ifndef _GWIN_SLIDER_H #ifndef _GWIN_SLIDER_H
#define _GWIN_SLIDER_H #define _GWIN_SLIDER_H
/* This file is included within "gwin/gwidget.h" */ /* This file is included within "src/gwin/gwin_widget.h" */
#define GEVENT_GWIN_SLIDER (GEVENT_GWIN_CTRL_FIRST+1) #define GEVENT_GWIN_SLIDER (GEVENT_GWIN_CTRL_FIRST+1)

7
src/gwin/gwidget.c → src/gwin/gwin_widget.c
View File

@ -5,13 +5,18 @@
* http://ugfx.org/license.html * http://ugfx.org/license.html
*/ */
/**
* @file src/gwin/gwin_widget.c
* @brief GWIN sub-system widget code
*/
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GWIN && GWIN_NEED_WIDGET #if GFX_USE_GWIN && GWIN_NEED_WIDGET
#include <string.h> #include <string.h>
#include "src/gwin/class_gwin.h" #include "gwin_class.h"
/* Our listener for events for widgets */ /* Our listener for events for widgets */
static GListener gl; static GListener gl;

18
src/gwin/gwidget.h → src/gwin/gwin_widget.h
View File

@ -6,7 +6,7 @@
*/ */
/** /**
* @file src/gwin/gwidget.h * @file src/gwin/gwin_widget.h
* @brief GWIN Widgets header file. * @brief GWIN Widgets header file.
* *
* @defgroup Widget Widget * @defgroup Widget Widget
@ -23,7 +23,7 @@
#ifndef _GWIDGET_H #ifndef _GWIDGET_H
#define _GWIDGET_H #define _GWIDGET_H
/* This file is included within "gwin/gwin.h" */ /* This file is included within "src/gwin/sys_defs.h" */
// Forward definition // Forward definition
struct GWidgetObject; struct GWidgetObject;
@ -360,31 +360,31 @@ bool_t gwinAttachListener(GListener *pl);
/* Include extra widget types */ /* Include extra widget types */
#if GWIN_NEED_BUTTON || defined(__DOXYGEN__) #if GWIN_NEED_BUTTON || defined(__DOXYGEN__)
#include "src/gwin/button.h" #include "gwin_button.h"
#endif #endif
#if GWIN_NEED_SLIDER || defined(__DOXYGEN__) #if GWIN_NEED_SLIDER || defined(__DOXYGEN__)
#include "src/gwin/slider.h" #include "gwin_slider.h"
#endif #endif
#if GWIN_NEED_CHECKBOX || defined(__DOXYGEN__) #if GWIN_NEED_CHECKBOX || defined(__DOXYGEN__)
#include "src/gwin/checkbox.h" #include "gwin_checkbox.h"
#endif #endif
#if GWIN_NEED_RADIO || defined(__DOXYGEN__) #if GWIN_NEED_RADIO || defined(__DOXYGEN__)
#include "src/gwin/radio.h" #include "gwin_radio.h"
#endif #endif
#if GWIN_NEED_LABEL || defined(__DOXYGEN__) #if GWIN_NEED_LABEL || defined(__DOXYGEN__)
#include "src/gwin/label.h" #include "gwin_label.h"
#endif #endif
#if GWIN_NEED_LIST || defined(__DOXYGEN__) #if GWIN_NEED_LIST || defined(__DOXYGEN__)
#include "src/gwin/list.h" #include "gwin_list.h"
#endif #endif
#if GWIN_NEED_PROGRESSBAR || defined(__DOXYGEN__) #if GWIN_NEED_PROGRESSBAR || defined(__DOXYGEN__)
#include "src/gwin/progressbar.h" #include "gwin_progressbar.h"
#endif #endif
#endif /* _GWIDGET_H */ #endif /* _GWIDGET_H */

9
src/gwin/gwm.c → src/gwin/gwin_wm.c
View File

@ -5,6 +5,11 @@
* http://ugfx.org/license.html * http://ugfx.org/license.html
*/ */
/**
* @file src/gwin/gwin_wm.c
* @brief GWIN sub-system window manager code
*/
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GWIN && !GWIN_NEED_WINDOWMANAGER #if GFX_USE_GWIN && !GWIN_NEED_WINDOWMANAGER
@ -13,7 +18,7 @@
*/ */
#include "src/gwin/class_gwin.h" #include "gwin_class.h"
// Needed if there is no window manager // Needed if there is no window manager
#define MIN_WIN_WIDTH 1 #define MIN_WIN_WIDTH 1
@ -147,7 +152,7 @@
#if GFX_USE_GWIN && GWIN_NEED_WINDOWMANAGER #if GFX_USE_GWIN && GWIN_NEED_WINDOWMANAGER
#include "src/gwin/class_gwin.h" #include "gwin_class.h"
/*----------------------------------------------- /*-----------------------------------------------
* Data * Data

12
src/gwin/sys_defs.h
View File

@ -950,26 +950,26 @@ extern "C" {
/* Include widgets */ /* Include widgets */
#if GWIN_NEED_WIDGET || defined(__DOXYGEN__) #if GWIN_NEED_WIDGET || defined(__DOXYGEN__)
#include "src/gwin/gwidget.h" #include "gwin_widget.h"
#endif #endif
/* Include containers */ /* Include containers */
#if GWIN_NEED_CONTAINERS || defined(__DOXYGEN__) #if GWIN_NEED_CONTAINERS || defined(__DOXYGEN__)
#include "src/gwin/gcontainer.h" #include "gwin_container.h"
#endif #endif
/* Include vanilla window objects */ /* Include vanilla window objects */
#if GWIN_NEED_CONSOLE || defined(__DOXYGEN__) #if GWIN_NEED_CONSOLE || defined(__DOXYGEN__)
#include "src/gwin/console.h" #include "gwin_console.h"
#endif #endif
#if GWIN_NEED_GRAPH || defined(__DOXYGEN__) #if GWIN_NEED_GRAPH || defined(__DOXYGEN__)
#include "src/gwin/graph.h" #include "gwin_graph.h"
#endif #endif
#if GWIN_NEED_IMAGE || defined(__DOXYGEN__) #if GWIN_NEED_IMAGE || defined(__DOXYGEN__)
#include "src/gwin/gimage.h" #include "gwin_image.h"
#endif #endif
#if GWIN_NEED_GL3D || defined(__DOXYGEN__) #if GWIN_NEED_GL3D || defined(__DOXYGEN__)
#include "src/gwin/gwin_gl3d.h" #include "gwin_gl3d.h"
#endif #endif
#endif /* GFX_USE_GWIN */ #endif /* GFX_USE_GWIN */

30
src/gwin/sys_make.mk
View File

@ -1,18 +1,18 @@
GFXSRC += $(GFXLIB)/src/gwin/gwin.c \ GFXSRC += $(GFXLIB)/src/gwin/gwin_gwin.c \
$(GFXLIB)/src/gwin/gwidget.c \ $(GFXLIB)/src/gwin/gwin_widget.c \
$(GFXLIB)/src/gwin/gwm.c \ $(GFXLIB)/src/gwin/gwin_wm.c \
$(GFXLIB)/src/gwin/console.c \ $(GFXLIB)/src/gwin/gwin_console.c \
$(GFXLIB)/src/gwin/graph.c \ $(GFXLIB)/src/gwin/gwin_graph.c \
$(GFXLIB)/src/gwin/button.c \ $(GFXLIB)/src/gwin/gwin_button.c \
$(GFXLIB)/src/gwin/slider.c \ $(GFXLIB)/src/gwin/gwin_slider.c \
$(GFXLIB)/src/gwin/checkbox.c \ $(GFXLIB)/src/gwin/gwin_checkbox.c \
$(GFXLIB)/src/gwin/gimage.c \ $(GFXLIB)/src/gwin/gwin_image.c \
$(GFXLIB)/src/gwin/label.c \ $(GFXLIB)/src/gwin/gwin_label.c \
$(GFXLIB)/src/gwin/radio.c \ $(GFXLIB)/src/gwin/gwin_radio.c \
$(GFXLIB)/src/gwin/list.c \ $(GFXLIB)/src/gwin/gwin_list.c \
$(GFXLIB)/src/gwin/progressbar.c \ $(GFXLIB)/src/gwin/gwin_progressbar.c \
$(GFXLIB)/src/gwin/gcontainer.c \ $(GFXLIB)/src/gwin/gwin_container.c \
$(GFXLIB)/src/gwin/frame.c \ $(GFXLIB)/src/gwin/gwin_frame.c \
$(GFXLIB)/src/gwin/gwin_gl3d.c \ $(GFXLIB)/src/gwin/gwin_gl3d.c \
GFXINC += $(GFXLIB)/3rdparty/tinygl-0.4-ugfx/include GFXINC += $(GFXLIB)/3rdparty/tinygl-0.4-ugfx/include