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

Fixes warnings, bad code and code style

Browse source
This commit is contained in:
Antonio Lignan 2014-10-16 17:59:52 +02:00
parent 4cc1762851
commit c836fbfbd9
6 changed files with 164 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,8 +43,7 @@
static uint8_t controlPin;
enum PHIDGET_RELAY_STATUSTYPES
{
enum PHIDGET_RELAY_STATUSTYPES {
/* must be a bit and not more, not using 0x00. */
INITED = 0x01,
RUNNING = 0x02,
@ -59,49 +58,48 @@ void
relay_enable(uint8_t pin)
{
if (!(_RELAY_STATUS & INITED)){
if(!(_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);
// Configures the control pin
/* Configures the control pin */
P6SEL &= ~controlPin;
P6DIR |= controlPin;
}
}
/*---------------------------------------------------------------------------*/
void
relay_on()
{
if ((_RELAY_STATUS & INITED)){
if((_RELAY_STATUS & INITED)) {
P6OUT |= controlPin;
}
}
/*---------------------------------------------------------------------------*/
void
relay_off()
{
if ((_RELAY_STATUS & INITED)){
if((_RELAY_STATUS & INITED)) {
P6OUT &= ~controlPin;
}
}
/*---------------------------------------------------------------------------*/
uint8_t
int8_t
relay_toggle()
{
uint8_t status;
if ((_RELAY_STATUS & INITED)){
if((_RELAY_STATUS & INITED)) {
P6OUT ^= controlPin;
if((P6OUT & controlPin)) return 1;
if((P6OUT & controlPin)) {
return 1;
}
return 0;
}
return -1;
}
/*---------------------------------------------------------------------------*/