From cd594a42962b236152003fe4a04c3a7d0e767ec5 Mon Sep 17 00:00:00 2001
From: Brian Schwind <brianmschwind@gmail.com>
Date: Tue, 11 Oct 2016 20:51:29 +0900
Subject: [PATCH] Fix according to review comments

---
 extras/tsl2561/tsl2561.c | 102 ++++++++++++++++++++++++++++++++++++---
 extras/tsl2561/tsl2561.h |  86 ---------------------------------
 2 files changed, 95 insertions(+), 93 deletions(-)

diff --git a/extras/tsl2561/tsl2561.c b/extras/tsl2561/tsl2561.c
index 5c6be57..06e6892 100644
--- a/extras/tsl2561/tsl2561.c
+++ b/extras/tsl2561/tsl2561.c
@@ -10,7 +10,93 @@
 #include "task.h"
 #include "tsl2561.h"
 
-bool write_register(uint8_t i2c_addr, uint8_t reg, uint8_t value)
+// Registers
+#define TSL2561_REG_COMMAND 0x80
+#define TSL2561_REG_CONTROL 0x00
+#define TSL2561_REG_TIMING 0x01
+#define TSL2561_REG_THRESHOLD_LOW_0 0x02
+#define TSL2561_REG_THRESHOLD_LOW_1 0x03
+#define TSL2561_REG_THRESHOLD_HIGH_0 0x04
+#define TSL2561_REG_THRESHOLD_HIGH_1 0x05
+#define TSL2561_REG_INTERRUPT 0x06
+#define TSL2561_REG_PART_ID 0x0A
+#define TSL2561_REG_CHANNEL_0_LOW 0x0C
+#define TSL2561_REG_CHANNEL_0_HIGH 0x0D
+#define TSL2561_REG_CHANNEL_1_LOW 0x0E
+#define TSL2561_REG_CHANNEL_1_HIGH 0x0F
+
+// TSL2561 Misc Values
+#define TSL2561_ON 0x03
+#define TSL2561_OFF 0x00
+#define TSL2561_READ_WORD 0x20
+
+// Integration times in milliseconds
+#define TSL2561_INTEGRATION_TIME_13MS 20
+#define TSL2561_INTEGRATION_TIME_101MS 110
+#define TSL2561_INTEGRATION_TIME_402MS 410 // Default
+
+// Calculation constants
+#define LUX_SCALE 14
+#define RATIO_SCALE 9
+#define CH_SCALE 10
+#define CHSCALE_TINT0 0x7517
+#define CHSCALE_TINT1 0x0fe7
+
+// Package constants
+#define TSL2561_PACKAGE_CS 0x00
+#define TSL2561_PACKAGE_T_FN_CL 0x01
+
+// Constants from the TSL2561 data sheet
+#define K1T 0x0040 // 0.125 * 2^RATIO_SCALE
+#define B1T 0x01f2 // 0.0304 * 2^LUX_SCALE
+#define M1T 0x01be // 0.0272 * 2^LUX_SCALE
+#define K2T 0x0080 // 0.250 * 2^RATIO_SCALE
+#define B2T 0x0214 // 0.0325 * 2^LUX_SCALE
+#define M2T 0x02d1 // 0.0440 * 2^LUX_SCALE
+#define K3T 0x00c0 // 0.375 * 2^RATIO_SCALE
+#define B3T 0x023f // 0.0351 * 2^LUX_SCALE
+#define M3T 0x037b // 0.0544 * 2^LUX_SCALE
+#define K4T 0x0100 // 0.50 * 2^RATIO_SCALE
+#define B4T 0x0270 // 0.0381 * 2^LUX_SCALE
+#define M4T 0x03fe // 0.0624 * 2^LUX_SCALE
+#define K5T 0x0138 // 0.61 * 2^RATIO_SCALE
+#define B5T 0x016f // 0.0224 * 2^LUX_SCALE
+#define M5T 0x01fc // 0.0310 * 2^LUX_SCALE
+#define K6T 0x019a // 0.80 * 2^RATIO_SCALE
+#define B6T 0x00d2 // 0.0128 * 2^LUX_SCALE
+#define M6T 0x00fb // 0.0153 * 2^LUX_SCALE
+#define K7T 0x029a // 1.3 * 2^RATIO_SCALE
+#define B7T 0x0018 // 0.00146 * 2^LUX_SCALE
+#define M7T 0x0012 // 0.00112 * 2^LUX_SCALE
+#define K8T 0x029a // 1.3 * 2^RATIO_SCALE
+#define B8T 0x0000 // 0.000 * 2^LUX_SCALE
+#define M8T 0x0000 // 0.000 * 2^LUX_SCALE
+#define K1C 0x0043 // 0.130 * 2^RATIO_SCALE
+#define B1C 0x0204 // 0.0315 * 2^LUX_SCALE
+#define M1C 0x01ad // 0.0262 * 2^LUX_SCALE
+#define K2C 0x0085 // 0.260 * 2^RATIO_SCALE
+#define B2C 0x0228 // 0.0337 * 2^LUX_SCALE
+#define M2C 0x02c1 // 0.0430 * 2^LUX_SCALE
+#define K3C 0x00c8 // 0.390 * 2^RATIO_SCALE
+#define B3C 0x0253 // 0.0363 * 2^LUX_SCALE
+#define M3C 0x0363 // 0.0529 * 2^LUX_SCALE
+#define K4C 0x010a // 0.520 * 2^RATIO_SCALE
+#define B4C 0x0282 // 0.0392 * 2^LUX_SCALE
+#define M4C 0x03df // 0.0605 * 2^LUX_SCALE
+#define K5C 0x014d // 0.65 * 2^RATIO_SCALE
+#define B5C 0x0177 // 0.0229 * 2^LUX_SCALE
+#define M5C 0x01dd // 0.0291 * 2^LUX_SCALE
+#define K6C 0x019a // 0.80 * 2^RATIO_SCALE
+#define B6C 0x0101 // 0.0157 * 2^LUX_SCALE
+#define M6C 0x0127 // 0.0180 * 2^LUX_SCALE
+#define K7C 0x029a // 1.3 * 2^RATIO_SCALE
+#define B7C 0x0037 // 0.00338 * 2^LUX_SCALE
+#define M7C 0x002b // 0.00260 * 2^LUX_SCALE
+#define K8C 0x029a // 1.3 * 2^RATIO_SCALE
+#define B8C 0x0000 // 0.000 * 2^LUX_SCALE
+#define M8C 0x0000 // 0.000 * 2^LUX_SCALE
+
+static bool write_register(uint8_t i2c_addr, uint8_t reg, uint8_t value)
 {
     uint8_t data[2];
     data[0] = TSL2561_REG_COMMAND | reg;
@@ -18,7 +104,7 @@ bool write_register(uint8_t i2c_addr, uint8_t reg, uint8_t value)
     return i2c_slave_write(i2c_addr, data, 2);
 }
 
