andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

allow hex values with leading 0x, check enum for single number

Browse Source
This commit is contained in:
MichaelDvP
2021-01-30 12:53:28 +01:00
parent f27bef35b9
commit e963a190f8
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/helpers.cpp
View File

@@ -321,6 +321,10 @@ std::string Helpers::data_to_hex(const uint8_t * data, const uint8_t length) {
// works with only positive numbers // works with only positive numbers
uint32_t Helpers::hextoint(const char * hex) { uint32_t Helpers::hextoint(const char * hex) {
uint32_t val = 0; uint32_t val = 0;
// skip leading '0x'
if (hex[0] == '0' && hex[1] == 'x') {
hex += 2;
}
while (*hex) { while (*hex) {
// get current character then increment // get current character then increment
char byte = *hex++; char byte = *hex++;
@@ -460,7 +464,7 @@ bool Helpers::value2enum(const char * v, uint8_t & value, const flash_string_vec
std::string str = toLower(v); std::string str = toLower(v);
for (value = 0; value < strs.size(); value++) { for (value = 0; value < strs.size(); value++) {
std::string str1 = uuid::read_flash_string(strs[value]); std::string str1 = uuid::read_flash_string(strs[value]);
if ((str1 == "off" && str == "false") || (str1 == "on" && str == "true") || (str == str1) || (v[0] == '0' + value)) { if ((str1 == "off" && str == "false") || (str1 == "on" && str == "true") || (str == str1) || (v[0] == ('0' + value) && v[1] == '\0')) {
return true; return true;
} }
} }