From 07e919541b0e001023e2779040bc38619dd8d26f Mon Sep 17 00:00:00 2001 From: Mathieu Carbou Date: Sat, 25 Jan 2025 21:51:37 +0100 Subject: [PATCH 1/2] Introduce AsyncTCPVersion.h to more easily manage and use library version --- src/AsyncTCP.h | 5 +---- src/AsyncTCPVersion.h | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 src/AsyncTCPVersion.h diff --git a/src/AsyncTCP.h b/src/AsyncTCP.h index 7607ec34..dd110171 100644 --- a/src/AsyncTCP.h +++ b/src/AsyncTCP.h @@ -22,10 +22,7 @@ #ifndef ASYNCTCP_H_ #define ASYNCTCP_H_ -#define ASYNCTCP_VERSION "3.3.2" -#define ASYNCTCP_VERSION_MAJOR 3 -#define ASYNCTCP_VERSION_MINOR 3 -#define ASYNCTCP_VERSION_REVISION 2 +#include "AsyncTCPVersion.h" #define ASYNCTCP_FORK_ESP32Async #include "IPAddress.h" diff --git a/src/AsyncTCPVersion.h b/src/AsyncTCPVersion.h new file mode 100644 index 00000000..33b07909 --- /dev/null +++ b/src/AsyncTCPVersion.h @@ -0,0 +1,40 @@ +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov + +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +/** Major version number (X.x.x) */ +#define ASYNCTCP_VERSION_MAJOR 3 +/** Minor version number (x.X.x) */ +#define ASYNCTCP_VERSION_MINOR 3 +/** Patch version number (x.x.X) */ +#define ASYNCTCP_VERSION_PATCH 2 + +/** + * Macro to convert version number into an integer + * + * To be used in comparisons, such as ASYNCTCP_VERSION >= ASYNCTCP_VERSION_VAL(2, 0, 0) + */ +#define ASYNCTCP_VERSION_VAL(major, minor, patch) ((major << 16) | (minor << 8) | (patch)) + +/** + * Current version, as an integer + * + * To be used in comparisons, such as ASYNCTCP_VERSION_NUM >= ASYNCTCP_VERSION_VAL(2, 0, 0) + */ +#define ASYNCTCP_VERSION_NUM ASYNCTCP_VERSION_VAL(ASYNCTCP_VERSION_MAJOR, ASYNCTCP_VERSION_MINOR, ASYNCTCP_VERSION_PATCH) + +/** + * Current version, as string + */ +#define df2xstr(s) #s +#define df2str(s) df2xstr(s) +#define ASYNCTCP_VERSION df2str(ASYNCTCP_VERSION_MAJOR) "." df2str(ASYNCTCP_VERSION_MINOR) "." df2str(ASYNCTCP_VERSION_PATCH) + +#ifdef __cplusplus +} +#endif From 45cf45c724f73486952f000741bc098f70b1c247 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci-lite[bot]" <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Date: Tue, 28 Jan 2025 16:27:34 +0000 Subject: [PATCH 2/2] ci(pre-commit): Apply automatic fixes --- src/AsyncTCPVersion.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AsyncTCPVersion.h b/src/AsyncTCPVersion.h index 33b07909..2c1148a8 100644 --- a/src/AsyncTCPVersion.h +++ b/src/AsyncTCPVersion.h @@ -31,8 +31,8 @@ extern "C" { /** * Current version, as string */ -#define df2xstr(s) #s -#define df2str(s) df2xstr(s) +#define df2xstr(s) #s +#define df2str(s) df2xstr(s) #define ASYNCTCP_VERSION df2str(ASYNCTCP_VERSION_MAJOR) "." df2str(ASYNCTCP_VERSION_MINOR) "." df2str(ASYNCTCP_VERSION_PATCH) #ifdef __cplusplus