1.9.0

Author: DeniedAccessLife

ArduinoStrike/ArduinoStrike/Arduino.cpp

@@ -1,74 +1,67 @@
 #include "Arduino.h"
-#include "Utils.h"
+#include "Logger.h"
 
 Arduino::~Arduino()
 {
-    if (handle != INVALID_HANDLE_VALUE)
+    if (serial_port.is_open())
     {
-        CloseHandle(handle);
-        LOG("Disconnected from Arduino.");
+        serial_port.close();
+        Logger::LogMessage("Disconnected from Arduino.", boost::log::trivial::debug);
     }
 }
 
-Arduino::Arduino(LPCSTR name) : handle(INVALID_HANDLE_VALUE)
+Arduino::Arduino(LPCSTR name) : io_context(), serial_port(io_context)
 {
     char port[100] = "\\.\\";
 
-    LOG("Searching for device...");
+    Logger::LogMessage("Searching for device...");
     while (!GetDevice(name, port))
     {
-        LOG("Device not found. Retrying...");
+        Logger::LogMessage("Device not found. Retrying...");
         sleep_for(milliseconds(1000));
     }
 
-    LOG(string("Device found: ") + name + " (" + port + ")");
+    Logger::LogMessage(string("Device found: ") + name + " (" + port + ")");
 
-    handle = CreateFile(port, GENERIC_READ | GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
-
-    if (handle == INVALID_HANDLE_VALUE)
+    try
     {
-        DWORD error_code = GetLastError();
-        LOG("Error opening port: " + to_string(error_code));
-        cerr << "Error opening port: " << error_code << endl;
-        return;
-    }
-
-    LOG("Port opened successfully.");
+        serial_port.open(port);
 
-    DCB dcb = {};
-    dcb.DCBlength = sizeof(dcb);
-
-    if (!GetCommState(handle, &dcb))
+        if (!serial_port.is_open())
+        {
+            Logger::LogMessage("Error opening port: Serial port not open after attempt.");
+            cerr << "Error opening port: Serial port not open after attempt." << endl;
+            return;
+        }
+    }
+    catch (boost::system::system_error& error)
     {
-        LOG("Failed to get port state.");
+        DWORD error_code = error.code().value();
+        Logger::LogMessage("Error opening port: " + to_string(error_code) + " - " + error.what());
+        cerr << "Error opening port: " << error_code << " - " << error.what() << endl;
         return;
     }
 
-    dcb.BaudRate = CBR_9600;
-    dcb.ByteSize = 8;
-    dcb.StopBits = ONESTOPBIT;
-    dcb.Parity = NOPARITY;
+    Logger::LogMessage("Port opened successfully.");
 
-    if (!SetCommState(handle, &dcb))
+    try
     {
-        LOG("Failed to set port state.");
-        return;
+        serial_port.set_option(serial_port::baud_rate(9600));
+        serial_port.set_option(serial_port::baud_rate(9600));
+        serial_port.set_option(serial_port::character_size(8));
+        serial_port.set_option(serial_port::stop_bits(serial_port::stop_bits::one));
+        serial_port.set_option(serial_port::parity(serial_port::parity::none));
+        serial_port.set_option(serial_port::flow_control(serial_port::flow_control::none));
     }
-
-    COMMTIMEOUTS cto = {};
-    cto.ReadIntervalTimeout = 50;
-    cto.ReadTotalTimeoutConstant = 100;
-    cto.ReadTotalTimeoutMultiplier = 10;
-    cto.WriteTotalTimeoutConstant = 50;
-    cto.WriteTotalTimeoutMultiplier = 10;
-
-    if (!SetCommTimeouts(handle, &cto))
+    catch (boost::system::system_error& error)
     {
-        LOG("Failed to set timeouts.");
+        Logger::LogMessage("Failed to set port options: " + string(error.what()));
+        cerr << "Failed to set port options: " << error.what() << endl;
+        serial_port.close();
         return;
     }
 
-    LOG("Port initialized successfully.");
+    Logger::LogMessage("Port initialized successfully.");
     cout << "Successfully connected!" << endl;
 }
 
@@ -78,7 +71,7 @@ bool Arduino::GetDevice(LPCSTR name, LPSTR port)
 
     if (device_info == INVALID_HANDLE_VALUE)
     {
-        LOG("Failed to get device information (SetupDiGetClassDevs returned INVALID_HANDLE_VALUE).");
+        Logger::LogMessage("Failed to get device information (SetupDiGetClassDevs returned INVALID_HANDLE_VALUE).");
         return false;
     }
 
