From e6621dee5a872091c6fe055bfee32b18824afe3c Mon Sep 17 00:00:00 2001 From: Roy_01 Date: Tue, 5 Mar 2024 17:25:47 +0800 Subject: [PATCH] define each series of Elite --- app_config.h | 69 +++++++++++++++++++++++++++++++++++++++++++++++++--- edc_2_0.c | 4 ++- eis_2_0.c | 4 ++- elite.c | 8 ++++-- 4 files changed, 78 insertions(+), 7 deletions(-) diff --git a/app_config.h b/app_config.h index 82e163b..b711c26 100644 --- a/app_config.h +++ b/app_config.h @@ -103,14 +103,37 @@ extern "C" #define BLE_ADVERTISING_ENABLED 1 // BLE device name +#define DEF_ELITE_EDC_14 0x00020105 +#define DEF_ELITE_EDC_15 0x00020106 #define DEF_ELITE_EDC_15RE 0x00020107 #define DEF_ELITE_EDC_15R2 0x00020108 +#define DEF_ELITE_EDC_20 0x00020109 +#define DEF_ELITE_BAT_01 0x00030100 +#define DEF_ELITE_BAT_10 0x00030101 #define DEF_ELITE_EIS_10 0x00040100 #define DEF_ELITE_EIS_11 0x00040101 #define DEF_ELITE_EIS_MINI_10 0x00040102 -#define DEF_ELITE_MODEL DEF_ELITE_EDC_15RE +#define DEF_ELITE_TRIG_01 0x00050100 +#define DEF_ELITE_MEGAFLY_01 0x00060100 +#define DEF_ELITE_MODEL DEF_ELITE_EDC_20 -#if (DEF_ELITE_MODEL == DEF_ELITE_EDC_15RE) +#if (DEF_ELITE_MODEL == DEF_ELITE_EDC_14) +#define ELITE_DEVICE_NAME "Elite-EDC" +#define MAJOR_PRODUCT_NUMBER 0 +#define MINOR_PRODUCT_NUMBER 2 +#define MAJOR_VERSION_NUMBER 1 +#define MINOR_VERSION_NUMBER 5 +#define BLE_EDC_ENABLED 1 +#define EDC_BLE_OBSERVER_PRIO 3 +#elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_15) +#define ELITE_DEVICE_NAME "Elite-EDC" +#define MAJOR_PRODUCT_NUMBER 0 +#define MINOR_PRODUCT_NUMBER 2 +#define MAJOR_VERSION_NUMBER 1 +#define MINOR_VERSION_NUMBER 6 +#define BLE_EDC_ENABLED 1 +#define EDC_BLE_OBSERVER_PRIO 3 +#elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_15RE) #define ELITE_DEVICE_NAME "Elite-EDC" #define MAJOR_PRODUCT_NUMBER 0 #define MINOR_PRODUCT_NUMBER 2 @@ -119,13 +142,37 @@ extern "C" #define BLE_EDC_ENABLED 1 #define EDC_BLE_OBSERVER_PRIO 3 #elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_15R2) -#define ELITE_DEVICE_NAME "EDC" +#define ELITE_DEVICE_NAME "Elite-EDC" #define MAJOR_PRODUCT_NUMBER 0 #define MINOR_PRODUCT_NUMBER 2 #define MAJOR_VERSION_NUMBER 1 #define MINOR_VERSION_NUMBER 8 #define BLE_EDC_ENABLED 1 #define EDC_BLE_OBSERVER_PRIO 3 +#elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_20) +#define ELITE_DEVICE_NAME "Elite-EDC" +#define MAJOR_PRODUCT_NUMBER 0 +#define MINOR_PRODUCT_NUMBER 2 +#define MAJOR_VERSION_NUMBER 1 +#define MINOR_VERSION_NUMBER 9 +#define BLE_EDC_ENABLED 1 +#define EDC_BLE_OBSERVER_PRIO 3 +#elif (DEF_ELITE_MODEL == DEF_ELITE_BAT_01) +#define ELITE_DEVICE_NAME "BAT" +#define MAJOR_PRODUCT_NUMBER 0 +#define MINOR_PRODUCT_NUMBER 3 +#define MAJOR_VERSION_NUMBER 1 +#define MINOR_VERSION_NUMBER 0 +#define BLE_BAT_ENABLED 1 +#define EDC_BLE_OBSERVER_PRIO 3 +#elif (DEF_ELITE_MODEL == DEF_ELITE_BAT_10) +#define ELITE_DEVICE_NAME "BAT" +#define MAJOR_PRODUCT_NUMBER 0 +#define MINOR_PRODUCT_NUMBER 3 +#define MAJOR_VERSION_NUMBER 1 +#define MINOR_VERSION_NUMBER 1 +#define BLE_BAT_ENABLED 1 +#define EDC_BLE_OBSERVER_PRIO 3 #elif (DEF_ELITE_MODEL == DEF_ELITE_EIS_10) #define ELITE_DEVICE_NAME "EIS" #define MAJOR_PRODUCT_NUMBER 0 @@ -150,6 +197,22 @@ extern "C" #define MINOR_VERSION_NUMBER 2 #define BLE_EIS_ENABLED 1 #define EDC_BLE_OBSERVER_PRIO 3 +#elif (DEF_ELITE_MODEL == DEF_ELITE_TRIG_01) +#define ELITE_DEVICE_NAME "TRIG" +#define MAJOR_PRODUCT_NUMBER 0 +#define MINOR_PRODUCT_NUMBER 5 +#define MAJOR_VERSION_NUMBER 1 +#define MINOR_VERSION_NUMBER 0 +#define BLE_TRIG_ENABLED 1 +#define EDC_BLE_OBSERVER_PRIO 3 +#elif (DEF_ELITE_MODEL == DEF_ELITE_MEGAFLY_01) +#define ELITE_DEVICE_NAME "MEGAFLY" +#define MAJOR_PRODUCT_NUMBER 0 +#define MINOR_PRODUCT_NUMBER 6 +#define MAJOR_VERSION_NUMBER 1 +#define MINOR_VERSION_NUMBER 0 +#define BLE_MEGAFLY_ENABLED 1 +#define EDC_BLE_OBSERVER_PRIO 3 #endif #define BLE_ELITE_ENABLED 1 #define ELITE_UUID 0xFFF0 diff --git a/edc_2_0.c b/edc_2_0.c index ccaa263..f20ef08 100644 --- a/edc_2_0.c +++ b/edc_2_0.c @@ -2,7 +2,9 @@ #include "nrf_log.h" -#if (DEF_ELITE_MODEL == DEF_ELITE_EDC_15RE) +#if (DEF_ELITE_MODEL == DEF_ELITE_EDC_15RE ||\ + DEF_ELITE_MODEL == DEF_ELITE_EDC_15R2 ||\ + DEF_ELITE_MODEL == DEF_ELITE_EDC_20) static void dummy(uint8_t *ins, uint16_t size) { NRF_LOG_INFO("%s", __FUNCTION__); } diff --git a/eis_2_0.c b/eis_2_0.c index 84d7eac..dfddab1 100644 --- a/eis_2_0.c +++ b/eis_2_0.c @@ -2,7 +2,9 @@ #include "nrf_log.h" -#if (DEF_ELITE_MODEL == DEF_ELITE_EIS_10) +#if (DEF_ELITE_MODEL == DEF_ELITE_EIS_10 ||\ + DEF_ELITE_MODEL == DEF_ELITE_EIS_11 ||\ + DEF_ELITE_MODEL == DEF_ELITE_EIS_MINI_10) static void dummy(uint8_t *ins, uint16_t size) { NRF_LOG_INFO("%s", __FUNCTION__); } diff --git a/elite.c b/elite.c index 6657a8c..d22af09 100644 --- a/elite.c +++ b/elite.c @@ -14,9 +14,13 @@ #include #include -#if (DEF_ELITE_MODEL == DEF_ELITE_EDC_15RE) +#if (DEF_ELITE_MODEL == DEF_ELITE_EDC_15RE ||\ + DEF_ELITE_MODEL == DEF_ELITE_EDC_15R2 ||\ + DEF_ELITE_MODEL == DEF_ELITE_EDC_20) static elite_instance_t *p_instance = &edc_2_0; -#elif (DEF_ELITE_MODEL == DEF_ELITE_EIS_10) +#elif (DEF_ELITE_MODEL == DEF_ELITE_EIS_10 ||\ + DEF_ELITE_MODEL == DEF_ELITE_EIS_11 ||\ + DEF_ELITE_MODEL == DEF_ELITE_EIS_MINI_10) static elite_instance_t *p_instance = &eis_2_0; #else #error "Unknown DEF_ELITE_MODEL"