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

[P115] Constrain threshold value to 1...32 & copy charge rate value

Browse Source
This commit is contained in:
TD-er
2021-05-13 11:56:19 +02:00
parent c55e8f0674
commit 682fe5e38d
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/_P115_MAX1704x_v2.ino
+12 -12
View File
@@ -103,11 +103,15 @@ boolean Plugin_115(byte function, struct EventStruct *event, String& string)
options[1] = F("MAX17044 (2S)"); // 2-cell version of the MAX17043 (full-scale range of 10V)
options[2] = F("MAX17048");
options[3] = F("MAX17049 (2S)"); // 2-cell version of the MAX17048
int optionValues[4] = { 0, 1, 2, 3 };
int optionValues[4] = {
MAX1704X_MAX17043,
MAX1704X_MAX17044,
MAX1704X_MAX17048,
MAX1704X_MAX17049 };
addFormSelector(F("Device"), F("plugin_115_device"), 4, options, optionValues, choice);
}
addFormNumericBox(F("Alert threshold"), F("plugin_115_threshold"), P115_THRESHOLD, 1, 30);
addFormNumericBox(F("Alert threshold"), F("plugin_115_threshold"), P115_THRESHOLD, 1, 32);
addUnit(F("%"));
addFormCheckBox(F("Send Event on Alert"), F("plugin_115_alertevent"), P115_ALERTEVENT);
@@ -134,16 +138,19 @@ boolean Plugin_115(byte function, struct EventStruct *event, String& string)
UserVar[event->BaseVarIndex + 0] = P115_data->voltage;
UserVar[event->BaseVarIndex + 1] = P115_data->soc;
UserVar[event->BaseVarIndex + 2] = P115_data->alert;
UserVar[event->BaseVarIndex + 3] = P115_data->changeRate;
if (loglevelActiveFor(LOG_LEVEL_INFO)) {
String log;
log.reserve(48);
log.reserve(64);
log = F("MAX1704x : Voltage: ");
log += P115_data->voltage;
log += F(" SoC: ");
log += P115_data->soc;
log += F(" Alert: ");
log += P115_data->alert;
log += F(" Rate: ");
log += P115_data->changeRate;
addLog(LOG_LEVEL_INFO, log);
}
success = true;
@@ -168,13 +175,6 @@ boolean Plugin_115(byte function, struct EventStruct *event, String& string)
break;
}
case PLUGIN_EXIT:
{
// perform cleanup tasks here. For example, free memory
break;
}
case PLUGIN_ONCE_A_SECOND:
{
P115_data_struct *P115_data = static_cast<P115_data_struct *>(getPluginTaskData(event->TaskIndex));
@@ -208,8 +208,8 @@ boolean Plugin_115(byte function, struct EventStruct *event, String& string)
}
break;
}
} // switch
}
return success;
} // function
}
#endif // USES_P115
src/src/PluginStructs/P115_data_struct.cpp
+1
View File
@@ -10,6 +10,7 @@ P115_data_struct::P115_data_struct(
{
// Call begin() immediately, or else _i2cPort in lipo object is still a nullptr
lipo.begin();
_threshold = constrain(_threshold, 1, 32);
}
bool P115_data_struct::begin()
src/src/PluginStructs/P115_data_struct.h
+1 -1
View File
@@ -24,7 +24,7 @@ public:
const sfe_max1704x_devices_e _device;
SFE_MAX1704X lipo;
const int _threshold;
int _threshold;
float voltage = 0.0f; // LiPo voltage
float soc = 0.0f; // LiPo state-of-charge (SOC)