Skip to content

Commit f3d71fb

Browse files
committed
Fixed temt6000
1 parent cb43574 commit f3d71fb

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

TEMT6000/TEMT6000.cpp

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,47 @@ void onChange(float lux) {}
55
TEMT6000::TEMT6000()
66
{
77
m_rawValue = 0;
8-
m_sampleTimeMillis; = 0;
8+
m_sampleTimeMillis = 0;
99
m_onChangeCallback = &onChange;
1010
}
1111

12-
TEMT6000::setup(uint8_t pin, float vccVoltage)
12+
void TEMT6000::setup(uint8_t pin, float vccVoltage)
1313
{
1414
m_pin = pin;
1515
m_vccVoltage = vccVoltage;
1616
m_rawValue = this->getRawValue();
17+
18+
pinMode(pin, INPUT);
1719
}
1820

19-
void TEMT6000::setOnChangeCallback(void (*callback)(), unsigned long sampleTimeMillis)
21+
void TEMT6000::setOnChangeCallback(void (*callback)(float), unsigned long sampleTimeMillis)
2022
{
2123
m_sampleTimeMillis = sampleTimeMillis;
2224
m_timer.setup(RT_ON, m_sampleTimeMillis);
23-
m_fallingEdgeCallback = callback;
25+
m_onChangeCallback = callback;
26+
m_timer.start();
2427
}
2528

26-
int TEMT6000::getRawValue()
29+
int16_t TEMT6000::getRawValue()
2730
{
2831
return analogRead(m_pin);
2932
}
3033

3134
float TEMT6000::getVoltage()
3235
{
33-
return this->getRawValue() * m_vccVoltage / 1024.0;
36+
return (this->getRawValue() * m_vccVoltage / 1023.0);
3437
}
3538

3639
float TEMT6000::getCurrent()
3740
{
38-
return this->getVoltage() / 10000.0; // 10.000 Ohms resistor
41+
return (this->getVoltage() / 10000.0); // 10.000 Ohms resistor
3942
}
4043

4144
float TEMT6000::getLux()
4245
{
4346
// Convert current to microamps and apply formula
4447
// Formula: Lux = 2.0 * Microamps
45-
return this->getCurrent() * 1000000 * 2.0;
48+
return (this->getCurrent() * 1000000 * 2.0);
4649
}
4750

4851
void TEMT6000::loop()
@@ -53,6 +56,7 @@ void TEMT6000::loop()
5356
{
5457
m_rawValue = this->getRawValue();
5558
m_onChangeCallback(this->getLux());
59+
m_timer.start();
5660
}
5761
}
5862
}

TEMT6000/TEMT6000.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class TEMT6000
1818
public:
1919
TEMT6000();
2020
void setup(uint8_t pin, float vccVoltage);
21-
void setOnChangeCallback(void (*callback)(), unsigned long sampleTimeMillis);
21+
void setOnChangeCallback(void (*callback)(float), unsigned long sampleTimeMillis);
2222

2323
int16_t getRawValue();
2424
float getVoltage();

0 commit comments

Comments
 (0)