Skip to content

Commit

Permalink
tlc59116 for zolertia, added 0 values at init and code clean-up
Browse files Browse the repository at this point in the history
  • Loading branch information
@JelmerT
JelmerT committed Jun 24, 2013
1 parent cc2567b commit ed8be50
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 32 deletions.
4 changes: 2 additions & 2 deletions examples/z1/test-tlc59116.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
/**
* \file
* A simple program for testing the TLC59116 I2C led driver.
* All 16 outputs will sequencially light up.
* \author
* Jelmer Tiete, VUB <[email protected]>
*/
Expand All @@ -57,7 +58,7 @@ PROCESS_THREAD(tlc59116_process, ev, data) {
PROCESS_BEGIN();
{

/* Start and setup the led driver with default values, eg outputs on and pwm enabled. */
/* Start and setup the led driver with default values, eg outputs on and pwm enabled and 0. */
tlc59116_init();

while (1) {
Expand All @@ -78,4 +79,3 @@ PROCESS_THREAD(tlc59116_process, ev, data) {
}

/*---------------------------------------------------------------------------*/

33 changes: 15 additions & 18 deletions platform/z1/dev/tlc59116.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

/**
* \file
* Device drivers for tlc5916 led driver in Zolertia Z1.
* Device drivers for tlc5916 i2c led driver on Zolertia Z1.
* \author
* Jelmer Tiete, VUB <[email protected]>
*/
Expand All @@ -44,14 +44,6 @@
#include "i2cmaster.h"


#if 0
#include <stdio.h>
#define PRINTFDEBUG(...) printf(__VA_ARGS__)
#else
#define PRINTFDEBUG(...)
#endif


/*---------------------------------------------------------------------------*/
/* Write to a register.
args:
Expand All @@ -74,8 +66,8 @@ tlc59116_write_reg(uint8_t reg, uint8_t val) {
/*---------------------------------------------------------------------------*/
/* Write several registers from a stream.
args:
len number of bytes to read
data pointer to where the data is read from
len number of bytes to write
data pointer to where the data is written from
First byte in stream must be the register address to begin writing to.
The data is then written from second byte and increasing. */
Expand All @@ -86,7 +78,7 @@ tlc59116_write_stream(uint8_t len, uint8_t *data) {
while (i2c_busy());
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());
PRINTFDEBUG("WRITE_STR %u B to 0x%02X\n", len, data[0]);
}
Expand Down Expand Up @@ -146,21 +138,22 @@ tlc59116_read_stream(uint8_t reg, uint8_t len, uint8_t *whereto) {
}

/*---------------------------------------------------------------------------*/
/* Set pwm value for individual led
*/
/* Set pwm value for individual led. Make sure PWM mode is enabled.
*/

void
tlc59116_led(uint8_t led, uint8_t pwm) {
if (led<0 | led>15) {
PRINTFDEBUG("TLC59116: wrong led value.");
}//else{
}else{
tlc59116_write_reg(led+TLC59116_PWM0, pwm);
// }
}
}

/*---------------------------------------------------------------------------*/
/* Init the led driver: ports, pins, registers, interrupts (none enabled), I2C,
default threshold values etc. */
default threshold values etc.
*/

void
tlc59116_init(void) {
Expand All @@ -171,10 +164,14 @@ tlc59116_init(void) {
tlc59116_write_reg(TLC59116_MODE1, TLC59116_MODE1_DEFAULT);
tlc59116_write_reg(TLC59116_MODE2, TLC59116_MODE2_DEFAULT);

/*Set all PWM values to 0x00 (off)*/
//This would maybe be better with a SWRST
uint8_t tx_buf[] = {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);

/* set all leds to PWM control */
tlc59116_write_reg(TLC59116_LEDOUT0,TLC59116_LEDOUT_PWM);
tlc59116_write_reg(TLC59116_LEDOUT1,TLC59116_LEDOUT_PWM);
tlc59116_write_reg(TLC59116_LEDOUT2,TLC59116_LEDOUT_PWM);
tlc59116_write_reg(TLC59116_LEDOUT3,TLC59116_LEDOUT_PWM);
}

33 changes: 21 additions & 12 deletions platform/z1/dev/tlc59116.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

/**
* \file
* Device drivers header file for TLC59116 led driver in Zolertia Z1.
* Device drivers header file for TLC59116 i2c led driver on Zolertia Z1.
* \author
* Jelmer Tiete, VUB <[email protected]>
*/
Expand All @@ -42,6 +42,14 @@
#include <stdio.h>
#include "dev/i2cmaster.h"

#if 0
#include <stdio.h>
#define PRINTFDEBUG(...) printf(__VA_ARGS__)
#else
#define PRINTFDEBUG(...)
#endif


/* -------------------------------------------------------------------------- */
/* Init the led driver: ports, pins, registers, I2C*/
void tlc59116_init(void);
Expand All @@ -59,7 +67,8 @@ void tlc59116_write_reg(uint8_t reg, uint8_t val);
data pointer to where the data is read from
First byte in stream must be the register address to begin writing to.
The data is then written from the second byte and increasing. The address byte
is not included in length len. */
is not included in length len.
*/
void tlc59116_write_stream(uint8_t len, uint8_t *data);

/* Read one register.
Expand All @@ -77,32 +86,32 @@ uint8_t tlc59116_read_reg(uint8_t reg);
*/
void tlc59116_read_stream(uint8_t reg, uint8_t len, uint8_t *whereto);

/* Set pwm value for individual led
/* Set pwm value for individual led
args:
led led output -> 1 till 16
led led output -> 0 till 15
pwm led pwm value
*/

void tlc59116_led(uint8_t led, uint8_t pwm);


/* -------------------------------------------------------------------------- */
/* Application definitions, change if required by application. */

/* Suggested defaults according to the data sheet etc */
#define TLC59116_MODE1_DEFAULT 0x80 //
#define TLC59116_MODE2_DEFAULT 0x00 //
#define TLC59116_MODE1_DEFAULT 0x80 //
#define TLC59116_MODE2_DEFAULT 0x00 //

#define TLC59116_LEDOUT_PWM 0xAA // LDRx = 01 -> PWM, 4 leds per reg: 01010101 -> 0xAA

/* -------------------------------------------------------------------------- */
/* Reference definitions, should not be changed */
/* TLC59116 slave address */
#define TLC59116_ADDR 0x60 //7bit adress 0xC0 8bit adress; adress with all adress pins pulled to ground
//#define TLC59116_ALLCALL 0xD0
#define TLC59116_LEDOUT_PWM 0xAA // LDRx = 01 -> PWM, 4 leds per reg: 01010101 -> 0xAA

#define TLC59116_ADDR 0x60 //7bit adress, 8bit write adress: 0xC0
//address with all address pins pulled to ground
/* TLC59116 registers */
#define TLC59116_MODE1 0x00
#define TLC59116_MODE2 0x01
#define TLC59116_PWM0_AUTOINCR 0xA2 //
#define TLC59116_PWM0 0x02
#define TLC59116_PWM1 0x03
#define TLC59116_PWM2 0x04
Expand All @@ -126,7 +135,7 @@ void tlc59116_led(uint8_t led, uint8_t pwm);
#define TLC59116_LEDOUT2 0x16
#define TLC59116_LEDOUT3 0x17

/* More registers, but not used in this implementation */
/* More registers follow, but not used in this implementation */

/* -------------------------------------------------------------------------- */
#endif /* ifndef __ADXL345_H__ */

0 comments on commit ed8be50

Please sign in to comment.