From 0ba7500cd1e1020842631c4fbef2a682fc93336e Mon Sep 17 00:00:00 2001 From: Razvalyaev Date: Tue, 20 May 2025 18:46:26 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=B4=D0=B5=D1=84=D0=B0=D0=B9=D0=BD=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=BE=D1=82=D0=BA=D0=BB=D1=8E=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20usb=20=D0=BC=D1=8B=D1=88=D0=BA=D0=B8=20-=20=D1=87=D1=82?= =?UTF-8?q?=D0=BE=D0=B1=D1=8B=20=D0=B2=D0=BE=20=D0=B2=D1=80=D0=B5=D0=BC?= =?UTF-8?q?=D1=8F=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D1=82=D0=B5=D1=80=D1=8F=D1=82=D1=8C=20=D0=B4=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D1=83=D0=BF=20=D0=BA=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=BB=D0=BB=D0=B5=D1=80=D1=83=20=D0=B8=D0=B7-=D0=B7=D0=B0=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=B9=D0=BA=D0=B8=20usb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mouse/mouse.ino | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/mouse/mouse.ino b/mouse/mouse.ino index 17aab46..45318e7 100644 --- a/mouse/mouse.ino +++ b/mouse/mouse.ino @@ -3,23 +3,22 @@ #define SHOW_REAL_BATTERY - - - -#ifdef SHOW_REAL_BATTERY -#define BATTERY_UPDATE_INTERVAL 5000 // например, 30000 мс = 30 секунд -#define BATTERY_ADC_PIN 6 -#define BATTERY_VOLTAGE_DIVIDER_RATIO 2.0f -#define BATTERY_VOLTAGE_MAX 5.0f -#define BATTERY_VOLTAGE_MIN 3.5f -#include "BatteryMonitor.h" -BatteryMonitor battery(BATTERY_ADC_PIN, BATTERY_VOLTAGE_DIVIDER_RATIO, BATTERY_VOLTAGE_MAX, BATTERY_VOLTAGE_MIN); - -#endif +#define DISABLE_USB BleMouse bleMouse("Ball Mouse"); +#ifdef SHOW_REAL_BATTERY + #define BATTERY_UPDATE_INTERVAL 5000 // например, 30000 мс = 30 секунд + #define BATTERY_ADC_PIN 6 + #define BATTERY_VOLTAGE_DIVIDER_RATIO 2.0f + #define BATTERY_VOLTAGE_MAX 5.0f + #define BATTERY_VOLTAGE_MIN 3.5f + #include "BatteryMonitor.h" + BatteryMonitor battery(BATTERY_ADC_PIN, BATTERY_VOLTAGE_DIVIDER_RATIO, BATTERY_VOLTAGE_MAX, BATTERY_VOLTAGE_MIN); +#endif//SHOW_REAL_BATTERY + +#ifndef DISABLE_USB // Расширяем класс для обработки USB мыши class MyEspUsbHost : public EspUsbHost { void onMouseButtons(hid_mouse_report_t report, uint8_t last_buttons) { @@ -48,8 +47,8 @@ class MyEspUsbHost : public EspUsbHost { bleMouse.move(report.x, report.y, report.wheel); } }; - MyEspUsbHost usbHost; +#endif //DISABLE_USB void setup() { Serial.begin(115200); @@ -59,12 +58,16 @@ void setup() { bleMouse.begin(); Serial.println("BLE Mouse started"); +#ifndef DISABLE_USB usbHost.begin(); Serial.println("USB Host started"); +#endif //DISABLE_USB } void loop() { +#ifndef DISABLE_USB usbHost.task(); +#endif //DISABLE_USB #ifdef SHOW_REAL_BATTERY // чтение уровня батареи