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

Make all include paths in ugfx relative. 

The only include path now needed is for drivers (in particular GDISP drivers)
remotes/origin_old/ugfx_release_2.6
inmarket 8 years ago
parent
a69849177d
commit
c5a86757bd
158 changed files with 284 additions and 314 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c
  2. 2
      boards/base/STM32F746-Discovery/stm32f746g_raw32_system.c
  3. 2
      boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c
  4. 5
      drivers/gadc/AT91SAM7/driver.mk
  5. 2
      drivers/gadc/AT91SAM7/gadc_lld_AT91SAM7.c
  6. 6
      drivers/gaudio/Win32/driver.mk
  7. 2
      drivers/gaudio/Win32/gaudio_play_Win32.c
  8. 2
      drivers/gaudio/Win32/gaudio_record_Win32.c
  9. 5
      drivers/gaudio/gadc/driver.mk
  10. 2
      drivers/gaudio/gadc/gaudio_record_gadc.c
  11. 5
      drivers/gaudio/pwm/driver.mk
  12. 2
      drivers/gaudio/pwm/gaudio_play_pwm.c
  13. 7
      drivers/gaudio/vs1053/driver.mk
  14. 4
      drivers/gaudio/vs1053/gaudio_play_vs1053.c
  15. 4
      drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c
  16. 6
      drivers/gdisp/HX8347D/gdisp_lld_HX8347D.c
  17. 4
      drivers/gdisp/ILI9320/gdisp_lld_ILI9320.c
  18. 4
      drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c
  19. 6
      drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c
  20. 4
      drivers/gdisp/ILI93xx/gdisp_lld_ILI93xx.c
  21. 4
      drivers/gdisp/ILI9481/gdisp_lld_ILI9481.c
  22. 2
      drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c
  23. 6
      drivers/gdisp/Nokia6610GE12/gdisp_lld_Nokia6610GE12.c
  24. 6
      drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
  25. 6
      drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c
  26. 6
      drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c
  27. 4
      drivers/gdisp/R61505U/gdisp_lld_R61505U.c
  28. 4
      drivers/gdisp/RA8875/gdisp_lld_RA8875.c
  29. 4
      drivers/gdisp/S6D1121/gdisp_lld_S6D1121.c
  30. 4
      drivers/gdisp/SPFD54124B/gdisp_lld_SPFD54124B.c
  31. 4
      drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c
  32. 6
      drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c
  33. 2
      drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c
  34. 2
      drivers/gdisp/SSD1351/gdisp_lld_SSD1351.c
  35. 6
      drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
  36. 6
      drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c
  37. 6
      drivers/gdisp/ST7565/gdisp_lld_ST7565.c
  38. 4
      drivers/gdisp/STM32F429iDiscovery/gdisp_lld_STM32F429iDiscovery.c
  39. 4
      drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c
  40. 6
      drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c
  41. 4
      drivers/gdisp/TestStub/gdisp_lld_TestStub.c
  42. 4
      drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c
  43. 5
      drivers/ginput/dial/GADC/driver.mk
  44. 2
      drivers/ginput/dial/GADC/ginput_lld_dial_GADC.c
  45. 5
      drivers/ginput/toggle/Pal/driver.mk
  46. 48
      drivers/ginput/toggle/Pal/ginput_lld_toggle_Pal.c
  47. 1
      drivers/ginput/touch/ADS7843/driver.mk
  48. 2
      drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c
  49. 1
      drivers/ginput/touch/FT5x06/driver.mk
  50. 4
      drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c
  51. 1
      drivers/ginput/touch/MAX11802/driver.mk
  52. 4
      drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c
  53. 1
      drivers/ginput/touch/MCU/driver.mk
  54. 2
      drivers/ginput/touch/MCU/gmouse_lld_MCU.c
  55. 1
      drivers/ginput/touch/STMPE610/driver.mk
  56. 4
      drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c
  57. 1
      drivers/ginput/touch/STMPE811/driver.mk
  58. 4
      drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c
  59. 10
      drivers/multiple/Win32/gdisp_lld_Win32.c
  60. 8
      drivers/multiple/X/gdisp_lld_X.c
  61. 4
      drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
  62. 5
      gfxconf.example.h
  63. 2
      src/gadc/gadc.c
  64. 2
      src/gadc/gadc.h
  65. 2
      src/gadc/gadc_driver.h
  66. 2
      src/gaudio/gaudio.c
  67. 2
      src/gaudio/gaudio.h
  68. 2
      src/gaudio/gaudio_driver_play.h
  69. 2
      src/gaudio/gaudio_driver_record.h
  70. 2
      src/gdisp/gdisp.c
  71. 3
      src/gdisp/gdisp.h
  72. 2
      src/gdisp/gdisp_colors.h
  73. 2
      src/gdisp/gdisp_driver.h
  74. 2
      src/gdisp/gdisp_fonts.c
  75. 2
      src/gdisp/gdisp_image.c
  76. 2
      src/gdisp/gdisp_image_bmp.c
  77. 2
      src/gdisp/gdisp_image_gif.c
  78. 2
      src/gdisp/gdisp_image_jpg.c
  79. 2
      src/gdisp/gdisp_image_native.c
  80. 2
      src/gdisp/gdisp_image_png.c
  81. 6
      src/gdisp/gdisp_pixmap.c
  82. 2
      src/gdisp/mcufont/mf_config.h
  83. 2
      src/gdriver/gdriver.c
  84. 2
      src/gevent/gevent.c
  85. 2
      src/gevent/gevent.h
  86. 2
      src/gfile/gfile.c
  87. 2
      src/gfile/gfile.h
  88. 2
      src/gfile/gfile_fatfs_diskio_chibios.c
  89. 6
      src/gfile/gfile_fatfs_wrapper.c
  90. 6
      src/gfile/gfile_fatfs_wrapper.h
  91. 2
      src/gfile/gfile_fs_chibios.c
  92. 2
      src/gfile/gfile_fs_fatfs.c
  93. 2
      src/gfile/gfile_fs_mem.c
  94. 2
      src/gfile/gfile_fs_native.c
  95. 2
      src/gfile/gfile_fs_petitfs.c
  96. 2
      src/gfile/gfile_fs_ram.c
  97. 2
      src/gfile/gfile_fs_rom.c
  98. 2
      src/gfile/gfile_fs_strings.c
  99. 2
      src/gfile/gfile_petitfs_diskio_chibios.c
  100. 4
      src/gfile/gfile_petitfs_wrapper.c

