fanwuyang/ence260-othello
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename tune; use push-pull

Browse Source
This commit is contained in:
Michael Hayes
2013-09-19 09:12:24 +12:00
parent 7b89c25d11
commit 4ef18f4897
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/squeak4/electric.mmel
-1
View File
@@ -1 +0,0 @@
"<C3CG/A#2A#F3/CCG/A#2A#A#4E>6<F2FE3CF2FF3CF2FG3CF2FA3C>2<C3CG/A#2A#F3/CCG/A#2A#A#4E>6<F2FE3CF2FF3CF2FG3CF2FA3C>2<G2D3FD/DAC4A3/FC4ECC3GC4B3>6<G3D4GF/DFE/CCB3C4B3C4B3>3GD4GF/DFE/<C3CG/A#2A#F3/CCG/A#2A#A#4E>6<F2FE3CF2FF3CF2FG3CF2FA3C>2<C3CG/A#2A#F3/CCG/A#2A#A#4E>6<F2FE3CF2FF3CF2FG3CF2FA3C>2CCG/A#2A#F3/CCG/A#2A#A#4E<F2FE3CF2FF3CF2FG3CF2FA3C>2<G2D3FD/DAC4A3/FC4ECC3GC4B3>6<G3D4GFD/FE/CCB3C4B3C4B3>2GD4GFDFE<C3CG/A#2A#F3/CCG/A#2A#A#4E>3C3GA#2F3CGA#2A#3AA#AFD#"
apps/squeak4/squeak4.c
+12 -5
View File
@@ -14,8 +14,10 @@
#include "../fonts/font3x5_1.h" #include "../fonts/font3x5_1.h"
/* Connect piezo tweeter to outermost pins of UCFK4 P1 connector. */ /* Connect piezo tweeter to pins 6 and 8 of UCFK4 P1 connector
#define PIEZO_PIO PIO_DEFINE (PORT_D, 6) for push-pull operation. This gives increased volume. */
#define PIEZO1_PIO PIO_DEFINE (PORT_D, 4)
#define PIEZO2_PIO PIO_DEFINE (PORT_D, 6)
/* Define polling rates in Hz. */ /* Define polling rates in Hz. */
#define TWEETER_TASK_RATE 20000 #define TWEETER_TASK_RATE 20000
@@ -41,7 +43,7 @@ static char *note_names[] = {"C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A
static const char tune1[] = static const char tune1[] =
{ {
//#include "mysterex.mmel" //#include "mysterex.mmel"
#include "electric.mmel" #include "are_friends_electric.mmel"
" >" " >"
}; };
@@ -76,13 +78,18 @@ static void tweeter_task_init (void)
{ {
tweeter = tweeter_init (&tweeter_info, TWEETER_TASK_RATE, scale_table); tweeter = tweeter_init (&tweeter_info, TWEETER_TASK_RATE, scale_table);
pio_config_set (PIEZO_PIO, PIO_OUTPUT_LOW); pio_config_set (PIEZO1_PIO, PIO_OUTPUT_LOW);
pio_config_set (PIEZO2_PIO, PIO_OUTPUT_HIGH);
} }
static void tweeter_task (__unused__ void *data) static void tweeter_task (__unused__ void *data)
{ {
pio_output_set (PIEZO_PIO, tweeter_update (tweeter)); uint8_t state;
state = tweeter_update (tweeter);
pio_output_set (PIEZO1_PIO, state);
pio_output_set (PIEZO2_PIO, !state);
} }