Brewery/gravitymon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Precommit fixes

Browse Source
This commit is contained in:
Magnus Persson
2022-08-04 16:12:14 +02:00
parent 9e437d1e0d
commit 6c94c6b204
10 changed files with 136 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
src/templating.hpp
View File

@ -75,34 +75,35 @@ class TemplatingEngine {
String val;
};
KeyVal items[23] = {{TPL_MDNS, ""}, {TPL_ID, ""},
{TPL_SLEEP_INTERVAL, ""}, {TPL_TEMP, ""},
{TPL_TEMP_C, ""}, {TPL_TEMP_F, ""},
{TPL_TEMP_UNITS, ""}, {TPL_BATTERY, ""},
{TPL_RSSI, ""}, {TPL_RUN_TIME, ""},
{TPL_ANGLE, ""}, {TPL_TILT, ""},
{TPL_GRAVITY, ""}, {TPL_GRAVITY_G, ""},
{TPL_GRAVITY_P, ""}, {TPL_GRAVITY_CORR, ""},
{TPL_GRAVITY_CORR_G, ""}, {TPL_GRAVITY_CORR_P, ""},
{TPL_GRAVITY_UNIT, ""}, {TPL_TOKEN, ""},
{TPL_TOKEN2, ""}, {TPL_APP_VER, ""},
{TPL_APP_BUILD, ""}};
KeyVal _items[23] = {{TPL_MDNS, ""}, {TPL_ID, ""},
{TPL_SLEEP_INTERVAL, ""}, {TPL_TEMP, ""},
{TPL_TEMP_C, ""}, {TPL_TEMP_F, ""},
{TPL_TEMP_UNITS, ""}, {TPL_BATTERY, ""},
{TPL_RSSI, ""}, {TPL_RUN_TIME, ""},
{TPL_ANGLE, ""}, {TPL_TILT, ""},
{TPL_GRAVITY, ""}, {TPL_GRAVITY_G, ""},
{TPL_GRAVITY_P, ""}, {TPL_GRAVITY_CORR, ""},
{TPL_GRAVITY_CORR_G, ""}, {TPL_GRAVITY_CORR_P, ""},
{TPL_GRAVITY_UNIT, ""}, {TPL_TOKEN, ""},
{TPL_TOKEN2, ""}, {TPL_APP_VER, ""},
{TPL_APP_BUILD, ""}};
char buffer[20];
String baseTemplate;
char _buffer[20];
String _baseTemplate;
char *_output = 0;
void setVal(String key, float val, int dec = 2) {
String s = convertFloatToString(val, &buffer[0], dec);
String s = convertFloatToString(val, &_buffer[0], dec);
s.trim();
setVal(key, s);
}
void setVal(String key, int val) { setVal(key, String(val)); }
void setVal(String key, char val) { setVal(key, String(val)); }
void setVal(String key, String val) {
int max = sizeof(items) / sizeof(KeyVal);
int max = sizeof(_items) / sizeof(KeyVal);
for (int i = 0; i < max; i++) {
if (items[i].key.equals(key)) {
items[i].val = val;
if (_items[i].key.equals(key)) {
_items[i].val = val;
return;
}
}
@ -110,21 +111,64 @@ class TemplatingEngine {
Log.warning(F("TPL : Key not found %s." CR), key.c_str());
}
void transform(String& s) {
int max = sizeof(items) / sizeof(KeyVal);
for (int i = 0; i < max; i++) {
while (s.indexOf(items[i].key) != -1)
s.replace(items[i].key, items[i].val);
void transform() {
const char *format = _baseTemplate.c_str();
int len = _baseTemplate.length();
int size = len;
// Lets check how much memory will be needed to transform the template
for (int j = 0; j < len - 2; j++) {
if (*(format + j) == '$' && *(format + j + 1) == '{') {
// Start of format tag found
int max = sizeof(_items) / sizeof(KeyVal);
for (int i = 0; i < max; i++) {
if (strncmp(format + j, _items[i].key.c_str(),
_items[i].key.length()) == 0) {
// Found key
size = size - _items[i].key.length() + _items[i].val.length();
}
}
}
}
_output = static_cast<char *>(malloc(size + 20));
if (!_output) {
Log.error(F("TPL : Unable to allocate memory for transforming template, "
"needed %d." CR),
size);
return;
}
memset(_output, 0, size + 20);
// Lets do the transformation
int k = 0;
for (int j = 0; j < len - 2; j++) {
if (*(format + j) == '$' && *(format + j + 1) == '{') {
// Start of format tag found
int max = sizeof(_items) / sizeof(KeyVal);
for (int i = 0; i < max; i++) {
if (strncmp(format + j, _items[i].key.c_str(),
_items[i].key.length()) == 0) {
// Found key
strncat(_output, format + k, j - k);
strcat(_output, _items[i].val.c_str());
k = j + _items[i].key.length();
}
}
}
}
strcat(_output, format + k);
}
void dumpAll() {
int max = sizeof(items) / sizeof(KeyVal);
int max = sizeof(_items) / sizeof(KeyVal);
for (int i = 0; i < max; i++) {
Serial.print("Key=\'");
Serial.print(items[i].key.c_str());
Serial.print(_items[i].key.c_str());
Serial.print("\', Val=\'");
Serial.print(items[i].val.c_str());
Serial.print(_items[i].val.c_str());
Serial.println("\'");
}
}
@ -138,9 +182,16 @@ class TemplatingEngine {
TEMPLATE_MQTT = 4
};
TemplatingEngine() {}
~TemplatingEngine() { freeMemory(); }
void freeMemory() {
if (_output) free(_output);
_output = 0;
}
void initialize(float angle, float gravitySG, float corrGravitySG,
float tempC, float runTime);
const String& create(TemplatingEngine::Templates idx);
const char *create(TemplatingEngine::Templates idx);
};
#endif // SRC_TEMPLATING_HPP_