2
boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c
View File

@ -1,4 +1,4 @@
#include "gfx.h"
#include "../../../gfx.h"
#include "stm32f746g_discovery_sdram.h"
#include "stm32f7xx_hal_rcc.h"
#include "stm32f7xx_hal_dma.h"

2
boards/base/STM32F746-Discovery/stm32f746g_raw32_system.c
View File

@ -1,4 +1,4 @@
#include "gfx.h"
#include "../../../gfx.h"
#include "stm32f7xx.h"
#if !defined (HSE_VALUE)

2
boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c
View File

@ -1,4 +1,4 @@
#include "gfx.h"
#include "../../../gfx.h"
#include "stm32f7xx_hal.h"
#if GFX_USE_OS_CHIBIOS

5
drivers/gadc/AT91SAM7/driver.mk
View File

@ -1,5 +1,2 @@
# List the required driver.
GFXSRC += $(GFXLIB)/drivers/gadc/AT91SAM7/gadc_lld.c
# Required include directories
GFXINC += $(GFXLIB)/drivers/gadc/AT91SAM7
GFXSRC += $(GFXLIB)/drivers/gadc/AT91SAM7/gadc_lld_AT91SAM7.c

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

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

6
drivers/gaudio/Win32/driver.mk
View File

@ -1,6 +1,4 @@
# List the required driver.
GFXSRC += $(GFXLIB)/drivers/gaudio/Win32/gaudio_record_lld.c \
$(GFXLIB)/drivers/gaudio/Win32/gaudio_play_lld.c
GFXINC += $(GFXLIB)/drivers/gaudio/Win32
GFXSRC += $(GFXLIB)/drivers/gaudio/Win32/gaudio_record_Win32.c \
$(GFXLIB)/drivers/gaudio/Win32/gaudio_play_Win32.c
GFXLIBS += winmm

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

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

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

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

5
drivers/gaudio/gadc/driver.mk
View File

@ -1,8 +1,5 @@
# List the required driver.
GFXSRC += $(GFXLIB)/drivers/gaudio/gadc/gaudio_record_lld.c
# Required include directories
GFXINC += $(GFXLIB)/drivers/gaudio/gadc
GFXSRC += $(GFXLIB)/drivers/gaudio/gadc/gaudio_record_gadc.c
# Make sure the GADC sub-system is turned on
GFXDEFS += -DGFX_USE_GADC=GAUDIO_NEED_RECORD

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

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

5
drivers/gaudio/pwm/driver.mk
View File

@ -1,5 +1,2 @@
# List the required driver.
GFXSRC += $(GFXLIB)/drivers/gaudio/pwm/gaudio_play_lld.c
# Required include directories
GFXINC += $(GFXLIB)/drivers/gaudio/pwm
GFXSRC += $(GFXLIB)/drivers/gaudio/pwm/gaudio_play_pwm.c

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

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

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

@ -1,7 +1,2 @@
# List the required driver.
GFXSRC += $(GFXLIB)/drivers/gaudio/vs1053/gaudio_play_lld.c
# Required include directories
GFXINC += $(GFXLIB)/drivers/gaudio/vs1053
#GFXDEFS += -DGFX_USE_GTIMER=GFX_USE_GAUDIO
GFXSRC += $(GFXLIB)/drivers/gaudio/vs1053/gaudio_play_vs1053.c

4
drivers/gaudio/vs1053/gaudio_play_lld.c → drivers/gaudio/vs1053/gaudio_play_vs1053.c
View File

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

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

@ -10,8 +10,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_ED060SC4
#include "drivers/gdisp/ED060SC4/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_ED060SC4.h"

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

@ -10,8 +10,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_HX8347D
#include "drivers/gdisp/HX8347D/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_HX8347D.h"
@ -36,7 +36,7 @@
/* Driver local functions. */
/*===========================================================================*/
#include "drivers/gdisp/HX8347D/HX8347D.h"
#include "HX8347D.h"
#define write_reg(g, reg, data) { write_index(g, reg); write_data(g, data); }

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

@ -20,8 +20,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_ILI9320
#include "drivers/gdisp/ILI9320/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_ILI9320.h"

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

@ -20,8 +20,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_ILI9325
#include "drivers/gdisp/ILI9325/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_ILI9325.h"

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

@ -19,8 +19,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_ILI9341
#include "drivers/gdisp/ILI9341/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_ILI9341.h"
@ -41,7 +41,7 @@
#define GDISP_INITIAL_BACKLIGHT 100
#endif
#include "drivers/gdisp/ILI9341/ILI9341.h"
#include "ILI9341.h"
/*===========================================================================*/
/* Driver local functions. */

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

@ -20,8 +20,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_ILI93xx
#include "drivers/gdisp/ILI93xx/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_ILI93xx.h"

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

@ -19,8 +19,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_ILI9481
#include "drivers/gdisp/ILI9481/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.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
#include "gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_LGDP4532.h"

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

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

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

@ -51,8 +51,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_Nokia6610GE8
#include "drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_Nokia6610GE8.h"
@ -60,7 +60,7 @@
/* Driver local definitions. */
/*===========================================================================*/
#include "drivers/gdisp/Nokia6610GE8/GE8.h"
#include "GE8.h"
#define GDISP_SCAN_LINES 132

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

@ -10,8 +10,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_PCD8544
#include "drivers/gdisp/PCD8544/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_PCD8544.h"
/*===========================================================================*/
@ -26,7 +26,7 @@
#define GDISP_FLG_NEEDFLUSH (GDISP_FLG_DRIVER << 0)
#include "drivers/gdisp/PCD8544/PCD8544.h"
#include "PCD8544.h"
/*===========================================================================*/
/* Driver local routines. */

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

@ -10,8 +10,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_PCF8812
#include "drivers/gdisp/PCF8812/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_PCF8812.h"
/*===========================================================================*/
@ -29,7 +29,7 @@
#define GDISP_FLG_NEEDFLUSH (GDISP_FLG_DRIVER << 0)
#include "drivers/gdisp/PCF8812/PCF8812.h"
#include "PCF8812.h"
/*===========================================================================*/
/* Driver local routines. */

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

@ -20,8 +20,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_R61505U
#include "drivers/gdisp/R61505U/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_R61505U.h"

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

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

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

