diff --git a/components/ESP-NOW/CMakeLists.txt b/components/ESP-NOW/CMakeLists.txt deleted file mode 100644 index f666de7..0000000 --- a/components/ESP-NOW/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -idf_component_register( - SRCS - "ESP-NOW.c" - INCLUDE_DIRS - "." - REQUIRES - "SystemK" - "esp_wifi" - "nvs_flash" - "esp_netif" - "esp_event" - "esp_system" - "freertos" - "NVM" -) \ No newline at end of file diff --git a/components/ESP-NOW/ESP-NOW.c b/components/ESP-NOW/ESP-NOW.c deleted file mode 100644 index c116ca0..0000000 --- a/components/ESP-NOW/ESP-NOW.c +++ /dev/null @@ -1,180 +0,0 @@ -/* - * This program source code file is part of the KTag project. - * - * 🛡️ 🃞 - * - * Copyright © 2025 Joseph P. Kearney and the KTag developers. - * - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU Affero General Public License as published by the Free - * Software Foundation, either version 3 of the License, or (at your option) any - * later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more - * details. - * - * There should be a copy of the GNU Affero General Public License in the LICENSE - * file in the root of this repository. If not, see . - */ - -#include -#include -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" -#include "esp_system.h" -#include "esp_wifi.h" -#include "esp_mac.h" -#include "esp_event.h" -#include "esp_now.h" -// -#include "nvs_flash.h" - -static const char *TAG = "ESP-NOW"; - -// Broadcast address (all 0xFF sends to all devices) -static uint8_t Broadcast_MAC[ESP_NOW_ETH_ALEN] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; - -// Structure for the data to send -typedef struct -{ - uint32_t counter; - char message[32]; -} broadcast_data_t; - -// ESP-NOW receive callback -static void ESPNOW_Recv_CB(const esp_now_recv_info_t *recv_info, const uint8_t *data, int len) -{ - if (recv_info == NULL || data == NULL || len <= 0) - { - KLOG_ERROR(TAG, "Receive callback error"); - return; - } - - // Log sender MAC address - KLOG_INFO(TAG, "Received from: " MACSTR ", RSSI: %d", - MAC2STR(recv_info->src_addr), recv_info->rx_ctrl->rssi); - - // Parse received data - if (len == sizeof(broadcast_data_t)) - { - broadcast_data_t *recv_data = (broadcast_data_t *)data; - KLOG_INFO(TAG, "Counter: %lu, Message: %s", - recv_data->counter, recv_data->message); - } - else - { - KLOG_WARN(TAG, "Unexpected data length: %d", len); - } -} - -// ESP-NOW send callback -static void ESPNOW_Send_CB(const wifi_tx_info_t *tx_info, esp_now_send_status_t status) -{ - if (tx_info == NULL) - { - KLOG_ERROR(TAG, "Send callback error: tx_info is NULL"); - return; - } - - if (status == ESP_NOW_SEND_SUCCESS) - { - KLOG_INFO(TAG, "Send success to " MACSTR, MAC2STR(tx_info->des_addr)); - } - else - { - KLOG_WARN(TAG, "Send failed to " MACSTR, MAC2STR(tx_info->des_addr)); - } -} - -static esp_err_t Initialize_ESPNOW(void) -{ - esp_err_t ret = esp_now_init(); - if (ret != ESP_OK) - { - KLOG_ERROR(TAG, "ESP-NOW init failed: %s", esp_err_to_name(ret)); - return ret; - } - - // Register send and receive callbacks - esp_now_register_send_cb(ESPNOW_Send_CB); - esp_now_register_recv_cb(ESPNOW_Recv_CB); - - // Add broadcast peer - esp_now_peer_info_t peer_info = {}; - memcpy(peer_info.peer_addr, Broadcast_MAC, ESP_NOW_ETH_ALEN); - peer_info.channel = 0; // Use current channel - peer_info.ifidx = WIFI_IF_STA; - peer_info.encrypt = false; - - ret = esp_now_add_peer(&peer_info); - if (ret != ESP_OK) - { - KLOG_ERROR(TAG, "Failed to add broadcast peer: %s", esp_err_to_name(ret)); - return ret; - } - - KLOG_INFO(TAG, "ESP-NOW initialized successfully"); - return ESP_OK; -} - -// FreeRTOS task for periodic broadcast -static void ESPNOW_Task(void *pvParameters) -{ - broadcast_data_t data = {0}; - TickType_t last_wake = xTaskGetTickCount(); - const TickType_t period = pdMS_TO_TICKS(2000); - - KLOG_INFO(TAG, "ESP-NOW task started"); - - while (1) - { - // Update data - data.counter++; - snprintf(data.message, sizeof(data.message), "Broadcast #%lu", data.counter); - - // Send broadcast - esp_err_t ret = esp_now_send(Broadcast_MAC, (uint8_t *)&data, sizeof(data)); - if (ret != ESP_OK) - { - KLOG_ERROR(TAG, "Send error: %s", esp_err_to_name(ret)); - } - - // Wait for next period - vTaskDelayUntil(&last_wake, period); - } -} - -static void Initialize_WiFi(void) -{ - ESP_ERROR_CHECK(esp_netif_init()); - ESP_ERROR_CHECK(esp_event_loop_create_default()); - - wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT(); - ESP_ERROR_CHECK(esp_wifi_init(&cfg)); - ESP_ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_RAM)); - ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA)); - ESP_ERROR_CHECK(esp_wifi_start()); - - KLOG_INFO(TAG, "WiFi initialized in station mode"); -} - -void Initialize_ESP_NOW(void) -{ - Initialize_WiFi(); - - // Initialize ESP-NOW - if (Initialize_ESPNOW() != ESP_OK) - { - KLOG_ERROR(TAG, "ESP-NOW initialization failed"); - return; - } - - // Enable Long Range mode - esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_LR); - esp_wifi_set_protocol(WIFI_IF_AP, WIFI_PROTOCOL_LR); - - // Create broadcast task - xTaskCreate(ESPNOW_Task, "ESP-NOW", 4096, NULL, 5, NULL); -} \ No newline at end of file diff --git a/components/Serial_Console/CMakeLists.txt b/components/Serial_Console/CMakeLists.txt index b4fbae4..94c73e9 100644 --- a/components/Serial_Console/CMakeLists.txt +++ b/components/Serial_Console/CMakeLists.txt @@ -2,14 +2,34 @@ idf_component_register( SRCS "Console.c" "Commands/Log_Command.c" + "Commands/System_Command.c" INCLUDE_DIRS "." "./Commands" REQUIRES "SystemK" "System_Events" + "app_update" "console" + "espcoredump" + "esp_netif" + "esp_pm" + "esp_timer" "log" "nvs_flash" + "spi_flash" "vfs" ) + +target_compile_definitions(${COMPONENT_LIB} PRIVATE HAS_SYSTEMK_GIT_VERSION) + +add_custom_target(generate_git_versions ALL + COMMAND ${CMAKE_COMMAND} + -DSOURCE_DIR=${CMAKE_SOURCE_DIR} + -DOUTPUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/git_versions.h + -P ${CMAKE_CURRENT_SOURCE_DIR}/generate_git_versions.cmake + BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/git_versions.h +) + +add_dependencies(${COMPONENT_LIB} generate_git_versions) +target_include_directories(${COMPONENT_LIB} PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/components/Serial_Console/Commands/System_Command.c b/components/Serial_Console/Commands/System_Command.c new file mode 100644 index 0000000..feaf949 --- /dev/null +++ b/components/Serial_Console/Commands/System_Command.c @@ -0,0 +1,663 @@ +/* + * This program source code file is part of the KTag project, a DIY laser tag + * game with customizable features and wide interoperability. + * + * 🛡 🃞 + * + * Copyright © 2026 Joseph P. Kearney and the KTag developers. + * + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU Affero General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more + * details. + * + * There should be a copy of the GNU Affero General Public License in the LICENSE + * file in the root of this repository. If not, see . + */ + +#include "esp_console.h" +#include "esp_system.h" +#include "esp_chip_info.h" +#include "esp_flash.h" +#include "esp_partition.h" +#include "esp_ota_ops.h" +#include "esp_app_desc.h" +#include "esp_idf_version.h" +#include "esp_pm.h" +#include "esp_sleep.h" +#include "esp_timer.h" +#include "esp_heap_caps.h" +#include "esp_mac.h" +#include "esp_netif.h" +#include "esp_core_dump.h" +#include "nvs_flash.h" +#include "linenoise/linenoise.h" +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" +#include "git_versions.h" // Generated during the build process. +#include +#include +#include +#include + +static void print_usage(void) +{ + printf( + "Usage:\n" + " system chip-info - Show chip and system information\n" + " system coredump - Check coredump status\n" + " system factory-reset - Clear NVS and restart\n" + " system flash - Show flash information\n" + " system heap-caps - Show heap by capability\n" + " system hostname [name]- Show/set hostname\n" + " system mac - Show MAC addresses\n" + " system partition - List partition table\n" + " system RAM - Display heap memory usage\n" + " system reboot - Reboot the device\n" + " system reset-reason - Show last reset reason\n" + " system stats - Combined system statistics\n" + " system tasks - List FreeRTOS tasks\n" + " system uptime - Display system uptime\n" + " system version - Show firmware version\n"); +} + +static int system_cmd_chip_info(void) +{ + esp_chip_info_t chip_info; + esp_chip_info(&chip_info); + + printf("Chip Information:\n"); + printf(" Model: %s\n", CONFIG_IDF_TARGET); + printf(" Cores: %d\n", chip_info.cores); + printf(" Revision: %d\n", chip_info.revision); + printf(" Features: %s%s%s%s\n", + (chip_info.features & CHIP_FEATURE_WIFI_BGN) ? "WiFi " : "", + (chip_info.features & CHIP_FEATURE_BT) ? "BT " : "", + (chip_info.features & CHIP_FEATURE_BLE) ? "BLE " : "", + (chip_info.features & CHIP_FEATURE_IEEE802154) ? "802.15.4 " : ""); + + uint32_t flash_size; + if (esp_flash_get_size(NULL, &flash_size) == ESP_OK) + { + printf(" Flash: %lu MB %s\n", + flash_size / (1024 * 1024), + (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "(embedded)" : "(external)"); + } + + return 0; +} + +static int system_cmd_uptime(void) +{ + int64_t uptime_us = esp_timer_get_time(); + int64_t uptime_s = uptime_us / 1000000; + + int days = uptime_s / 86400; + int hours = (uptime_s % 86400) / 3600; + int minutes = (uptime_s % 3600) / 60; + int seconds = uptime_s % 60; + + printf("Uptime: %d days, %02d:%02d:%02d\n", days, hours, minutes, seconds); + printf(" (%lld seconds)\n", uptime_s); + + return 0; +} + +static int system_cmd_tasks(void) +{ +#if (configUSE_TRACE_FACILITY == 1) + uint32_t task_count = uxTaskGetNumberOfTasks(); + TaskStatus_t *task_array = malloc(task_count * sizeof(TaskStatus_t)); + + if (task_array == NULL) + { + printf("Failed to allocate memory for task list\n"); + return 1; + } + + uint32_t total_runtime; + task_count = uxTaskGetSystemState(task_array, task_count, &total_runtime); + + printf("Tasks (%lu total):\n", task_count); + printf("%-16s %5s %6s %11s %8s", "Name", "State", "Core", "Priority", "Stack"); +#if (configGENERATE_RUN_TIME_STATS == 1) + printf(" %7s", "CPU%"); +#endif + printf("\n"); + printf("----------------------------------------------------------------\n"); + + for (uint32_t i = 0; i < task_count; i++) + { + const char *state_str; + switch (task_array[i].eCurrentState) + { + case eRunning: + state_str = "RUN "; + break; + case eReady: + state_str = "READY"; + break; + case eBlocked: + state_str = "BLOCK"; + break; + case eSuspended: + state_str = "SUSP "; + break; + case eDeleted: + state_str = "DEL "; + break; + default: + state_str = "? "; + break; + } + + uint32_t stack_remaining = task_array[i].usStackHighWaterMark; + + BaseType_t affinity = xTaskGetCoreID(task_array[i].xHandle); + + printf("%-16s %5s ", task_array[i].pcTaskName, state_str); + + if (affinity == tskNO_AFFINITY) + { + printf("%6s", "ANY"); + } + else + { + printf("%6d", (int)affinity); + } + + printf(" %11u %8lu", task_array[i].uxCurrentPriority, stack_remaining); + +#if (configGENERATE_RUN_TIME_STATS == 1) + float cpu_percent = 0.0; + if (total_runtime > 0) + { + cpu_percent = (100.0 * task_array[i].ulRunTimeCounter) / total_runtime; + } + printf(" %6.1f%%", cpu_percent); +#endif + printf("\n"); + } + + free(task_array); +#else + printf("Task listing not available (configUSE_TRACE_FACILITY not enabled)\n"); + printf("Enable in menuconfig: Component config -> FreeRTOS -> Kernel\n"); +#endif + return 0; +} + +static int system_cmd_reset_reason(void) +{ + esp_reset_reason_t reason = esp_reset_reason(); + + printf("Reset reason: "); + switch (reason) + { + case ESP_RST_UNKNOWN: + printf("Unknown\n"); + break; + case ESP_RST_POWERON: + printf("Power-on reset\n"); + break; + case ESP_RST_EXT: + printf("External pin reset\n"); + break; + case ESP_RST_SW: + printf("Software reset\n"); + break; + case ESP_RST_PANIC: + printf("Exception/panic\n"); + break; + case ESP_RST_INT_WDT: + printf("Interrupt watchdog\n"); + break; + case ESP_RST_TASK_WDT: + printf("Task watchdog\n"); + break; + case ESP_RST_WDT: + printf("Other watchdog\n"); + break; + case ESP_RST_DEEPSLEEP: + printf("Deep sleep reset\n"); + break; + case ESP_RST_BROWNOUT: + printf("Brownout reset\n"); + break; + case ESP_RST_SDIO: + printf("SDIO reset\n"); + break; + default: + printf("Code %d\n", reason); + break; + } + + return 0; +} + +static int system_cmd_ram(void) +{ + size_t free_heap = esp_get_free_heap_size(); + size_t min_free_heap = esp_get_minimum_free_heap_size(); + size_t largest_block = heap_caps_get_largest_free_block(MALLOC_CAP_DEFAULT); + + printf("Heap Memory:\n"); + printf(" Free: %u bytes (%.2f KB)\n", free_heap, free_heap / 1024.0); + printf(" Minimum free: %u bytes (%.2f KB)\n", min_free_heap, min_free_heap / 1024.0); + printf(" Largest free block: %u bytes (%.2f KB)\n", largest_block, largest_block / 1024.0); + + return 0; +} + +static int system_cmd_flash(void) +{ + uint32_t flash_size; + if (esp_flash_get_size(NULL, &flash_size) != ESP_OK) + { + printf("Failed to get flash size\n"); + return 1; + } + + printf("Flash Information:\n"); + printf(" Total size: %lu bytes (%.2f MB)\n", flash_size, flash_size / (1024.0 * 1024.0)); + + const esp_partition_t *running = esp_ota_get_running_partition(); + if (running) + { + printf(" Running partition: %s (offset 0x%lx, size %lu KB)\n", + running->label, running->address, running->size / 1024); + } + + return 0; +} + +static int system_cmd_partition(void) +{ + printf("Partition Table:\n"); + printf("%-16s %-10s %-10s %10s %10s\n", "Label", "Type", "SubType", "Offset", "Size"); + printf("------------------------------------------------------------------------\n"); + + esp_partition_iterator_t it = esp_partition_find(ESP_PARTITION_TYPE_ANY, ESP_PARTITION_SUBTYPE_ANY, NULL); + + while (it != NULL) + { + const esp_partition_t *part = esp_partition_get(it); + + const char *type_str = "?"; + if (part->type == ESP_PARTITION_TYPE_APP) + type_str = "app"; + else if (part->type == ESP_PARTITION_TYPE_DATA) + type_str = "data"; + + printf("%-16s %-10s 0x%-8x 0x%08lx %8lu KB\n", + part->label, + type_str, + part->subtype, + part->address, + part->size / 1024); + + it = esp_partition_next(it); + } + + esp_partition_iterator_release(it); + return 0; +} + +static int system_cmd_heap_caps(void) +{ + printf("Heap by Capability:\n"); + + size_t internal_free = heap_caps_get_free_size(MALLOC_CAP_INTERNAL); + size_t internal_total = heap_caps_get_total_size(MALLOC_CAP_INTERNAL); + printf(" Internal: %u / %u bytes free (%.1f%%)\n", + internal_free, internal_total, + internal_total > 0 ? 100.0 * internal_free / internal_total : 0); + + size_t spiram_free = heap_caps_get_free_size(MALLOC_CAP_SPIRAM); + size_t spiram_total = heap_caps_get_total_size(MALLOC_CAP_SPIRAM); + if (spiram_total > 0) + { + printf(" SPIRAM: %u / %u bytes free (%.1f%%)\n", + spiram_free, spiram_total, 100.0 * spiram_free / spiram_total); + } + + size_t dma_free = heap_caps_get_free_size(MALLOC_CAP_DMA); + size_t dma_total = heap_caps_get_total_size(MALLOC_CAP_DMA); + printf(" DMA capable: %u / %u bytes free (%.1f%%)\n", + dma_free, dma_total, + dma_total > 0 ? 100.0 * dma_free / dma_total : 0); + + size_t exec_free = heap_caps_get_free_size(MALLOC_CAP_EXEC); + size_t exec_total = heap_caps_get_total_size(MALLOC_CAP_EXEC); + printf(" Executable: %u / %u bytes free (%.1f%%)\n", + exec_free, exec_total, + exec_total > 0 ? 100.0 * exec_free / exec_total : 0); + + return 0; +} + +static int system_cmd_stats(void) +{ + printf("=== System Statistics ===\n\n"); + + system_cmd_uptime(); + printf("\n"); + system_cmd_ram(); + printf("\n"); + + uint32_t task_count = uxTaskGetNumberOfTasks(); + printf("Active tasks: %lu\n\n", task_count); + + system_cmd_reset_reason(); + + return 0; +} + +static int system_cmd_coredump(void) +{ + esp_core_dump_summary_t summary; + esp_err_t err = esp_core_dump_get_summary(&summary); + + if (err == ESP_ERR_NOT_FOUND) + { + printf("No coredump found in flash\n"); + return 0; + } + else if (err != ESP_OK) + { + printf("Failed to read coredump: %s\n", esp_err_to_name(err)); + return 1; + } + + printf("Coredump found:\n"); + printf(" Program counter: 0x%08lx\n", summary.exc_pc); + printf(" Exception cause: %lu\n", summary.ex_info.exc_cause); + printf(" Exception vaddr: 0x%08lx\n", summary.ex_info.exc_vaddr); + + return 0; +} + +static int system_cmd_mac(void) +{ + uint8_t mac[6]; + + printf("MAC Addresses:\n"); + + if (esp_read_mac(mac, ESP_MAC_WIFI_STA) == ESP_OK) + { + printf(" WiFi STA: %02x:%02x:%02x:%02x:%02x:%02x\n", + mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); + } + + if (esp_read_mac(mac, ESP_MAC_WIFI_SOFTAP) == ESP_OK) + { + printf(" WiFi AP: %02x:%02x:%02x:%02x:%02x:%02x\n", + mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); + } + + if (esp_read_mac(mac, ESP_MAC_BT) == ESP_OK) + { + printf(" BT: %02x:%02x:%02x:%02x:%02x:%02x\n", + mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); + } + + if (esp_read_mac(mac, ESP_MAC_ETH) == ESP_OK) + { + printf(" Ethernet: %02x:%02x:%02x:%02x:%02x:%02x\n", + mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); + } + + return 0; +} +typedef struct +{ + const char **hostname_out; + bool success; +} hostname_get_ctx_t; + +typedef struct +{ + const char *hostname_in; + esp_err_t result; +} hostname_set_ctx_t; + +static esp_err_t get_hostname_tcpip(void *ctx) +{ + hostname_get_ctx_t *context = (hostname_get_ctx_t *)ctx; + esp_netif_t *netif = esp_netif_next_unsafe(NULL); + + if (netif) + { + esp_netif_get_hostname(netif, context->hostname_out); + context->success = true; + } + else + { + context->success = false; + } + + return ESP_OK; +} + +static esp_err_t set_hostname_tcpip(void *ctx) +{ + hostname_set_ctx_t *context = (hostname_set_ctx_t *)ctx; + esp_netif_t *netif = esp_netif_next_unsafe(NULL); + + if (netif) + { + context->result = esp_netif_set_hostname(netif, context->hostname_in); + } + else + { + context->result = ESP_ERR_NOT_FOUND; + } + + return ESP_OK; +} + +static int system_cmd_hostname(int argc, char **argv) +{ + if (argc < 3) + { + const char *hostname = NULL; + hostname_get_ctx_t ctx = { + .hostname_out = &hostname, + .success = false}; + + esp_err_t err = esp_netif_tcpip_exec(get_hostname_tcpip, &ctx); + + if (err != ESP_OK) + { + printf("Failed to access network interface: %s\n", esp_err_to_name(err)); + return 1; + } + + if (ctx.success) + { + if (hostname) + { + printf("Hostname: %s\n", hostname); + } + else + { + printf("No hostname set\n"); + } + } + else + { + printf("No network interface available\n"); + } + return 0; + } + + hostname_set_ctx_t ctx = { + .hostname_in = argv[2], + .result = ESP_FAIL}; + + esp_err_t err = esp_netif_tcpip_exec(set_hostname_tcpip, &ctx); + + if (err != ESP_OK) + { + printf("Failed to access network interface: %s\n", esp_err_to_name(err)); + return 1; + } + + if (ctx.result == ESP_ERR_NOT_FOUND) + { + printf("No network interface available\n"); + } + else if (ctx.result == ESP_OK) + { + printf("Hostname set to: %s\n", argv[2]); + } + else + { + printf("Failed to set hostname: %s\n", esp_err_to_name(ctx.result)); + } + + return 0; +} + +static int system_cmd_version(void) +{ + const esp_app_desc_t *app_desc = esp_app_get_description(); + + printf("Firmware Information:\n"); + printf(" Version: %s\n", app_desc->version); + printf(" Project: %s\n", app_desc->project_name); + printf(" IDF version: %s\n", app_desc->idf_ver); + printf(" SystemK version: %s (%s)\n", SYSTEMK_VERSION_STRING, SYSTEMK_GIT_COMMIT_HASH_SHORT); + printf(" Git commit: %s\n", GIT_COMMIT_HASH_LONG); + printf(" Compile time: %s %s\n", app_desc->date, app_desc->time); + + return 0; +} + +static int system_cmd_factory_reset(void) +{ + printf("WARNING: This will erase all NVS data!\n"); + printf("Type 'yes' to confirm: "); + + char confirm[10]; + if (fgets(confirm, sizeof(confirm), stdin) == NULL) + { + printf("\nCancelled\n"); + return 0; + } + + // Remove newline + confirm[strcspn(confirm, "\n")] = 0; + + if (strcmp(confirm, "yes") != 0) + { + printf("Factory reset cancelled.\n"); + return 0; + } + + printf("Erasing NVS...\n"); + esp_err_t err = nvs_flash_erase(); + if (err != ESP_OK) + { + printf("Failed to erase NVS: %s\n", esp_err_to_name(err)); + return 1; + } + + printf("Factory reset complete. Rebooting...\n"); + vTaskDelay(pdMS_TO_TICKS(1000)); + esp_restart(); + + return 0; +} + +static int system_cmd_reboot(void) +{ + printf("Rebooting...\n"); + vTaskDelay(pdMS_TO_TICKS(100)); + esp_restart(); + return 0; +} + +static int cmd_system(int argc, char **argv) +{ + if (argc < 2) + { + print_usage(); + return 0; + } + + if (!strcmp(argv[1], "chip-info")) + return system_cmd_chip_info(); + if (!strcmp(argv[1], "coredump")) + return system_cmd_coredump(); + if (!strcmp(argv[1], "factory-reset")) + return system_cmd_factory_reset(); + if (!strcmp(argv[1], "flash")) + return system_cmd_flash(); + if (!strcmp(argv[1], "heap-caps")) + return system_cmd_heap_caps(); + if (!strcmp(argv[1], "hostname")) + return system_cmd_hostname(argc, argv); + if (!strcmp(argv[1], "mac")) + return system_cmd_mac(); + if (!strcmp(argv[1], "partition")) + return system_cmd_partition(); + if (!strcmp(argv[1], "RAM")) + return system_cmd_ram(); + if (!strcmp(argv[1], "reboot")) + return system_cmd_reboot(); + if (!strcmp(argv[1], "reset-reason")) + return system_cmd_reset_reason(); + if (!strcmp(argv[1], "stats")) + return system_cmd_stats(); + if (!strcmp(argv[1], "tasks")) + return system_cmd_tasks(); + if (!strcmp(argv[1], "uptime")) + return system_cmd_uptime(); + if (!strcmp(argv[1], "version")) + return system_cmd_version(); + + printf("Unknown command\n"); + print_usage(); + return 0; +} + +static void system_completion(const char *buf, linenoiseCompletions *lc) +{ + if (!strncmp(buf, "system", 6)) + { + linenoiseAddCompletion(lc, "system chip-info"); + linenoiseAddCompletion(lc, "system coredump"); + linenoiseAddCompletion(lc, "system factory-reset"); + linenoiseAddCompletion(lc, "system flash"); + linenoiseAddCompletion(lc, "system heap-caps"); + linenoiseAddCompletion(lc, "system hostname"); + linenoiseAddCompletion(lc, "system mac"); + linenoiseAddCompletion(lc, "system partition"); + linenoiseAddCompletion(lc, "system RAM"); + linenoiseAddCompletion(lc, "system reboot"); + linenoiseAddCompletion(lc, "system reset-reason"); + linenoiseAddCompletion(lc, "system stats"); + linenoiseAddCompletion(lc, "system tasks"); + linenoiseAddCompletion(lc, "system uptime"); + linenoiseAddCompletion(lc, "system version"); + } +} + +void Register_System_Command(void) +{ + linenoiseSetCompletionCallback(system_completion); + + const esp_console_cmd_t cmd = { + .command = "system", + .help = "System management and diagnostic commands", + .func = &cmd_system, + }; + + ESP_ERROR_CHECK(esp_console_cmd_register(&cmd)); +} \ No newline at end of file diff --git a/components/ESP-NOW/ESP-NOW.h b/components/Serial_Console/Commands/System_Command.h similarity index 71% rename from components/ESP-NOW/ESP-NOW.h rename to components/Serial_Console/Commands/System_Command.h index 24e9697..f34f331 100644 --- a/components/ESP-NOW/ESP-NOW.h +++ b/components/Serial_Console/Commands/System_Command.h @@ -1,9 +1,10 @@ /* - * This program source code file is part of the KTag project. + * This program source code file is part of the KTag project, a DIY laser tag + * game with customizable features and wide interoperability. * - * 🛡️ 🃞 + * 🛡 🃞 * - * Copyright © 2025 Joseph P. Kearney and the KTag developers. + * Copyright © 2026 Joseph P. Kearney and the KTag developers. * * This program is free software: you can redistribute it and/or modify it under * the terms of the GNU Affero General Public License as published by the Free @@ -19,6 +20,4 @@ * file in the root of this repository. If not, see . */ -#pragma once - -void Initialize_ESP_NOW(void); \ No newline at end of file +void Register_System_Command(void); \ No newline at end of file diff --git a/components/Serial_Console/Console.c b/components/Serial_Console/Console.c index af2a29e..80e59d5 100644 --- a/components/Serial_Console/Console.c +++ b/components/Serial_Console/Console.c @@ -22,10 +22,12 @@ #include "esp_console.h" #include +#include static void register_commands() { Register_Log_Command(); + Register_System_Command(); esp_console_register_help_command(); } diff --git a/components/Serial_Console/generate_git_versions.cmake b/components/Serial_Console/generate_git_versions.cmake new file mode 100644 index 0000000..b66f862 --- /dev/null +++ b/components/Serial_Console/generate_git_versions.cmake @@ -0,0 +1,72 @@ +# Main repository hashes +execute_process( + COMMAND git rev-parse --short HEAD + WORKING_DIRECTORY ${SOURCE_DIR} + OUTPUT_VARIABLE GIT_HASH_SHORT + OUTPUT_STRIP_TRAILING_WHITESPACE +) + +execute_process( + COMMAND git rev-parse HEAD + WORKING_DIRECTORY ${SOURCE_DIR} + OUTPUT_VARIABLE GIT_HASH_LONG + OUTPUT_STRIP_TRAILING_WHITESPACE +) + +# Check for uncommitted changes in main repo +execute_process( + COMMAND git diff-index --quiet HEAD -- + WORKING_DIRECTORY ${SOURCE_DIR} + RESULT_VARIABLE GIT_DIRTY +) + +if(NOT GIT_DIRTY EQUAL 0) + set(GIT_HASH_SHORT "${GIT_HASH_SHORT}+") + set(GIT_HASH_LONG "${GIT_HASH_LONG}+") +endif() + +# SystemK hashes +set(SYSTEMK_PATH "${SOURCE_DIR}/components/SystemK") + +execute_process( + COMMAND git rev-parse --short HEAD + WORKING_DIRECTORY ${SYSTEMK_PATH} + OUTPUT_VARIABLE SYSTEMK_HASH_SHORT + OUTPUT_STRIP_TRAILING_WHITESPACE + RESULT_VARIABLE SYSTEMK_RESULT +) + +execute_process( + COMMAND git rev-parse HEAD + WORKING_DIRECTORY ${SYSTEMK_PATH} + OUTPUT_VARIABLE SYSTEMK_HASH_LONG + OUTPUT_STRIP_TRAILING_WHITESPACE +) + +# Check for uncommitted changes in SystemK. +execute_process( + COMMAND git diff-index --quiet HEAD -- + WORKING_DIRECTORY ${SYSTEMK_PATH} + RESULT_VARIABLE SYSTEMK_DIRTY +) + +# Handle the case where SystemK doesn't exist or is not a git repo. +if(SYSTEMK_RESULT EQUAL 0) + if(NOT SYSTEMK_DIRTY EQUAL 0) + set(SYSTEMK_HASH_SHORT "${SYSTEMK_HASH_SHORT}+") + set(SYSTEMK_HASH_LONG "${SYSTEMK_HASH_LONG}+") + endif() +else() + set(SYSTEMK_HASH_SHORT "unknown") + set(SYSTEMK_HASH_LONG "unknown") +endif() + +file(WRITE ${OUTPUT_FILE} +"#ifndef GIT_VERSION_H +#define GIT_VERSION_H +#define GIT_COMMIT_HASH_SHORT \"${GIT_HASH_SHORT}\" +#define GIT_COMMIT_HASH_LONG \"${GIT_HASH_LONG}\" +#define SYSTEMK_GIT_COMMIT_HASH_SHORT \"${SYSTEMK_HASH_SHORT}\" +#define SYSTEMK_GIT_COMMIT_HASH_LONG \"${SYSTEMK_HASH_LONG}\" +#endif +") \ No newline at end of file diff --git a/main/HW_NeoPixels.c b/main/HW_NeoPixels.c index 6d4255e..2c0fde9 100644 --- a/main/HW_NeoPixels.c +++ b/main/HW_NeoPixels.c @@ -31,7 +31,7 @@ #include #include "HW_NeoPixels.h" -#define NEOPIXELS_STACK_SIZE (100 * 1024) +#define NEOPIXELS_STACK_SIZE (10 * 1024) #define NEOPIXELS_TASK_PRIORITY (tskIDLE_PRIORITY + 1) static StaticTask_t xTaskBuffer; StackType_t *xStack; diff --git a/main/main.c b/main/main.c index 79fd198..0a7856b 100644 --- a/main/main.c +++ b/main/main.c @@ -49,7 +49,6 @@ #include #include #include -#include #include "nvs_flash.h" #include "HW_NeoPixels.h" #include "Version.h" @@ -123,8 +122,6 @@ void app_main(void) // Initialize the switches after SystemK, so xQueueEvents will have already been created. Initialize_Switches(); - Initialize_ESP_NOW(); - KLOG_INFO(TAG, "Initialization complete."); } diff --git a/sdkconfig b/sdkconfig index 1613bf3..9b2ab6c 100644 --- a/sdkconfig +++ b/sdkconfig @@ -441,11 +441,11 @@ CONFIG_BOOTLOADER_LOG_VERSION_1=y CONFIG_BOOTLOADER_LOG_VERSION=1 # CONFIG_BOOTLOADER_LOG_LEVEL_NONE is not set # CONFIG_BOOTLOADER_LOG_LEVEL_ERROR is not set -# CONFIG_BOOTLOADER_LOG_LEVEL_WARN is not set -CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y +CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y +# CONFIG_BOOTLOADER_LOG_LEVEL_INFO is not set # CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set # CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set -CONFIG_BOOTLOADER_LOG_LEVEL=3 +CONFIG_BOOTLOADER_LOG_LEVEL=2 # # Format @@ -1871,9 +1871,13 @@ CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=4096 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0 CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=1 -# CONFIG_FREERTOS_USE_TRACE_FACILITY is not set +CONFIG_FREERTOS_USE_TRACE_FACILITY=y +CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=y # CONFIG_FREERTOS_USE_LIST_DATA_INTEGRITY_CHECK_BYTES is not set -# CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS is not set +# CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID is not set +CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y +CONFIG_FREERTOS_RUN_TIME_COUNTER_TYPE_U32=y +# CONFIG_FREERTOS_RUN_TIME_COUNTER_TYPE_U64 is not set # CONFIG_FREERTOS_USE_APPLICATION_TASK_TAG is not set # end of Kernel @@ -1893,6 +1897,7 @@ CONFIG_FREERTOS_TICK_SUPPORT_SYSTIMER=y CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL1=y # CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL3 is not set CONFIG_FREERTOS_SYSTICK_USES_SYSTIMER=y +CONFIG_FREERTOS_RUN_TIME_STATS_USING_ESP_TIMER=y # CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH is not set # CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set # end of Port @@ -1952,17 +1957,19 @@ CONFIG_LOG_VERSION=1 # CONFIG_LOG_DEFAULT_LEVEL_NONE is not set # CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set # CONFIG_LOG_DEFAULT_LEVEL_WARN is not set -# CONFIG_LOG_DEFAULT_LEVEL_INFO is not set +CONFIG_LOG_DEFAULT_LEVEL_INFO=y # CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set -CONFIG_LOG_DEFAULT_LEVEL_VERBOSE=y -CONFIG_LOG_DEFAULT_LEVEL=5 -CONFIG_LOG_MAXIMUM_EQUALS_DEFAULT=y +# CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set +CONFIG_LOG_DEFAULT_LEVEL=3 +# CONFIG_LOG_MAXIMUM_EQUALS_DEFAULT is not set +# CONFIG_LOG_MAXIMUM_LEVEL_DEBUG is not set +CONFIG_LOG_MAXIMUM_LEVEL_VERBOSE=y CONFIG_LOG_MAXIMUM_LEVEL=5 # # Level Settings # -CONFIG_LOG_MASTER_LEVEL=y +# CONFIG_LOG_MASTER_LEVEL is not set CONFIG_LOG_DYNAMIC_LEVEL_CONTROL=y # CONFIG_LOG_TAG_LEVEL_IMPL_NONE is not set # CONFIG_LOG_TAG_LEVEL_IMPL_LINKED_LIST is not set @@ -2728,11 +2735,11 @@ CONFIG_MDNS_PREDEF_NETIF_ETH=y # CONFIG_APP_ROLLBACK_ENABLE is not set # CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set # CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set -# CONFIG_LOG_BOOTLOADER_LEVEL_WARN is not set -CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y +CONFIG_LOG_BOOTLOADER_LEVEL_WARN=y +# CONFIG_LOG_BOOTLOADER_LEVEL_INFO is not set # CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG is not set # CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE is not set -CONFIG_LOG_BOOTLOADER_LEVEL=3 +CONFIG_LOG_BOOTLOADER_LEVEL=2 # CONFIG_FLASH_ENCRYPTION_ENABLED is not set # CONFIG_FLASHMODE_QIO is not set # CONFIG_FLASHMODE_QOUT is not set