From 75eea47140e22f86fb23631e4fb436d8a09c8695 Mon Sep 17 00:00:00 2001 From: krolyxon Date: Mon, 11 May 2026 15:00:40 +0530 Subject: [PATCH] move bluetooth, nfc, and utils into subfolders --- src/{ => bluetooth}/ble_mouse.cpp | 6 +++--- src/{ => bluetooth}/ble_mouse.h | 0 src/{ => bluetooth}/blescanner.cpp | 4 ++-- src/{ => bluetooth}/blescanner.h | 0 src/{ => hid}/badusb.cpp | 2 +- src/{ => hid}/badusb.h | 0 src/main.cpp | 2 +- src/{ => nfc}/nfc.cpp | 4 ++-- src/{ => nfc}/nfc.h | 0 src/rf/nrf24.cpp | 2 +- src/ui/menu.cpp | 14 +++++++------- src/{ => utils}/buttons.cpp | 2 +- src/{ => utils}/buttons.h | 0 src/{ => utils}/device_check.cpp | 6 +++--- src/{ => utils}/device_check.h | 0 src/{ => utils}/sysinfo.cpp | 2 +- src/{ => utils}/sysinfo.h | 0 src/wifi/wifi_analyzer.cpp | 2 +- src/wifi/wifi_scan.cpp | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) rename src/{ => bluetooth}/ble_mouse.cpp (95%) rename src/{ => bluetooth}/ble_mouse.h (100%) rename src/{ => bluetooth}/blescanner.cpp (98%) rename src/{ => bluetooth}/blescanner.h (100%) rename src/{ => hid}/badusb.cpp (99%) rename src/{ => hid}/badusb.h (100%) rename src/{ => nfc}/nfc.cpp (97%) rename src/{ => nfc}/nfc.h (100%) rename src/{ => utils}/buttons.cpp (96%) rename src/{ => utils}/buttons.h (100%) rename src/{ => utils}/device_check.cpp (97%) rename src/{ => utils}/device_check.h (100%) rename src/{ => utils}/sysinfo.cpp (98%) rename src/{ => utils}/sysinfo.h (100%) diff --git a/src/ble_mouse.cpp b/src/bluetooth/ble_mouse.cpp similarity index 95% rename from src/ble_mouse.cpp rename to 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 #include -#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 similarity index 100% rename from src/ble_mouse.h rename to src/bluetooth/ble_mouse.h diff --git a/src/blescanner.cpp b/src/bluetooth/blescanner.cpp similarity index 98% rename from src/blescanner.cpp rename to src/bluetooth/blescanner.cpp index ba12568..d637683 100644 --- a/src/blescanner.cpp +++ b/src/bluetooth/blescanner.cpp @@ -5,8 +5,8 @@ #include #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 similarity index 100% rename from src/blescanner.h rename to src/bluetooth/blescanner.h diff --git a/src/badusb.cpp b/src/hid/badusb.cpp similarity index 99% rename from src/badusb.cpp rename to src/hid/badusb.cpp index 37d5ea7..0438357 100644 --- a/src/badusb.cpp +++ b/src/hid/badusb.cpp @@ -1,6 +1,6 @@ #include #include -#include "ui/display.h" +#include "../ui/display.h" extern USBHIDKeyboard Keyboard; diff --git a/src/badusb.h b/src/hid/badusb.h similarity index 100% rename from src/badusb.h rename to 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 similarity index 97% rename from src/nfc.cpp rename to src/nfc/nfc.cpp index 3dcf5a9..474b4a0 100644 --- a/src/nfc.cpp +++ b/src/nfc/nfc.cpp @@ -5,8 +5,8 @@ #include #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 similarity index 100% rename from src/nfc.h rename to 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 #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 #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 similarity index 96% rename from src/buttons.cpp rename to 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 -#include "config.h" +#include "../config.h" void buttonsInit() { diff --git a/src/buttons.h b/src/utils/buttons.h similarity index 100% rename from src/buttons.h rename to src/utils/buttons.h diff --git a/src/device_check.cpp b/src/utils/device_check.cpp similarity index 97% rename from src/device_check.cpp rename to 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 #include #include -#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 similarity index 100% rename from src/device_check.h rename to src/utils/device_check.h diff --git a/src/sysinfo.cpp b/src/utils/sysinfo.cpp similarity index 98% rename from src/sysinfo.cpp rename to src/utils/sysinfo.cpp index 046933e..aad170d 100644 --- a/src/sysinfo.cpp +++ b/src/utils/sysinfo.cpp @@ -1,5 +1,5 @@ #include -#include "ui/display.h" +#include "../ui/display.h" #include "buttons.h" #include #include diff --git a/src/sysinfo.h b/src/utils/sysinfo.h similarity index 100% rename from src/sysinfo.h rename to 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 #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 #include #include "../ui/display.h" -#include "../buttons.h" +#include "../utils/buttons.h" #define MAX_NETWORKS 30