Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'feat/ble_mesh_device_properties_v2_v3.3' into 'release/v3.3'

Browse source 
Feat/ble mesh device properties v2 (v3.3)

See merge request espressif/esp-idf!10790
This commit is contained in:
Island 2020-10-13 19:50:17 +08:00
parent 7d8d841659 23a21f92be
commit 58c5b7a1bf
6 changed files with 1463 additions and 1088 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/bt/CMakeLists.txt
View file

@ -371,12 +371,12 @@ if(CONFIG_BT_ENABLED)
"esp_ble_mesh/mesh_core/settings.c"
"esp_ble_mesh/mesh_core/test.c"
"esp_ble_mesh/mesh_core/transport.c"
"esp_ble_mesh/mesh_models/common/device_property.c"
"esp_ble_mesh/mesh_models/client/client_common.c"
"esp_ble_mesh/mesh_models/client/generic_client.c"
"esp_ble_mesh/mesh_models/client/lighting_client.c"
"esp_ble_mesh/mesh_models/client/sensor_client.c"
"esp_ble_mesh/mesh_models/client/time_scene_client.c"
"esp_ble_mesh/mesh_models/server/device_property.c"
"esp_ble_mesh/mesh_models/server/generic_server.c"
"esp_ble_mesh/mesh_models/server/lighting_server.c"
"esp_ble_mesh/mesh_models/server/sensor_server.c"

1
components/bt/component.mk
View file

@ -156,6 +156,7 @@ COMPONENT_SRCDIRS += esp_ble_mesh/mesh_common \
esp_ble_mesh/mesh_core \
esp_ble_mesh/mesh_core/storage \
esp_ble_mesh/btc \
esp_ble_mesh/mesh_models/common \
esp_ble_mesh/mesh_models/client \
esp_ble_mesh/mesh_models/server \
esp_ble_mesh/api/core \

135
components/bt/esp_ble_mesh/mesh_models/server/device_property.c → components/bt/esp_ble_mesh/mesh_models/common/device_property.c
View file

