From 31e6cc48ca0bb37aa7d900d08fd7d987bb4890f5 Mon Sep 17 00:00:00 2001 From: Toni Lozano Date: Mon, 25 Jan 2016 12:20:36 +0100 Subject: [PATCH] Solved doxygen comments information from VAC, AAC and PM10 sensor files --- examples/zolertia/zoul/Makefile | 7 ++++--- examples/zolertia/zoul/test-aac-sensor.c | 10 ++++++++-- examples/zolertia/zoul/test-pm10-sensor.c | 12 ++++++------ examples/zolertia/zoul/test-vac-sensor.c | 10 ++++++++-- platform/zoul/dev/pm10-sensor.c | 1 + platform/zoul/dev/pm10-sensor.h | 5 +++++ 6 files changed, 32 insertions(+), 13 deletions(-) diff --git a/examples/zolertia/zoul/Makefile b/examples/zolertia/zoul/Makefile index fd9ca7b86..95e4a4e1f 100644 --- a/examples/zolertia/zoul/Makefile +++ b/examples/zolertia/zoul/Makefile @@ -1,14 +1,15 @@ DEFINES+=PROJECT_CONF_H=\"project-conf.h\" CONTIKI_PROJECT = zoul-demo test-tsl2563 test-sht25 test-pwm test-power-mgmt -CONTIKI_PROJECT += test-bmp085-bmp180 test-motion test-rotation-sensor +ONTIKI_PROJECT += test-bmp085-bmp180 test-motion test-rotation-sensor CONTIKI_PROJECT += test-grove-light-sensor test-grove-loudness-sensor CONTIKI_PROJECT += test-weather-meter test-grove-gyro test-lcd -CONTIKI_PROJECT += test-pm10 test-vac-sensor +CONTIKI_PROJECT += test-pm10-sensor test-vac-sensor test-aac-sensor + CONTIKI_TARGET_SOURCEFILES += tsl2563.c sht25.c bmpx8x.c motion-sensor.c CONTIKI_TARGET_SOURCEFILES += adc-sensors.c weather-meter.c grove-gyro.c -CONTIKI_TARGET_SOURCEFILES += rgb-bl-lcd.c +CONTIKI_TARGET_SOURCEFILES += rgb-bl-lcd.c pm10-sensor.c all: $(CONTIKI_PROJECT) diff --git a/examples/zolertia/zoul/test-aac-sensor.c b/examples/zolertia/zoul/test-aac-sensor.c index 661eadf69..0884f9200 100644 --- a/examples/zolertia/zoul/test-aac-sensor.c +++ b/examples/zolertia/zoul/test-aac-sensor.c @@ -31,9 +31,16 @@ /* * \addtogroup zoul-examples * @{ + * \defgroup zoul-aac-sensor-test Test AAC sensor + * + * Demonstrates the operation of the current AAC analog sensor + * @{ * * \file - * Example demonstrating the Zoul module on the RE-Mote & AAC sensor 0-5V 50Amps AC + * Example demonstrating the Zoul module on the RE-Mote & AAC sensor 0-5V 50Amps AC + * + * \author + * Javier Sánchez */ #include "contiki.h" #include "sys/etimer.h" @@ -87,7 +94,6 @@ PROCESS_THREAD(test_aac_sensor_process, ev, data) counter++; } } - PROCESS_END(); } /*---------------------------------------------------------------------------*/ diff --git a/examples/zolertia/zoul/test-pm10-sensor.c b/examples/zolertia/zoul/test-pm10-sensor.c index d72ae51b4..7aedbf60c 100644 --- a/examples/zolertia/zoul/test-pm10-sensor.c +++ b/examples/zolertia/zoul/test-pm10-sensor.c @@ -31,23 +31,26 @@ /** * \addtogroup zoul-examples * @{ + * \defgroup zoul-pm10-sensor-test Test PM10 sensor * * Demonstrates the operation of the Sharp PM10 analog sensor * @{ * * \file - * GP2Y1010AU0F PM10 sensor example using the ADC sensors wrapper + * GP2Y1010AU0F PM10 sensor example using the ADC sensors wrapper * * \author * Toni Lozano */ /*---------------------------------------------------------------------------*/ #include +#include "cpu.h" #include "contiki.h" #include "dev/leds.h" #include "dev/adc-sensors.h" #include "dev/zoul-sensors.h" #include "lib/sensors.h" +#include "dev/sys-ctrl.h" #include "dev/pm10-sensor.h" /*---------------------------------------------------------------------------*/ #define ADC_PIN 2 @@ -76,16 +79,14 @@ PROCESS_THREAD(test_pm10_sensor_process, ev, data) PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et)); leds_toggle(LEDS_GREEN); - - pm10_value = pm10.value(NULL); - + printf("PM10 value\n"); + pm10_value = pm10.value(1); if(pm10_value != ADC_WRAPPER_ERROR) { printf("PM10 value = %u ppm\n", pm10_value); } else { printf("Error, enable the DEBUG flag in adc-wrapper.c for info\n"); PROCESS_EXIT(); } - } PROCESS_END(); } @@ -94,4 +95,3 @@ PROCESS_THREAD(test_pm10_sensor_process, ev, data) * @} * @} */ - diff --git a/examples/zolertia/zoul/test-vac-sensor.c b/examples/zolertia/zoul/test-vac-sensor.c index 0f1f9a4eb..289a0e839 100644 --- a/examples/zolertia/zoul/test-vac-sensor.c +++ b/examples/zolertia/zoul/test-vac-sensor.c @@ -31,9 +31,16 @@ /* * \addtogroup zoul-examples * @{ + * \defgroup zoul-vac-sensor-test Test VAC sensor + * + * Demonstrates the operation of the voltage VAC analog sensor + * @{ * * \file - * Example demonstrating the Zoul module on the RE-Mote & VAC sensor + * Example demonstrating the Zoul module on the RE-Mote & VAC sensor 0-5V 250V AC + * + * \author + * Javier Sánchez */ #include "contiki.h" #include "sys/etimer.h" @@ -88,7 +95,6 @@ PROCESS_THREAD(test_vac_sensor_process, ev, data) counter++; } } - PROCESS_END(); } /*---------------------------------------------------------------------------*/ diff --git a/platform/zoul/dev/pm10-sensor.c b/platform/zoul/dev/pm10-sensor.c index aa8704c50..015852c93 100644 --- a/platform/zoul/dev/pm10-sensor.c +++ b/platform/zoul/dev/pm10-sensor.c @@ -66,6 +66,7 @@ configure(int type, int value) if(type != SENSORS_ACTIVE) { return PM10_ERROR; } + /*Set PA7 as output, used as pulse-driven wave*/ ioc_set_over(PM10_SENSOR_PORT, PM10_SENSOR_CTRL_PIN, IOC_OVERRIDE_DIS); GPIO_SOFTWARE_CONTROL(PM10_SENSOR_PORT, GPIO_PIN_MASK(PM10_SENSOR_CTRL_PIN)); diff --git a/platform/zoul/dev/pm10-sensor.h b/platform/zoul/dev/pm10-sensor.h index c411428b5..e090f8202 100644 --- a/platform/zoul/dev/pm10-sensor.h +++ b/platform/zoul/dev/pm10-sensor.h @@ -31,6 +31,11 @@ */ /*---------------------------------------------------------------------------*/ /** + * \addtogroup zoul-sensors + * @{ + * + * \defgroup zoul-pm10-sensor Analog PM10 sensor + * @{ * \file * GP2Y1010AU0F PM10 sensor driver * \author