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

Accessory btn now selects team in Configuring state.

Browse source
This commit is contained in:
Joe Kearney 2025-01-27 20:01:28 -06:00
parent 6f51f5b006
commit 80b4987bcb
4 changed files with 189 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

229
States/State_Configuring.c
View file

@ -22,14 +22,14 @@
/* Include Files */
#include "SystemK.h"
static void Configuring_Entry(StateMachineContext_T * context);
static void Configuring_Do(StateMachineContext_T * context);
static void Configuring_Exit(StateMachineContext_T * context);
static void Configuring_Entry(StateMachineContext_T *context);
static void Configuring_Do(StateMachineContext_T *context);
static void Configuring_Exit(StateMachineContext_T *context);
#define MAX_MENU_DEPTH 10
static MenuItem_T const * CurrentMenuItem;
static MenuItem_T const *CurrentMenuItem;
static uint8_t MenuItemHistoryIndex = 0;
static MenuItem_T const * MenuItemHistory[MAX_MENU_DEPTH];
static MenuItem_T const *MenuItemHistory[MAX_MENU_DEPTH];
static const uint16_t LONG_PRESS_FOR_READY_in_ms = 5000;
@ -37,17 +37,16 @@ static const char *KLOG_TAG = "STATE_CONFIGURING";
//! Activities for the **Configuring** state.
const StateActivity_T STATE_CONFIGURING_Activities =
{
.Entry = Configuring_Entry,
.Do = Configuring_Do,
.Exit = Configuring_Exit
};
{
.Entry = Configuring_Entry,
.Do = Configuring_Do,
.Exit = Configuring_Exit};
//! Sets up the Configuring state.
/*!
* \param context Context in which this state is being run.
*/
static void Configuring_Entry(StateMachineContext_T * context)
static void Configuring_Entry(StateMachineContext_T *context)
{
LOG("Entering the Configuring state.");
NeoPixelsAction_T neopixels_action = {.ID = NEOPIXELS_MENU, .Prominence = NEOPIXELS_FOREGROUND, .Data = (void *)0x00};
@ -68,114 +67,134 @@ static void Configuring_Entry(StateMachineContext_T * context)
/*!
* \param context Context in which this state is being run.
*/
static void Configuring_Do(StateMachineContext_T * context)
{
static void Configuring_Do(StateMachineContext_T *context)
{
portBASE_TYPE xStatus;
static KEvent_T Event;
xStatus = Receive_KEvent(&Event);
if (xStatus == pdPASS)
{
switch (Event.ID)
{
case KEVENT_MENU_ENTER:
case KEVENT_MENU_ENTER:
if (CurrentMenuItem->OnFocus != NULL)
{
CurrentMenuItem->OnFocus(true);
}
break;
case KEVENT_MENU_SELECT:
{
if (CurrentMenuItem->OnSelect != NULL)
{
MenuItem_T const *menuItem = CurrentMenuItem->OnSelect();
// Check to see if we have entered a submenu.
if (menuItem != NULL)
{
// Save off the old menu item, so we can get back to it later.
MenuItemHistoryIndex++;
MenuItemHistory[MenuItemHistoryIndex] = menuItem;
CurrentMenuItem = menuItem;
if (CurrentMenuItem->OnFocus != NULL)
{
CurrentMenuItem->OnFocus(true);
}
}
}
}
break;
case KEVENT_MENU_BACK:
if (MenuItemHistoryIndex > 0)
{
// Go up a menu.
MenuItemHistoryIndex--;
CurrentMenuItem = MenuItemHistory[MenuItemHistoryIndex];
if (CurrentMenuItem->OnFocus != NULL)
{
CurrentMenuItem->OnFocus(true);
}
break;
}
break;
case KEVENT_MENU_SELECT:
{
if (CurrentMenuItem->OnSelect != NULL)
{
MenuItem_T const * menuItem = CurrentMenuItem->OnSelect();
// Check to see if we have entered a submenu.
if (menuItem != NULL)
{
// Save off the old menu item, so we can get back to it later.
MenuItemHistoryIndex++;
MenuItemHistory[MenuItemHistoryIndex] = menuItem;
CurrentMenuItem = menuItem;
if (CurrentMenuItem->OnFocus != NULL)
{
CurrentMenuItem->OnFocus(true);
}
}
}
}
break;
case KEVENT_MENU_BACK:
if (MenuItemHistoryIndex > 0)
{
// Go up a menu.
MenuItemHistoryIndex--;
CurrentMenuItem = MenuItemHistory[MenuItemHistoryIndex];
if (CurrentMenuItem->OnFocus != NULL)
{
CurrentMenuItem->OnFocus(true);
}
}
break;
case KEVENT_MENU_UP:
{
if (CurrentMenuItem->OnIncrement != NULL)
{
CurrentMenuItem->OnIncrement();
}
}
break;
case KEVENT_MENU_DOWN:
{
if (CurrentMenuItem->OnDecrement != NULL)
{
CurrentMenuItem->OnDecrement();
}
}
break;
case KEVENT_MENU_EXIT:
while (MenuItemHistoryIndex > 0)
{
// Go up a menu.
MenuItemHistoryIndex--;
CurrentMenuItem = MenuItemHistory[MenuItemHistoryIndex];
if (CurrentMenuItem->OnFocus != NULL)
{
CurrentMenuItem->OnFocus(true);
}
}
break;
case KEVENT_MENU_UP:
{
if (CurrentMenuItem->OnIncrement != NULL)
{
CurrentMenuItem->OnIncrement();
}
}
break;
case KEVENT_TRIGGER_SWITCH_RELEASED:
{
uint32_t duration_of_press_in_ms = (uint32_t)Event.Data;
if (duration_of_press_in_ms > LONG_PRESS_FOR_READY_in_ms)
{
Transition_For_Event(context, STATE_READY, &Event);
}
}
break;
case KEVENT_MENU_DOWN:
{
if (CurrentMenuItem->OnDecrement != NULL)
{
CurrentMenuItem->OnDecrement();
}
}
break;
case KEVENT_PLAY_PRESSED_ON_REMOTE:
case KEVENT_MENU_EXIT:
while (MenuItemHistoryIndex > 0)
{
// Go up a menu.
MenuItemHistoryIndex--;
CurrentMenuItem = MenuItemHistory[MenuItemHistoryIndex];
if (CurrentMenuItem->OnFocus != NULL)
{
CurrentMenuItem->OnFocus(true);
}
}
break;
case KEVENT_TRIGGER_SWITCH_RELEASED:
{
uint32_t duration_of_press_in_ms = (uint32_t)Event.Data;
if (duration_of_press_in_ms > LONG_PRESS_FOR_READY_in_ms)
{
Transition_For_Event(context, STATE_READY, &Event);
break;
}
}
break;
case KEVENT_REPROGRAM:
Transition_For_Event(context, STATE_REPROGRAMMING, &Event);
break;
default:
// All other events are ignored in this state.
ProcessUnhandledEvent(&Event);
break;
case KEVENT_ACCESSORY_SWITCH_PRESSED:
{
uint8_t Team_ID;
(void)SETTINGS_get_uint8_t(SYSTEMK_SETTING_TEAMID, &Team_ID);
Team_ID++;
if (Team_ID > BASIC_TEAMS_MAXIMUM)
{
Team_ID = BASIC_TEAMS_MINIMUM;
}
if (Set_Team_With_Audio_Feedback(Team_ID) != SYSTEMK_RESULT_SUCCESS)
{
KLOG_WARN(KLOG_TAG, "Failed to increment team!");
}
}
break;
case KEVENT_PLAY_PRESSED_ON_REMOTE:
Transition_For_Event(context, STATE_READY, &Event);
break;
case KEVENT_REPROGRAM:
Transition_For_Event(context, STATE_REPROGRAMMING, &Event);
break;
default:
// All other events are ignored in this state.
ProcessUnhandledEvent(&Event);
break;
}
}
}
@ -184,14 +203,14 @@ static void Configuring_Do(StateMachineContext_T * context)
/*!
* \param context Context in which this state is being run.
*/
static void Configuring_Exit(StateMachineContext_T * context)
static void Configuring_Exit(StateMachineContext_T *context)
{
// Save any changes that were made to NVM.
if (SETTINGS_Save() != SYSTEMK_RESULT_SUCCESS)
{
KLOG_ERROR(KLOG_TAG, "Couldn't save the settings to NVM!");
}
NeoPixelsAction_T neopixels_action = {.ID = NEOPIXELS_ALL_OFF, .Prominence = NEOPIXELS_FOREGROUND, .Data = (void *)0x00};
xQueueSend(xQueueNeoPixels, &neopixels_action, 0);
}