diff --git a/examples/esb/beeper.c b/examples/esb/beeper.c index e42dbbab4..47d8cc2d3 100644 --- a/examples/esb/beeper.c +++ b/examples/esb/beeper.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: beeper.c,v 1.2 2008/07/08 12:54:41 nifi Exp $ + * @(#)$Id: beeper.c,v 1.3 2010/01/14 18:18:51 nifi Exp $ */ #include "contiki-esb.h" @@ -67,7 +67,7 @@ PROCESS_THREAD(beeper_process, ev, data) etimer_set(&etimer, CLOCK_SECOND / 2); PT_INIT(&beeper_pt); - button_sensor.activate(); + button_sensor.configure(SENSORS_ACTIVE, 1); while(1) { diff --git a/examples/esb/blinker.c b/examples/esb/blinker.c index 0d660e80d..bc4cfde49 100644 --- a/examples/esb/blinker.c +++ b/examples/esb/blinker.c @@ -26,14 +26,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: blinker.c,v 1.2 2007/11/28 20:31:30 nifi Exp $ + * $Id: blinker.c,v 1.3 2010/01/14 18:18:51 nifi Exp $ * * ----------------------------------------------------------------- * * Author : Adam Dunkels, Joakim Eriksson, Niclas Finne * Created : 2006-08-28 - * Updated : $Date: 2007/11/28 20:31:30 $ - * $Revision: 1.2 $ + * Updated : $Date: 2010/01/14 18:18:51 $ + * $Revision: 1.3 $ */ #include "contiki-esb.h" @@ -52,9 +52,9 @@ PROCESS_THREAD(blinker_process, ev, data) etimer_stop(&pir_timer); etimer_stop(&vib_timer); etimer_set(&etimer, CLOCK_SECOND * 4); - button_sensor.activate(); - vib_sensor.activate(); - pir_sensor.activate(); + button_sensor.configure(SENSORS_ACTIVE, 1); + vib_sensor.configure(SENSORS_ACTIVE, 1); + pir_sensor.configure(SENSORS_ACTIVE, 1); while(1) { diff --git a/examples/esb/fft-test.c b/examples/esb/fft-test.c index 384729992..6f553300f 100644 --- a/examples/esb/fft-test.c +++ b/examples/esb/fft-test.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: fft-test.c,v 1.2 2008/04/25 22:12:25 joxe Exp $ + * $Id: fft-test.c,v 1.3 2010/01/14 18:18:51 nifi Exp $ * * ----------------------------------------------------------------- * fft-test - a test program that use the sound sensor for sampling @@ -35,8 +35,8 @@ * * Author : Joakim Eriksson * Created : 2008-04-04 - * Updated : $Date: 2008/04/25 22:12:25 $ - * $Revision: 1.2 $ + * Updated : $Date: 2010/01/14 18:18:51 $ + * $Revision: 1.3 $ */ #include "contiki-esb.h" @@ -65,12 +65,10 @@ PROCESS_THREAD(fft_process, ev, data) PROCESS_BEGIN(); etimer_set(&etimer, CLOCK_SECOND * 4); - button_sensor.activate(); + button_sensor.configure(SENSORS_ACTIVE, 1); /* start and configure the sound sensor for sampling */ - sound_sensor.activate(); - sound_sensor.configure(SOUND_SET_BUFFER_PTR, fftBuf); - sound_sensor.configure(SOUND_SET_BUFFER_SIZE, (void *) FFT_TEST_SIZE); - sound_sensor.configure(SOUND_SET_DIV, (void *) 1); + sound_sensor.configure(SENSORS_ACTIVE, 1); + sound_sensor_set_buffer(fftBuf, FFT_TEST_SIZE, 1); while(1) { PROCESS_WAIT_EVENT(); @@ -124,7 +122,7 @@ PROCESS_THREAD(fft_process, ev, data) } else if(ev == PROCESS_EVENT_TIMER) { if(data == &etimer) { if(on) { - sound_sensor.configure(SOUND_START_SAMPLE, NULL); + sound_sensor_start_sample(); leds_off(LEDS_ALL); } etimer_set(&etimer, CLOCK_SECOND / 2);