github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-10-31 16:14:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use pgm_read_dword() instead of pgm_read_float() (issue #1433)

Browse Source
This commit is contained in:
Benoit Blanchon
2021-12-30 10:02:21 +01:00
parent d20c3c65c8
commit a2e1021d7d
4 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extras/tests/Helpers/progmem_emulation.hpp
View File

@@ -27,10 +27,6 @@ inline void* pgm_read_ptr(const void* p) {
return *reinterpret_cast<void* const*>(convertFlashToPtr(p));
}
inline float pgm_read_float(const void* p) {
return *reinterpret_cast<const float*>(convertFlashToPtr(p));
}
#define ARDUINOJSON_DEFINE_PROGMEM_ARRAY(type, name, value) \
static type const ARDUINOJSON_CONCAT2(name, _progmem)[] = value; \
static type const* name = reinterpret_cast<type const*>( \

8
extras/tests/MixedConfiguration/enable_progmem_1.cpp
View File

@@ -50,6 +50,14 @@ TEST_CASE("Flash strings") {
}
}
TEST_CASE("parseNumber()") { // tables are in Flash
using ARDUINOJSON_NAMESPACE::parseNumber;
CHECK(parseNumber<float>("1") == 1.f);
CHECK(parseNumber<float>("1.23") == 1.23f);
CHECK(parseNumber<float>("-1.23e34") == -1.23e34f);
}
TEST_CASE("strlen_P") {
CHECK(strlen_P(PSTR("")) == 0);
CHECK(strlen_P(PSTR("a")) == 1);