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

Merge pull request #824 from alignan/fix_warnings

Browse source 
Warning fixes
This commit is contained in:
Nicolas Tsiftes 2014-10-20 11:16:36 +02:00
parent 7c55290c32 c836fbfbd9
commit 27cde1ff81
6 changed files with 164 additions and 195 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
examples/z1/test-relay-phidget.c
View file

@ -42,28 +42,25 @@
#include "contiki.h" #include "contiki.h"
#include "dev/relay-phidget.h" #include "dev/relay-phidget.h"
#if 1 #if 1
#define PRINTF(...) printf(__VA_ARGS__) #define PRINTF(...) printf(__VA_ARGS__)
#else #else
#define PRINTF(...) #define PRINTF(...)
#endif #endif
#if 0 #if 0
#define PRINTFDEBUG(...) printf(__VA_ARGS__) #define PRINTFDEBUG(...) printf(__VA_ARGS__)
#else #else
#define PRINTFDEBUG(...) #define PRINTFDEBUG(...)
#endif #endif
#define RELAY_INTERVAL (CLOCK_SECOND) #define RELAY_INTERVAL (CLOCK_SECOND)
PROCESS(test_process, "Relay test process"); PROCESS(test_process, "Relay test process");
AUTOSTART_PROCESSES(&test_process); AUTOSTART_PROCESSES(&test_process);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static struct etimer et; static struct etimer et;
static uint8_t status; static int8_t status;
PROCESS_THREAD(test_process, ev, data) PROCESS_THREAD(test_process, ev, data)
{ {

54
platform/z1/dev/light-ziglet.c
View file

@ -38,7 +38,6 @@
* Marcus Lundén, SICS <mlunden@sics.se> * Marcus Lundén, SICS <mlunden@sics.se>
*/ */
#include <stdio.h> #include <stdio.h>
#include "contiki.h" #include "contiki.h"
#include "i2cmaster.h" #include "i2cmaster.h"
@ -50,9 +49,10 @@
#define PRINTFDEBUG(...) #define PRINTFDEBUG(...)
#endif #endif
#warning LIGHT SENSOR ZIGLET IS CURRENTLY BROKEN
/* Bitmasks and bit flag variable for keeping track of tmp102 status. */ /* Bitmasks and bit flag variable for keeping track of tmp102 status. */
enum TSL2563_STATUSTYPES enum TSL2563_STATUSTYPES {
{
/* must be a bit and not more, not using 0x00. */ /* must be a bit and not more, not using 0x00. */
INITED = 0x01, INITED = 0x01,
RUNNING = 0x02, RUNNING = 0x02,
@ -80,32 +80,34 @@ calculateLux(uint16_t *buffer)
PRINTFDEBUG("ratio %lu, lratio %lu\n", ratio, lratio); PRINTFDEBUG("ratio %lu, lratio %lu\n", ratio, lratio);
if ((lratio >= 0) && (lratio <= K1T)) if((lratio >= 0) && (lratio <= K1T)) {
tmp = (ch0 * B1T) - (ch1 * M1T); tmp = (ch0 * B1T) - (ch1 * M1T);
else if (lratio <= K2T) } else if(lratio <= K2T) {
tmp = (ch0 * B2T) - (ch1 * M2T); tmp = (ch0 * B2T) - (ch1 * M2T);
else if (lratio <= K3T) } else if(lratio <= K3T) {
tmp = (ch0 * B3T) - (ch1 * M3T); tmp = (ch0 * B3T) - (ch1 * M3T);
else if (lratio <= K4T) } else if(lratio <= K4T) {
tmp = (ch0 * B4T) - (ch1 * M4T); tmp = (ch0 * B4T) - (ch1 * M4T);
else if (lratio <= K5T) } else if(lratio <= K5T) {
tmp = (ch0 * B5T) - (ch1 * M5T); tmp = (ch0 * B5T) - (ch1 * M5T);
else if (lratio <= K6T) } else if(lratio <= K6T) {
tmp = (ch0 * B6T) - (ch1 * M6T); tmp = (ch0 * B6T) - (ch1 * M6T);
else if (lratio <= K7T) } else if(lratio <= K7T) {
tmp = (ch0 * B7T) - (ch1 * M7T); tmp = (ch0 * B7T) - (ch1 * M7T);
else if (lratio > K8T) } else if(lratio > K8T) {
tmp = (ch0 * B8T) - (ch1 * M8T); tmp = (ch0 * B8T) - (ch1 * M8T);
}
if (tmp < 0) tmp = 0; if(tmp < 0) {
tmp = 0;
}
tmp += (1 << 13); tmp += (1 << 13);
PRINTFDEBUG("tmp %lu\n", tmp); PRINTFDEBUG("tmp %lu\n", tmp);
return (tmp >> 14); return tmp >> 14;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Init the light ziglet sensor: ports, pins, registers, interrupts (none enabled), I2C, /* Init the light ziglet sensor: ports, pins, registers, interrupts (none enabled), I2C,
default threshold values etc. */ default threshold values etc. */
@ -113,8 +115,7 @@ calculateLux(uint16_t *buffer)
void void
light_ziglet_init(void) light_ziglet_init(void)
{ {
if (!(_TSL2563_STATUS & INITED)) if(!(_TSL2563_STATUS & INITED)) {
{
PRINTFDEBUG("light ziglet init\n"); PRINTFDEBUG("light ziglet init\n");
_TSL2563_STATUS |= INITED; _TSL2563_STATUS |= INITED;
@ -123,7 +124,6 @@ light_ziglet_init (void)
return; return;
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Write to a 16-bit register. /* Write to a 16-bit register.
args: args:
@ -147,7 +147,6 @@ tsl2563_write_reg (uint8_t reg, uint16_t val)
while(i2c_busy()); while(i2c_busy());
PRINTFDEBUG("WRITE_REG 0x%04X @ reg 0x%02X\n", val, reg); PRINTFDEBUG("WRITE_REG 0x%04X @ reg 0x%02X\n", val, reg);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Read register. /* Read register.
args: args:
@ -163,13 +162,13 @@ tsl2563_read_reg (uint8_t reg)
uint16_t retVal = 0; uint16_t retVal = 0;
uint8_t rtx = reg; uint8_t rtx = reg;
// Transmit the register to read /* Transmit the register to read */
i2c_transmitinit(TSL2563_ADDR); i2c_transmitinit(TSL2563_ADDR);
while(i2c_busy()); while(i2c_busy());
i2c_transmit_n(1, &rtx); i2c_transmit_n(1, &rtx);
while(i2c_busy()); while(i2c_busy());
// Receive the data /* Receive the data */
i2c_receiveinit(TSL2563_ADDR); i2c_receiveinit(TSL2563_ADDR);
while(i2c_busy()); while(i2c_busy());
i2c_receive_n(4, &buf[0]); i2c_receive_n(4, &buf[0]);
@ -184,40 +183,36 @@ tsl2563_read_reg (uint8_t reg)
if(readBuf[0] == readBuf[1]) { if(readBuf[0] == readBuf[1]) {
tsl2563_read_reg(TSL2563_READ); tsl2563_read_reg(TSL2563_READ);
return; return 0x00;
} else { } else {
retVal = calculateLux(&readBuf); retVal = calculateLux(readBuf);
return retVal; return retVal;
} }
} }
uint16_t uint16_t
light_ziglet_on(void) light_ziglet_on(void)
{ {
uint16_t data; uint16_t data;
uint8_t regon[] = { 0x00, TSL2563_PWRN }; uint8_t regon[] = { 0x00, TSL2563_PWRN };
// Turn on the sensor /* Turn on the sensor */
i2c_transmitinit(TSL2563_ADDR); i2c_transmitinit(TSL2563_ADDR);
while(i2c_busy()); while(i2c_busy());
i2c_transmit_n (2, &regon); i2c_transmit_n(2, regon);
while(i2c_busy()); while(i2c_busy());
data = (uint16_t)tsl2563_read_reg(TSL2563_READ); data = (uint16_t)tsl2563_read_reg(TSL2563_READ);
return data; return data;
} }
void void
light_ziglet_off(void) light_ziglet_off(void)
{ {
uint8_t regoff = 0x00; uint8_t regoff = 0x00;
// Turn off the sensor /* Turn off the sensor */
i2c_transmitinit(TSL2563_ADDR); i2c_transmitinit(TSL2563_ADDR);
while(i2c_busy()); while(i2c_busy());
i2c_transmit_n(1, &regoff); i2c_transmit_n(1, &regoff);
while(i2c_busy()); while(i2c_busy());
return; return;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Read light ziglet sensor /* Read light ziglet sensor
*/ */
@ -230,4 +225,3 @@ light_ziglet_read(void)
light_ziglet_off(); light_ziglet_off();
return lux; return lux;
} }

18
platform/z1/dev/relay-phidget.c
View file

@ -43,8 +43,7 @@
static uint8_t controlPin; static uint8_t controlPin;
enum PHIDGET_RELAY_STATUSTYPES enum PHIDGET_RELAY_STATUSTYPES {
{
/* must be a bit and not more, not using 0x00. */ /* must be a bit and not more, not using 0x00. */
INITED = 0x01, INITED = 0x01,
RUNNING = 0x02, RUNNING = 0x02,
@ -63,15 +62,14 @@ relay_enable(uint8_t pin)
_RELAY_STATUS |= INITED; _RELAY_STATUS |= INITED;
// Selects the pin to be configure as the control pin of the relay module /* Selects the pin to be configure as the control pin of the relay module */
controlPin = (1 << pin); controlPin = (1 << pin);
// Configures the control pin /* Configures the control pin */
P6SEL &= ~controlPin; P6SEL &= ~controlPin;
P6DIR |= controlPin; P6DIR |= controlPin;
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
@ -81,7 +79,6 @@ relay_on()
P6OUT |= controlPin; P6OUT |= controlPin;
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
relay_off() relay_off()
@ -90,18 +87,19 @@ relay_off()
P6OUT &= ~controlPin; P6OUT &= ~controlPin;
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
uint8_t int8_t
relay_toggle() relay_toggle()
{ {
uint8_t status;
if((_RELAY_STATUS & INITED)) { if((_RELAY_STATUS & INITED)) {
P6OUT ^= controlPin; P6OUT ^= controlPin;
if((P6OUT & controlPin)) return 1; if((P6OUT & controlPin)) {
return 1;
}
return 0; return 0;
} }
return -1;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

3
platform/z1/dev/relay-phidget.h
View file

@ -44,7 +44,6 @@ void relay_enable(uint8_t pin);
void relay_on(); void relay_on();
void relay_off(); void relay_off();
uint8_t relay_toogle(); int8_t relay_toogle();
#endif /* RELAY_PHIDGET_H_ */ #endif /* RELAY_PHIDGET_H_ */

12
platform/z1/dev/tlc59116.c
View file

@ -38,13 +38,11 @@
* Jelmer Tiete, VUB <jelmer@tiete.be> * Jelmer Tiete, VUB <jelmer@tiete.be>
*/ */
#include <stdio.h> #include <stdio.h>
#include "contiki.h" #include "contiki.h"
#include "tlc59116.h" #include "tlc59116.h"
#include "i2cmaster.h" #include "i2cmaster.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Write to a register. /* Write to a register.
* args: * args:
@ -82,11 +80,10 @@ tlc59116_write_stream(uint8_t len, uint8_t * data)
while(i2c_busy()); while(i2c_busy());
PRINTFDEBUG("I2C Ready to TX(stream)\n"); PRINTFDEBUG("I2C Ready to TX(stream)\n");
i2c_transmit_n(len, data); // start tx and send conf reg i2c_transmit_n(len, data); /* start tx and send conf reg */
while(i2c_busy()); while(i2c_busy());
PRINTFDEBUG("WRITE_STR %u B to 0x%02X\n", len, data[0]); PRINTFDEBUG("WRITE_STR %u B to 0x%02X\n", len, data[0]);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Read one register. /* Read one register.
* args: * args:
@ -116,7 +113,6 @@ tlc59116_read_reg(uint8_t reg)
return retVal; return retVal;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Read several registers in a stream. /* Read several registers in a stream.
* args: * args:
@ -144,7 +140,6 @@ tlc59116_read_stream(uint8_t reg, uint8_t len, uint8_t * whereto)
i2c_receive_n(len, whereto); i2c_receive_n(len, whereto);
while(i2c_busy()); while(i2c_busy());
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Set pwm value for individual led. Make sure PWM mode is enabled. /* Set pwm value for individual led. Make sure PWM mode is enabled.
* args: * args:
@ -155,13 +150,12 @@ tlc59116_read_stream(uint8_t reg, uint8_t len, uint8_t * whereto)
void void
tlc59116_led(uint8_t led, uint8_t pwm) tlc59116_led(uint8_t led, uint8_t pwm)
{ {
if(led < 0 | led > 15) { if((led < 0) || (led > 15)) {
PRINTFDEBUG("TLC59116: wrong led value."); PRINTFDEBUG("TLC59116: wrong led value.");
} else { } else {
tlc59116_write_reg(led + TLC59116_PWM0, pwm); tlc59116_write_reg(led + TLC59116_PWM0, pwm);
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Init the led driver: ports, pins, registers, interrupts (none enabled), I2C, /* Init the led driver: ports, pins, registers, interrupts (none enabled), I2C,
* default threshold values etc. * default threshold values etc.
@ -181,7 +175,7 @@ tlc59116_init(void)
/*This would maybe be better with a SWRST */ /*This would maybe be better with a SWRST */
uint8_t tx_buf[] = uint8_t tx_buf[] =
{ TLC59116_PWM0_AUTOINCR, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; { TLC59116_PWM0_AUTOINCR, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
tlc59116_write_stream(17, &tx_buf); tlc59116_write_stream(17, tx_buf);
/* set all leds to PWM control */ /* set all leds to PWM control */
tlc59116_write_reg(TLC59116_LEDOUT0, TLC59116_LEDOUT_PWM); tlc59116_write_reg(TLC59116_LEDOUT0, TLC59116_LEDOUT_PWM);

31
platform/z1/dev/tmp102.c
View file

@ -38,32 +38,27 @@
* Marcus Lundén, SICS <mlunden@sics.se> * Marcus Lundén, SICS <mlunden@sics.se>
*/ */
#include <stdio.h> #include <stdio.h>
#include "contiki.h" #include "contiki.h"
#include "i2cmaster.h" #include "i2cmaster.h"
#include "tmp102.h" #include "tmp102.h"
/* Bitmasks and bit flag variable for keeping track of tmp102 status. */ /* Bitmasks and bit flag variable for keeping track of tmp102 status. */
enum TMP102_STATUSTYPES enum TMP102_STATUSTYPES {
{
/* must be a bit and not more, not using 0x00. */ /* must be a bit and not more, not using 0x00. */
INITED = 0x01, INITED = 0x01,
RUNNING = 0x02, RUNNING = 0x02,
STOPPED = 0x04, STOPPED = 0x04,
LOW_POWER = 0x08, LOW_POWER = 0x08,
AAA = 0x10, // available to extend this... AAA = 0x10, /* available to extend this... */
BBB = 0x20, // available to extend this... BBB = 0x20, /* available to extend this... */
CCC = 0x40, // available to extend this... CCC = 0x40, /* available to extend this... */
DDD = 0x80 // available to extend this... DDD = 0x80 /* available to extend this... */
}; };
static enum TMP102_STATUSTYPES _TMP102_STATUS = 0x00; static enum TMP102_STATUSTYPES _TMP102_STATUS = 0x00;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
//PROCESS(tmp102_process, "Temperature Sensor process"); /* PROCESS(tmp102_process, "Temperature Sensor process"); */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Init the temperature sensor: ports, pins, registers, interrupts (none enabled), I2C, /* Init the temperature sensor: ports, pins, registers, interrupts (none enabled), I2C,
@ -72,8 +67,7 @@ static enum TMP102_STATUSTYPES _TMP102_STATUS = 0x00;
void void
tmp102_init(void) tmp102_init(void)
{ {
if (!(_TMP102_STATUS & INITED)) if(!(_TMP102_STATUS & INITED)) {
{
PRINTFDEBUG("TMP102 init\n"); PRINTFDEBUG("TMP102 init\n");
_TMP102_STATUS |= INITED; _TMP102_STATUS |= INITED;
/* Power Up TMP102 via pin */ /* Power Up TMP102 via pin */
@ -85,10 +79,8 @@ tmp102_init (void)
/* Set up ports and pins for I2C communication */ /* Set up ports and pins for I2C communication */
i2c_enable(); i2c_enable();
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Write to a 16-bit register. /* Write to a 16-bit register.
args: args:
@ -112,7 +104,6 @@ tmp102_write_reg (uint8_t reg, uint16_t val)
while(i2c_busy()); while(i2c_busy());
PRINTFDEBUG("WRITE_REG 0x%04X @ reg 0x%02X\n", val, reg); PRINTFDEBUG("WRITE_REG 0x%04X @ reg 0x%02X\n", val, reg);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Read register. /* Read register.
args: args:
@ -128,13 +119,13 @@ tmp102_read_reg (uint8_t reg)
uint8_t rtx = reg; uint8_t rtx = reg;
PRINTFDEBUG("READ_REG 0x%02X\n", reg); PRINTFDEBUG("READ_REG 0x%02X\n", reg);
// transmit the register to read /* transmit the register to read */
i2c_transmitinit(TMP102_ADDR); i2c_transmitinit(TMP102_ADDR);
while(i2c_busy()); while(i2c_busy());
i2c_transmit_n(1, &rtx); i2c_transmit_n(1, &rtx);
while(i2c_busy()); while(i2c_busy());
// receive the data /* receive the data */
i2c_receiveinit(TMP102_ADDR); i2c_receiveinit(TMP102_ADDR);
while(i2c_busy()); while(i2c_busy());
i2c_receive_n(2, &buf[0]); i2c_receive_n(2, &buf[0]);
@ -144,7 +135,6 @@ tmp102_read_reg (uint8_t reg)
return retVal; return retVal;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Read temperature in a raw format. Further processing will be needed /* Read temperature in a raw format. Further processing will be needed
to make an interpretation of these 12 or 13-bit data, depending on configuration to make an interpretation of these 12 or 13-bit data, depending on configuration
@ -159,12 +149,10 @@ tmp102_read_temp_raw (void)
return rd; return rd;
} }
int16_t int16_t
tmp102_read_temp_x100(void) tmp102_read_temp_x100(void)
{ {
int16_t raw = 0; int16_t raw = 0;
int8_t rd = 0;
int16_t sign = 1; int16_t sign = 1;
int16_t abstemp, temp_int; int16_t abstemp, temp_int;
@ -189,7 +177,6 @@ tmp102_read_temp_x100(void)
return temp_int; return temp_int;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Simple Read temperature. Return is an integer with temperature in 1deg. precision /* Simple Read temperature. Return is an integer with temperature in 1deg. precision
Return value is a signed 8 bit integer. Return value is a signed 8 bit integer.