Fixed Ctrl+C handling and improved Arduino initialization/shutdown with proper interrupt and error handling.

Author: DeniedAccessLife

ArduinoStrike/ArduinoStrike/Arduino.cpp

@@ -1,6 +1,8 @@
 #include "Logger.h"
 #include "Arduino.h"
 
+extern volatile bool g_shouldExit;
+
 Arduino::~Arduino()
 {
     if (serial_port.is_open())
@@ -13,12 +15,18 @@ Arduino::~Arduino()
 Arduino::Arduino(LPCSTR name) : io_context(), serial_port(io_context)
 {
     char port[100] = "\\.\\";
-
     Logger::LogMessage("Searching for device...");
+
     while (!GetDevice(name, port))
     {
         Logger::LogMessage("Device not found. Retrying...");
         sleep_for(milliseconds(1000));
+        
+        if (g_shouldExit)
+        {
+            Logger::LogMessage("Search interrupted by user request.");
+            throw runtime_error("Device search interrupted");
+        }
     }
 
     Logger::LogMessage(string("Device found: ") + name + " (" + port + ")");
@@ -150,7 +158,7 @@ bool Arduino::GetDevice(LPCSTR name, LPSTR port)
 
         if (devices.empty())
         {
-            Logger::LogMessage("No devices found in the system.");
+            Logger::LogMessage("No devices found in the system!");
             return false;
         }
 
@@ -168,7 +176,7 @@ bool Arduino::LoadConfiguration(const string& file_name, DeviceInfo& config_devi
 
     if (!config)
     {
-        Logger::LogMessage("Configuration file not found.", boost::log::trivial::debug);
+        Logger::LogMessage("Configuration file not found!", boost::log::trivial::debug);
         return false;
     }
 

ArduinoStrike/ArduinoStrike/ArduinoStrike.cpp

@@ -39,8 +39,22 @@ int main()
     }
 
     utils.PrintAscii(ASCII_INTRO);
-    Arduino arduino("Arduino Leonardo");
-    utils.PrintAscii(ASCII_OUTRO), utils.PrintHotkeys(config.GenerateHotkeysString());
+    
+    Arduino* arduino = nullptr;
+
+    try
+    {
+        arduino = new Arduino("Arduino Leonardo");
+    }
+    catch (const runtime_error& e)
+    {
+        Logger::LogMessage("Failed to initialize Arduino: " + string(e.what()));
+        Logger::LogMessage("Exiting...");
+        return 1;
+    }
+    
+    utils.PrintAscii(ASCII_OUTRO);
+    utils.PrintHotkeys(config.GenerateHotkeysString());
 
     ModuleManager manager;
     manager.AddModule<Bhop>("Bhop", VK_SPACE);
@@ -52,7 +66,9 @@ int main()
 
     while (!g_shouldExit)
     {
-        manager.ProcessModules(arduino, config);
+        manager.ProcessModules(*arduino, config);
         sleep_for(milliseconds(10));
     }
+    
+    delete arduino;
 }