move bluetooth, nfc, and utils into subfolders

19 files changed, 24 insertions, 24 deletions

diff --git a/src/ble_mouse.cpp b/src/bluetooth/ble_mouse.cpp
index 0035eb5..423ea8c 100644
--- a/src/ble_mouse.cpp
+++ b/src/bluetooth/ble_mouse.cpp
@@ -1,9 +1,9 @@
 #include <Arduino.h>
 #include <BleMouse.h>
-#include "badusb.h"
-#include "config.h"
+#include "../hid/badusb.h"
+#include "../config.h"
 
-#include "buttons.h"
+#include "../utils/buttons.h"
 #include "ui/display.h"
 
 // ===== BLE MOUSE =====
diff --git a/src/ble_mouse.h b/src/bluetooth/ble_mouse.h
index fc6a4cc..fc6a4cc 100644
--- a/src/ble_mouse.h
+++ b/src/bluetooth/ble_mouse.h
diff --git a/src/blescanner.cpp b/src/bluetooth/blescanner.cpp
index ba12568..d637683 100644
--- a/src/blescanner.cpp
+++ b/src/bluetooth/blescanner.cpp
@@ -5,8 +5,8 @@
 #include <vector>
 
 #include "ui/display.h"
-#include "buttons.h"
-#include "config.h"
+#include "../utils/buttons.h"
+#include "../config.h"
 
 // ===== DEVICE STRUCT =====
 struct BLEDeviceInfo {
diff --git a/src/blescanner.h b/src/bluetooth/blescanner.h
index a642de2..a642de2 100644
--- a/src/blescanner.h
+++ b/src/bluetooth/blescanner.h
diff --git a/src/badusb.cpp b/src/hid/badusb.cpp
index 37d5ea7..0438357 100644
--- a/src/badusb.cpp
+++ b/src/hid/badusb.cpp
@@ -1,6 +1,6 @@
 #include <Arduino.h>
 #include <USBHIDKeyboard.h>
-#include "ui/display.h"
+#include "../ui/display.h"
 
 extern USBHIDKeyboard Keyboard;
 
diff --git a/src/badusb.h b/src/hid/badusb.h
index a3390ec..a3390ec 100644
--- a/src/badusb.h
+++ b/src/hid/badusb.h
diff --git a/src/main.cpp b/src/main.cpp
index 08d18a4..bc93dd5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,7 +21,7 @@
 
 
 #include "ui/display.h"
-#include "buttons.h"
+#include "utils/buttons.h"
 #include "ui/menu.h"
 
 #include "config.h"
diff --git a/src/nfc.cpp b/src/nfc/nfc.cpp
index 3dcf5a9..474b4a0 100644
--- a/src/nfc.cpp
+++ b/src/nfc/nfc.cpp
@@ -5,8 +5,8 @@
 #include <Adafruit_PN532.h>
 
 #include "ui/display.h"
-#include "buttons.h"
-#include "config.h"
+#include "../utils/buttons.h"
+#include "../config.h"
 
 #define PN532_IRQ   -1
 #define PN532_RESET -1
diff --git a/src/nfc.h b/src/nfc/nfc.h
index 1570b5d..1570b5d 100644
--- a/src/nfc.h
+++ b/src/nfc/nfc.h
diff --git a/src/rf/nrf24.cpp b/src/rf/nrf24.cpp
index 0479985..b780725 100644
--- a/src/rf/nrf24.cpp
+++ b/src/rf/nrf24.cpp
@@ -2,7 +2,7 @@
 #include <RF24.h>
 #include "nrf24.h"
 #include "../ui/display.h"
-#include "../buttons.h"
+#include "../utils/buttons.h"
 #define JAM_DURATION 500
 
 extern SPIClass *RADIO_SPI;
diff --git a/src/ui/menu.cpp b/src/ui/menu.cpp
index 2c8c3cd..462b89f 100644
--- a/src/ui/menu.cpp
+++ b/src/ui/menu.cpp
@@ -1,18 +1,18 @@
 #include <Arduino.h>
 #include "menu.h"
 #include "display.h"
-#include "buttons.h"
-#include "badusb.h"
+#include "utils/buttons.h"
+#include "hid/badusb.h"
 #include "rf/nrf24.h"
 #include "rf/cc1101.h"
-#include "blescanner.h"
 #include "wifi/wifi_scan.h"
 #include "wifi/wifi_analyzer.h"
-#include "device_check.h"
-#include "ble_mouse.h"
-#include "sysinfo.h"
+#include "utils/device_check.h"
+#include "bluetooth/ble_mouse.h"
+#include "bluetooth/blescanner.h"
+#include "utils/sysinfo.h"
 #include "BleMouse.h"
-#include "nfc.h"
+#include "nfc/nfc.h"
 
 // ================= MENU DATA =================
 extern BleMouse bleMouse;
diff --git a/src/buttons.cpp b/src/utils/buttons.cpp
index 27ce40b..d3d1020 100644
--- a/src/buttons.cpp
+++ b/src/utils/buttons.cpp
@@ -1,6 +1,6 @@
 #include "buttons.h"
 #include <Arduino.h>
-#include "config.h"
+#include "../config.h"
 
 void buttonsInit()
 {
diff --git a/src/buttons.h b/src/utils/buttons.h
index cfa9fa3..cfa9fa3 100644
--- a/src/buttons.h
+++ b/src/utils/buttons.h
diff --git a/src/device_check.cpp b/src/utils/device_check.cpp
index adebe48..5f63ffe 100644
--- a/src/device_check.cpp
+++ b/src/utils/device_check.cpp
@@ -2,11 +2,11 @@
 #include <SPI.h>
 #include <Wire.h>
 #include <RF24.h>
-#include "libs/ELECHOUSE_CC1101_SRC_DRV.h"
+#include "../libs/ELECHOUSE_CC1101_SRC_DRV.h"
 
-#include "ui/display.h"
+#include "../ui/display.h"
 #include "buttons.h"
-#include "config.h"
+#include "../config.h"
 
 // ===== EXTERNALS =====
 extern RF24 radio1;
diff --git a/src/device_check.h b/src/utils/device_check.h
index 3d6b250..3d6b250 100644
--- a/src/device_check.h
+++ b/src/utils/device_check.h
diff --git a/src/sysinfo.cpp b/src/utils/sysinfo.cpp
index 046933e..aad170d 100644
--- a/src/sysinfo.cpp
+++ b/src/utils/sysinfo.cpp
@@ -1,5 +1,5 @@
 #include <Arduino.h>
-#include "ui/display.h"
+#include "../ui/display.h"
 #include "buttons.h"
 #include <esp_chip_info.h>
 #include <esp_heap_caps.h>
diff --git a/src/sysinfo.h b/src/utils/sysinfo.h
index 8a4f176..8a4f176 100644
--- a/src/sysinfo.h
+++ b/src/utils/sysinfo.h
diff --git a/src/wifi/wifi_analyzer.cpp b/src/wifi/wifi_analyzer.cpp
index 320e826..928e621 100644
--- a/src/wifi/wifi_analyzer.cpp
+++ b/src/wifi/wifi_analyzer.cpp
@@ -3,7 +3,7 @@
 #include <esp_wifi.h>
 
 #include "../ui/display.h"
-#include "../buttons.h"
+#include "../utils/buttons.h"
 
 // ===== CONFIG =====
 #define GRAPH_WIDTH     128
diff --git a/src/wifi/wifi_scan.cpp b/src/wifi/wifi_scan.cpp
index 0b20d3d..9dabe8f 100644
--- a/src/wifi/wifi_scan.cpp
+++ b/src/wifi/wifi_scan.cpp
@@ -1,7 +1,7 @@
 #include <Arduino.h>
 #include <WiFi.h>
 #include "../ui/display.h"
-#include "../buttons.h"
+#include "../utils/buttons.h"
 
 #define MAX_NETWORKS 30