MrUnknownDE/OpenIris-ESPIDF
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/OpenIris-ESPIDF.git synced 2026-04-26 01:23:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove heartbeats in favor of ping command

Browse Source
This commit is contained in:
Lorow
2025-10-09 23:13:56 +02:00
parent ecf881a552
commit f241603a82
3 changed files with 4 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
components/SerialManager/SerialManager/SerialManager.cpp
View File

@@ -5,8 +5,8 @@
#define BUF_SIZE (1024) #define BUF_SIZE (1024)
SerialManager::SerialManager(std::shared_ptr<CommandManager> commandManager, esp_timer_handle_t *timerHandle, std::shared_ptr<ProjectConfig> deviceConfig) SerialManager::SerialManager(std::shared_ptr<CommandManager> commandManager, esp_timer_handle_t *timerHandle)
: commandManager(commandManager), timerHandle(timerHandle), deviceConfig(deviceConfig) : commandManager(commandManager), timerHandle(timerHandle)
{ {
this->data = static_cast<uint8_t *>(malloc(BUF_SIZE)); this->data = static_cast<uint8_t *>(malloc(BUF_SIZE));
this->temp_data = static_cast<uint8_t *>(malloc(256)); this->temp_data = static_cast<uint8_t *>(malloc(256));
@@ -83,46 +83,6 @@ void SerialManager::notify_startup_command_received()
} }
} }
void SerialManager::send_heartbeat()
{
// Get the MAC address as unique identifier
uint8_t mac[6];
esp_read_mac(mac, ESP_MAC_WIFI_STA);
// Format as serial number string
char serial_number[18];
sprintf(serial_number, "%02X%02X%02X%02X%02X%02X",
mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
// Create heartbeat JSON with serial number
char heartbeat[128];
sprintf(heartbeat, "{\"heartbeat\":\"openiris_setup_mode\",\"serial\":\"%s\"}\n", serial_number);
usb_serial_jtag_write_bytes(heartbeat, strlen(heartbeat), 1000 / 20);
// Ignore return value; if the driver was uninstalled, this is a no-op
}
bool SerialManager::should_send_heartbeat()
{
// Always send heartbeat during startup delay or if no WiFi configured
// If startup timer is still running, always send heartbeat
if (timerHandle != nullptr && *timerHandle != nullptr)
{
return true;
}
// If in heartbeat mode after startup, continue sending
if (getStartupCommandReceived())
{
return true;
}
// Otherwise, only send if no WiFi credentials configured
const auto wifiConfigs = deviceConfig->getWifiConfigs();
return wifiConfigs.empty();
}
void SerialManager::shutdown() void SerialManager::shutdown()
{ {
// Stop heartbeats; timer will be deleted by main if needed. // Stop heartbeats; timer will be deleted by main if needed.
@@ -142,23 +102,9 @@ void SerialManager::shutdown()
void HandleSerialManagerTask(void *pvParameters) void HandleSerialManagerTask(void *pvParameters)
{ {
auto const serialManager = static_cast<SerialManager *>(pvParameters); auto const serialManager = static_cast<SerialManager *>(pvParameters);
TickType_t lastHeartbeat = xTaskGetTickCount();
const TickType_t heartbeatInterval = pdMS_TO_TICKS(2000); // 2 second heartbeat
while (true) while (true)
{ {
serialManager->try_receive(); serialManager->try_receive();
// Send heartbeat every 2 seconds, but only if no WiFi credentials are set
TickType_t currentTime = xTaskGetTickCount();
if ((currentTime - lastHeartbeat) >= heartbeatInterval)
{
if (serialManager->should_send_heartbeat())
{
serialManager->send_heartbeat();
}
lastHeartbeat = currentTime;
}
} }
} }

5
components/SerialManager/SerialManager/SerialManager.hpp
View File

@@ -32,11 +32,9 @@ struct cdc_command_packet_t
class SerialManager class SerialManager
{ {
public: public:
explicit SerialManager(std::shared_ptr<CommandManager> commandManager, esp_timer_handle_t *timerHandle, std::shared_ptr<ProjectConfig> deviceConfig); explicit SerialManager(std::shared_ptr<CommandManager> commandManager, esp_timer_handle_t *timerHandle);
void setup(); void setup();
void try_receive(); void try_receive();
void send_heartbeat();
bool should_send_heartbeat();
void notify_startup_command_received(); void notify_startup_command_received();
void shutdown(); void shutdown();
@@ -45,7 +43,6 @@ private:
std::shared_ptr<CommandManager> commandManager; std::shared_ptr<CommandManager> commandManager;
esp_timer_handle_t *timerHandle; esp_timer_handle_t *timerHandle;
std::shared_ptr<ProjectConfig> deviceConfig;
uint8_t *data; uint8_t *data;
uint8_t *temp_data; uint8_t *temp_data;
}; };

2
main/openiris_main.cpp
View File

@@ -68,8 +68,8 @@ UVCStreamManager uvcStream;
#endif #endif
auto ledManager = std::make_shared<LEDManager>(BLINK_GPIO, CONFIG_LED_C_PIN_GPIO, ledStateQueue, deviceConfig); auto ledManager = std::make_shared<LEDManager>(BLINK_GPIO, CONFIG_LED_C_PIN_GPIO, ledStateQueue, deviceConfig);
auto *serialManager = new SerialManager(commandManager, &timerHandle, deviceConfig);
std::shared_ptr<MonitoringManager> monitoringManager = std::make_shared<MonitoringManager>(); std::shared_ptr<MonitoringManager> monitoringManager = std::make_shared<MonitoringManager>();
auto *serialManager = new SerialManager(commandManager, &timerHandle);
void startWiFiMode(); void startWiFiMode();
void startWiredMode(bool shouldCloseSerialManager); void startWiredMode(bool shouldCloseSerialManager);