Software/SystemK
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reworked BLE according to v0.12 of the KTag Beacon Specification #5

Merged
Joe merged 15 commits from BLE_Protocol_v0.12 into main 2025-09-01 17:44:10 +00:00
Conversation 0 Commits 15 Files changed 22 +22 -1
3 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2b31cc45e1 - Show all commits

16
States/Playing/State_Playing__Interacting.c
View file

@ -406,6 +406,7 @@ static void Playing__Interacting_Do(StateMachineContext_T * context)
} }
break; break;
case KEVENT_PLAY_PRESSED_ON_REMOTE:
case KEVENT_GAME_OVER: case KEVENT_GAME_OVER:
{ {
AudioAction_T audio_action = {.ID = AUDIO_PLAY_GAME_OVER, .Play_To_Completion = true}; AudioAction_T audio_action = {.ID = AUDIO_PLAY_GAME_OVER, .Play_To_Completion = true};
@ -413,6 +414,21 @@ static void Playing__Interacting_Do(StateMachineContext_T * context)
Transition_For_Event(context, STATE_WRAPPING_UP, &Event); Transition_For_Event(context, STATE_WRAPPING_UP, &Event);
} }
break; break;
case KEVENT_MENU_UP:
{
#ifdef LOG_INTERACTING_SUBSTATE
KLOG_INFO(KLOG_TAG, "Simulating a tag leading to being tagged out.");
#endif // LOG_INTERACTING_SUBSTATE
Reduce_Health(Get_Max_Health());
AudioAction_T audio_action = {.ID = AUDIO_PLAY_TAG_RECEIVED, .Data = (void *)0x00};
Perform_Audio_Action(&audio_action);
NeoPixelsAction_T neopixels_action = {.ID = NEOPIXELS_TAG_RECEIVED, .Prominence = NEOPIXELS_FOREGROUND, .Data = (void *)&ReceivedTagColor};
xQueueSend(xQueueNeoPixels, &neopixels_action, 0);
}
break;
default: default:
// All other events are ignored in this state. // All other events are ignored in this state.

3
States/Playing/State_Playing__Tagged_Out.c
View file

@ -185,6 +185,7 @@ static void Playing__Tagged_Out_Do(StateMachineContext_T * context)
} }
break; break;
case KEVENT_PLAY_PRESSED_ON_REMOTE:
case KEVENT_GAME_OVER: case KEVENT_GAME_OVER:
{ {
AudioAction_T audio_action = {.ID = AUDIO_PLAY_GAME_OVER, .Play_To_Completion = true}; AudioAction_T audio_action = {.ID = AUDIO_PLAY_GAME_OVER, .Play_To_Completion = true};
@ -193,7 +194,7 @@ static void Playing__Tagged_Out_Do(StateMachineContext_T * context)
} }
break; break;
case KEVENT_PLAY_PRESSED_ON_REMOTE: case KEVENT_MENU_DOWN:
Set_Health(Get_Max_Health()); Set_Health(Get_Max_Health());
Reset_Bombs(); Reset_Bombs();
Transition_For_Event(context, STATE_PLAYING__INTERACTING, &Event); Transition_For_Event(context, STATE_PLAYING__INTERACTING, &Event);

4
States/State_Wrapping_Up.c
View file

@ -118,6 +118,10 @@ static void Wrapping_Up_Do(StateMachineContext_T * context)
BLE_FreePacketBuffer(Event.Data); BLE_FreePacketBuffer(Event.Data);
} }
break; break;
case KEVENT_PLAY_PRESSED_ON_REMOTE:
Transition_For_Event(context, STATE_CONFIGURING, &Event);
break;
default: default:
// All other events are ignored in this state. // All other events are ignored in this state.