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

Add transition and delay timers to models.

Browse Source 
* Remove level server setDelta() callback as it is unnecessary.

* Add target value and remaining time to status messages.
This commit is contained in:
h2zero
2021-09-06 09:14:45 -06:00
parent 8efa7d2acc
commit bc2e11637e
7 changed files with 295 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NimBLEMeshModel.h
+19 -2
View File
@@ -26,6 +26,23 @@ public:
bt_mesh_model_pub* opPub;
NimBLEMeshModelCallbacks* m_callbacks;
int extractTransTimeDelay(os_mbuf *buf);
bool checkRetransmit(uint8_t tid, bt_mesh_msg_ctx *ctx);
void sendMessage(bt_mesh_model *model, bt_mesh_msg_ctx *ctx, os_mbuf *msg);
void startTdTimer(ble_npl_time_t timerMs);
uint8_t m_lastTid;
uint16_t m_lastSrcAddr;
uint16_t m_lastDstAddr;
time_t m_lastMsgTime;
uint8_t m_transTime;
uint8_t m_delayTime;
uint8_t m_onOffValue;
uint8_t m_onOffTarget;
int16_t m_levelValue;
int16_t m_levelTarget;
int16_t m_transStep;
ble_npl_callout m_tdTimer;
};
class NimBLEGenOnOffSrvModel : NimBLEMeshModel {
@@ -44,6 +61,7 @@ class NimBLEGenOnOffSrvModel : NimBLEMeshModel {
static void setOnOffUnack(bt_mesh_model *model,
bt_mesh_msg_ctx *ctx,
os_mbuf *buf);
static void tdTimerCb(ble_npl_event *event);
};
class NimBLEGenLevelSrvModel : NimBLEMeshModel {
@@ -74,6 +92,7 @@ class NimBLEGenLevelSrvModel : NimBLEMeshModel {
static void setMoveUnack(bt_mesh_model *model,
bt_mesh_msg_ctx *ctx,
os_mbuf *buf);
static void tdTimerCb(ble_npl_event *event);
};
class NimBLEMeshModelCallbacks {
@@ -83,8 +102,6 @@ public:
virtual uint8_t getOnOff();
virtual void setLevel(int16_t);
virtual int16_t getLevel();
virtual void setDelta(int16_t);
};
#endif // CONFIG_BT_ENABLED