-uint8_t read_register(uint8_t i2c_addr, uint8_t reg)
+static uint8_t read_register(uint8_t i2c_addr, uint8_t reg)
 {
     uint8_t data[1];
 
@@ -30,7 +116,7 @@ uint8_t read_register(uint8_t i2c_addr, uint8_t reg)
     return data[0];
 }
 
-uint16_t read_register_16(uint8_t i2c_addr, uint8_t low_register_addr)
+static uint16_t read_register_16(uint8_t i2c_addr, uint8_t low_register_addr)
 {
     uint16_t value = 0;
     uint8_t data[2];
@@ -45,12 +131,12 @@ uint16_t read_register_16(uint8_t i2c_addr, uint8_t low_register_addr)
     return value;
 }
 
-bool enable(uint8_t i2c_addr)
+static bool enable(uint8_t i2c_addr)
 {
     return write_register(i2c_addr, TSL2561_REG_CONTROL, TSL2561_ON);
 }
 
-bool disable(uint8_t i2c_addr)
+static bool disable(uint8_t i2c_addr)
 {
     return write_register(i2c_addr, TSL2561_REG_CONTROL, TSL2561_OFF);
 }
@@ -100,7 +186,7 @@ void tsl2561_set_gain(tsl2561_t *device, uint8_t gain)
     device->gain = gain;
 }
 
