deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Solved doxygen comments information from VAC, AAC and PM10 sensor files

Browse source
This commit is contained in:
Toni Lozano 2016-01-25 12:20:36 +01:00
parent 42e1beb931
commit 31e6cc48ca
6 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
examples/zolertia/zoul/Makefile
View file

@ -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)

8
examples/zolertia/zoul/test-aac-sensor.c
View file

@ -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
*
* \author
* Javier Sánchez <asanchez@zolertia.com>
*/
#include "contiki.h"
#include "sys/etimer.h"
@ -87,7 +94,6 @@ PROCESS_THREAD(test_aac_sensor_process, ev, data)
counter++;
}
}
PROCESS_END();
}
/*---------------------------------------------------------------------------*/

10
examples/zolertia/zoul/test-pm10-sensor.c
View file

@ -31,6 +31,7 @@
/**
* \addtogroup zoul-examples
* @{
* \defgroup zoul-pm10-sensor-test Test PM10 sensor
*
* Demonstrates the operation of the Sharp PM10 analog sensor
* @{
@ -43,11 +44,13 @@
*/
/*---------------------------------------------------------------------------*/
#include <stdio.h>
#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)
* @}
* @}
*/

10
examples/zolertia/zoul/test-vac-sensor.c
View file

@ -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 <asanchez@zolertia.com>
*/
#include "contiki.h"
#include "sys/etimer.h"
@ -88,7 +95,6 @@ PROCESS_THREAD(test_vac_sensor_process, ev, data)
counter++;
}
}
PROCESS_END();
}
/*---------------------------------------------------------------------------*/

1
platform/zoul/dev/pm10-sensor.c
View file

@ -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));

5
platform/zoul/dev/pm10-sensor.h
View file

@ -31,6 +31,11 @@
*/
/*---------------------------------------------------------------------------*/
/**
* \addtogroup zoul-sensors
* @{
*
* \defgroup zoul-pm10-sensor Analog PM10 sensor
* @{
* \file
* GP2Y1010AU0F PM10 sensor driver
* \author