Software/2024A-SW
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

32ESPecial Version 1.00 (#9)

Browse source 
This release reworked the initialization code to provide more robust initialization, especially when no USB stick is present.

It incorporates [Version 1.0 of SystemK](Software/SystemK#9).

This is the first release for the [32ESPecial Blaster Kits](https://link.clubk.club/2025002).

Co-authored-by: Joe Kearney <joe@clubk.club>
Reviewed-on: #9
This commit is contained in:
Joe Kearney 2025-11-30 21:46:46 +00:00
parent 14ec8fe280
commit e12ee17973
67 changed files with 1232 additions and 649 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/NVM/CMakeLists.txt
View file

@ -9,6 +9,7 @@ idf_component_register(
"."
REQUIRES
"SystemK"
"System_Events"
"spiffs"
"driver"
"usb"

2
components/NVM/Key_Value.h
View file

@ -30,4 +30,4 @@ SystemKResult_T KV_Get_Value_uint32(const char *filename, const char *search_key
SystemKResult_T KV_Set_Value_uint32(const char *filename, const char *set_key, uint32_t *set_value);
SystemKResult_T KV_Get_Value_uint8(const char *filename, const char *search_key, uint8_t *value);
SystemKResult_T KV_Set_Value_uint8(const char *filename, const char *set_key, uint8_t *set_value);
SystemKResult_T KV_Set_Value_uint8(const char *filename, const char *set_key, uint8_t *set_value);

2
components/NVM/NVM.h
View file

@ -24,3 +24,5 @@
#include "Key_Value.h"
#include "SPIFFS.h"
#include "USB.h"
SystemKResult_T Initialize_Settings(void);

9
components/NVM/SPIFFS.c
View file

@ -20,13 +20,14 @@
*/
#include <SystemK.h>
#include <System_Events.h>
#include <string.h>
#include "esp_spiffs.h"
static const char *TAG = "SPIFFS";
const char *DEFAULT_CONFIG_FILE = "/spiffs/default_config.txt";
void Initialize_SPIFFS(SemaphoreHandle_t init_complete)
void Initialize_SPIFFS(void)
{
KLOG_INFO(TAG, "Initializing SPI flash file system (SPIFFS)...");
@ -80,5 +81,7 @@ void Initialize_SPIFFS(SemaphoreHandle_t init_complete)
fclose(f);
KLOG_INFO(TAG, ">>> %s <<<", buf);
xSemaphoreGive(init_complete);
}
xEventGroupSetBits(Get_System_Events(), SYS_SPIFFS_READY);
KLOG_INFO(TAG, "SPIFFS initialized.");
}

4
components/NVM/SPIFFS.h
View file

@ -21,6 +21,6 @@
#pragma once
void Initialize_SPIFFS(SemaphoreHandle_t init_complete);
void Initialize_SPIFFS(void);
extern const char *DEFAULT_CONFIG_FILE;
extern const char *DEFAULT_CONFIG_FILE;

404
components/NVM/Settings.c
View file

@ -21,95 +21,73 @@
#include <string.h>
#include <SystemK.h>
#include <System_Events.h>
#include <NVM.h>
static const uint8_t UNINTIALIZED_UINT8 = UINT8_MAX;
static const char *TAG = "Settings";
// Cache variable declarations
// 1 if this device is configured for a right-handed player, 0 otherwise.
static uint8_t Cached_Is_Right_Handed = 1;
// Value from CONFIG_KTAG_MIN_AUDIO_VOLUME to CONFIG_KTAG_MAX_AUDIO_VOLUME representing the current volume.
static uint8_t Cached_Audio_Volume = CONFIG_KTAG_MAX_AUDIO_VOLUME;
// Selected team.
static uint8_t Cached_Team_ID = BASIC_TEAMS_MINIMUM;
// Unique-per-team identification of a player.
static uint8_t Cached_Player_ID = 0;
// Selected weapon.
static uint8_t Cached_Weapon_ID = DUBUQUE_PROTOCOL_ID;
// Maximum health for the game.
static uint8_t Cached_Max_Health = 100;
// Number of special weapons (currently only bombs) obtained when reentering after being tagged out.
static uint8_t Cached_N_Special_Weapons_On_Reentry = 1;
// Time (in milliseconds) after starting a game before the countdown begins.
static uint32_t Cached_T_Start_Game_in_ms = 30000;
// Duration of a game (in milliseconds). If this is zero or UINT32_MAX, the game is untimed.
static uint32_t Cached_T_Game_Length_in_ms = 600000;
// Color in addition to the team color used to identify a player's device. The format is Brightness-Red-Green-Blue, where a brightness of 0xFF indicates a false flag.
static uint32_t Cached_Secondary_Color = 0xFE000000;
static uint8_t Cached_Team_ID = UNINTIALIZED_UINT8;
static uint8_t Cached_Player_ID = UNINTIALIZED_UINT8;
static uint8_t Cached_Weapon_ID = UNINTIALIZED_UINT8;
static uint8_t Cached_Max_Health = UNINTIALIZED_UINT8;
static uint8_t Cached_N_Special_Weapons_On_Reentry = UNINTIALIZED_UINT8;
SystemKResult_T SETTINGS_get_uint8_t(SystemKSettingID_T id, uint8_t *value)
{
SystemKResult_T result = SYSTEMK_RESULT_UNSPECIFIED_FAILURE;
char *key = "";
uint8_t *cached_value = NULL;
switch (id)
{
case SYSTEMK_SETTING_IS_RIGHT_HANDED:
key = "Is_Right_Handed";
*value = Cached_Is_Right_Handed;
result = SYSTEMK_RESULT_SUCCESS;
break;
case SYSTEMK_SETTING_AUDIO_VOLUME:
key = "Audio_Volume";
*value = Cached_Audio_Volume;
result = SYSTEMK_RESULT_SUCCESS;
break;
case SYSTEMK_SETTING_TEAMID:
if (Cached_Team_ID != UNINTIALIZED_UINT8)
{
*value = Cached_Team_ID;
result = SYSTEMK_RESULT_SUCCESS;
}
else
{
key = "Team_ID";
cached_value = &Cached_Team_ID;
}
*value = Cached_Team_ID;
result = SYSTEMK_RESULT_SUCCESS;
break;
case SYSTEMK_SETTING_PLAYERID:
if (Cached_Player_ID != UNINTIALIZED_UINT8)
{
*value = Cached_Player_ID;
result = SYSTEMK_RESULT_SUCCESS;
}
else
{
key = "Player_ID";
cached_value = &Cached_Player_ID;
}
*value = Cached_Player_ID;
result = SYSTEMK_RESULT_SUCCESS;
break;
case SYSTEMK_SETTING_WEAPONID:
if (Cached_Weapon_ID != UNINTIALIZED_UINT8)
{
*value = Cached_Weapon_ID;
result = SYSTEMK_RESULT_SUCCESS;
}
else
{
key = "Weapon_ID";
cached_value = &Cached_Weapon_ID;
}
*value = Cached_Weapon_ID;
result = SYSTEMK_RESULT_SUCCESS;
break;
case SYSTEMK_SETTING_MAX_HEALTH:
if (Cached_Max_Health != UNINTIALIZED_UINT8)
{
*value = Cached_Max_Health;
result = SYSTEMK_RESULT_SUCCESS;
}
else
{
key = "Max_Health";
cached_value = &Cached_Max_Health;
}
*value = Cached_Max_Health;
result = SYSTEMK_RESULT_SUCCESS;
break;
case SYSTEMK_SETTING_N_SPECIAL_WEAPONS_ON_REENTRY:
if (Cached_N_Special_Weapons_On_Reentry != UNINTIALIZED_UINT8)
{
*value = Cached_N_Special_Weapons_On_Reentry;
result = SYSTEMK_RESULT_SUCCESS;
}
else
{
key = "N_Special_Weapons_On_Reentry";
cached_value = &Cached_N_Special_Weapons_On_Reentry;
}
*value = Cached_N_Special_Weapons_On_Reentry;
result = SYSTEMK_RESULT_SUCCESS;
break;
default:
@ -117,30 +95,10 @@ SystemKResult_T SETTINGS_get_uint8_t(SystemKSettingID_T id, uint8_t *value)
break;
}
if (result != SYSTEMK_RESULT_SUCCESS)
{
result = KV_Get_Value_uint8(CONFIG_FILE, key, value);
if (result != SYSTEMK_RESULT_SUCCESS)
{
result = KV_Get_Value_uint8(DEFAULT_CONFIG_FILE, key, value);
if (result == SYSTEMK_RESULT_SUCCESS)
{
(void)KV_Set_Value_uint8(CONFIG_FILE, key, value);
}
}
// Save the cached value, if necessary.
if ((cached_value != NULL) && (result == SYSTEMK_RESULT_SUCCESS))
{
*cached_value = *value;
}
}
return result;
}
SystemKResult_T SETTINGS_set_uint8_t(SystemKSettingID_T id, uint8_t value)
{
SystemKResult_T result = SYSTEMK_RESULT_SUCCESS;
@ -148,10 +106,12 @@ SystemKResult_T SETTINGS_set_uint8_t(SystemKSettingID_T id, uint8_t value)
switch (id)
{
case SYSTEMK_SETTING_IS_RIGHT_HANDED:
Cached_Is_Right_Handed = value;
result = KV_Set_Value_uint8(CONFIG_FILE, "Is_Right_Handed", &value);
break;
case SYSTEMK_SETTING_AUDIO_VOLUME:
Cached_Audio_Volume = value;
result = KV_Set_Value_uint8(CONFIG_FILE, "Audio_Volume", &value);
break;
@ -188,24 +148,26 @@ SystemKResult_T SETTINGS_set_uint8_t(SystemKSettingID_T id, uint8_t value)
return result;
}
SystemKResult_T SETTINGS_get_uint32_t(SystemKSettingID_T id, uint32_t *value)
{
SystemKResult_T result = SYSTEMK_RESULT_SUCCESS;
char *key = "";
SystemKResult_T result = SYSTEMK_RESULT_UNSPECIFIED_FAILURE;
switch (id)
{
case SYSTEMK_SETTING_DEVICE_TYPE:
*value = BLE_DEVICE_TYPE_32ESPECIAL;
return result;
break;
case SYSTEMK_SETTING_T_START_GAME_in_ms:
key = "T_Start_Game_in_ms";
*value = Cached_T_Start_Game_in_ms;
result = SYSTEMK_RESULT_SUCCESS;
break;
case SYSTEMK_SETTING_T_GAME_LENGTH_in_ms:
key = "T_Game_Length_in_ms";
*value = Cached_T_Game_Length_in_ms;
result = SYSTEMK_RESULT_SUCCESS;
break;
case SYSTEMK_SETTING_SECONDARY_COLOR:
*value = Cached_Secondary_Color;
result = SYSTEMK_RESULT_SUCCESS;
break;
default:
@ -213,21 +175,6 @@ SystemKResult_T SETTINGS_get_uint32_t(SystemKSettingID_T id, uint32_t *value)
break;
}
if (result == SYSTEMK_RESULT_SUCCESS)
{
result = KV_Get_Value_uint32(CONFIG_FILE, key, value);
if (result != SYSTEMK_RESULT_SUCCESS)
{
result = KV_Get_Value_uint32(DEFAULT_CONFIG_FILE, key, value);
if (result == SYSTEMK_RESULT_SUCCESS)
{
(void)KV_Set_Value_uint32(CONFIG_FILE, key, value);
}
}
}
return result;
}
@ -238,13 +185,20 @@ SystemKResult_T SETTINGS_set_uint32_t(SystemKSettingID_T id, uint32_t value)
switch (id)
{
case SYSTEMK_SETTING_T_START_GAME_in_ms:
Cached_T_Start_Game_in_ms = value;
result = KV_Set_Value_uint32(CONFIG_FILE, "T_Start_Game_in_ms", &value);
break;
case SYSTEMK_SETTING_T_GAME_LENGTH_in_ms:
Cached_T_Game_Length_in_ms = value;
result = KV_Set_Value_uint32(CONFIG_FILE, "T_Game_Length_in_ms", &value);
break;
case SYSTEMK_SETTING_SECONDARY_COLOR:
Cached_Secondary_Color = value;
result = KV_Set_Value_uint32(CONFIG_FILE, "Secondary_Color", &value);
break;
default:
result = SYSTEMK_RESULT_WRONG_DATATYPE;
break;
@ -253,7 +207,7 @@ SystemKResult_T SETTINGS_set_uint32_t(SystemKSettingID_T id, uint32_t value)
return result;
}
SystemKResult_T SETTINGS_get_device_name(char* name)
SystemKResult_T SETTINGS_get_device_name(char *name)
{
char buffer[KV_MAX_VALUE_LENGTH];
SystemKResult_T result = KV_Get_Value_string(CONFIG_FILE, "Device_Name", buffer);
@ -267,7 +221,7 @@ SystemKResult_T SETTINGS_get_device_name(char* name)
return result;
}
SystemKResult_T SETTINGS_set_device_name(char* name)
SystemKResult_T SETTINGS_set_device_name(char *name)
{
SystemKResult_T result = KV_Set_Value_string(CONFIG_FILE, "Device_Name", name);
return result;
@ -278,3 +232,239 @@ SystemKResult_T SETTINGS_Save(void)
{
return SYSTEMK_RESULT_SUCCESS;
}
SystemKResult_T Initialize_Settings(void)
{
SystemKResult_T result = SYSTEMK_RESULT_SUCCESS;
SystemKResult_T temp_result;
uint32_t value_uint32_t;
uint8_t value_uint8_t;
KLOG_INFO(TAG, "Initializing settings...");
// Initialize Is_Right_Handed
temp_result = KV_Get_Value_uint8(CONFIG_FILE, "Is_Right_Handed", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Try to get from default config
temp_result = KV_Get_Value_uint8(DEFAULT_CONFIG_FILE, "Is_Right_Handed", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Use hardcoded default
value_uint8_t = 1;
KLOG_WARN(TAG, "Is_Right_Handed not found in config files; using default value of 1.");
}
// Save to config file
temp_result = KV_Set_Value_uint8(CONFIG_FILE, "Is_Right_Handed", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
result = temp_result;
KLOG_ERROR(TAG, "Failed to set Is_Right_Handed in config file.");
}
}
Cached_Is_Right_Handed = value_uint8_t;
// Initialize Audio_Volume
temp_result = KV_Get_Value_uint8(CONFIG_FILE, "Audio_Volume", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Try to get from default config
temp_result = KV_Get_Value_uint8(DEFAULT_CONFIG_FILE, "Audio_Volume", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Use hardcoded default
value_uint8_t = CONFIG_KTAG_MAX_AUDIO_VOLUME;
KLOG_WARN(TAG, "Audio_Volume not found in config files; using default value of CONFIG_KTAG_MAX_AUDIO_VOLUME.");
}
// Save to config file
temp_result = KV_Set_Value_uint8(CONFIG_FILE, "Audio_Volume", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
result = temp_result;
KLOG_ERROR(TAG, "Failed to set Audio_Volume in config file.");
}
}
Cached_Audio_Volume = value_uint8_t;
// Initialize Team_ID
temp_result = KV_Get_Value_uint8(CONFIG_FILE, "Team_ID", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Try to get from default config
temp_result = KV_Get_Value_uint8(DEFAULT_CONFIG_FILE, "Team_ID", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Use hardcoded default
value_uint8_t = BASIC_TEAMS_MINIMUM;
KLOG_WARN(TAG, "Team_ID not found in config files; using default value of BASIC_TEAMS_MINIMUM.");
}
// Save to config file
temp_result = KV_Set_Value_uint8(CONFIG_FILE, "Team_ID", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
result = temp_result;
KLOG_ERROR(TAG, "Failed to set Team_ID in config file.");
}
}
Cached_Team_ID = value_uint8_t;
// Initialize Player_ID
temp_result = KV_Get_Value_uint8(CONFIG_FILE, "Player_ID", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Try to get from default config
temp_result = KV_Get_Value_uint8(DEFAULT_CONFIG_FILE, "Player_ID", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Use hardcoded default
value_uint8_t = 0;
KLOG_WARN(TAG, "Player_ID not found in config files; using default value of 0.");
}
// Save to config file
temp_result = KV_Set_Value_uint8(CONFIG_FILE, "Player_ID", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
result = temp_result;
KLOG_ERROR(TAG, "Failed to set Player_ID in config file.");
}
}
Cached_Player_ID = value_uint8_t;
// Initialize Weapon_ID
temp_result = KV_Get_Value_uint8(CONFIG_FILE, "Weapon_ID", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Try to get from default config
temp_result = KV_Get_Value_uint8(DEFAULT_CONFIG_FILE, "Weapon_ID", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Use hardcoded default
value_uint8_t = DUBUQUE_PROTOCOL_ID;
KLOG_WARN(TAG, "Weapon_ID not found in config files; using default value of DUBUQUE_PROTOCOL_ID.");
}
// Save to config file
temp_result = KV_Set_Value_uint8(CONFIG_FILE, "Weapon_ID", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
result = temp_result;
KLOG_ERROR(TAG, "Failed to set Weapon_ID in config file.");
}
}
Cached_Weapon_ID = value_uint8_t;
// Initialize Max_Health
temp_result = KV_Get_Value_uint8(CONFIG_FILE, "Max_Health", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Try to get from default config
temp_result = KV_Get_Value_uint8(DEFAULT_CONFIG_FILE, "Max_Health", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Use hardcoded default
value_uint8_t = 100;
KLOG_WARN(TAG, "Max_Health not found in config files; using default value of 100.");
}
// Save to config file
temp_result = KV_Set_Value_uint8(CONFIG_FILE, "Max_Health", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
result = temp_result;
KLOG_ERROR(TAG, "Failed to set Max_Health in config file.");
}
}
Cached_Max_Health = value_uint8_t;
// Initialize N_Special_Weapons_On_Reentry
temp_result = KV_Get_Value_uint8(CONFIG_FILE, "N_Special_Weapons_On_Reentry", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Try to get from default config
temp_result = KV_Get_Value_uint8(DEFAULT_CONFIG_FILE, "N_Special_Weapons_On_Reentry", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Use hardcoded default
value_uint8_t = 1;
KLOG_WARN(TAG, "N_Special_Weapons_On_Reentry not found in config files; using default value of 1.");
}
// Save to config file
temp_result = KV_Set_Value_uint8(CONFIG_FILE, "N_Special_Weapons_On_Reentry", &value_uint8_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
result = temp_result;
KLOG_ERROR(TAG, "Failed to set N_Special_Weapons_On_Reentry in config file.");
}
}
Cached_N_Special_Weapons_On_Reentry = value_uint8_t;
// Initialize T_Start_Game_in_ms
temp_result = KV_Get_Value_uint32(CONFIG_FILE, "T_Start_Game_in_ms", &value_uint32_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Try to get from default config
temp_result = KV_Get_Value_uint32(DEFAULT_CONFIG_FILE, "T_Start_Game_in_ms", &value_uint32_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Use hardcoded default
value_uint32_t = 30000;
KLOG_WARN(TAG, "T_Start_Game_in_ms not found in config files; using default value of 30000.");
}
// Save to config file
temp_result = KV_Set_Value_uint32(CONFIG_FILE, "T_Start_Game_in_ms", &value_uint32_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
result = temp_result;
KLOG_ERROR(TAG, "Failed to set T_Start_Game_in_ms in config file.");
}
}
Cached_T_Start_Game_in_ms = value_uint32_t;
// Initialize T_Game_Length_in_ms
temp_result = KV_Get_Value_uint32(CONFIG_FILE, "T_Game_Length_in_ms", &value_uint32_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Try to get from default config
temp_result = KV_Get_Value_uint32(DEFAULT_CONFIG_FILE, "T_Game_Length_in_ms", &value_uint32_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Use hardcoded default
value_uint32_t = 600000;
KLOG_WARN(TAG, "T_Game_Length_in_ms not found in config files; using default value of 600000.");
}
// Save to config file
temp_result = KV_Set_Value_uint32(CONFIG_FILE, "T_Game_Length_in_ms", &value_uint32_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
result = temp_result;
KLOG_ERROR(TAG, "Failed to set T_Game_Length_in_ms in config file.");
}
}
Cached_T_Game_Length_in_ms = value_uint32_t;
// Initialize Secondary_Color
temp_result = KV_Get_Value_uint32(CONFIG_FILE, "Secondary_Color", &value_uint32_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Try to get from default config
temp_result = KV_Get_Value_uint32(DEFAULT_CONFIG_FILE, "Secondary_Color", &value_uint32_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
// Use hardcoded default
value_uint32_t = 0xFE000000;
KLOG_WARN(TAG, "Secondary_Color not found in config files; using default value of 0xFE000000.");
}
// Save to config file
temp_result = KV_Set_Value_uint32(CONFIG_FILE, "Secondary_Color", &value_uint32_t);
if (temp_result != SYSTEMK_RESULT_SUCCESS)
{
result = temp_result;
KLOG_ERROR(TAG, "Failed to set Secondary_Color in config file.");
}
}
Cached_Secondary_Color = value_uint32_t;
xEventGroupSetBits(Get_System_Events(), SYS_SETTINGS_READY);
KLOG_INFO(TAG, "Settings initialized.");
return result;
}

43
components/NVM/USB.c
View file

@ -22,6 +22,7 @@
// From https://github.com/espressif/esp-idf/blob/master/examples/peripherals/usb/host/msc/main/msc_example_main.c
#include <SystemK.h>
#include <System_Events.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
@ -55,6 +56,9 @@ static const char *TAG = "USB";
static const char *OTA_FILE = "/usb/esp/OTA_URL.txt";
const char *CONFIG_FILE = "/usb/esp/config.txt";
__NOINIT_ATTR uint_fast8_t Restarts;
static bool Device_Connected_This_Power_Cycle = false;
typedef enum
{
USB_STATE_UNINITIALIZED,
@ -260,27 +264,25 @@ static void usb_host_task(void *args)
if (usb_host_device_free_all() == ESP_OK)
{
KLOG_INFO(TAG, "USB_HOST_LIB_EVENT_FLAGS_NO_CLIENTS");
// break;
};
}
if (event_flags & USB_HOST_LIB_EVENT_FLAGS_ALL_FREE)
{
KLOG_INFO(TAG, "USB_HOST_LIB_EVENT_FLAGS_ALL_FREE");
// break;
}
}
}
static void app_usb_task(void *args)
{
SemaphoreHandle_t init_complete = args;
static USB_State_T Current_State = USB_STATE_UNINITIALIZED;
static msc_host_device_handle_t msc_device = NULL;
static msc_host_vfs_handle_t vfs_handle = NULL;
static uint8_t device_address = 1;
usb_message_t msg;
esp_reset_reason() == ESP_RST_POWERON ? Restarts = 0 : Restarts++;
while (true)
{
switch (Current_State)
@ -308,14 +310,32 @@ static void app_usb_task(void *args)
{
device_address = msg.data.new_dev_address;
Current_State = USB_STATE_DEVICE_CONNECTED;
Device_Connected_This_Power_Cycle = true;
Restarts = 0;
KLOG_INFO(TAG, "Device connected.");
}
}
else
{
KLOG_ERROR(TAG, "No flash drive detected--rebooting.");
vTaskDelay(pdMS_TO_TICKS(100));
esp_restart();
if (Device_Connected_This_Power_Cycle == false)
{
if (Restarts <= 3)
{
KLOG_ERROR(TAG, "No flash drive detected--rebooting.");
vTaskDelay(pdMS_TO_TICKS(100));
esp_restart();
}
else
{
static bool warning_sent = false;
if (warning_sent == false)
{
KLOG_WARN(TAG, "No flash drive detected after multiple attempts.");
warning_sent = true;
}
}
}
}
}
break;
@ -345,7 +365,7 @@ static void app_usb_task(void *args)
else
{
Current_State = USB_STATE_VFS_REGISTERED;
xSemaphoreGive(init_complete);
xEventGroupSetBits(Get_System_Events(), SYS_USB_FS_PRESENT);
}
}
}
@ -360,6 +380,7 @@ static void app_usb_task(void *args)
if (msg.id == USB_DEVICE_DISCONNECTED)
{
Current_State = USB_STATE_PROCESSING_DISCONNECTION;
xEventGroupClearBits(Get_System_Events(), SYS_USB_FS_PRESENT);
}
}
vTaskDelay(pdMS_TO_TICKS(1000));
@ -389,7 +410,7 @@ static void app_usb_task(void *args)
}
}
void Initialize_USB(SemaphoreHandle_t init_complete)
void Initialize_USB(void)
{
KLOG_INFO(TAG, "Initializing USB file system...");
@ -404,7 +425,7 @@ void Initialize_USB(SemaphoreHandle_t init_complete)
app_usb_task, // Function that implements the task.
"USB NVM", // Text name for the task.
STACK_SIZE, // Stack size in bytes, not words.
(void *)init_complete, // Parameter passed into the task.
NULL, // Parameter passed into the task.
tskIDLE_PRIORITY + 2, // Priority at which the task is created.
xStack, // Array to use as the task's stack.
&xTaskBuffer, // Variable to hold the task's data structure.
@ -446,4 +467,4 @@ void Erase_OTA_File(void)
{
KLOG_ERROR(TAG, "Error erasing the OTA file: %s", strerror(errno));
}
}
}

2
components/NVM/USB.h
View file

@ -21,7 +21,7 @@
#pragma once
void Initialize_USB(SemaphoreHandle_t init_complete);
void Initialize_USB(void);
extern const char *CONFIG_FILE;