-void get_channel_data(tsl2561_t *device, uint16_t *channel0, uint16_t *channel1)
+static void get_channel_data(tsl2561_t *device, uint16_t *channel0, uint16_t *channel1)
 {
     enable(device->i2c_addr);
 
@@ -127,6 +213,7 @@ void get_channel_data(tsl2561_t *device, uint16_t *channel0, uint16_t *channel1)
 
 bool tsl2561_read_lux(tsl2561_t *device, uint32_t *lux)
 {
+    bool success = true;
     uint32_t chScale;
     uint32_t channel1;
     uint32_t channel0;
@@ -265,6 +352,7 @@ bool tsl2561_read_lux(tsl2561_t *device, uint32_t *lux)
             printf("Invalid package type in CalculateLux\n");
             b = 0;
             m = 0;
+            success = false;
             break;
     }
 
@@ -283,5 +371,5 @@ bool tsl2561_read_lux(tsl2561_t *device, uint32_t *lux)
     // Strip off fractional portion
     *lux = temp >> LUX_SCALE;
 
-    return true;
+    return success;
 }
diff --git a/extras/tsl2561/tsl2561.h b/extras/tsl2561/tsl2561.h
index 5cdf03b..c021630 100644
--- a/extras/tsl2561/tsl2561.h
+++ b/extras/tsl2561/tsl2561.h
@@ -15,101 +15,15 @@
 #define TSL2561_I2C_ADDR_GND 0x29
 #define TSL2561_I2C_ADDR_FLOAT 0x39 // Default
 
-// Registers
-#define TSL2561_REG_COMMAND 0x80
-#define TSL2561_REG_CONTROL 0x00
-#define TSL2561_REG_TIMING 0x01
-#define TSL2561_REG_THRESHOLD_LOW_0 0x02
-#define TSL2561_REG_THRESHOLD_LOW_1 0x03
-#define TSL2561_REG_THRESHOLD_HIGH_0 0x04
-#define TSL2561_REG_THRESHOLD_HIGH_1 0x05
-#define TSL2561_REG_INTERRUPT 0x06
-#define TSL2561_REG_PART_ID 0x0A
-#define TSL2561_REG_CHANNEL_0_LOW 0x0C
-#define TSL2561_REG_CHANNEL_0_HIGH 0x0D
-#define TSL2561_REG_CHANNEL_1_LOW 0x0E
-#define TSL2561_REG_CHANNEL_1_HIGH 0x0F
-
-// TSL2561 Misc Values
-#define TSL2561_ON 0x03
-#define TSL2561_OFF 0x00
-#define TSL2561_READ_WORD 0x20
-
 // Integration time IDs
 #define TSL2561_INTEGRATION_13MS 0x00
 #define TSL2561_INTEGRATION_101MS 0x01
 #define TSL2561_INTEGRATION_402MS 0x02 // Default
 
-// Integration times in milliseconds
-#define TSL2561_INTEGRATION_TIME_13MS 20
-#define TSL2561_INTEGRATION_TIME_101MS 110
-#define TSL2561_INTEGRATION_TIME_402MS 410 // Default
-
 // Gain IDs
 #define TSL2561_GAIN_1X 0x00
 #define TSL2561_GAIN_16X 0x10
 
-// Calculation constants
-#define LUX_SCALE 14
-#define RATIO_SCALE 9
-#define CH_SCALE 10
-#define CHSCALE_TINT0 0x7517
-#define CHSCALE_TINT1 0x0fe7
-
-// Package constants
-#define TSL2561_PACKAGE_CS 0x00
-#define TSL2561_PACKAGE_T_FN_CL 0x01
-
-// Constants from the TSL2561 data sheet
-#define K1T 0x0040 // 0.125 * 2^RATIO_SCALE
-#define B1T 0x01f2 // 0.0304 * 2^LUX_SCALE
-#define M1T 0x01be // 0.0272 * 2^LUX_SCALE
-#define K2T 0x0080 // 0.250 * 2^RATIO_SCALE
-#define B2T 0x0214 // 0.0325 * 2^LUX_SCALE
-#define M2T 0x02d1 // 0.0440 * 2^LUX_SCALE
-#define K3T 0x00c0 // 0.375 * 2^RATIO_SCALE
-#define B3T 0x023f // 0.0351 * 2^LUX_SCALE
-#define M3T 0x037b // 0.0544 * 2^LUX_SCALE
-#define K4T 0x0100 // 0.50 * 2^RATIO_SCALE
-#define B4T 0x0270 // 0.0381 * 2^LUX_SCALE
-#define M4T 0x03fe // 0.0624 * 2^LUX_SCALE
-#define K5T 0x0138 // 0.61 * 2^RATIO_SCALE
-#define B5T 0x016f // 0.0224 * 2^LUX_SCALE
-#define M5T 0x01fc // 0.0310 * 2^LUX_SCALE
-#define K6T 0x019a // 0.80 * 2^RATIO_SCALE
-#define B6T 0x00d2 // 0.0128 * 2^LUX_SCALE
-#define M6T 0x00fb // 0.0153 * 2^LUX_SCALE
-#define K7T 0x029a // 1.3 * 2^RATIO_SCALE
-#define B7T 0x0018 // 0.00146 * 2^LUX_SCALE
-#define M7T 0x0012 // 0.00112 * 2^LUX_SCALE
-#define K8T 0x029a // 1.3 * 2^RATIO_SCALE
-#define B8T 0x0000 // 0.000 * 2^LUX_SCALE
-#define M8T 0x0000 // 0.000 * 2^LUX_SCALE
-#define K1C 0x0043 // 0.130 * 2^RATIO_SCALE
-#define B1C 0x0204 // 0.0315 * 2^LUX_SCALE
-#define M1C 0x01ad // 0.0262 * 2^LUX_SCALE
-#define K2C 0x0085 // 0.260 * 2^RATIO_SCALE
-#define B2C 0x0228 // 0.0337 * 2^LUX_SCALE
-#define M2C 0x02c1 // 0.0430 * 2^LUX_SCALE
-#define K3C 0x00c8 // 0.390 * 2^RATIO_SCALE
-#define B3C 0x0253 // 0.0363 * 2^LUX_SCALE
-#define M3C 0x0363 // 0.0529 * 2^LUX_SCALE
-#define K4C 0x010a // 0.520 * 2^RATIO_SCALE
-#define B4C 0x0282 // 0.0392 * 2^LUX_SCALE
-#define M4C 0x03df // 0.0605 * 2^LUX_SCALE
-#define K5C 0x014d // 0.65 * 2^RATIO_SCALE
-#define B5C 0x0177 // 0.0229 * 2^LUX_SCALE
-#define M5C 0x01dd // 0.0291 * 2^LUX_SCALE
-#define K6C 0x019a // 0.80 * 2^RATIO_SCALE
-#define B6C 0x0101 // 0.0157 * 2^LUX_SCALE
-#define M6C 0x0127 // 0.0180 * 2^LUX_SCALE
-#define K7C 0x029a // 1.3 * 2^RATIO_SCALE
-#define B7C 0x0037 // 0.00338 * 2^LUX_SCALE
-#define M7C 0x002b // 0.00260 * 2^LUX_SCALE
-#define K8C 0x029a // 1.3 * 2^RATIO_SCALE
-#define B8C 0x0000 // 0.000 * 2^LUX_SCALE
-#define M8C 0x0000 // 0.000 * 2^LUX_SCALE
-
 typedef struct {
     uint8_t i2c_addr;
     uint8_t integration_time;