Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-28 04:07:47 +00:00
Code Issues Releases Activity

Merge branch 'mega' into feature/Playground_Si1145

Browse Source
This commit is contained in:
TD-er
2020-12-14 09:31:08 +01:00
committed by GitHub
parent a6c2cf7aac 7fd95a8ec0
commit d1ec8b0a44
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/source/Plugin/P003_commands.repl
+2 -2
View File
@@ -8,7 +8,7 @@
Reset the counters (pulse counter and total counter) of P003 Pulse Counter.
The taskIndex parameter is optional. When not given, only the first task with this plugin will be cleared.
A call to reset the value will also trigger a call to ``PLUGIN_READ`` as if it processes a normal succesful read.
A call to reset the value will also trigger a call to ``PLUGIN_READ`` as if it processes a normal successful read.
"
"
``SetPulseCounterTotal,value,<taskIndex>``
@@ -16,7 +16,7 @@
Set the value of the total count of P003 Pulse Counter.
The taskIndex parameter is optional. When not given, only the total count of the first task with this plugin will be set.
A call to set the counter total will also trigger a call to ``PLUGIN_READ`` as if it processes a normal succesful read.
A call to set the counter total will also trigger a call to ``PLUGIN_READ`` as if it processes a normal successful read.
N.B. The set value is the internal value, so any present formula will be processed after this value is set.
"
src/_P106_BME680.ino
+4 -4
View File
@@ -103,7 +103,7 @@ boolean Plugin_106(byte function, struct EventStruct *event, String& string)
static_cast<P106_data_struct *>(getPluginTaskData(event->TaskIndex));
if (nullptr != P106_data) {
P106_data->bme.begin(PCONFIG(0));
P106_data->begin(PCONFIG(0));
success = P106_data->initialized;
}
break;
@@ -116,7 +116,7 @@ boolean Plugin_106(byte function, struct EventStruct *event, String& string)
if (nullptr != P106_data)
{
P106_data->bme.begin(PCONFIG(0));
P106_data->begin(PCONFIG(0));
if (!P106_data->initialized) {
break;
@@ -131,8 +131,8 @@ boolean Plugin_106(byte function, struct EventStruct *event, String& string)
UserVar[event->BaseVarIndex + 0] = P106_data->bme.temperature;
UserVar[event->BaseVarIndex + 1] = P106_data->bme.humidity;
UserVar[event->BaseVarIndex + 2] = P106_data->bme.pressure / 100.0;
UserVar[event->BaseVarIndex + 3] = P106_data->bme.gas_resistance / 1000.0;
UserVar[event->BaseVarIndex + 2] = P106_data->bme.pressure / 100.0f;
UserVar[event->BaseVarIndex + 3] = P106_data->bme.gas_resistance / 1000.0f;
}
success = true;
src/src/Helpers/ESPEasy_FactoryDefault.cpp
+1 -1
View File
@@ -253,7 +253,7 @@ void ResetFactory()
#ifndef BUILD_NO_RAM_TRACKER
checkRAM(F("ResetFactory2"));
#endif
serialPrintln(F("RESET: Succesful, rebooting. (you might need to press the reset button if you've justed flashed the firmware)"));
serialPrintln(F("RESET: Successful, rebooting. (you might need to press the reset button if you've just flashed the firmware)"));
// NOTE: this is a known ESP8266 bug, not our fault. :)
delay(1000);