From bef17fb67fc283cdc8cbda068d122c2a95c3b880 Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 31 Jan 2013 11:47:07 +0700 Subject: [PATCH] add version macros --- tests/test/test_project_settings.c | 13 ++++++++++++- tinyusb/common/common.h | 6 ++++-- tinyusb/tusb_option.h | 6 ++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/tests/test/test_project_settings.c b/tests/test/test_project_settings.c index 79e3d426d..fdc0162da 100644 --- a/tests/test/test_project_settings.c +++ b/tests/test/test_project_settings.c @@ -36,6 +36,11 @@ */ #include "unity.h" +#include "common.h" +#include "tusb_option.h" + +#define LATEST_VERSION "00.00" +#define LATEST_VERSION_NAME "alpha" void setUp(void) { @@ -45,7 +50,13 @@ void tearDown(void) { } -void test_project_memory() +void test_memory_usage(void) { TEST_IGNORE_MESSAGE("Try to keep project total memory usage up-to-date"); } + +void test_latest_version(void) +{ + TEST_ASSERT_EQUAL_STRING(LATEST_VERSION, TUSB_VERSION); + TEST_ASSERT_EQUAL_STRING(LATEST_VERSION_NAME, TUSB_VERSION_NAME); +} diff --git a/tinyusb/common/common.h b/tinyusb/common/common.h index 17c70429e..e6550e586 100644 --- a/tinyusb/common/common.h +++ b/tinyusb/common/common.h @@ -62,11 +62,11 @@ #include #include "compiler/compiler.h" -#include "tusb_option.h" -#include "errors.h" #include "assertion.h" #include "binary.h" +#include "errors.h" +#include "tusb_option.h" #include "hal/hal.h" #include "core/tusb_types.h" #include "core/std_descriptors.h" @@ -78,6 +78,8 @@ #define STATIC_ #endif +#define STRING_(x) #x // stringify without expand +#define XSTRING_(x) STRING_(x) // expand then stringify /// form an uint32_t from 4 x uint8_t static inline uint32_t u32_from_u8(uint8_t b1, uint8_t b2, uint8_t b3, uint8_t b4) ATTR_ALWAYS_INLINE ATTR_CONST; diff --git a/tinyusb/tusb_option.h b/tinyusb/tusb_option.h index 0b0d308a2..04316ac9c 100644 --- a/tinyusb/tusb_option.h +++ b/tinyusb/tusb_option.h @@ -53,6 +53,12 @@ extern "C" { #endif +#define TUSB_VERSION_YEAR 00 +#define TUSB_VERSION_MONTH 00 +#define TUSB_VERSION_WEEK 0 +#define TUSB_VERSION_NAME "alpha" +#define TUSB_VERSION XSTRING_(TUSB_VERSION_YEAR) "." XSTRING_(TUSB_VERSION_MONTH) + /// define this symbol will make tinyusb look for external configure file #include "tusb_config.h"