Reworked BLE according to v0.12 of the KTag Beacon Specification (#5)
This change to SystemK implements version 0.12 of the KTag Beacon Specification. The spec. is here: [KTag Beacon Specification v0.12](https://ktag.clubk.club/Technology/BLE/KTag%20Beacon%20Specification%20v0.12.pdf) This change also includes the 31AUG2025 changes to the State Machine (now documented [here](https://ktag.clubk.club/Technology/SystemK/SystemKStateMachine.drawio.png)), as well as changes to support automated testing. **All projects should update to this version.** Co-authored-by: Joe Kearney <joe@clubk.club> Reviewed-on: #5
This commit is contained in:
parent
7aa827563a
commit
430aec54b8
22 changed files with 368 additions and 47 deletions
|
@ -34,8 +34,7 @@ static TickType_t xBLEConfigurationResponseTimerPeriod = 3000 / portTICK_PERIOD_
|
|||
|
||||
static void BLEConfigurationResponseTimerCallback(TimerHandle_t xTimer)
|
||||
{
|
||||
// Don't send HELLO packets once configuration has started.
|
||||
BLE_StopAdvertising();
|
||||
BLE_UpdateHelloPacket();
|
||||
}
|
||||
|
||||
#define MAX_MENU_DEPTH 10
|
||||
|
@ -107,13 +106,6 @@ static void Configuring_Do(StateMachineContext_T *context)
|
|||
{
|
||||
portBASE_TYPE xStatus;
|
||||
static KEvent_T Event;
|
||||
|
||||
// For the first hundred milliseconds, keep updating the Hello packet, since on some platforms (PSoC6), one call is not enough.
|
||||
// TODO: Fix the Hello packet hack on PSoC6.
|
||||
if ((xTaskGetTickCount() - context->Time_At_State_Entry_In_Ticks) < (100 / portTICK_PERIOD_MS))
|
||||
{
|
||||
BLE_UpdateHelloPacket();
|
||||
}
|
||||
|
||||
xStatus = Receive_KEvent(&Event);
|
||||
|
||||
|
@ -238,7 +230,12 @@ static void Configuring_Do(StateMachineContext_T *context)
|
|||
break;
|
||||
|
||||
case KEVENT_BLE_PACKET_RECEIVED:
|
||||
if (((BLE_Packet_T *)Event.Data)->Generic.type == BLE_PACKET_TYPE_PARAMETERS)
|
||||
if (((BLE_Packet_T *)Event.Data)->Generic.type == BLE_PACKET_TYPE_INSTIGATE_GAME)
|
||||
{
|
||||
Transition_For_Event(context, STATE_STARTING_GAME__RESPONDING, &Event);
|
||||
// Don't free the packet buffer here; it will be freed in Starting_Game__Responding_Entry().
|
||||
}
|
||||
else if (((BLE_Packet_T *)Event.Data)->Generic.type == BLE_PACKET_TYPE_PARAMETERS)
|
||||
{
|
||||
HandleBLEConfigurationPacket((BLE_ParametersPacket_T *)Event.Data);
|
||||
}
|
||||
|
@ -408,6 +405,12 @@ void HandleBLEConfigurationPacket(const BLE_ParametersPacket_T *const packet)
|
|||
BLE_RespondToConfigurationPacket(packet, BLE_ERROR_CHANGING_PARAMETERS);
|
||||
}
|
||||
|
||||
// A parameters request addressed to this device or broadcast will end a BLE Quiet.
|
||||
if (BLE_Unquiet() != SYSTEMK_RESULT_SUCCESS)
|
||||
{
|
||||
KLOG_ERROR(KLOG_TAG, "Couldn't Unquiet to respond to a Parameters request!");
|
||||
}
|
||||
|
||||
if (xTimerStart(BLEConfigurationResponseTimer, 0) != pdPASS)
|
||||
{
|
||||
KLOG_ERROR(KLOG_TAG, "Couldn't start the BLEConfigurationResponseTimer!");
|
||||
|
@ -415,11 +418,6 @@ void HandleBLEConfigurationPacket(const BLE_ParametersPacket_T *const packet)
|
|||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Once configuration has begun, stop advertising the HELLO packet to free up bandwidth.
|
||||
BLE_StopAdvertising();
|
||||
}
|
||||
|
||||
BLE_FreePacketBuffer((BLE_GenericPacketType_T *)packet);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue