From f265924396167729e8d9fb36a0383263f36c1270 Mon Sep 17 00:00:00 2001 From: inmarket Date: Tue, 27 Feb 2018 17:44:21 +1000 Subject: First set of V3 macro changes --- drivers/gaudio/Win32/gaudio_play_config.h | 4 ++-- drivers/gaudio/Win32/gaudio_record_config.h | 4 ++-- drivers/gaudio/gadc/gaudio_record_board_template.h | 2 +- drivers/gaudio/gadc/gaudio_record_gadc.c | 2 +- drivers/gaudio/pwm/gaudio_play_config.h | 2 +- drivers/gaudio/vs1053/gaudio_play_config.h | 6 +++--- drivers/gaudio/vs1053/gaudio_play_vs1053.c | 2 +- drivers/gaudio/vs1053/readme.txt | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) (limited to 'drivers/gaudio') diff --git a/drivers/gaudio/Win32/gaudio_play_config.h b/drivers/gaudio/Win32/gaudio_play_config.h index c4830010..03156500 100644 --- a/drivers/gaudio/Win32/gaudio_play_config.h +++ b/drivers/gaudio/Win32/gaudio_play_config.h @@ -19,8 +19,8 @@ #define GAUDIO_PLAY_FORMAT1 ARRAY_DATA_16BITSIGNED #define GAUDIO_PLAY_FORMAT2 ARRAY_DATA_8BITUNSIGNED #define GAUDIO_PLAY_NUM_CHANNELS 2 -#define GAUDIO_PLAY_CHANNEL0_IS_STEREO FALSE -#define GAUDIO_PLAY_CHANNEL1_IS_STEREO TRUE +#define GAUDIO_PLAY_CHANNEL0_IS_STEREO GFXOFF +#define GAUDIO_PLAY_CHANNEL1_IS_STEREO GFXON #define GAUDIO_PLAY_MONO 0 #define GAUDIO_PLAY_STEREO 1 diff --git a/drivers/gaudio/Win32/gaudio_record_config.h b/drivers/gaudio/Win32/gaudio_record_config.h index 5897212b..565fb3bb 100644 --- a/drivers/gaudio/Win32/gaudio_record_config.h +++ b/drivers/gaudio/Win32/gaudio_record_config.h @@ -19,8 +19,8 @@ #define GAUDIO_RECORD_FORMAT1 ARRAY_DATA_16BITSIGNED #define GAUDIO_RECORD_FORMAT2 ARRAY_DATA_8BITUNSIGNED #define GAUDIO_RECORD_NUM_CHANNELS 2 -#define GAUDIO_RECORD_CHANNEL0_IS_STEREO FALSE -#define GAUDIO_RECORD_CHANNEL1_IS_STEREO TRUE +#define GAUDIO_RECORD_CHANNEL0_IS_STEREO GFXOFF +#define GAUDIO_RECORD_CHANNEL1_IS_STEREO GFXON #define GAUDIO_RECORD_MONO 0 #define GAUDIO_RECORD_STEREO 1 diff --git a/drivers/gaudio/gadc/gaudio_record_board_template.h b/drivers/gaudio/gadc/gaudio_record_board_template.h index 42c15205..74e5b698 100644 --- a/drivers/gaudio/gadc/gaudio_record_board_template.h +++ b/drivers/gaudio/gadc/gaudio_record_board_template.h @@ -14,7 +14,7 @@ #define GAUDIO_RECORD_NUM_CHANNELS 1 -#define GAUDIO_RECORD_CHANNEL0_IS_STEREO FALSE +#define GAUDIO_RECORD_CHANNEL0_IS_STEREO GFXOFF #define GAUDIO_RECORD_MICROPHONE 0 diff --git a/drivers/gaudio/gadc/gaudio_record_gadc.c b/drivers/gaudio/gadc/gaudio_record_gadc.c index a35d070b..c894c84b 100644 --- a/drivers/gaudio/gadc/gaudio_record_gadc.c +++ b/drivers/gaudio/gadc/gaudio_record_gadc.c @@ -12,7 +12,7 @@ /* Double check the GADC system is turned on */ #if !GFX_USE_GADC - #error "GAUDIO - The GADC driver for GAUDIO requires GFX_USE_GADC to be TRUE" + #error "GAUDIO - The GADC driver for GAUDIO requires GFX_USE_GADC to be GFXON" #endif /* Include the driver defines */ diff --git a/drivers/gaudio/pwm/gaudio_play_config.h b/drivers/gaudio/pwm/gaudio_play_config.h index 9c65cd11..508b0a65 100644 --- a/drivers/gaudio/pwm/gaudio_play_config.h +++ b/drivers/gaudio/pwm/gaudio_play_config.h @@ -26,7 +26,7 @@ #define GAUDIO_PLAY_FORMAT1 ARRAY_DATA_10BITUNSIGNED #define GAUDIO_PLAY_FORMAT2 ARRAY_DATA_8BITUNSIGNED #define GAUDIO_PLAY_NUM_CHANNELS 1 -#define GAUDIO_PLAY_CHANNEL0_IS_STEREO FALSE +#define GAUDIO_PLAY_CHANNEL0_IS_STEREO GFXOFF #define GAUDIO_PLAY_MONO 0 #endif /* GFX_USE_GAUDIO && GAUDIO_NEED_PLAY */ diff --git a/drivers/gaudio/vs1053/gaudio_play_config.h b/drivers/gaudio/vs1053/gaudio_play_config.h index 51a3d273..b0b17a8c 100644 --- a/drivers/gaudio/vs1053/gaudio_play_config.h +++ b/drivers/gaudio/vs1053/gaudio_play_config.h @@ -22,7 +22,7 @@ * No testing is made of the file format - if there is an error it can only be detected by the codec chip * and its behaviour is undefined (we haven't tested). * Note that some formats require a firmware patch to be installed to play correctly. - * In this case define VS1053_FIRMWARE_PATCH as TRUE in your gfxconf.h file and include the patch file + * In this case define VS1053_FIRMWARE_PATCH as GFXON in your gfxconf.h file and include the patch file * in your project directory. The patch file MUST be called "vs1053_patch.plg". */ #define GAUDIO_PLAY_MAX_SAMPLE_FREQUENCY 48000 @@ -32,8 +32,8 @@ #define GAUDIO_PLAY_FORMAT3 ARRAY_DATA_UNKNOWN #define GAUDIO_PLAY_FORMAT_FILE ARRAY_DATA_UNKNOWN #define GAUDIO_PLAY_NUM_CHANNELS 2 -#define GAUDIO_PLAY_CHANNEL0_IS_STEREO FALSE -#define GAUDIO_PLAY_CHANNEL1_IS_STEREO TRUE +#define GAUDIO_PLAY_CHANNEL0_IS_STEREO GFXOFF +#define GAUDIO_PLAY_CHANNEL1_IS_STEREO GFXON #define GAUDIO_PLAY_MONO 0 #define GAUDIO_PLAY_STEREO 1 diff --git a/drivers/gaudio/vs1053/gaudio_play_vs1053.c b/drivers/gaudio/vs1053/gaudio_play_vs1053.c index 2aab288c..c96ec036 100644 --- a/drivers/gaudio/vs1053/gaudio_play_vs1053.c +++ b/drivers/gaudio/vs1053/gaudio_play_vs1053.c @@ -23,7 +23,7 @@ #define VS1053_CLK 12288000 #endif #ifndef VS1053_FIRMWARE_PATCH - #define VS1053_FIRMWARE_PATCH FALSE + #define VS1053_FIRMWARE_PATCH GFXOFF #endif #ifndef VS1053_POLL_RATE #define VS1053_POLL_RATE 5 diff --git a/drivers/gaudio/vs1053/readme.txt b/drivers/gaudio/vs1053/readme.txt index d5d10145..3b0ded50 100644 --- a/drivers/gaudio/vs1053/readme.txt +++ b/drivers/gaudio/vs1053/readme.txt @@ -10,5 +10,5 @@ Requires GFX_USE_GTIMER * No testing is made of the file format - if there is an error it can only be detected by the codec chip * and its behaviour is undefined (we haven't tested). * Note that some formats require a firmware patch to be installed to play correctly. - * In this case define VS1053_FIRMWARE_PATCH as TRUE in your gfxconf.h file and include the patch file + * In this case define VS1053_FIRMWARE_PATCH as GFXON in your gfxconf.h file and include the patch file * in your project directory. The patch file MUST be called "vs1053_patch.plg". -- cgit v1.2.3