move bluetooth, nfc, and utils into subfolders

src/bluetooth/ble_mouse.cpp

@@ -1,9 +1,9 @@
 #include <Arduino.h>
 #include <BleMouse.h>
-#include "badusb.h"
+#include "../hid/badusb.h"
-#include "config.h"
+#include "../config.h"
 
-#include "buttons.h"
+#include "../utils/buttons.h"
 #include "ui/display.h"
 
 // ===== BLE MOUSE =====

src/bluetooth/blescanner.cpp

@@ -5,8 +5,8 @@
 #include <vector>
 
 #include "ui/display.h"
-#include "buttons.h"
+#include "../utils/buttons.h"
-#include "config.h"
+#include "../config.h"
 
 // ===== DEVICE STRUCT =====
 struct BLEDeviceInfo {

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;
 

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"

src/nfc/nfc.cpp

@@ -5,8 +5,8 @@
 #include <Adafruit_PN532.h>
 
 #include "ui/display.h"
-#include "buttons.h"
+#include "../utils/buttons.h"
-#include "config.h"
+#include "../config.h"
 
 #define PN532_IRQ   -1
 #define PN532_RESET -1

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;

src/ui/menu.cpp

@@ -1,18 +1,18 @@
 #include <Arduino.h>
 #include "menu.h"
 #include "display.h"
-#include "buttons.h"
+#include "utils/buttons.h"
-#include "badusb.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 "utils/device_check.h"
-#include "ble_mouse.h"
+#include "bluetooth/ble_mouse.h"
-#include "sysinfo.h"
+#include "bluetooth/blescanner.h"
+#include "utils/sysinfo.h"
 #include "BleMouse.h"
-#include "nfc.h"
+#include "nfc/nfc.h"
 
 // ================= MENU DATA =================
 extern BleMouse bleMouse;

src/utils/buttons.cpp

@@ -1,6 +1,6 @@
 #include "buttons.h"
 #include <Arduino.h>
-#include "config.h"
+#include "../config.h"
 
 void buttonsInit()
 {

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;

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>

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

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