feedc0de/esp-nimble-cpp
1
0
Fork 0
forked from h2zero/esp-nimble-cpp
Code Pull Requests Activity

Fix health model fault reporting.

Browse Source
This commit is contained in:
h2zero
2022-04-13 20:36:37 -06:00
parent 5b206b97a3
commit 123825d483
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/NimBLEMeshModel.cpp
View File

@ -617,13 +617,13 @@ int NimBLEHealthSrvCallbacks::faultGetCurrent(bt_mesh_model *model, uint8_t *tes
uint16_t *company_id, uint8_t *faults, uint16_t *company_id, uint8_t *faults,
uint8_t *fault_count) uint8_t *fault_count)
{ {
NIMBLE_LOGD(LOG_TAG, "faultGetCurrent - default"); NIMBLE_LOGD(LOG_TAG, "faultGetCurrent");
NimBLEHealthSrvModel* pModel = (NimBLEHealthSrvModel*)NimBLEDevice::getMeshNode()->getHealthModel(model); NimBLEHealthSrvModel* pModel = (NimBLEHealthSrvModel*)NimBLEDevice::getMeshNode()->getHealthModel(model);
*test_id = pModel->m_testId; *test_id = pModel->m_testId;
*company_id = CID_VENDOR; *company_id = CID_VENDOR;
faults = &pModel->m_faults[0]; *fault_count = std::min(*(size_t*)fault_count, pModel->m_faults.size());
*fault_count = pModel->m_faults.size(); memcpy(faults, &pModel->m_faults[0], *fault_count);
return 0; return 0;
} }
@ -631,7 +631,7 @@ int NimBLEHealthSrvCallbacks::faultGetRegistered(bt_mesh_model *model, uint16_t
uint8_t *test_id, uint8_t *faults, uint8_t *test_id, uint8_t *faults,
uint8_t *fault_count) uint8_t *fault_count)
{ {
NIMBLE_LOGD(LOG_TAG, "faultGetRegistered - default"); NIMBLE_LOGD(LOG_TAG, "faultGetRegistered");
if (company_id != CID_VENDOR) { if (company_id != CID_VENDOR) {
return -BLE_HS_EINVAL; return -BLE_HS_EINVAL;
@ -639,8 +639,8 @@ int NimBLEHealthSrvCallbacks::faultGetRegistered(bt_mesh_model *model, uint16_t
NimBLEHealthSrvModel* pModel = (NimBLEHealthSrvModel*)NimBLEDevice::getMeshNode()->getHealthModel(model); NimBLEHealthSrvModel* pModel = (NimBLEHealthSrvModel*)NimBLEDevice::getMeshNode()->getHealthModel(model);
*test_id = pModel->m_testId; *test_id = pModel->m_testId;
faults = &pModel->m_faults[0]; *fault_count = std::min(*(size_t*)fault_count, pModel->m_faults.size());
*fault_count = pModel->m_faults.size(); memcpy(faults, &pModel->m_faults[0], *fault_count);
return 0; return 0;
} }