@@ -96,7 +89,7 @@ bool Arduino::GetDevice(LPCSTR name, LPSTR port)
     bool config_loaded = Arduino::LoadConfiguration("device_config.cfg", config_device);
 
     // Collect system devices
-    LOG("Enumerating connected devices...");
+    Logger::LogMessage("Enumerating connected devices...");
     DWORD count = 0;
     SP_DEVINFO_DATA dev_info_data = {};
     dev_info_data.cbSize = sizeof(dev_info_data);
@@ -108,13 +101,13 @@ bool Arduino::GetDevice(LPCSTR name, LPSTR port)
         if (Arduino::ExtractProperties(device_info, dev_info_data, system_device))
         {
             devices.push_back(system_device);
-            LOG("Detected device: FRIENDLYNAME = " + system_device.friendly_name + ", HARDWAREID = " + system_device.hardware_id + ", PORT = " + system_device.port);
+            Logger::LogMessage("Detected device: FRIENDLYNAME = " + system_device.friendly_name + ", HARDWAREID = " + system_device.hardware_id + ", PORT = " + system_device.port);
 
             // Check against configuration file
             if (config_loaded && system_device.friendly_name == config_device.friendly_name && system_device.hardware_id == config_device.hardware_id)
             {
                 strncpy_s(port, 100, system_device.port.c_str(), system_device.port.size());
-                LOG("Using saved device: FRIENDLYNAME = " + system_device.friendly_name + ", HARDWAREID = " + system_device.hardware_id + ", PORT = " + system_device.port);
+                Logger::LogMessage("Using saved device: FRIENDLYNAME = " + system_device.friendly_name + ", HARDWAREID = " + system_device.hardware_id + ", PORT = " + system_device.port);
                 found_device = true;
                 break;
             }
@@ -123,7 +116,7 @@ bool Arduino::GetDevice(LPCSTR name, LPSTR port)
             if (!found_device && name && system_device.friendly_name.find(name) != string::npos)
             {
                 strncpy_s(port, 100, system_device.port.c_str(), system_device.port.size());
-                LOG("Device matched by FRIENDLYNAME: " + system_device.friendly_name);
+                Logger::LogMessage("Device matched by FRIENDLYNAME: " + system_device.friendly_name);
                 found_device = true;
                 break;
             }
@@ -133,7 +126,7 @@ bool Arduino::GetDevice(LPCSTR name, LPSTR port)
                 if (regex_search(system_device.hardware_id, pattern))
                 {
                     strncpy_s(port, 100, system_device.port.c_str(), system_device.port.size());
-                    LOG("Device matched by VID/PID: " + system_device.hardware_id);
+                    Logger::LogMessage("Device matched by VID/PID: " + system_device.hardware_id);
                     found_device = true;
                     break;
                 }
@@ -151,17 +144,17 @@ bool Arduino::GetDevice(LPCSTR name, LPSTR port)
     {
         if (config_loaded)
         {
-            LOG("Saved device not found in the system. Deleting configuration file.");
+            Logger::LogMessage("Saved device not found in the system. Deleting configuration file.");
             remove("device_config.cfg");
         }
 
         if (devices.empty())
         {
-            LOG("No devices found in the system.");
+            Logger::LogMessage("No devices found in the system.");
             return false;
         }
 
-        LOG("Prompting user to select a device...");
+        Logger::LogMessage("Prompting user to select a device...");
         return Arduino::SelectDevice(devices, port);
     }
 
@@ -175,7 +168,7 @@ bool Arduino::LoadConfiguration(const string& file_name, DeviceInfo& config_devi
 
     if (!config)
     {
-        LOG("Configuration file not found.");
+        Logger::LogMessage("Configuration file not found.", boost::log::trivial::debug);
         return false;
     }
 
@@ -197,11 +190,11 @@ bool Arduino::LoadConfiguration(const string& file_name, DeviceInfo& config_devi
 
     if (!config_device.friendly_name.empty() && !config_device.hardware_id.empty())
     {
-        LOG("Loaded device from configuration: FRIENDLYNAME = " + config_device.friendly_name + ", HARDWAREID = " + config_device.hardware_id + ", PORT = " + config_device.port);
+        Logger::LogMessage("Loaded device from configuration: FRIENDLYNAME = " + config_device.friendly_name + ", HARDWAREID = " + config_device.hardware_id + ", PORT = " + config_device.port);
         return true;
     }
 
-    LOG("Configuration file is incomplete or corrupted.");
+    Logger::LogMessage("Configuration file is incomplete or corrupted.");
     return false;
 }
 
@@ -250,7 +243,7 @@ bool Arduino::SelectDevice(const vector<DeviceInfo>& devices, LPSTR port)
     {
         const auto& selected_device = devices[choice - 1];
         strncpy_s(port, 100, selected_device.port.c_str(), selected_device.port.size());
-        LOG("User selected device: " + selected_device.friendly_name);
+        Logger::LogMessage("User selected device: " + selected_device.friendly_name);
 
         ofstream config("device_config.cfg");
 
@@ -260,50 +253,37 @@ bool Arduino::SelectDevice(const vector<DeviceInfo>& devices, LPSTR port)
             config << "HARDWAREID=" << selected_device.hardware_id << endl;
             config << "PORT=" << selected_device.port << endl;
 
-            LOG("Device selection saved to configuration.");
+            Logger::LogMessage("Device selection saved to configuration.");
         }
 
         return true;
     }
 
     utils.PrintCenteredText("No device selected by the user.");
-    LOG("No device selected by the user.");
+    Logger::LogMessage("No device selected by the user.");
 
     return false;
 }
 
-bool Arduino::WriteMessage(const string& message) const
+bool Arduino::WriteMessage(const string& message)
 {
-    DWORD bytes = 0;
-    BOOL result = WriteFile(handle, message.c_str(), message.size() + 1, &bytes, nullptr);
-
-    if (result == 0 || bytes != message.size() + 1)
+    if (!serial_port.is_open())
     {
-        LOG("Failed to send message: " + message);
-        cerr << "Failed to send message!" << endl;
+        Logger::LogMessage("Attempt to write to a closed serial port");
+        cerr << "Attempt to write to a closed serial port" << endl;
         return false;
     }
 
-    LOG("Message sent: " + message);
-    return true;
-}
-
-void Arduino::LogMessage(const string& message)
-{
-    static ofstream log_file("arduino_debug.log", ios::app);
-
-    if (!log_file.is_open())
+    try
     {
-        cerr << "Error opening the log file." << endl;
-        return;
+        write(serial_port, buffer(message.c_str(), message.size() + 1));
+        Logger::LogMessage("Message sent: " + message);
+        return true;
+    }
+    catch (boost::system::system_error& error)
+    {
+        Logger::LogMessage("Failed to send message: " + message + " - " + error.what());
+        cerr << "Failed to send message: " << message << " - " << error.what() << endl;
+        return false;
     }
-
-    tm local;
-    time_t now = time(nullptr);
-    localtime_s(&local, &now);
-
-    char buffer[100];
-    strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", &local);
-
-    log_file << "[" << buffer << "] " << message << std::endl;
 }

ArduinoStrike/ArduinoStrike/Arduino.h

@@ -1,23 +1,14 @@
 #pragma once
-#pragma comment(lib, "Setupapi.lib")
 
-#include <regex>
-#include <thread>
-#include <fstream>
-#include <iostream>
-#include <windows.h>
+#pragma comment(lib, "Setupapi.lib")
+#include "Utils.h"
 #include <devguid.h>
 #include <SetupAPI.h>
 
-#ifdef _DEBUG
-#define LOG(msg) Arduino::LogMessage(msg)
-#else
-#define LOG(msg)
-#endif
-
 using namespace std;
-using namespace chrono;
+using namespace std::chrono;
 using namespace this_thread;
+using namespace boost::asio;
 
 struct DeviceInfo
 {
@@ -31,13 +22,14 @@ class Arduino
 public:
     ~Arduino();
     Arduino(LPCSTR name);
-    bool WriteMessage(const string& message) const;
+    bool WriteMessage(const string& message);
 
 private:
-    HANDLE handle;
+    io_context io_context;
+    serial_port serial_port;
+
     bool GetDevice(LPCSTR name, LPSTR port);
     bool LoadConfiguration(const string& file_name, DeviceInfo& config_device);
     bool ExtractProperties(HDEVINFO device_info, SP_DEVINFO_DATA& dev_info_data, DeviceInfo& device);
     bool SelectDevice(const vector<DeviceInfo>& devices, LPSTR port);
-    static void LogMessage(const string& message);
 };