iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-30 11:59:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix some more bugs

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-11-18 13:29:53 +03:00
parent b2e9d90686
commit 4f9763334b
6 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/items/vImpulsOut.h
View File

@@ -17,7 +17,7 @@ class ImpulsOutClass {
private: private:
unsigned long currentMillis; unsigned long currentMillis;
unsigned long prevMillis; unsigned long prevMillis;
unsigned long difference;
unsigned long _impulsPeriod = 0; unsigned long _impulsPeriod = 0;
unsigned int _impulsCount = 0; unsigned int _impulsCount = 0;
unsigned int _impulsCountBuf = 0; unsigned int _impulsCountBuf = 0;

1
include/items/vLogging.h
View File

@@ -19,6 +19,7 @@ class LoggingClass {
unsigned long currentMillis; unsigned long currentMillis;
unsigned long prevMillis; unsigned long prevMillis;
unsigned long difference;
unsigned long _period; unsigned long _period;
unsigned int _maxPoints; unsigned int _maxPoints;
String _loggingValueKey; String _loggingValueKey;

1
include/items/vSensorDallas.h
View File

@@ -22,6 +22,7 @@ private:
unsigned long currentMillis; unsigned long currentMillis;
unsigned long prevMillis; unsigned long prevMillis;
unsigned long difference;
unsigned long _interval; unsigned long _interval;
String _key; String _key;
unsigned int _pin; unsigned int _pin;

2
src/items/vImpulsOut.cpp
View File

@@ -20,7 +20,7 @@ void ImpulsOutClass::execute(unsigned long impulsPeriod, unsigned int impulsCoun
void ImpulsOutClass::loop() { void ImpulsOutClass::loop() {
currentMillis = millis(); currentMillis = millis();
unsigned long difference = currentMillis - prevMillis; difference = currentMillis - prevMillis;
if (_impulsCountBuf > 0) { if (_impulsCountBuf > 0) {
if (difference > _impulsPeriod) { if (difference > _impulsPeriod) {
_impulsCountBuf--; _impulsCountBuf--;

2
src/items/vLogging.cpp
View File

@@ -17,7 +17,7 @@ LoggingClass::~LoggingClass() {}
void LoggingClass::loop() { void LoggingClass::loop() {
currentMillis = millis(); currentMillis = millis();
unsigned long difference = currentMillis - prevMillis; difference = currentMillis - prevMillis;
if (difference >= _period) { if (difference >= _period) {
prevMillis = millis(); prevMillis = millis();
addNewDelOldData("logs/" + _key + ".txt", _maxPoints, jsonReadStr(configLiveJson, _loggingValueKey)); addNewDelOldData("logs/" + _key + ".txt", _maxPoints, jsonReadStr(configLiveJson, _loggingValueKey));

2
src/items/vSensorDallas.cpp
View File

@@ -20,7 +20,7 @@ SensorDallas::~SensorDallas() {}
void SensorDallas::loop() { void SensorDallas::loop() {
currentMillis = millis(); currentMillis = millis();
unsigned long difference = currentMillis - prevMillis; difference = currentMillis - prevMillis;
if (difference >= _interval) { if (difference >= _interval) {
prevMillis = millis(); prevMillis = millis();
readDallas(); readDallas();