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

fixed the z1 platform and generic code used by z1 to work with IAR compiler

Browse source
This commit is contained in:
Joakim Eriksson 2011-05-25 17:21:51 +02:00
parent c48f8fd39a
commit 77ec0bfa0f
42 changed files with 318 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

10
platform/z1/dev/potentiometer-sensor.c
View file

@ -36,7 +36,15 @@
#include "dev/potentiometer-sensor.h"
#include "dev/sky-sensors.h"
#include "contiki.h"
#ifdef __IAR_SYSTEMS_ICC__
#include <msp430.h>
#else
#include <io.h>
#include <signal.h>
#endif
/* Configure ADC12_2 to sample channel 11 (voltage) and use */
/* the Vref+ as reference (SREF_1) since it is a stable reference */
@ -44,7 +52,7 @@
#define INPUT_REFERENCE SREF_0
#define POTENTIOMETER_MEM ADC12MEM4
const struct sensors_sensor battery_sensor;
const struct sensors_sensor potentiometer_sensor;
/*---------------------------------------------------------------------------*/
static int
value(int type)