@ -19,8 +19,8 @@
static struct bt_mesh_dev_prop {
u16_t prop_id;
u8_t len;
} device_properties [] = {
{ BLE_MESH_INVALID_DEVICE_PROPERTY_ID, 0xFF },
} device_properties[] = {
{ BLE_MESH_INVALID_DEVICE_PROPERTY_ID, 0xFF }, /* Prohibited */
{ BLE_MESH_AVERAGE_AMBIENT_TEMPERATURE_IN_A_PERIOD_OF_DAY, 0x03 },
{ BLE_MESH_AVERAGE_INPUT_CURRENT, 0x03 },
{ BLE_MESH_AVERAGE_INPUT_VOLTAGE, 0x03 },
@ -32,20 +32,20 @@ static struct bt_mesh_dev_prop {
{ BLE_MESH_COLOR_RENDERING_INDEX_RA, 0x01 },
{ BLE_MESH_DEVICE_APPEARANCE, 0x02 },
{ BLE_MESH_DEVICE_COUNTRY_OF_ORIGIN, 0x02 },
{ BLE_MESH_DEVICE_DATE_OF_MANUFACTURE, 0x04 },
{ BLE_MESH_DEVICE_ENERGY_USE_SINCE_TURN_ON, 0x04 },
{ BLE_MESH_DEVICE_DATE_OF_MANUFACTURE, 0x03 },
{ BLE_MESH_DEVICE_ENERGY_USE_SINCE_TURN_ON, 0x03 },
{ BLE_MESH_DEVICE_FIRMWARE_REVISION, 0x08 },
{ BLE_MESH_DEVICE_GLOBAL_TRADE_ITEM_NUMBER, 0x08 },
{ BLE_MESH_DEVICE_HARDWARE_REVISION, 0x16 },
{ BLE_MESH_DEVICE_MANUFACTURER_NAME, 0x36 },
{ BLE_MESH_DEVICE_MODEL_NUMBER, 0x24 },
{ BLE_MESH_DEVICE_GLOBAL_TRADE_ITEM_NUMBER, 0x06 },
{ BLE_MESH_DEVICE_HARDWARE_REVISION, 0x10 },
{ BLE_MESH_DEVICE_MANUFACTURER_NAME, 0x24 },
{ BLE_MESH_DEVICE_MODEL_NUMBER, 0x18 },
{ BLE_MESH_DEVICE_OPERATING_TEMPERATURE_RANGE_SPECIFICATION, 0x04 },
{ BLE_MESH_DEVICE_OPERATING_TEMPERATURE_STATISTICAL_VALUES, 0x09 },
{ BLE_MESH_DEVICE_OVER_TEMPERATURE_EVENT_STATISTICS, 0x06 },
{ BLE_MESH_DEVICE_POWER_RANGE_SPECIFICATION, 0x12 },
{ BLE_MESH_DEVICE_RUNTIME_SINCE_TURN_ON, 0x04 },
{ BLE_MESH_DEVICE_RUNTIME_WARRANTY, 0x04 },
{ BLE_MESH_DEVICE_SERIAL_NUMBER, 0x16 },
{ BLE_MESH_DEVICE_POWER_RANGE_SPECIFICATION, 0x09 },
{ BLE_MESH_DEVICE_RUNTIME_SINCE_TURN_ON, 0x03 },
{ BLE_MESH_DEVICE_RUNTIME_WARRANTY, 0x03 },
{ BLE_MESH_DEVICE_SERIAL_NUMBER, 0x10 },
{ BLE_MESH_DEVICE_SOFTWARE_REVISION, 0x08 },
{ BLE_MESH_DEVICE_UNDER_TEMPERATURE_EVENT_STATISTICS, 0x06 },
{ BLE_MESH_INDOOR_AMBIENT_TEMPERATURE_STATISTICAL_VALUES, 0x05 },
@ -63,9 +63,9 @@ static struct bt_mesh_dev_prop {
{ BLE_MESH_INPUT_VOLTAGE_RANGE_SPECIFICATION, 0x06 },
{ BLE_MESH_INPUT_VOLTAGE_RIPPLE_SPECIFICATION, 0x01 },
{ BLE_MESH_INPUT_VOLTAGE_STATISTICS, 0x09 },
{ BLE_MESH_LIGHT_CONTROL_AMBIENT_LUXLEVEL_ON, 0x04 },
{ BLE_MESH_LIGHT_CONTROL_AMBIENT_LUXLEVEL_PROLONG, 0x04 },
{ BLE_MESH_LIGHT_CONTROL_AMBIENT_LUXLEVEL_STANDBY, 0x04 },
{ BLE_MESH_LIGHT_CONTROL_AMBIENT_LUXLEVEL_ON, 0x03 },
{ BLE_MESH_LIGHT_CONTROL_AMBIENT_LUXLEVEL_PROLONG, 0x03 },
{ BLE_MESH_LIGHT_CONTROL_AMBIENT_LUXLEVEL_STANDBY, 0x03 },
{ BLE_MESH_LIGHT_CONTROL_LIGHTNESS_ON, 0x02 },
{ BLE_MESH_LIGHT_CONTROL_LIGHTNESS_PROLONG, 0x02 },
{ BLE_MESH_LIGHT_CONTROL_LIGHTNESS_STANDBY, 0x02 },
@ -83,8 +83,8 @@ static struct bt_mesh_dev_prop {
{ BLE_MESH_LIGHT_CONTROL_TIME_RUN_ON, 0x03 },
{ BLE_MESH_LUMEN_MAINTENANCE_FACTOR, 0x01 },
{ BLE_MESH_LUMINOUS_EFFICACY, 0x02 },
{ BLE_MESH_LUMINOUS_ENERGY_SINCE_TURN_ON, 0x04 },
{ BLE_MESH_LUMINOUS_EXPOSURE, 0x04 },
{ BLE_MESH_LUMINOUS_ENERGY_SINCE_TURN_ON, 0x03 },
{ BLE_MESH_LUMINOUS_EXPOSURE, 0x03 },
{ BLE_MESH_LUMINOUS_FLUX_RANGE, 0x04 },
{ BLE_MESH_MOTION_SENSED, 0x01 },
{ BLE_MESH_MOTION_THRESHOLD, 0x01 },
@ -98,14 +98,14 @@ static struct bt_mesh_dev_prop {
{ BLE_MESH_OVER_OUTPUT_RIPPLE_VOLTAGE_EVENT_STATISTICS, 0x06 },
{ BLE_MESH_PEOPLE_COUNT, 0x02 },
{ BLE_MESH_PRESENCE_DETECTED, 0x01 },
{ BLE_MESH_PRESENT_AMBIENT_LIGHT_LEVEL, 0x04 },
{ BLE_MESH_PRESENT_AMBIENT_LIGHT_LEVEL, 0x03 },
{ BLE_MESH_PRESENT_AMBIENT_TEMPERATURE, 0x01 },
{ BLE_MESH_PRESENT_CIE_1931_CHROMATICITY, 0x04 },
{ BLE_MESH_PRESENT_CORRELATED_COLOR_TEMPERATURE, 0x02 },
{ BLE_MESH_PRESENT_DEVICE_INPUT_POWER, 0x04 },
{ BLE_MESH_PRESENT_DEVICE_INPUT_POWER, 0x03 },
{ BLE_MESH_PRESENT_DEVICE_OPERATING_EFFICIENCY, 0x01 },
{ BLE_MESH_PRESENT_DEVICE_OPERATING_TEMPERATURE, 0x02 },
{ BLE_MESH_PRESENT_ILLUMINANCE, 0x04 },
{ BLE_MESH_PRESENT_ILLUMINANCE, 0x03 },
{ BLE_MESH_PRESENT_INDOOR_AMBIENT_TEMPERATURE, 0x01 },
{ BLE_MESH_PRESENT_INPUT_CURRENT, 0x02 },
{ BLE_MESH_PRESENT_INPUT_RIPPLE_VOLTAGE, 0x01 },
@ -116,28 +116,99 @@ static struct bt_mesh_dev_prop {
{ BLE_MESH_PRESENT_OUTPUT_VOLTAGE, 0x02 },
{ BLE_MESH_PRESENT_PLANCKIAN_DISTANCE, 0x02 },
{ BLE_MESH_PRESENT_RELATIVE_OUTPUT_RIPPLE_VOLTAGE, 0x01 },
{ BLE_MESH_RELATIVE_DEVICE_ENERGY_USE_IN_A_PERIOD_OF_DAY, 0x06 },
{ BLE_MESH_RELATIVE_DEVICE_ENERGY_USE_IN_A_PERIOD_OF_DAY, 0x05 },
{ BLE_MESH_RELATIVE_DEVICE_RUNTIME_IN_A_GENERIC_LEVEL_RANGE, 0x05 },
{ BLE_MESH_RELATIVE_EXPOSURE_TIME_IN_AN_ILLUMINANCE_RANGE, 0x09 },
{ BLE_MESH_RELATIVE_RUNTIME_IN_A_CORRELATED_COLOR_TEMPERATURE_RANGE, 0x04 },
{ BLE_MESH_RELATIVE_RUNTIME_IN_A_DEVICE_OPERATING_TEMPERATURE_RANGE, 0x05 },
{ BLE_MESH_RELATIVE_EXPOSURE_TIME_IN_AN_ILLUMINANCE_RANGE, 0x05 },
{ BLE_MESH_RELATIVE_RUNTIME_IN_A_CORRELATED_COLOR_TEMPERATURE_RANGE, 0x03 },
{ BLE_MESH_RELATIVE_RUNTIME_IN_A_DEVICE_OPERATING_TEMPERATURE_RANGE, 0x03 },
{ BLE_MESH_RELATIVE_RUNTIME_IN_AN_INPUT_CURRENT_RANGE, 0x05 },
{ BLE_MESH_RELATIVE_RUNTIME_IN_AN_INPUT_VOLTAGE_RANGE, 0x05 },
{ BLE_MESH_SHORT_CIRCUIT_EVENT_STATISTICS, 0x06 },
{ BLE_MESH_TIME_SINCE_MOTION_SENSED, 0x02 },
{ BLE_MESH_TIME_SINCE_PRESENCE_DETECTED, 0x02 },
{ BLE_MESH_TOTAL_DEVICE_ENERGY_USE, 0x04 },
{ BLE_MESH_TOTAL_DEVICE_OFF_ON_CYCLES, 0x04 },
{ BLE_MESH_TOTAL_DEVICE_POWER_ON_CYCLES, 0x04 },
{ BLE_MESH_TOTAL_DEVICE_POWER_ON_TIME, 0x04 },
{ BLE_MESH_TOTAL_DEVICE_RUNTIME, 0x04 },
{ BLE_MESH_TOTAL_LIGHT_EXPOSURE_TIME, 0x04 },
{ BLE_MESH_TOTAL_LUMINOUS_ENERGY, 0x04 },
{ BLE_MESH_TOTAL_DEVICE_ENERGY_USE, 0x03 },
{ BLE_MESH_TOTAL_DEVICE_OFF_ON_CYCLES, 0x03 },
{ BLE_MESH_TOTAL_DEVICE_POWER_ON_CYCLES, 0x03 },
{ BLE_MESH_TOTAL_DEVICE_POWER_ON_TIME, 0x03 },
{ BLE_MESH_TOTAL_DEVICE_RUNTIME, 0x03 },
{ BLE_MESH_TOTAL_LIGHT_EXPOSURE_TIME, 0x03 },
{ BLE_MESH_TOTAL_LUMINOUS_ENERGY, 0x03 },
{ BLE_MESH_DESIRED_AMBIENT_TEMPERATURE, 0x01 },
{ BLE_MESH_PRECISE_TOTAL_DEVICE_ENERGY_USE, 0x04 },
{ BLE_MESH_POWER_FACTOR, 0x01 },
{ BLE_MESH_SENSOR_GAIN, 0x04 },
{ BLE_MESH_PRECISE_PRESENT_AMBIENT_TEMPERATURE, 0x02 },
{ BLE_MESH_PRESENT_AMBIENT_RELATIVE_HUMIDITY, 0x02 },
{ BLE_MESH_PRESENT_AMBIENT_CARBON_DIOXIDE_CONCENTRATION, 0x02 },
{ BLE_MESH_PRESENT_AMBIENT_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION, 0x02 },
{ BLE_MESH_PRESENT_AMBIENT_NOISE, 0x01 },
{ 0x007A, 0xFF }, /* Not defined */
{ 0x007B, 0xFF }, /* Not defined */
{ 0x007C, 0xFF }, /* Not defined */
{ 0x007D, 0xFF }, /* Not defined */
{ 0x007E, 0xFF }, /* Not defined */
{ 0x007F, 0xFF }, /* Not defined */
{ BLE_MESH_ACTIVE_ENERGY_LOADSIDE, 0x04 },
{ BLE_MESH_ACTIVE_POWER_LOADSIDE, 0x03 },
{ BLE_MESH_AIR_PRESSURE, 0x04 },
{ BLE_MESH_APPARENT_ENERGY, 0x04 },
{ BLE_MESH_APPARENT_POWER, 0x03 },
{ BLE_MESH_APPARENT_WIND_DIRECTION, 0x02 },
{ BLE_MESH_APPARENT_WIND_SPEED, 0x02 },
{ BLE_MESH_DEW_POINT, 0x01 },
{ BLE_MESH_EXTERNAL_SUPPLY_VOLTAGE, 0x03 },
{ BLE_MESH_EXTERNAL_SUPPLY_VOLTAGE_FREQUENCY, 0x02 },
{ BLE_MESH_GUST_FACTOR, 0x01 },
{ BLE_MESH_HEAT_INDEX, 0x01 },
{ BLE_MESH_LIGHT_DISTRIBUTION, 0x01 },
{ BLE_MESH_LIGHT_SOURCE_CURRENT, 0x03 },
{ BLE_MESH_LIGHT_SOURCE_ON_TIME_NOT_RESETTABLE, 0x04 },
{ BLE_MESH_LIGHT_SOURCE_ON_TIME_RESETTABLE, 0x04 },
{ BLE_MESH_LIGHT_SOURCE_OPEN_CIRCUIT_STATISTICS, 0x06 },
{ BLE_MESH_LIGHT_SOURCE_OVERALL_FAILURES_STATISTICS, 0x06 },
{ BLE_MESH_LIGHT_SOURCE_SHORT_CIRCUIT_STATISTICS, 0x06 },
{ BLE_MESH_LIGHT_SOURCE_START_COUNTER_RESETTABLE, 0x03 },
{ BLE_MESH_LIGHT_SOURCE_TEMPERATURE, 0x02 },
{ BLE_MESH_LIGHT_SOURCE_THERMAL_DERATING_STATISTICS, 0x06 },
{ BLE_MESH_LIGHT_SOURCE_THERMAL_SHUTDOWN_STATISTICS, 0x06 },
{ BLE_MESH_LIGHT_SOURCE_TOTAL_POWER_ON_CYCLES, 0x03 },
{ BLE_MESH_LIGHT_SOURCE_VOLTAGE, 0x03 },
{ BLE_MESH_LUMINAIRE_COLOR, 0x18 },
{ BLE_MESH_LUMINAIRE_IDENTIFICATION_NUMBER, 0x18 },
{ BLE_MESH_LUMINAIRE_MANUFACTURER_GTIN, 0x06 },
{ BLE_MESH_LUMINAIRE_NOMINAL_INPUT_POWER, 0x03 },
{ BLE_MESH_LUMINAIRE_NOMINAL_MAXIMUM_AC_MAINS_VOLTAGE, 0x02 },
{ BLE_MESH_LUMINAIRE_NOMINAL_MINIMUM_AC_MAINS_VOLTAGE, 0x02 },
{ BLE_MESH_LUMINAIRE_POWER_AT_MINIMUM_DIM_LEVEL, 0x03 },
{ BLE_MESH_LUMINAIRE_TIME_OF_MANUFACTURE, 0x03 },
{ BLE_MESH_MAGNETIC_DECLINATION, 0x02 },
{ BLE_MESH_MAGNETIC_FLUX_DENSITY_2D, 0x04 },
{ BLE_MESH_MAGNETIC_FLUX_DENSITY_3D, 0x06 },
{ BLE_MESH_NOMINAL_LIGHT_OUTPUT, 0x03 },
{ BLE_MESH_OVERALL_FAILURE_CONDITION, 0x06 },
{ BLE_MESH_POLLEN_CONCENTRATION, 0x03 },
{ BLE_MESH_PRESENT_INDOOR_RELATIVE_HUMIDITY, 0x02 },
{ BLE_MESH_PRESENT_OUTDOOR_RELATIVE_HUMIDITY, 0x02 },
{ BLE_MESH_PRESSURE, 0x04 },
{ BLE_MESH_RAINFALL, 0x02 },
{ BLE_MESH_RATED_MEDIAN_USEFUL_LIFE_OF_LUMINAIRE, 0x03 },
{ BLE_MESH_RATED_MEDIAN_USEFUL_LIGHT_SOURCE_STARTS, 0x03 },
{ BLE_MESH_REFERENCE_TEMPERATURE, 0x02 },
{ BLE_MESH_TOTAL_DEVICE_STARTS, 0x03 },
{ BLE_MESH_TRUE_WIND_DIRECTION, 0x02 },
{ BLE_MESH_TRUE_WIND_SPEED, 0x02 },
{ BLE_MESH_UV_INDEX, 0x01 },
{ BLE_MESH_WIND_CHILL, 0x01 },
{ BLE_MESH_LIGHT_SOURCE_TYPE, 0x01 },
{ BLE_MESH_LUMINAIRE_IDENTIFICATION_STRING, 0x40 },
{ BLE_MESH_OUTPUT_POWER_LIMITATION, 0x06 },
{ BLE_MESH_THERMAL_DERATING, 0x06 },
{ BLE_MESH_OUTPUT_CURRENT_PERCENT, 0x01 },
};
u8_t bt_mesh_get_dev_prop_len(u16_t prop_id)
{
if (prop_id > BLE_MESH_TOTAL_LUMINOUS_ENERGY) {
if (prop_id > BLE_MESH_OUTPUT_CURRENT_PERCENT) {
BT_ERR("Unknown Device Property ID 0x%04x", prop_id);
return UINT8_MAX;
}

1358
components/bt/esp_ble_mesh/mesh_models/common/include/device_property.h Normal file
View file

File diff suppressed because it is too large Load diff

1053
components/bt/esp_ble_mesh/mesh_models/server/include/device_property.h
View file

File diff suppressed because it is too large Load diff

2
components/bt/esp_ble_mesh/mesh_models/server/include/server_common.h
View file

@ -53,8 +53,6 @@ extern "C" {
#define BLE_MESH_UNKNOWN_REMAIN_TIME 0x3F
#define BLE_MESH_DEVICE_SPECIFIC_RESOLUTION 10
#define BLE_MESH_INVALID_DEVICE_PROPERTY_ID 0x0000
enum {
BLE_MESH_TRANS_TIMER_START, /* Proper transition timer has been started */
BLE_MESH_TRANS_FLAG_MAX,