Darkages/SpotMicroESP32-Leika
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🪄 Formats BatteryService

Browse Source
This commit is contained in:
Rune Harlyk
2024-07-09 20:02:41 +02:00
committed by Rune Harlyk
parent 227610fcb9
commit 74c2285800
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esp32/lib/ESP32-sveltekit/BatteryService.h
+6 -14
View File
@@ -33,8 +33,7 @@
#define VOLTAGE_THRESHOLD 6.4 #define VOLTAGE_THRESHOLD 6.4
#define CURRENT_THRESHOLD 5 #define CURRENT_THRESHOLD 5
class BatteryService class BatteryService {
{
public: public:
BatteryService(Peripherals *peripherals, EventSocket *socket); BatteryService(Peripherals *peripherals, EventSocket *socket);
@@ -43,32 +42,25 @@ public:
void loop() { void loop() {
unsigned long currentMillis = millis(); unsigned long currentMillis = millis();
if (!_lastUpdate || (currentMillis - _lastUpdate) >= BATTERY_CHECK_INTERVAL) if (!_lastUpdate || (currentMillis - _lastUpdate) >= BATTERY_CHECK_INTERVAL) {
{
_lastUpdate = currentMillis; _lastUpdate = currentMillis;
updateBattery(); updateBattery();
} }
if(!_lastEmit || (currentMillis - _lastEmit) >= BATTERY_INTERVAL) if (!_lastEmit || (currentMillis - _lastEmit) >= BATTERY_INTERVAL) {
{
_lastEmit = currentMillis; _lastEmit = currentMillis;
batteryEvent(); batteryEvent();
} }
} }
void updateBattery() void updateBattery() {
{
_voltage = _peripherals->readADCVoltage(ADC_VOLTAGE); _voltage = _peripherals->readADCVoltage(ADC_VOLTAGE);
float voltage = _peripherals->readADCVoltage(ADC_CURRENT); float voltage = _peripherals->readADCVoltage(ADC_CURRENT);
_current = (voltage - 2.5) / CURRENT_FACTOR; _current = (voltage - 2.5) / CURRENT_FACTOR;
} }
float getVoltage() { float getVoltage() { return _voltage; }
return _voltage;
}
float getCurrent() { float getCurrent() { return _current; }
return _current;
}
private: private:
void batteryEvent(); void batteryEvent();