From 271f0c743f31d3ae21ede35909e1f14845c6d338 Mon Sep 17 00:00:00 2001 From: inmarket Date: Thu, 20 Mar 2014 23:41:27 +1000 Subject: Updates to GADC to use new simpler gfx queued bufferring. NOTE: code is still buggy (or the one and only driver is buggy). --- boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'boards/base') diff --git a/boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h b/boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h index cdea5e06..68063881 100644 --- a/boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h +++ b/boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h @@ -19,13 +19,18 @@ #define GAUDIO_RECORD_NUM_CHANNELS 1 +/** + * @brief Whether each channel is mono or stereo + */ +#define GAUDIO_RECORD_CHANNEL0_IS_STEREO FALSE + /** * The list of audio channels and their uses */ #define GAUDIO_RECORD_MICROPHONE 0 #ifdef GAUDIO_RECORD_IMPLEMENTATION - static uint32_t gaudin_lld_physdevs[GAUDIO_RECORD_NUM_CHANNELS] = { + static uint32_t gaudio_gadc_physdevs[GAUDIO_RECORD_NUM_CHANNELS] = { GADC_PHYSDEV_MICROPHONE, }; #endif -- cgit v1.2.3 From fb8d159749daa8aefa75615d2f8a6cca2fac9ec0 Mon Sep 17 00:00:00 2001 From: inmarket Date: Sun, 30 Mar 2014 19:11:29 +1000 Subject: Turn on PWM audio output for Olimex SAM7EX256 board. --- boards/base/Olimex-SAM7EX256-GE8/board.mk | 1 + boards/base/Olimex-SAM7EX256-GE8/example/halconf.h | 6 +- boards/base/Olimex-SAM7EX256-GE8/example/mcuconf.h | 11 ++++ .../base/Olimex-SAM7EX256-GE8/gaudio_play_board.h | 75 ++++++++++++++++++++++ 4 files changed, 88 insertions(+), 5 deletions(-) create mode 100644 boards/base/Olimex-SAM7EX256-GE8/gaudio_play_board.h (limited to 'boards/base') diff --git a/boards/base/Olimex-SAM7EX256-GE8/board.mk b/boards/base/Olimex-SAM7EX256-GE8/board.mk index 249cfc2d..98119565 100644 --- a/boards/base/Olimex-SAM7EX256-GE8/board.mk +++ b/boards/base/Olimex-SAM7EX256-GE8/board.mk @@ -6,3 +6,4 @@ include $(GFXLIB)/drivers/gadc/AT91SAM7/gadc_lld.mk include $(GFXLIB)/drivers/ginput/dial/GADC/ginput_lld.mk include $(GFXLIB)/drivers/ginput/toggle/Pal/ginput_lld.mk include $(GFXLIB)/drivers/gaudio/gadc/driver.mk +include $(GFXLIB)/drivers/gaudio/pwm/driver.mk diff --git a/boards/base/Olimex-SAM7EX256-GE8/example/halconf.h b/boards/base/Olimex-SAM7EX256-GE8/example/halconf.h index db88d41b..3b60d923 100644 --- a/boards/base/Olimex-SAM7EX256-GE8/example/halconf.h +++ b/boards/base/Olimex-SAM7EX256-GE8/example/halconf.h @@ -80,7 +80,7 @@ * @brief Enables the GPT subsystem. */ #if !defined(HAL_USE_GPT) || defined(__DOXYGEN__) -#define HAL_USE_GPT FALSE +#define HAL_USE_GPT TRUE #endif /** @@ -116,10 +116,6 @@ */ #if !defined(HAL_USE_PWM) || defined(__DOXYGEN__) #define HAL_USE_PWM TRUE -#define PWM_USE_PWM1 FALSE -#define PWM_USE_PWM2 TRUE -#define PWM_USE_PWM3 FALSE -#define PWM_USE_PWM4 FALSE #endif /** diff --git a/boards/base/Olimex-SAM7EX256-GE8/example/mcuconf.h b/boards/base/Olimex-SAM7EX256-GE8/example/mcuconf.h index a9a0fea7..8acdd42d 100644 --- a/boards/base/Olimex-SAM7EX256-GE8/example/mcuconf.h +++ b/boards/base/Olimex-SAM7EX256-GE8/example/mcuconf.h @@ -52,6 +52,10 @@ /* * PWM driver system settings. */ +#define PWM_USE_PWM1 TRUE // used by audio-out +#define PWM_USE_PWM2 TRUE // used by back-light +#define PWM_USE_PWM3 FALSE +#define PWM_USE_PWM4 FALSE /* * SERIAL driver system settings. @@ -69,3 +73,10 @@ #define AT91SAM7_SPI_USE_SPI1 FALSE #define AT91SAM7_SPI0_PRIORITY (AT91C_AIC_PRIOR_HIGHEST - 1) #define AT91SAM7_SPI1_PRIORITY (AT91C_AIC_PRIOR_HIGHEST - 1) + +/* + * GPT driver system settings. + */ +#define AT91_GPT_USE_TC0 FALSE // used internally by ADC driver +#define AT91_GPT_USE_TC1 TRUE // uGFX used for audio-out +#define AT91_GPT_USE_TC2 FALSE diff --git a/boards/base/Olimex-SAM7EX256-GE8/gaudio_play_board.h b/boards/base/Olimex-SAM7EX256-GE8/gaudio_play_board.h new file mode 100644 index 00000000..bbbc48c6 --- /dev/null +++ b/boards/base/Olimex-SAM7EX256-GE8/gaudio_play_board.h @@ -0,0 +1,75 @@ +/* + * 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 + */ + +#ifndef GAUDIO_PLAY_BOARD_H +#define GAUDIO_PLAY_BOARD_H + +/* Our timer callback */ +static void gptcallback(GPTDriver *gptp) { + (void) gptp; + gaudio_play_pwm_timer_callbackI(); +} + +/* PWM configuration structure. The speaker is on PWM0/PB19 ie PWM1/PIN1 in ChibiOS speak */ +static PWMConfig pwmcfg = { + 1000000, /* 1 MHz PWM clock frequency. Ignored as we are using PWM_MCK_DIV_n */ + 1024, /* PWM period is 1024 cycles (10 bits). */ + 0, + { + {PWM_MCK_DIV_1 | PWM_OUTPUT_CENTER | PWM_OUTPUT_ACTIVE_HIGH | PWM_OUTPUT_PIN1 | PWM_DISABLEPULLUP_PIN1, 0}, + }, +}; + +/* Timer configuration structure. We use Timer 2 (TC1) */ +static GPTConfig gptcfg = { + 8192, // frequency + gptcallback, // callback + GPT_CLOCK_FREQUENCY, // clocksource + GPT_GATE_NONE, // clockgate + GPT_TRIGGER_NONE, // trigger +}; + +static uint16_t lastvalue; + +static bool gaudio_play_pwm_setup(uint32_t frequency, ArrayDataFormat format) { + if (format == ARRAY_DATA_10BITUNSIGNED) + pwmcfg.period = 1024; + else if (format == ARRAY_DATA_8BITUNSIGNED) + pwmcfg.period = 256; + else + return FALSE; + gptcfg.frequency = frequency; + return TRUE; +} + +static void gaudio_play_pwm_start(void) { + /* Start the PWM */ + pwmStart(&PWMD1, &pwmcfg); + lastvalue = pwmcfg.period>>1; + pwmEnableChannelI(&PWMD1, 0, lastvalue); + + /* Start the timer interrupt */ + gptStart(&GPTD2, &gptcfg); + gptStartContinuous(&GPTD2, 0); +} + +static void gaudio_play_pwm_stop(void) { + /* Stop the timer interrupt */ + gptStopTimer(&GPTD2); + + /* Stop the PWM */ + pwmStop(&PWMD1); +} + +static void gaudio_play_pwm_setI(uint16_t value) { + if (value != lastvalue) { + lastvalue = value; + pwmEnableChannelI(&PWMD1, 0, value); + } +} + +#endif /* GAUDIO_PLAY_BOARD_H */ -- cgit v1.2.3 From e0e2b2a3d97f327fbeec7883aab2a512c442b1a1 Mon Sep 17 00:00:00 2001 From: inmarket Date: Sat, 12 Apr 2014 13:58:30 +1000 Subject: Changes to example makefiles and other files for ChibiOS due to changes in ChibiOS-2.6.x --- boards/base/Mikromedia-STM32-M4-ILI9341/example/Makefile | 1 + boards/base/Mikromedia-STM32-M4-ILI9341/example/mcuconf.h | 5 ++++- boards/base/Olimex-SAM7EX256-GE8/example/Makefile | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'boards/base') diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example/Makefile b/boards/base/Mikromedia-STM32-M4-ILI9341/example/Makefile index 1c314543..0ca152c6 100644 --- a/boards/base/Mikromedia-STM32-M4-ILI9341/example/Makefile +++ b/boards/base/Mikromedia-STM32-M4-ILI9341/example/Makefile @@ -153,6 +153,7 @@ LD = $(TRGT)gcc CP = $(TRGT)objcopy AS = $(TRGT)gcc -x assembler-with-cpp OD = $(TRGT)objdump +SZ = $(TRGT)size HEX = $(CP) -O ihex BIN = $(CP) -O binary diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example/mcuconf.h b/boards/base/Mikromedia-STM32-M4-ILI9341/example/mcuconf.h index 64895943..c92d2970 100644 --- a/boards/base/Mikromedia-STM32-M4-ILI9341/example/mcuconf.h +++ b/boards/base/Mikromedia-STM32-M4-ILI9341/example/mcuconf.h @@ -29,6 +29,10 @@ */ #define STM32F4xx_MCUCONF +#define STM32F40_41xxx + +// Define this if you are using an older ChibiOS version +//#define STM32_VOS STM32_VOS_HIGH /* * HAL driver system settings. @@ -57,7 +61,6 @@ #define STM32_I2SSRC STM32_I2SSRC_CKIN #define STM32_PLLI2SN_VALUE 192 #define STM32_PLLI2SR_VALUE 5 -#define STM32_VOS STM32_VOS_HIGH #define STM32_PVD_ENABLE FALSE #define STM32_PLS STM32_PLS_LEV0 #define STM32_BKPRAM_ENABLE FALSE diff --git a/boards/base/Olimex-SAM7EX256-GE8/example/Makefile b/boards/base/Olimex-SAM7EX256-GE8/example/Makefile index b7b4da1c..e9fdde2d 100644 --- a/boards/base/Olimex-SAM7EX256-GE8/example/Makefile +++ b/boards/base/Olimex-SAM7EX256-GE8/example/Makefile @@ -136,6 +136,7 @@ LD = $(TRGT)gcc CP = $(TRGT)objcopy AS = $(TRGT)gcc -x assembler-with-cpp OD = $(TRGT)objdump +SZ = $(TRGT)size HEX = $(CP) -O ihex BIN = $(CP) -O binary -- cgit v1.2.3 From 81c19da89f6055ee19ebcb7c5fc786bd82dadbe8 Mon Sep 17 00:00:00 2001 From: inmarket Date: Tue, 29 Apr 2014 16:35:57 +1000 Subject: First version vs1053 audio play driver. Compiles but not tested yet. --- boards/base/Mikromedia-STM32-M4-ILI9341/board.mk | 1 + .../gaudio_play_board.h | 97 ++++++++++++++++++++++ boards/base/Mikromedia-STM32-M4-ILI9341/readme.txt | 3 +- 3 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 boards/base/Mikromedia-STM32-M4-ILI9341/gaudio_play_board.h (limited to 'boards/base') diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk b/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk index e466621c..b18bf8f5 100644 --- a/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk +++ b/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk @@ -3,3 +3,4 @@ GFXSRC += GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE include $(GFXLIB)/drivers/gdisp/ILI9341/gdisp_lld.mk include $(GFXLIB)/drivers/ginput/touch/MCU/ginput_lld.mk +include $(GFXLIB)/drivers/gaudio/vs1053/driver.mk diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/gaudio_play_board.h b/boards/base/Mikromedia-STM32-M4-ILI9341/gaudio_play_board.h new file mode 100644 index 00000000..9b16b27a --- /dev/null +++ b/boards/base/Mikromedia-STM32-M4-ILI9341/gaudio_play_board.h @@ -0,0 +1,97 @@ +/* + * 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 + */ + +#ifndef GAUDIO_PLAY_BOARD_H +#define GAUDIO_PLAY_BOARD_H + +#define SET_CS palSetPad(GPIOC, GPIOC_MP3_CS) +#define CLR_CS palClearPad(GPIOC, GPIOC_MP3_CS) +#define SET_RST palSetPad(GPIOC, GPIOC_MP3_RST) +#define CLR_RST palClearPad(GPIOC, GPIOC_MP3_RST) +#define SET_DCS palSetPad(GPIOC, GPIOC_MP3_DCS) +#define CLR_DCS palClearPad(GPIOC, GPIOC_MP3_DCS) +#define GET_DREQ palReadPad(GPIOC, GPIOC_MP3_DREQ) +#define SPI_PORT &SPID3 + +static const SPIConfig spicfg_init = { + 0, + GPIOC, + GPIOC_MP3_CS, + SPI_CR1_BR_2 | SPI_CR1_BR_1 | SPI_CR1_BR_0, +}; + +static const SPIConfig spicfg = { + 0, + GPIOC, + GPIOC_MP3_CS, + 0, +}; + +// Initialise the board +static inline void board_init(void) { + palSetPadMode(GPIOC, GPIOC_MP3_CS, PAL_MODE_OUTPUT_PUSHPULL); + palSetPadMode(GPIOC, GPIOC_MP3_RST, PAL_MODE_OUTPUT_PUSHPULL); + palSetPadMode(GPIOC, GPIOC_MP3_DCS, PAL_MODE_OUTPUT_PUSHPULL); + palSetPadMode(GPIOC, GPIOC_MP3_DREQ, PAL_MODE_INPUT); + SET_CS; SET_RST; SET_DCS; + spiStart(SPI_PORT, &spicfg_init); +} + +// Chip is initialised enough so we can talk fast to it +#define board_init_end() spiStart(SPI_PORT, &spicfg) + +// Reset the board +#define board_reset() { CLR_RST; gfxSleepMilliseconds(1); SET_RST; } + +// Returns the state of the dreq pin +#define board_dreq() GET_DREQ + +// Start a command write +static inline void board_startcmdwrite(void) { + #if SPI_USE_MUTUAL_EXCLUSION + spiAcquireBus(SPI_PORT); + #endif + CLR_CS; +} + +// End a command write +static inline void board_endcmdwrite(void) { + #if SPI_USE_MUTUAL_EXCLUSION + spiReleaseBus(SPI_PORT); + #endif + SET_CS; +} + +// Start a command read +#define board_startcmdread() board_startcmdwrite() + +// End a command read +#define board_endcmdread() board_endcmdwrite() + +// Start a data write +static inline void board_startdatawrite(void) { + #if SPI_USE_MUTUAL_EXCLUSION + spiAcquireBus(SPI_PORT); + #endif + CLR_DCS; +} + +// End a data write +static inline void board_enddatawrite(void) { + #if SPI_USE_MUTUAL_EXCLUSION + spiReleaseBus(SPI_PORT); + #endif + SET_DCS; +} + +// Write data to the SPI port +#define board_spiwrite(buf, len) spiSend(SPI_PORT, len, buf) + +// Read data from the SPI port +#define board_spiread(buf, len) spiReceive(SPI_PORT, len, buf) + +#endif /* GAUDIO_PLAY_BOARD_H */ diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/readme.txt b/boards/base/Mikromedia-STM32-M4-ILI9341/readme.txt index 961f9793..d37c58fb 100644 --- a/boards/base/Mikromedia-STM32-M4-ILI9341/readme.txt +++ b/boards/base/Mikromedia-STM32-M4-ILI9341/readme.txt @@ -3,7 +3,8 @@ running under ChibiOS with the ILI9341 display. On this board uGFX currently supports: - GDISP via the ILI9341 display - - GINPUT-touch via the MCU driver + - GINPUT-touch via the MCU driver + - GAUDIO (play only) via the vs1053 driver Note there are two variants of this board - one with the ILI9341 display and an older one with a different display. This one is for the ILI9341 display. -- cgit v1.2.3