Skip to content

Fix library version string calculation. #1727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 6, 2022
Merged

Fix library version string calculation. #1727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/IRremoteESP8266.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@
#define _IRREMOTEESP8266_VERSION_VAL(major, minor, patch) \
((major << 16) | (minor << 8) | (patch))
// Macro to convert literal into a string
#define MKSTR(x) #x
#define MKSTR_HELPER(x) #x
#define MKSTR(x) MKSTR_HELPER(x)
// Integer version
#define _IRREMOTEESP8266_VERSION _IRREMOTEESP8266_VERSION_VAL(\
_IRREMOTEESP8266_VERSION_MAJOR, \
Expand Down
14 changes: 14 additions & 0 deletions test/IRutils_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,3 +780,17 @@ TEST(TestUtils, InvertedBytePairs) {
TEST(TestUtils, lowLevelSanityCheck) {
ASSERT_EQ(0, irutils::lowLevelSanityCheck());
}

TEST(TestUtils, VersionDefines) {
// String
String version_str = uint64ToString(_IRREMOTEESP8266_VERSION_MAJOR) + '.' +
uint64ToString(_IRREMOTEESP8266_VERSION_MINOR) + '.' +
uint64ToString(_IRREMOTEESP8266_VERSION_PATCH); // e.g. "2.8.1"
ASSERT_EQ(_IRREMOTEESP8266_VERSION_STR, version_str);
ASSERT_EQ(_IRREMOTEESP8266_VERSION_, version_str);
// Integer
uint64_t version_int = (_IRREMOTEESP8266_VERSION_MAJOR << 16) +
(_IRREMOTEESP8266_VERSION_MINOR << 8) +
_IRREMOTEESP8266_VERSION_PATCH;
ASSERT_EQ(_IRREMOTEESP8266_VERSION, version_int);
}