This pull request fixes #12. The root cause was [`BLE_HandleCommonEvents()`](https://git.ktag.clubk.club/Software/SystemK/src/tag/SystemK_v01.01/BLE/BLE_Utils.c#L57) was causing BLE events to be marked as "not new" by [`BLE_IsPacketNew()`](https://git.ktag.clubk.club/Software/SystemK/src/tag/SystemK_v01.01/BLE/BLE_Packet_Tracker.c#L53), even though these packets were left unhandled by the common event handler. The solution is to separate the querying of whether a packet is new from the marking it as already seen, since we don't want to mark a packet as seen until it has been properly _handled_. I added the function `BLE_RememberPacket()` for the latter purpose. I also cleaned up some of the logging code, now that logging is configurable (on ESP32 platform, anyway). Co-authored-by: Joe Kearney <joe@clubk.club> Reviewed-on: #13
This commit is contained in:
parent
45df6f952a
commit
daa1a2a1ec
6 changed files with 28 additions and 6 deletions
|
|
@ -135,6 +135,8 @@ void HandleBLEEventPacket(const BLE_EventPacket_T *const packet, StateMachineCon
|
|||
{
|
||||
if (BLE_IsPacketNew(packet->BD_ADDR, BLE_PACKET_TYPE_EVENT, packet->event_number))
|
||||
{
|
||||
BLE_RememberPacket(packet->BD_ADDR, BLE_PACKET_TYPE_EVENT, packet->event_number);
|
||||
|
||||
if (packet->event_ID == BLE_EVENT_CONFIGURED)
|
||||
{
|
||||
if (context->States.Current_State == STATE_CONFIGURING)
|
||||
|
|
@ -146,6 +148,10 @@ void HandleBLEEventPacket(const BLE_EventPacket_T *const packet, StateMachineCon
|
|||
};
|
||||
Transition_For_Event(context, STATE_READY, &Event);
|
||||
}
|
||||
else
|
||||
{
|
||||
KLOG_WARN("STATE", "Ignoring a BLE Configured event--not in the Configuring State!");
|
||||
}
|
||||
}
|
||||
else if (packet->event_ID == BLE_EVENT_CONFIGURE)
|
||||
{
|
||||
|
|
@ -158,6 +164,10 @@ void HandleBLEEventPacket(const BLE_EventPacket_T *const packet, StateMachineCon
|
|||
};
|
||||
Transition_For_Event(context, STATE_CONFIGURING, &Event);
|
||||
}
|
||||
else
|
||||
{
|
||||
KLOG_WARN("STATE", "Ignoring a BLE Configure event--not in the Ready State!");
|
||||
}
|
||||
}
|
||||
else if (packet->event_ID == BLE_EVENT_WRAPUP_COMPLETE)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue