Setting to disable HID in setup mode

USBNova.ino

@@ -42,7 +42,9 @@ void setup() {
     selector::init();
     
     // Start Keyboard
-    hid::init();
+    if (selector::mode() == ATTACK || preferences::hidEnabled()) {
+        hid::init();
+    } 
 
     // Start USB Drive
     if (preferences::mscEnabled() || (selector::mode() == SETUP)){
@@ -110,7 +112,7 @@ void loop() {
         }
     } else if (selector::changed()) {
         // ==========  Setup Mode ==========  //
-        if (selector::mode() == SETUP) {
+        if (selector::mode() == SETUP && preferences::hidEnabled()) {
             preferences::load();                         // Reload the settings (in case the main script path changed)
             attack::start();                             // Start keystroke injection attack
             led::setColor(preferences::getSetupColor()); // Set LED to blue

src/preferences/preferences.cpp

@@ -23,6 +23,7 @@ namespace preferences {
     // ========== PRIVATE ========= //
     bool enable_msc { false };
     bool enable_led { true };
+    bool enable_hid { true };
 
     std::string hid_vid { "16D0" };
     std::string hid_pid { "11A4" };
@@ -69,6 +70,7 @@ namespace preferences {
     void toJson(JsonDocument& root) {
         root["enable_msc"] = enable_msc;
         root["enable_led"] = enable_led;
+        root["enable_hid"] = enable_hid;
 
         root["hid_vid"] = hid_vid;
         root["hid_pid"] = hid_pid;
@@ -120,6 +122,7 @@ namespace preferences {
         // === Add missing values === //
         if (!config_doc.containsKey("enable_msc")) config_doc["enable_msc"] = enable_msc;
         if (!config_doc.containsKey("enable_led")) config_doc["enable_led"] = enable_led;
+        if (!config_doc.containsKey("enable_hid")) config_doc["enable_hid"] = enable_hid;
 
         if (!config_doc.containsKey("hid_vid")) config_doc["hid_vid"] = hid_vid;
         if (!config_doc.containsKey("hid_pid")) config_doc["hid_pid"] = hid_pid;
@@ -147,6 +150,7 @@ namespace preferences {
         // === Fetch values === //
         enable_msc = config_doc["enable_msc"].as<bool>();
         enable_led = config_doc["enable_led"].as<bool>();
+        enable_hid = config_doc["enable_hid"].as<bool>();
 
         hid_vid = config_doc["hid_vid"].as<std::string>();
         hid_pid = config_doc["hid_pid"].as<std::string>();
@@ -202,6 +206,7 @@ namespace preferences {
     void reset() {
         enable_msc = false;
         enable_led = true;
+        enable_hid = true;
 
         hid_vid = "16D0";
         hid_pid = "11A4";
@@ -266,6 +271,10 @@ namespace preferences {
         return enable_led;
     }
 
+    bool hidEnabled() {
+        return enable_hid;
+    }
+
     uint16_t getHidVid() {
         return std::stoi(hid_vid, nullptr, 16);
     }

src/preferences/preferences.h

@@ -12,6 +12,7 @@ namespace preferences {
 
     bool mscEnabled();
     bool ledEnabled();
+    bool hidEnabled();
 
     uint16_t getHidVid();
     uint16_t getHidPid();