@ -19,8 +19,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_S6D1121
#include "drivers/gdisp/S6D1121/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_S6D1121.h"

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

@ -24,8 +24,8 @@
#undef GDISP_SCREEN_WIDTH
#endif
#include "drivers/gdisp/SPFD54124B/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_SPFD54124B.h"

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

@ -10,8 +10,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_SSD1289
#include "drivers/gdisp/SSD1289/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_SSD1289.h"

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

@ -10,8 +10,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_SSD1306
#include "drivers/gdisp/SSD1306/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_SSD1306.h"
#include <string.h> // for memset
@ -42,7 +42,7 @@
#define GDISP_FLG_NEEDFLUSH (GDISP_FLG_DRIVER<<0)
#include "drivers/gdisp/SSD1306/SSD1306.h"
#include "SSD1306.h"
/*===========================================================================*/
/* Driver local functions. */

2
drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c
View File

@ -20,7 +20,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_SSD1331
#include "gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_SSD1331.h"

2
drivers/gdisp/SSD1351/gdisp_lld_SSD1351.c
View File

@ -20,7 +20,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_SSD1351
#include "gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_SSD1351.h"

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

@ -10,8 +10,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_SSD1963
#include "drivers/gdisp/SSD1963/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.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)
@ -69,7 +69,7 @@ typedef struct LCD_Parameters {
/* Driver local functions. */
/*===========================================================================*/
#include "drivers/gdisp/SSD1963/ssd1963.h"
#include "ssd1963.h"
#define dummy_read(g) { volatile uint16_t dummy; dummy = read_data(g); (void) dummy; }
#define write_reg(g, reg, data) { write_index(g, reg); write_data(g, data); }

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

@ -10,8 +10,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_SSD2119
#include "drivers/gdisp/SSD2119/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_SSD2119.h"
@ -38,7 +38,7 @@
#define GDISP_NO_DMA_FROM_STACK FALSE
#endif
#include "drivers/gdisp/SSD2119/ssd2119.h"
#include "ssd2119.h"
/*===========================================================================*/
/* Driver local functions. */

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

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

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

@ -23,8 +23,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_STM32F429iDiscovery
#include "drivers/gdisp/STM32F429iDiscovery/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "stm32_ltdc.h"

4
drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c
View File

@ -23,8 +23,8 @@
#endif
#define GDISP_DRIVER_VMT GDISPVMT_STM32LTDC
#include "drivers/gdisp/STM32LTDC/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "stm32_ltdc.h"

6
drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c
View File

@ -10,8 +10,8 @@
#if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_TLS8204
#include "drivers/gdisp/TLS8204/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_TLS8204.h"
/*===========================================================================*/
@ -26,7 +26,7 @@
#define GDISP_FLG_NEEDFLUSH (GDISP_FLG_DRIVER << 0)
#include "drivers/gdisp/TLS8204/TLS8204.h"
#include "TLS8204.h"
/*===========================================================================*/
/* Driver local routines. */

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

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

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

@ -15,8 +15,8 @@ typedef struct fbInfo {
} fbInfo;
#define GDISP_DRIVER_VMT GDISPVMT_framebuffer
#include "drivers/gdisp/framebuffer/gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "gdisp_lld_config.h"
#include "../../../src/gdisp/gdisp_driver.h"
#include "board_framebuffer.h"
typedef struct fbPriv {

5
drivers/ginput/dial/GADC/driver.mk
View File

@ -1,5 +1,2 @@
# List the required driver.
GFXSRC += $(GFXLIB)/drivers/ginput/dial/GADC/ginput_lld_dial.c
# Required include directories
GFXINC += $(GFXLIB)/drivers/ginput/dial/GADC
GFXSRC += $(GFXLIB)/drivers/ginput/dial/GADC/ginput_lld_dial_GADC.c

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

@ -9,7 +9,7 @@
#if GFX_USE_GINPUT && GINPUT_NEED_DIAL
#include "src/ginput/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"

5
drivers/ginput/toggle/Pal/driver.mk
View File

@ -1,5 +1,2 @@
# List the required driver.
GFXSRC += $(GFXLIB)/drivers/ginput/toggle/Pal/ginput_lld_toggle.c
# Required include directories
GFXINC += $(GFXLIB)/drivers/ginput/toggle/Pal
GFXSRC += $(GFXLIB)/drivers/ginput/toggle/Pal/ginput_lld_toggle_Pal.c

48
drivers/ginput/toggle/Pal/ginput_lld_toggle.c → drivers/ginput/toggle/Pal/ginput_lld_toggle_Pal.c
View File

@ -1,24 +1,24 @@
/*
* This file is subject to the terms of the GFX License. If a copy of
* the license was not distributed with this file, you can obtain one at:
*
* http://ugfx.org/license.html
*/
#include "gfx.h"
#if (GFX_USE_GINPUT && GINPUT_NEED_TOGGLE) /*|| defined(__DOXYGEN__)*/
#include "src/ginput/ginput_driver_toggle.h"
GINPUT_TOGGLE_DECLARE_STRUCTURE();
void ginput_lld_toggle_init(const GToggleConfig *ptc) {
palSetGroupMode(((IOBus *)ptc->id)->portid, ptc->mask, 0, ptc->mode);
}
unsigned ginput_lld_toggle_getbits(const GToggleConfig *ptc) {
return palReadBus((IOBus *)ptc->id);
}
#endif /* GFX_USE_GINPUT && GINPUT_NEED_TOGGLE */
/*
* This file is subject to the terms of the GFX License. If a copy of
* the license was not distributed with this file, you can obtain one at:
*
* http://ugfx.org/license.html
*/
#include "gfx.h"
#if (GFX_USE_GINPUT && GINPUT_NEED_TOGGLE) /*|| defined(__DOXYGEN__)*/
#include "../../../../src/ginput/ginput_driver_toggle.h"
GINPUT_TOGGLE_DECLARE_STRUCTURE();
void ginput_lld_toggle_init(const GToggleConfig *ptc) {
palSetGroupMode(((IOBus *)ptc->id)->portid, ptc->mask, 0, ptc->mode);
}
unsigned ginput_lld_toggle_getbits(const GToggleConfig *ptc) {
return palReadBus((IOBus *)ptc->id);
}
#endif /* GFX_USE_GINPUT && GINPUT_NEED_TOGGLE */

1
drivers/ginput/touch/ADS7843/driver.mk
View File

@ -1,2 +1 @@
# List the required driver.
GFXSRC += $(GFXLIB)/drivers/ginput/touch/ADS7843/gmouse_lld_ADS7843.c

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

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

1
drivers/ginput/touch/FT5x06/driver.mk
View File

@ -1,2 +1 @@
# List the required driver.
GFXSRC += $(GFXLIB)/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c

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

@ -10,13 +10,13 @@
#if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
#define GMOUSE_DRIVER_VMT GMOUSEVMT_FT5x06
#include "src/ginput/ginput_driver_mouse.h"
#include "../../../../src/ginput/ginput_driver_mouse.h"
// Get the hardware interface
#include "gmouse_lld_FT5x06_board.h"
// Hardware definitions
#include "drivers/ginput/touch/FT5x06/ft5x06.h"
#include "ft5x06.h"
static bool_t MouseInit(GMouse* m, unsigned driverinstance) {
if (!init_board(m, driverinstance))

1
drivers/ginput/touch/MAX11802/driver.mk
View File

@ -1,2 +1 @@
# List the required driver.
GFXSRC += $(GFXLIB)/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c

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

@ -10,10 +10,10 @@
#if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
#define GMOUSE_DRIVER_VMT GMOUSEVMT_MAX11802
#include "src/ginput/ginput_driver_mouse.h"
#include "../../../../src/ginput/ginput_driver_mouse.h"
// Hardware definitions
#include "drivers/ginput/touch/MAX11802/max11802.h"
#include "max11802.h"
// Get the hardware interface
#include "gmouse_lld_MAX11802_board.h"

1
drivers/ginput/touch/MCU/driver.mk
View File

@ -1,2 +1 @@
# List the required driver.
GFXSRC += $(GFXLIB)/drivers/ginput/touch/MCU/gmouse_lld_MCU.c

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

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

1
drivers/ginput/touch/STMPE610/driver.mk
View File

@ -1,2 +1 @@
# List the required driver.
GFXSRC += $(GFXLIB)/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c

4
drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c
View File

@ -10,10 +10,10 @@
#if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
#define GMOUSE_DRIVER_VMT GMOUSEVMT_STMPE610
#include "src/ginput/ginput_driver_mouse.h"
#include "../../../../src/ginput/ginput_driver_mouse.h"
// Hardware definitions
#include "drivers/ginput/touch/STMPE610/stmpe610.h"
#include "stmpe610.h"
// Get the hardware interface
#include "gmouse_lld_STMPE610_board.h"

1
drivers/ginput/touch/STMPE811/driver.mk
View File

@ -1,2 +1 @@
# List the required driver.
GFXSRC += $(GFXLIB)/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c

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

@ -10,10 +10,10 @@
#if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
#define GMOUSE_DRIVER_VMT GMOUSEVMT_STMPE811
#include "src/ginput/ginput_driver_mouse.h"
#include "../../../../src/ginput/ginput_driver_mouse.h"
// Hardware definitions
#include "drivers/ginput/touch/STMPE811/stmpe811.h"
#include "stmpe811.h"
// Get the hardware interface
#include "gmouse_lld_STMPE811_board.h"

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

@ -14,7 +14,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_Win32
#include "gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "../../../src/gdisp/gdisp_driver.h"
// Configuration parameters for this driver
#ifndef GDISP_SCREEN_WIDTH
@ -82,7 +82,7 @@
#if GINPUT_NEED_TOGGLE
/* Include toggle support code */
#include "src/ginput/ginput_driver_toggle.h"
#include "../../../src/ginput/ginput_driver_toggle.h"
// Hack until toggle use gdriver.
static GDisplay *toggleWindow;
@ -91,7 +91,7 @@
#if GINPUT_NEED_MOUSE
// Include mouse support code
#define GMOUSE_DRIVER_VMT GMOUSEVMT_Win32
#include "src/ginput/ginput_driver_mouse.h"
#include "../../../src/ginput/ginput_driver_mouse.h"
// Forward definitions
static bool_t Win32MouseInit(GMouse *m, unsigned driverinstance);
@ -132,14 +132,14 @@
#if GINPUT_NEED_KEYBOARD
#define GKEYBOARD_DRIVER_VMT GKEYBOARDVMT_Win32
#include "src/ginput/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/ginput_keyboard_microcode.h"
#include "../../../src/ginput/ginput_keyboard_microcode.h"
// Forward definitions
extern uint8_t GKEYBOARD_WIN32_DEFAULT_LAYOUT[];

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

@ -20,7 +20,7 @@
#define GDISP_DRIVER_VMT GDISPVMT_X11
#include "gdisp_lld_config.h"
#include "src/gdisp/gdisp_driver.h"
#include "../../../src/gdisp/gdisp_driver.h"
// Configuration parameters for this driver
#ifndef GDISP_FORCE_24BIT
@ -56,7 +56,7 @@
#if GINPUT_NEED_MOUSE
// Include mouse support code
#define GMOUSE_DRIVER_VMT GMOUSEVMT_X11
#include "src/ginput/ginput_driver_mouse.h"
#include "../../../src/ginput/ginput_driver_mouse.h"
// Forward definitions
static bool_t XMouseInit(GMouse *m, unsigned driverinstance);
@ -98,7 +98,7 @@
#if GINPUT_NEED_KEYBOARD
// Include mouse support code
#define GKEYBOARD_DRIVER_VMT GKEYBOARDVMT_X
#include "src/ginput/ginput_driver_keyboard.h"
#include "../../../src/ginput/ginput_driver_keyboard.h"
#if !GKEYBOARD_X_NO_LAYOUT
#if GKEYBOARD_LAYOUT_OFF
@ -108,7 +108,7 @@
// Forward definitions
extern uint8_t GKEYBOARD_X_DEFAULT_LAYOUT[];
#include "src/ginput/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.

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

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

5
gfxconf.example.h
View File

@ -288,9 +288,7 @@
// GADC //
///////////////////////////////////////////////////////////////////////////
//#define GFX_USE_GADC FALSE
//#define GADC_MAX_LOWSPEED_DEVICES 4
// #define GADC_MAX_LOWSPEED_DEVICES 4
///////////////////////////////////////////////////////////////////////////
// GAUDIO //
@ -299,7 +297,6 @@
// #define GAUDIO_NEED_PLAY FALSE
// #define GAUDIO_NEED_RECORD FALSE
///////////////////////////////////////////////////////////////////////////
// GMISC //
///////////////////////////////////////////////////////////////////////////

2
src/gadc/gadc.c
View File

@ -5,7 +5,7 @@
* http://ugfx.org/license.html
*/
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GADC

2
src/gadc/gadc.h
View File

@ -38,7 +38,7 @@
#ifndef _GADC_H
#define _GADC_H
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GADC || defined(__DOXYGEN__)

2
src/gadc/gadc_driver.h
View File

@ -20,7 +20,7 @@
#ifndef _GADC_LLD_H
#define _GADC_LLD_H
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GADC || defined(__DOXYGEN__)

2
src/gaudio/gaudio.c
View File

@ -5,7 +5,7 @@
* http://ugfx.org/license.html
*/
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GAUDIO

2
src/gaudio/gaudio.h
View File

@ -18,7 +18,7 @@
#ifndef _GAUDIO_H
#define _GAUDIO_H
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GAUDIO || defined(__DOXYGEN__)

2
src/gaudio/gaudio_driver_play.h
View File

@ -20,7 +20,7 @@
#ifndef _GAUDIO_PLAY_LLD_H
#define _GAUDIO_PLAY_LLD_H
#include "gfx.h"
#include "../../gfx.h"
#if (GFX_USE_GAUDIO && GAUDIO_NEED_PLAY) || defined(__DOXYGEN__)

2
src/gaudio/gaudio_driver_record.h
View File

@ -20,7 +20,7 @@
#ifndef _GAUDIO_RECORD_LLD_H
#define _GAUDIO_RECORD_LLD_H
#include "gfx.h"
#include "../../gfx.h"
#if (GFX_USE_GAUDIO && GAUDIO_NEED_RECORD) || defined(__DOXYGEN__)

2
src/gdisp/gdisp.c
View File

@ -5,7 +5,7 @@
* http://ugfx.org/license.html
*/
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GDISP

3
src/gdisp/gdisp.h
View File

@ -27,7 +27,7 @@
#ifndef _GDISP_H
#define _GDISP_H
#include "gfx.h"
#include "../../gfx.h"
/* This type definition is defined here as it gets used in other gfx sub-systems even
* if GFX_USE_GDISP is FALSE.
@ -153,6 +153,7 @@ extern GDisplay *GDISP;
// Pull in the default hardware configuration for a single controller.
// If we have multiple controllers the settings must be set in the
// users gfxconf.h file.
// Use the compiler include path to find it
#include "gdisp_lld_config.h"
// Unless the user has specified a specific pixel format, use

2
src/gdisp/gdisp_colors.h
View File

@ -19,7 +19,7 @@
#ifndef _GDISP_COLORS_H
#define _GDISP_COLORS_H
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GDISP || defined(__DOXYGEN__)

2
src/gdisp/gdisp_driver.h
View File

@ -19,7 +19,7 @@
#if GFX_USE_GDISP
// Include the GDRIVER infrastructure
#include "src/gdriver/gdriver.h"
#include "../gdriver/gdriver.h"
// Are we currently compiling the driver itself?
#if defined(GDISP_DRIVER_VMT)

2
src/gdisp/gdisp_fonts.c
View File

@ -5,7 +5,7 @@
* http://ugfx.org/license.html
*/
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GDISP && GDISP_NEED_TEXT

2
src/gdisp/gdisp_image.c
View File

@ -5,7 +5,7 @@
* http://ugfx.org/license.html
*/
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GDISP && GDISP_NEED_IMAGE

2
src/gdisp/gdisp_image_bmp.c
View File

@ -5,7 +5,7 @@
* http://ugfx.org/license.html
*/
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_BMP

2
src/gdisp/gdisp_image_gif.c
View File

@ -5,7 +5,7 @@
* http://ugfx.org/license.html
*/
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_GIF

2
src/gdisp/gdisp_image_jpg.c
View File

@ -5,7 +5,7 @@
* http://ugfx.org/license.html
*/
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_JPG

2
src/gdisp/gdisp_image_native.c
View File

@ -5,7 +5,7 @@
* http://ugfx.org/license.html
*/
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_NATIVE

2
src/gdisp/gdisp_image_png.c
View File

@ -5,7 +5,7 @@
* http://ugfx.org/license.html
*/
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_PNG

6
src/gdisp/gdisp_pixmap.c
View File

@ -5,7 +5,7 @@
* http://ugfx.org/license.html
*/
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GDISP && GDISP_NEED_PIXMAP
@ -39,8 +39,8 @@
#error "GDISP Pixmap: Pixmap's do not currently support the specified GDISP_LLD_PIXELFORMAT"
#endif
#include "src/gdisp/gdisp_driver.h"
#include "src/gdriver/gdriver.h"
#include "gdisp_driver.h"
#include "../gdriver/gdriver.h"
typedef struct pixmap {
#if GDISP_NEED_PIXMAP_IMAGE

2
src/gdisp/mcufont/mf_config.h
View File

@ -14,7 +14,7 @@
* Configuration settings related to GFX *
*******************************************************/
#include "gfx.h"
#include "../../../gfx.h"
#if !GFX_USE_GDISP || !GDISP_NEED_TEXT
#define MF_NO_COMPILE // Don't compile any font code

2
src/gdriver/gdriver.c
View File

@ -5,7 +5,7 @@
* http://ugfx.org/license.html
*/
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GDRIVER

2
src/gevent/gevent.c
View File

@ -5,7 +5,7 @@
* http://ugfx.org/license.html
*/
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GEVENT || defined(__DOXYGEN__)

2
src/gevent/gevent.h
View File

@ -22,7 +22,7 @@
#ifndef _GEVENT_H
#define _GEVENT_H
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GEVENT || defined(__DOXYGEN__)

2
src/gfile/gfile.c
View File

@ -5,7 +5,7 @@
* http://ugfx.org/license.html
*/
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GFILE

2
src/gfile/gfile.h
View File

@ -19,7 +19,7 @@
#ifndef _GFILE_H
#define _GFILE_H
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GFILE || defined(__DOXYGEN__)

2
src/gfile/gfile_fatfs_diskio_chibios.c
View File

@ -5,7 +5,7 @@
/* disk I/O modules and attach it to FatFs module with common interface. */
/*-----------------------------------------------------------------------*/
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GFILE && GFILE_NEED_FATFS && GFX_USE_OS_CHIBIOS

6
src/gfile/gfile_fatfs_wrapper.c
View File

@ -5,15 +5,15 @@
* http://ugfx.org/license.html
*/
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GFILE && GFILE_NEED_FATFS
#include "gfile_fatfs_wrapper.h"
// Include the source we want
#include "3rdparty/fatfs-0.10b/src/ff.c"
#include "3rdparty/fatfs-0.10b/src/option/unicode.c"
#include "../../3rdparty/fatfs-0.10b/src/ff.c"
#include "../../3rdparty/fatfs-0.10b/src/option/unicode.c"
// Extra operating system support
#if _FS_REENTRANT

6
src/gfile/gfile_fatfs_wrapper.h
View File

@ -18,15 +18,15 @@
#include "ffconf.h"
// Prevent preprocessor redefinition warnings
#include "3rdparty/fatfs-0.10b/src/integer.h"
#include "../../3rdparty/fatfs-0.10b/src/integer.h"
#if defined(_T) && !defined(_INC_TCHAR)
#define _INC_TCHAR
#endif
// Include the fatfs API
#include "3rdparty/fatfs-0.10b/src/ff.h"
#include "../../3rdparty/fatfs-0.10b/src/ff.h"
// Include the fatfs diskio API
#include "3rdparty/fatfs-0.10b/src/diskio.h"
#include "../../3rdparty/fatfs-0.10b/src/diskio.h"
#endif //_FATFS_WRAPPER

2
src/gfile/gfile_fs_chibios.c
View File

@ -9,7 +9,7 @@
* The ChibiOS FileStream file-system
********************************************************/
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GFILE && GFILE_NEED_CHIBIOSFS && GFX_USE_OS_CHIBIOS

2
src/gfile/gfile_fs_fatfs.c
View File

@ -9,7 +9,7 @@
* The FATFS file-system
********************************************************/
#include "gfx.h"
#include "../../gfx.h"
#if GFX_USE_GFILE && GFILE_NEED_FATFS

2
src/gfile/gfile_fs_mem.c
View File

@ -9,7 +9,7 @@
* The virtual memory file-system
*******************************************