Bluetooth: Remove _gatt_ infix for Battery Service (BAS)
The _gatt_ infix was determined to be unnecessary as GATT is implied by it being a Bluetooth service. Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
parent
7ab35145fb
commit
b4a8229db6
18 changed files with 30 additions and 30 deletions
|
@ -10,7 +10,7 @@
|
|||
|
||||
/**
|
||||
* @brief Battery Service (BAS)
|
||||
* @defgroup bt_gatt_bas Battery Service (BAS)
|
||||
* @defgroup bt_bas Battery Service (BAS)
|
||||
* @ingroup bluetooth
|
||||
* @{
|
||||
*
|
||||
|
@ -30,7 +30,7 @@ extern "C" {
|
|||
*
|
||||
* @return The battery level in percent.
|
||||
*/
|
||||
uint8_t bt_gatt_bas_get_battery_level(void);
|
||||
uint8_t bt_bas_get_battery_level(void);
|
||||
|
||||
/** @brief Update battery level value.
|
||||
*
|
||||
|
@ -41,7 +41,7 @@ uint8_t bt_gatt_bas_get_battery_level(void);
|
|||
*
|
||||
* @return Zero in case of success and error code in case of error.
|
||||
*/
|
||||
int bt_gatt_bas_set_battery_level(uint8_t level);
|
||||
int bt_bas_set_battery_level(uint8_t level);
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
@ -8,7 +8,7 @@ CONFIG_BT_SIGNING=y
|
|||
CONFIG_BT_PERIPHERAL=y
|
||||
CONFIG_BT_GATT_DIS=y
|
||||
CONFIG_BT_ATT_PREPARE_COUNT=5
|
||||
CONFIG_BT_GATT_BAS=y
|
||||
CONFIG_BT_BAS=y
|
||||
CONFIG_BT_GATT_HRS=y
|
||||
CONFIG_BT_PRIVACY=y
|
||||
CONFIG_BT_DEVICE_NAME="Zephyr Peripheral Sample Long Name"
|
||||
|
|
|
@ -294,7 +294,7 @@ static struct bt_conn_auth_cb auth_cb_display = {
|
|||
|
||||
static void bas_notify(void)
|
||||
{
|
||||
uint8_t battery_level = bt_gatt_bas_get_battery_level();
|
||||
uint8_t battery_level = bt_bas_get_battery_level();
|
||||
|
||||
battery_level--;
|
||||
|
||||
|
@ -302,7 +302,7 @@ static void bas_notify(void)
|
|||
battery_level = 100U;
|
||||
}
|
||||
|
||||
bt_gatt_bas_set_battery_level(battery_level);
|
||||
bt_bas_set_battery_level(battery_level);
|
||||
}
|
||||
|
||||
static void hrs_notify(void)
|
||||
|
|
|
@ -4,6 +4,6 @@ CONFIG_BT=y
|
|||
CONFIG_BT_PERIPHERAL=y
|
||||
CONFIG_BT_GATT_DIS=y
|
||||
CONFIG_BT_GATT_DIS_PNP=n
|
||||
CONFIG_BT_GATT_BAS=y
|
||||
CONFIG_BT_BAS=y
|
||||
CONFIG_BT_DEVICE_NAME="CSC peripheral"
|
||||
CONFIG_BT_DEVICE_APPEARANCE=1157
|
||||
|
|
|
@ -385,7 +385,7 @@ static void bt_ready(void)
|
|||
|
||||
static void bas_notify(void)
|
||||
{
|
||||
uint8_t battery_level = bt_gatt_bas_get_battery_level();
|
||||
uint8_t battery_level = bt_bas_get_battery_level();
|
||||
|
||||
battery_level--;
|
||||
|
||||
|
@ -393,7 +393,7 @@ static void bas_notify(void)
|
|||
battery_level = 100U;
|
||||
}
|
||||
|
||||
bt_gatt_bas_set_battery_level(battery_level);
|
||||
bt_bas_set_battery_level(battery_level);
|
||||
}
|
||||
|
||||
void main(void)
|
||||
|
|
|
@ -5,5 +5,5 @@ CONFIG_TINYCRYPT=y
|
|||
CONFIG_BT_DEVICE_NAME="ESP peripheral"
|
||||
CONFIG_BT_GATT_DIS=y
|
||||
CONFIG_BT_GATT_DIS_PNP=n
|
||||
CONFIG_BT_GATT_BAS=y
|
||||
CONFIG_BT_BAS=y
|
||||
CONFIG_BT_DEVICE_APPEARANCE=768
|
||||
|
|
|
@ -406,7 +406,7 @@ static struct bt_conn_auth_cb auth_cb_display = {
|
|||
|
||||
static void bas_notify(void)
|
||||
{
|
||||
uint8_t battery_level = bt_gatt_bas_get_battery_level();
|
||||
uint8_t battery_level = bt_bas_get_battery_level();
|
||||
|
||||
battery_level--;
|
||||
|
||||
|
@ -414,7 +414,7 @@ static void bas_notify(void)
|
|||
battery_level = 100U;
|
||||
}
|
||||
|
||||
bt_gatt_bas_set_battery_level(battery_level);
|
||||
bt_bas_set_battery_level(battery_level);
|
||||
}
|
||||
|
||||
void main(void)
|
||||
|
|
|
@ -6,7 +6,7 @@ CONFIG_BT_DEBUG_LOG=y
|
|||
CONFIG_BT_SMP=y
|
||||
CONFIG_BT_PERIPHERAL=y
|
||||
CONFIG_BT_GATT_DIS=y
|
||||
CONFIG_BT_GATT_BAS=y
|
||||
CONFIG_BT_BAS=y
|
||||
CONFIG_BT_DEVICE_NAME="Test HoG mouse"
|
||||
CONFIG_BT_DEVICE_APPEARANCE=962
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ CONFIG_BT_SMP=y
|
|||
CONFIG_BT_PERIPHERAL=y
|
||||
CONFIG_BT_GATT_DIS=y
|
||||
CONFIG_BT_GATT_DIS_PNP=n
|
||||
CONFIG_BT_GATT_BAS=y
|
||||
CONFIG_BT_BAS=y
|
||||
CONFIG_BT_GATT_HRS=y
|
||||
CONFIG_BT_DEVICE_NAME="Zephyr Heartrate Sensor"
|
||||
CONFIG_BT_DEVICE_APPEARANCE=833
|
||||
|
|
|
@ -87,7 +87,7 @@ static struct bt_conn_auth_cb auth_cb_display = {
|
|||
|
||||
static void bas_notify(void)
|
||||
{
|
||||
uint8_t battery_level = bt_gatt_bas_get_battery_level();
|
||||
uint8_t battery_level = bt_bas_get_battery_level();
|
||||
|
||||
battery_level--;
|
||||
|
||||
|
@ -95,7 +95,7 @@ static void bas_notify(void)
|
|||
battery_level = 100U;
|
||||
}
|
||||
|
||||
bt_gatt_bas_set_battery_level(battery_level);
|
||||
bt_bas_set_battery_level(battery_level);
|
||||
}
|
||||
|
||||
static void hrs_notify(void)
|
||||
|
|
|
@ -4,7 +4,7 @@ CONFIG_BT_SMP=y
|
|||
CONFIG_BT_PERIPHERAL=y
|
||||
CONFIG_BT_GATT_DIS=y
|
||||
CONFIG_BT_GATT_DIS_PNP=n
|
||||
CONFIG_BT_GATT_BAS=y
|
||||
CONFIG_BT_BAS=y
|
||||
CONFIG_BT_DEVICE_NAME="Zephyr Health Thermometer"
|
||||
CONFIG_BT_DEVICE_APPEARANCE=768
|
||||
CONFIG_BT_ATT_ENFORCE_FLOW=n
|
||||
|
|
|
@ -90,7 +90,7 @@ static struct bt_conn_auth_cb auth_cb_display = {
|
|||
|
||||
static void bas_notify(void)
|
||||
{
|
||||
uint8_t battery_level = bt_gatt_bas_get_battery_level();
|
||||
uint8_t battery_level = bt_bas_get_battery_level();
|
||||
|
||||
battery_level--;
|
||||
|
||||
|
@ -98,7 +98,7 @@ static void bas_notify(void)
|
|||
battery_level = 100U;
|
||||
}
|
||||
|
||||
bt_gatt_bas_set_battery_level(battery_level);
|
||||
bt_bas_set_battery_level(battery_level);
|
||||
}
|
||||
|
||||
void main(void)
|
||||
|
|
|
@ -3,6 +3,6 @@
|
|||
|
||||
zephyr_sources_ifdef(CONFIG_BT_GATT_DIS dis.c)
|
||||
|
||||
zephyr_sources_ifdef(CONFIG_BT_GATT_BAS bas.c)
|
||||
zephyr_sources_ifdef(CONFIG_BT_BAS bas.c)
|
||||
|
||||
zephyr_sources_ifdef(CONFIG_BT_GATT_HRS hrs.c)
|
||||
|
|
|
@ -3,16 +3,16 @@
|
|||
# Copyright (c) 2018 Nordic Semiconductor ASA
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
menuconfig BT_GATT_BAS
|
||||
menuconfig BT_BAS
|
||||
bool "Enable GATT Battery service"
|
||||
select SENSOR
|
||||
|
||||
config BT_GATT_BAS_LOG_LEVEL
|
||||
config BT_BAS_LOG_LEVEL
|
||||
int "Battery service log level"
|
||||
depends on LOG
|
||||
range 0 4
|
||||
default 0
|
||||
depends on BT_GATT_BAS
|
||||
depends on BT_BAS
|
||||
help
|
||||
Sets log level for the Battery service.
|
||||
Levels are:
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <bluetooth/uuid.h>
|
||||
#include <bluetooth/services/bas.h>
|
||||
|
||||
#define LOG_LEVEL CONFIG_BT_GATT_BAS_LOG_LEVEL
|
||||
#define LOG_LEVEL CONFIG_BT_BAS_LOG_LEVEL
|
||||
#include <logging/log.h>
|
||||
LOG_MODULE_REGISTER(bas);
|
||||
|
||||
|
@ -64,12 +64,12 @@ static int bas_init(const struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
uint8_t bt_gatt_bas_get_battery_level(void)
|
||||
uint8_t bt_bas_get_battery_level(void)
|
||||
{
|
||||
return battery_level;
|
||||
}
|
||||
|
||||
int bt_gatt_bas_set_battery_level(uint8_t level)
|
||||
int bt_bas_set_battery_level(uint8_t level)
|
||||
{
|
||||
int rc;
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ CONFIG_BT_PERIPHERAL=y
|
|||
CONFIG_BT_PRIVACY=y
|
||||
CONFIG_BT_SMP=y
|
||||
CONFIG_BT_SIGNING=y
|
||||
CONFIG_BT_GATT_BAS=y
|
||||
CONFIG_BT_BAS=y
|
||||
CONFIG_BT_GATT_HRS=y
|
||||
CONFIG_BT_ATT_PREPARE_COUNT=2
|
||||
CONFIG_BT_GATT_CLIENT=y
|
||||
|
|
|
@ -5,7 +5,7 @@ CONFIG_BT_PERIPHERAL=y
|
|||
CONFIG_BT_PRIVACY=y
|
||||
CONFIG_BT_SMP=y
|
||||
CONFIG_BT_SIGNING=y
|
||||
CONFIG_BT_GATT_BAS=y
|
||||
CONFIG_BT_BAS=y
|
||||
CONFIG_BT_GATT_HRS=y
|
||||
CONFIG_BT_ATT_PREPARE_COUNT=2
|
||||
CONFIG_BT_GATT_CLIENT=y
|
||||
|
|
|
@ -119,7 +119,7 @@ static void bt_ready(void)
|
|||
|
||||
static void bas_notify(void)
|
||||
{
|
||||
uint8_t battery_level = bt_gatt_bas_get_battery_level();
|
||||
uint8_t battery_level = bt_bas_get_battery_level();
|
||||
|
||||
battery_level--;
|
||||
|
||||
|
@ -127,7 +127,7 @@ static void bas_notify(void)
|
|||
battery_level = 100U;
|
||||
}
|
||||
|
||||
bt_gatt_bas_set_battery_level(battery_level);
|
||||
bt_bas_set_battery_level(battery_level);
|
||||
}
|
||||
|
||||
static void hrs_notify(void)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue